Commit graph

16 commits

Author SHA1 Message Date
Ghostkeeper
7a1c3e1bd5
Use customised TableView for Keep/Discard Changes dialogue
Had to make some more modifications to get it to work again this time, due to the way the width of the table scales with the dialogue. But it's nice now.

Contributes to issue CURA-8686.
2022-01-26 16:30:50 +01:00
jelle Spijker
f730959f78 fixed discard or keep combobox on Mac
Use the new controls ComboBox
2021-08-30 16:15:02 +02:00
Konstantinos Karmas
504f6dbe70
Revert "Cura 7813 qml modules version bump" 2021-03-30 09:48:28 +02:00
jelle Spijker
3baa71fd48
Update QtGraphicalEffects, Window and Dialogs
CURA-7813
2021-03-29 18:12:35 +02:00
jelle Spijker
9da321ffb9
Update Layouts, Control.Styles and Dialogs
CURA-7813
2021-03-29 18:04:47 +02:00
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02:00
Ghostkeeper
a2d2043b3c
Don't create DiscardOrKeepProfileChangesDialog on start-up
Just whenever we need it, please.
This removes a warning from the start-up sequence, but the warning is still there when you open the dialogue. It's complaining that a model has size -13 and another has size -14, but I don't know which model that is. The UserChangesModel seems to be fine at a size of 1 or so.

Contributes to issue CURA-7501.
2020-10-30 17:45:58 +01:00
Ghostkeeper
222d6604e0
Clarifications and fixes to source strings
Found during work on CURA-7622.
2020-08-21 16:40:24 +02:00
Remco Burema
302e0c6277
Remove redundant button.
As discussed in the CCB this morning. Since the new profile will be the _changed to_ profile rather than the _changed from_ (the latter of which would make the button useful, but since the profile is already switched at that point it would be a lot of work), the 'Create New Profile ...' button (in  the Keep/Discard dialog) is redundant, since you can always create a new profile if you select keep changes.
2020-07-22 11:04:58 +02:00
Ghostkeeper
09298eac93
Elide setting name if it's too long
This keeps the text readable.

Fixes #7926.
2020-06-15 12:24:39 +02:00
Ghostkeeper
c7929fa053
Fix theming of width/height of this dialogue
Also allow resizing it, because why not.

Contributes to #7926.
2020-06-15 12:22:20 +02:00
Remco Burema
4b4864485c
CURA-7409 Update keep/discard dialog more. 2020-04-29 16:23:06 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog. 2020-04-29 13:02:48 +02:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups
Contributes to #6670
2019-11-19 13:00:39 +01:00
Jaime van Kessel
377a21071b
Remove color from discard dialog text, since it uses system style
Originally a lot of text would not be readable when in dark theme
because the text would be light, but the background would always be
white.
2019-11-18 11:33:36 +01:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs.
Contributes to CURA-5784.
2018-10-09 17:11:01 +02:00
Renamed from resources/qml/DiscardOrKeepProfileChangesDialog.qml (Browse further)