13 Commits

Author SHA1 Message Date
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
5118953373 Put a change timer on the globalStacks model
This decreases the time that a first thing is shown on the main screen (as the creation
of the global stack model doesn't block the UI anymore)
2019-02-21 18:30:23 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Remco Burema
7e11345f14 Remove checked off TODO-comment. [CURA-6153] 2019-01-31 20:30:57 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Ghostkeeper
232498980c
Merge branch '4.0'
Conflicts:
	cura/GlobalStacksModel.py -> CuraContainerRegistry being used in stead of ContainerRegistry, but imports were reordered.
	plugins/CuraDrive/src/DrivePluginExtension.py -> Typing being solved in two ways.
2019-01-28 16:45:45 +01:00
Jaime van Kessel
3774fdbd02 Refactored the "connection_type" metadata entry so it can support multiple types.
After a lot of discussion and finding out what the hell was going on,
we figured out we made a pretty big derp by only setting a single connection_type
in the metadata of the machine. What it's actually doing is describing what connection types
have been configured (and not just randomly displaying whatever output device set the value last)
2019-01-28 14:29:41 +01:00
Lipu Fei
c83f815838 Fix tests 2019-01-18 13:46:37 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Jaime van Kessel
d9d1c93bd0 Use "NotConnected" as default for the connection state
CURA-6011
2018-12-31 11:25:23 +01:00
Jaime van Kessel
89040b6d8f Remove unneeded nameChanged signal connection
CURA-6011
2018-12-31 11:18:17 +01:00
Jaime van Kessel
1277fbabc5 Fix connection type not always being seen correctly
CURA-6011
2018-12-31 11:15:03 +01:00
Jaime van Kessel
fd9b29fee2 Rename printersModel to GlobalStacksModel
This is a better description for the model anyway.

CURA-6011
2018-12-31 11:09:39 +01:00