Ghostkeeper
2ccc30b824
Only show add machine dialogue if your stack got corrupt, not whole onboarding
...
We don't need to accept the EULA again or whatever. Just add the printer that got lost.
Contributes to issue CURA-6057.
2019-04-03 15:52:07 +02:00
Jaime van Kessel
5c354eb6a3
Switch the order of name & id in addMachine call
...
This makes it possible for the name to not be set, in which case it will
default to the name provided by the definition
CURA-6179
2019-02-26 10:45:18 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages
...
It is now the default in Uranium.
Contributes to issue CURA-5876.
2018-12-04 15:04:51 +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
384c359db1
Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0
2018-11-30 15:34:47 +01:00
Jaime van Kessel
a825daea95
Cleanup the Theme.json
...
There were a lot of sizes that weren't used
2018-11-26 17:10:48 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu""
...
This reverts commit 791929d6897942e971a112a26839c0fa6f94f847.
2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"
...
This reverts commit 4caf770a62f07b71a646b7f09a08623485b89582, reversing
changes made to 0cdcd61ff2dfe2677e636cc2f1ee993cbd9d641d.
2018-11-20 23:47:46 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu
...
* fix-oauth2-client:
Switch Ultimaker Account OAuth2 client
Fix the title's top margin size in the add machine dialog.
2018-11-20 20:48:52 +01:00
Diego Prado Gesto
18c9e9f05a
Merge branch 'ui_rework_4_0' into cura4.0_header
2018-11-06 09:23:15 +01:00
Diego Prado Gesto
ef0ba81564
Merge branch 'ui_rework_4_0' into cura4.0_header
2018-11-01 09:21:33 +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
