16 Commits

Author SHA1 Message Date
Diego Prado Gesto
b2950eca51 CURA-5158 Fix some mistakes in previous confict fixing. 2018-03-29 14:37:55 +02:00
Ghostkeeper
b30df14073
Merge branch '3.3' 2018-03-29 08:55:06 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container
changes and output devices change.
2018-03-28 11:07:48 +02:00
Diego Prado Gesto
2ee42dda33 CURA-5158 The printer menu now reacts to the global container changes so
it is updates even if there is no connection.
2018-03-27 11:56:08 +02:00
Diego Prado Gesto
3ce51bb255 CURA-4870 Correctly align the name with the connection icon when the
printer is connected to USB
2018-03-15 16:14:20 +01:00
Diego Prado Gesto
0155a20994 CURA-4870 Fix visibility in the status icon 2018-03-15 10:33:06 +01:00
Diego Prado Gesto
1cf832653c CURA-4870 Make the configuration selector only available for network
printers.
Show the connection icon also for printers connected via USB or
Octoprint.
2018-03-14 17:00:39 +01:00
Diego Prado Gesto
23a2b6e0f7 CURA-4870 Don't show the configuration selector if the printer is not a
network printer (for example don't show if is USB)
2018-03-14 11:54:10 +01:00
Diego Prado Gesto
8a48503104 Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button
Fix some conflicts
2018-03-09 15:16:21 +01:00
Diego Prado Gesto
16a5b652f4 CURA-4870 Make the machine selection toolbutton react to changes in the
output devices
2018-03-09 15:08:51 +01:00
Ian Paschal
ae2a286e3f Improved Icons & Styling 2018-03-09 14:07:29 +01:00
Ian Paschal
1a57e9323b Improved status icon size 2018-03-08 12:54:59 +01:00
Ian Paschal
ffccdd99c0 Added status icon 2018-03-08 10:55:29 +01:00
Diego Prado Gesto
86103b4a0f CURA-4870 Change text size of the selected printer 2018-03-07 22:54:03 +01:00
Ian Paschal
a02486e85a Added status icon 2018-03-07 17:15:56 +01:00
Jack Ha
cda6aa2547 CURA-4234 splitted MachineSelection into a separate file and add it to PrintMonitor as well, because now it's part of the sidebar 2017-12-14 14:49:18 +01:00