14 Commits

Author	SHA1	Message	Date
ChrisTerBeke	25caf1a087	Fix merge conflicts	2018-12-18 14:44:13 +01:00
Jaime van Kessel	be9d35d45f	Fix some minor layout issues ... CURA-6011	2018-12-18 09:47:51 +01:00
Jaime van Kessel	aad7540366	Fix situation where multiple connect configurations would cause issues ... CURA-6011	2018-12-17 13:31:38 +01:00
Jaime van Kessel	938287095f	Use connection type instead of um_network_key to see if a printer has a network connection ... CURA-6011	2018-12-17 10:47:14 +01:00
Jaime van Kessel	226d052468	Move the machines from machinelist into their own model ... CURA-6011	2018-12-14 17:10:58 +01:00
Lipu Fei	4252b95603	Make ConnectionType Enum type accessible to QML ... CURA-6011	2018-12-14 11:28:21 +01:00
Aleksei S	973970a895	Every print ouput device should define its connection type(usb, network, cluster and etc) ... CURA-6011	2018-12-13 16:00:12 +01:00
ChrisTerBeke	ec03b012a7	fix merge conflict	2018-12-06 16:39:58 +01:00
Diego Prado Gesto	46c209a993	Add one pixel margin to the view selector.	2018-12-06 14:45:24 +01:00
ChrisTerBeke	d0513e40e1	Remove crappy implementation	2018-12-04 22:21:36 +01:00
ChrisTerBeke	0887817f7d	use special icon for cloud connected	2018-12-04 16:35:09 +01:00
ChrisTerBeke	e98f3bff38	Implement test version of showing cloud connected printers in list	2018-12-04 14:09:20 +01:00
Diego Prado Gesto	21bfa6e4c2	Fix code style. Add brackets in new line. ... Contributes to CURA-5942.	2018-11-26 10:58:38 +01:00
Diego Prado Gesto	a3bcdaf3b6	Make the popup in the printer selector resizable depending on the ... contents. Also there is a maximum height that will fit 9 printers. Contributes to CURA-5942.	2018-11-23 16:58:57 +01:00