29 Commits

Author SHA1 Message Date
Ghostkeeper
024bf409c9
Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0 2018-12-05 13:29:06 +01:00
Jaime van Kessel
b2238420fb Ensure that reset always correctly gets set to basic
The old code that simply resetted the preferences was still active, but this could cause a race condition
in some situations. In those cases it would first set it to basic and then clear the preferences (thus
resulting in no settings being visible)

CURA-5981
2018-12-04 15:46:13 +01:00
Ghostkeeper
b5bb3232f3
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
2018-12-04 15:21:36 +01:00
Lipu Fei
9ec7428620 Fix setting visiblity current index
CURA-5981
2018-12-04 10:55:01 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Ghostkeeper
f3af5a72ad
Use ListModel.count instead of rowCount
The .count property properly updates when the model is changed.

Contributes to issue CURA-5876.
2018-12-03 11:13:26 +01:00
Jaime van Kessel
ad26962cb9 Fix setting visibility not working in settingVisibilityPage
CURA-5981
2018-11-30 15:49:50 +01:00
Ghostkeeper
b37252f124
Minor code style fixes
Contributes to issue CURA-5734.
2018-10-10 14:18:37 +02:00
Jaime van Kessel
fc9f05fc8b Moved SettingVisibilityPreset loading to it's own class
Since there was so much debate regarding the unit testing of the visiblity presets, i had another look at it.
The old version was almost untestable because all functionalities were mushed together into a single class.

CURA-5734
2018-10-01 11:32:55 +02:00
Lipu Fei
f0dc138b37 Fix visibilty preset update
CURA-5088
2018-03-19 14:14:22 +01:00
Lipu Fei
2660d15857 Make "show all settings" work
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
2018-03-19 10:58:56 +01:00
Lipu Fei
8e39849aad Refactor setting visibility preset
CURA-5088
2018-03-15 14:41:34 +01:00
Lipu Fei
83175b00c2 Change SettingVisibilityPresetsModel to non-singleton
CURA-5088
2018-03-15 14:41:34 +01:00
fieldOfView
711d60e8c7 Allow switching back to the "Custom" set 2018-03-09 16:44:27 +01:00
fieldOfView
61bbfcda3a Add back "custom" option to the setting visibility page 2018-02-09 19:28:00 +01:00
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
fieldOfView
f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets
This is closer to the current Cura intend
2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb Move setting visibility presets into a model
Handling of "Custom" is still under consideration
2018-02-08 23:07:45 +01:00
Aleksei S
f655b0e033 Set Custom in visible setting preset
CURA-3710
2018-02-07 16:22:13 +01:00
Aleksei S
c890472641 Fix: save Custom setting visibility preset
CURA-3710
2018-02-07 10:53:17 +01:00
Lipu Fei
367e50669d Refactor code
CURA-3710
2018-02-01 13:56:49 +01:00
Aleksei S
f065a08c82 Added visible settings
CURA-3710
2018-01-30 15:26:15 +01:00
Aleksei S
54dc63a596 Add missing changes
CURA-3710
2018-01-23 11:24:27 +01:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Simon Edwards
882f4c1aef Make the other parts of the Cura UI which have a filter, also search on i18n labels.
CURA-2653 Searching in English while other language set
2016-12-08 16:55:22 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Jaime van Kessel
ab06d692d7 Added showAncestor option to settingvisibility page
CURA-2859
2016-11-03 14:59:57 +01:00
fieldOfView
e2d32ef963 Change references from Uranium to Cura 2016-10-17 14:17:28 +02:00
Jaime van Kessel
8046e72a10 Added missing file 2016-08-26 09:35:21 +02:00