20 Commits

Author SHA1 Message Date
ChrisTerBeke
b2d3d15011 Fix conflicts 2018-01-11 09:06:59 +01:00
ChrisTerBeke
fd86cc84e2 check if parent exists before using width and height properties from it 2018-01-10 11:17:26 +01:00
fieldOfView
2ce73a1839 Fix updating icon in the top bar
This makes sure events such as onAcceptsCommandsChanges get connected if an outputdevice has been added before the monitorstage is initialized.
2018-01-10 00:07:43 +01:00
Jaime van Kessel
931c87716b Connection state changes now trigger a re-evaluation of the icon
CL-541
2017-12-22 11:31:48 +01:00
Jaime van Kessel
e576c1a9f7 Ensure that an update of icon also happens on output device change
CL-541
2017-12-21 10:01:29 +01:00
Jaime van Kessel
24bd32477a Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-14 13:03:02 +01:00
Jaime van Kessel
1719a7b2fe Fixed preheating for Legacy UM3
CL-541
2017-12-08 17:16:59 +01:00
ChrisTerBeke
c4d7a33c31 Monitor view component loader should have width and height from parent 2017-12-08 14:56:03 +01:00
Jaime van Kessel
9ccd643f64 Repaired the monitor icon not being updated
CL-541
2017-12-08 14:36:53 +01:00
Jaime van Kessel
a8695db1c8 Fixed displaying of icons in monitor stage tab
CL-541
2017-12-08 10:44:05 +01:00
ChrisTerBeke
f91a4db617 Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component 2017-12-07 10:38:06 +01:00
ChrisTerBeke
dd92d8d5e0 Re-implement monitor view overlay when there is no monitor component 2017-12-07 09:22:02 +01:00
ChrisTerBeke
f6b570e299 Back to QUrl, fix monitor view overlay 2017-12-07 09:13:46 +01:00
ChrisTerBeke
548761fcc3 Some cleanup 2017-12-06 18:15:17 +01:00
ChrisTerBeke
ee643610e5 Fix sidebar loading and unloading depending on active stage 2017-12-06 17:46:18 +01:00
ChrisTerBeke
2d044a37ae Sidebar and main view via loader 2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b Make sidebar view working for active stage 2017-12-06 12:23:41 +01:00
ChrisTerBeke
0e1c9146cf Implement stage model in top bar 2017-12-06 09:58:50 +01:00
ChrisTerBeke
a5b99bd862 Scaffold monitor stage 2017-12-06 09:36:09 +01:00
ChrisTerBeke
84ba486d57 Add plugins for prepare and monitor stages 2017-12-06 09:34:09 +01:00