64 Commits

Author SHA1 Message Date
Jaime van Kessel
c950288b86 Minor UI changes to projectDialog
CURA-1263
2016-12-02 13:41:39 +01:00
Jaime van Kessel
9a03e8640b Added spacers to workspace dialog
CURA-1263
2016-12-02 13:39:39 +01:00
Jaime van Kessel
3345e918e8 Conflict resolvement boxes are now invisible if there is nothing to resolve
CURA-1263
2016-12-02 13:37:56 +01:00
Jaime van Kessel
c236f7d266 Total number of settings is now calculated for open project dialog
CURA-1263
2016-12-02 13:31:31 +01:00
Jaime van Kessel
04d268b1fb Machine name is now also displayed in open project dialog
CURA-1263
2016-12-02 13:27:39 +01:00
Jaime van Kessel
b3f1f6b4db Project load dialog now also gives information about the quality & quality changes
CURA-1263
2016-12-02 13:01:01 +01:00
Jaime van Kessel
6bb1b7ec80 Number of settings & mode are now displayed in open Project
CURA-1263
2016-12-02 11:54:28 +01:00
Jaime van Kessel
5119ee9a93 Use correct descriptor for project open
CURA-1263
2016-12-02 11:13:21 +01:00
Jaime van Kessel
92a4fd7239 Materials are now also handled in conflict resolvement
CURA-1263
2016-11-17 11:16:15 +01:00
Jaime van Kessel
053f0ca031 Replaced hack for setting extruders with more robust setter
CURA-1263
2016-11-16 14:54:48 +01:00
Jaime van Kessel
b175e6876f Added material conflict option
This is still desabled by default due to some architecture issues (so this is temporarily left as it is)

CURA-1263
2016-11-16 14:45:34 +01:00
Jaime van Kessel
bbf5c73dae Quality_changes user option is now set correctly
CURA-1263
2016-11-15 15:11:32 +01:00
Jaime van Kessel
f0eb5e0da3 User can now select what strategy to use per conflict
CURA-1263
2016-11-15 15:10:10 +01:00
Jaime van Kessel
cbcc48ff33 Pre-read now checks for conflicts and asks the user what strategy for resolvement to use
CURA-1263
2016-11-11 17:17:23 +01:00