1338 Commits

Author SHA1 Message Date
Lipu Fei
a0f841e8eb Prevent MachineSettings dialog go beyond the top of screen 2017-03-23 13:46:01 +01:00
Lipu Fei
fa7dc3a708 Use onActivated for profile override combobox 2017-03-22 16:01:50 +01:00
Lipu Fei
f9e377ec43 Enable/disable Keep/Discard buttons according to selection 2017-03-22 13:07:58 +01:00
Lipu Fei
8dbb1d47e1 Shrink the widht of profile override combobox 2017-03-21 11:14:55 +01:00
Lipu Fei
8f3e7c6fa5 More spacing for override profile combobox 2017-03-21 11:05:37 +01:00
Lipu Fei
555cd58f5e Save with code names for profile override preference
CURA-3561
2017-03-21 09:09:17 +01:00
Lipu Fei
8d6ea7bb97 Adjust Discard/Keep Profile Dialog size for high DPI 2017-03-20 11:30:05 +01:00
Jaime van Kessel
efce0696bd Recently activated material can no longer be removed
CURA-3147
2017-03-16 13:11:51 +01:00
Lipu Fei
97b943736b Use translation for text in keep/discard profile dialog 2017-03-14 11:59:51 +01:00
Lipu Fei
c9d223acd4 CURA-3452 Save spool cost and weight upon change 2017-03-10 12:41:28 +01:00
Lipu Fei
e67aecb041 CURA-3221 Translate column name "Default" 2017-03-08 15:36:11 +01:00
jack
c154ce07f8 Merge pull request #1499 from LipuFei/feature_CURA-3397-override-profile-dialog
CURA-3397 Set override profile preference option upon visibility change
2017-03-08 10:32:14 +01:00
jack
4a68f25769 Merge pull request #1502 from LipuFei/feature_CURA-3221-improve-override-profile-dialog
CURA-3221 improve override profile dialog
2017-03-08 09:52:32 +01:00
Lipu Fei
a20fb7a479 Fix some coding style 2017-03-07 20:18:31 +01:00
Lipu Fei
897791b0d2 CURA-3221 Use "system" font so texts fit in rows 2017-03-07 12:53:21 +01:00
Lipu Fei
adb37de51c Code style fixes 2017-03-07 12:53:20 +01:00
Lipu Fei
85bc79bde2 CURA-3221 Smaller settings column width for override profile dialog 2017-03-07 12:53:20 +01:00
Lipu Fei
d2c03b3554 CURA-3221 Larger window size for override profile dialog 2017-03-07 12:53:20 +01:00
Lipu Fei
9c5404401a CURA-3221 Remove star image 2017-03-07 12:53:20 +01:00
Lipu Fei
79de5eebb7 CURA-3221 Use "default" theme for description text 2017-03-07 12:53:20 +01:00
Lipu Fei
e9ae531de2 CURA-3397 Set override profile preference option upon visibility change 2017-03-07 11:15:47 +01:00
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732 Add result type. 2017-03-07 10:31:11 +01:00
Jaime van Kessel
856562236e Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura 2017-03-06 16:17:48 +01:00
Tim Kuipers
38a9df9d76 fix: more lenient int-list validator parsing (CURA-3275)
allow for empty integers
allow the brackets to be omitted
2017-03-06 14:42:11 +01:00
Tim Kuipers
87c8ff0e08 Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles 2017-03-06 14:31:57 +01:00
Lipu Fei
1c15d24e5b CURA-3397 Reduce tableView height to show buttons 2017-03-06 12:37:29 +01:00
Lipu Fei
c9254a3095 CURA-3397 Enable/disable "keep" and "discard" buttons according to the choice 2017-03-06 12:15:58 +01:00
Jaime van Kessel
2f3998b9db Fixed layout of discard dialog 2017-03-03 14:46:40 +01:00
Jaime van Kessel
419396cc16 Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura 2017-03-03 14:43:42 +01:00
Lipu Fei
b65d950181 CURA-3397 Change headers in override profile table 2017-03-03 13:23:32 +01:00
Lipu Fei
67b57129ed CURA-3397 Add options for profile override dialog 2017-03-03 13:23:32 +01:00
Lipu Fei
7997ae55ea CURA-3397 Make discard button default 2017-03-03 13:19:56 +01:00
Jaime van Kessel
cd9a8dbca5 Listbox now scales with window
CURA-3221
2017-03-03 10:19:53 +01:00
Jaime van Kessel
8e4f650746 Added a tiny bit of spacing between machine action buttons 2017-03-03 09:47:58 +01:00
Ghostkeeper
c0b4d43995
Add hotkey for reload all models
Small change. I can't be bothered to make an issue for this.
2017-03-02 15:42:57 +01:00
Simon Edwards
3e4ee0639c Fixed case of the button text.
CURA-3398
2017-03-02 11:46:28 +01:00
Jack Ha
f9a5dc885c Solved merge conflicts #1479 CURA-3321 2017-03-01 14:47:54 +01:00
Jaime van Kessel
0bf0b29a50 Added Create new profile button to Discard or keep profile changes dialog
CURA-3398
2017-03-01 14:42:18 +01:00
Jaime van Kessel
a1281bc019 Clarified some of the text in the discard dialog
CURA-3221
2017-03-01 11:33:03 +01:00
Jaime van Kessel
af21146fef Layout improvements
CURA-3221
2017-02-28 14:07:12 +01:00
Jaime van Kessel
4d7133610d Updated layout of dialog
CURA-3221
2017-02-28 13:38:15 +01:00
Jaime van Kessel
85b58c9296 Pressing the discard button now actually discards the changes
CURA-3221
2017-02-28 12:35:08 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes.
CURA-3221
2017-02-28 10:25:42 +01:00
Jaime van Kessel
4f74edd421 Project name is now correctly set upon loading project
CURA-3387
2017-02-21 14:27:56 +01:00
Jack Ha
057dc2fd7d Solved merge conflicts. CURA-3214 2017-02-21 11:01:20 +01:00
Jaime van Kessel
0b4a05a84c Recommended settings now shows correct status for adhesion when None was selected
Fixes #1454
2017-02-20 17:32:20 +01:00
fieldOfView
61e0cd4ff5 Move legacy options to layerview options 2017-02-20 11:09:34 +01:00
Jaime van Kessel
3bbbd4a692 Merge branch 'fix_window_overflow' of https://github.com/fieldOfView/Cura 2017-02-17 15:31:10 +01:00
fieldOfView
9254ac1694 Add libSavitar credit 2017-02-17 13:44:43 +01:00