59 Commits

Author	SHA1	Message	Date
Ian	cac8c85489	Don't use __file__ ... Contributes to CL-1274	2019-03-01 10:46:41 +01:00
Ian	cf9a1c0248	Sort UM imports alphabetically for easy scanning ... Contributes to CL-1274	2019-03-01 10:46:27 +01:00
Simon Edwards	60547b4265	Merge pull request #5329 from Ultimaker/CL-1247_improve_cloud_disabled_states ... CL-1247 Improve cloud disabled states	2019-02-20 13:17:11 +01:00
Simon Edwards	43b1c86920	Use QUrl.fromLocalFile() to create the file:// URLs for the images	2019-02-20 09:31:51 +01:00
Simon Edwards	3ad916b565	Fix the path to the pop up images in the monitor tab.	2019-02-19 17:07:09 +01:00
Ian Paschal	0ef014a542	Don't show "Review Connection" unless you're on the LAN ... Contributes to CL-1247	2019-02-19 12:24:04 +01:00
Ian Paschal	05b5dfa05f	Improve "don't ask me again" checkbox ... Contributes to CL-1222	2019-02-19 10:13:05 +01:00
Ian Paschal	e39e09a692	Fix incorrect method name ... Contributes to CL-1165	2019-02-13 15:21:09 +01:00
Simon Edwards	8f37421c11	Merge pull request #5291 from Ultimaker/CL-1222_cloud_flow_pop_up ... CL-1222 Ensure pop-up is not shown if cloud connection is already configured	2019-02-13 14:30:40 +01:00
Ian Paschal	25cfd4f496	Avoid double negatives in cloud flow metadata ... Contributes to CL-1222	2019-02-13 14:21:23 +01:00
Simon Edwards	d08b8d813d	Generate the correct path for the svg on Windows. ... CL-1222	2019-02-13 12:24:59 +01:00
Ian Paschal	cf4bcf81e7	Make pop up permanent ... Contributes to CL-1222	2019-02-13 11:49:53 +01:00
Ian Paschal	d74f4f36bd	Improve cloud flow checks ... Contributes to CL-1222	2019-02-13 11:30:31 +01:00
Ian Paschal	8fecf7fb39	Don't crash when clicking don't show again ... Contributes to CL-1222	2019-02-13 11:04:51 +01:00
Ian Paschal	c15e49876a	Revert "Use parseBool instead of "is True" and "is False"" ... This reverts commit aa454ea357b8a64405601b37e1a0ec5f230a34c5.	2019-02-13 11:00:11 +01:00
Ian Paschal	aa2acac244	Fix typo ... Contributes to CL-1222	2019-02-13 10:52:37 +01:00
Ian Paschal	70fc363048	Fix cloud pop up paths ... Contributes to CL-1222	2019-02-13 10:49:53 +01:00
Ian Paschal	aa454ea357	Use parseBool instead of "is True" and "is False" ... Contributes to CL-1222	2019-02-12 12:18:29 +01:00
Ian Paschal	0e913044de	Ensure pop-up is not shown if cloud connection is already configured ... Contributes to CL-1222	2019-02-11 10:21:54 +01:00
Ian Paschal	8807243108	Merge pull request #5286 from Ultimaker/CL-1222_cloud_flow_pop_up ... CL-1222 Cloud flow pop-up (Finalize copy)	2019-02-08 14:09:53 +01:00
Ian Paschal	937dce591d	Finalize copy ... Contributes to CL-1222	2019-02-08 13:53:02 +01:00
Simon Edwards	1163d8f442	Merge pull request #5271 from Ultimaker/CL-1222_cloud_flow_pop_up ... CL-1222 Cloud flow pop up	2019-02-08 13:26:03 +01:00
Ian Paschal	0dfcaadc49	Typecheck improvements ... Contributes to CL-1222	2019-02-08 13:13:26 +01:00
Ian Paschal	53e07eadd3	Allow for optional typing ... Contributes to CL-1222	2019-02-08 13:03:10 +01:00
Ian Paschal	2d77792988	Add some typings ... Contributes to CL-1222	2019-02-08 12:54:10 +01:00
Ian Paschal	2b6bab9552	Re-enable firmware check ... Contributes to CL-1222	2019-02-06 16:42:26 +01:00
Ian Paschal	fcb52dd1cf	Show cloud flow pop-up if machine is removed from cloud ... Contributes to CL-1222	2019-02-06 14:26:11 +01:00
Ian Paschal	162fdad4e4	Improve conditions for starting cloud flow ... Contributes to CL-1222	2019-02-06 13:58:33 +01:00
Ian Paschal	3a4fcb354a	Show cloud connection flow pop-up ... Contributes to CL-1222	2019-02-06 12:04:15 +01:00
Ian Paschal	5c0c176730	Show confirmation pop-up for cloud flow ... Contributes to CL-1222	2019-02-05 16:52:15 +01:00
Ian Paschal	70c384bd4e	Finish adding cloud flow checks ... Contributes to CL-1222	2019-02-05 16:51:47 +01:00
Ian Paschal	b29f3d3bd0	Improve comment ... Contributes to CL-1222	2019-02-05 16:50:50 +01:00
Ian Paschal	c41e81a6b9	Set required firmware version for cloud to 5.2.0 ... Contributes to CL-1222	2019-02-05 16:50:36 +01:00
Ian Paschal	9c82cfd6fa	Comment out firmware check for dev purposes ... Contributes to CL-1222	2019-02-04 16:52:01 +01:00
Ian Paschal	f2ddb2808f	Add firmware check ... Contributes to CL-1222	2019-02-04 16:02:38 +01:00
Ghostkeeper	7d871e5a18	Update text for pre-login screen ... This is a new text that we got from marketing.	2019-02-04 13:06:06 +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
ChrisTerBeke	7c7bca31c7	Fix renamed property connectionType	2019-01-08 11:52:27 +01:00
ChrisTerBeke	a6114d39e4	Fix merge conflicts with 4.0	2019-01-08 11:49:36 +01:00
Jaime van Kessel	4c1f68a447	Ensure that the connectiontype of a connected printer is set correctly ... CURA-6011	2019-01-04 15:24:01 +01:00
ChrisTerBeke	5e9fe3fe50	Fix some codestyle, make connectionType a property as it's needed in QML	2018-12-19 11:21:50 +01:00
ChrisTerBeke	25caf1a087	Fix merge conflicts	2018-12-18 14:44:13 +01:00
Jaime van Kessel	84a7f2e5a2	Fix review comments ... CURA-6011	2018-12-18 09:40:08 +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
Daniel Schiavini	4dc8edb996	STAR-322: Fixing the multipart upload	2018-12-14 12:48:40 +01:00
Daniel Schiavini	01e443049f	STAR-322: Creating a subclass for connect devices	2018-12-05 10:37:58 +01:00
ChrisTerBeke	24b75d781e	Fix merge conflict	2018-12-03 15:58:25 +01:00
Jaime van Kessel	36a86adc0f	Remove spammy log	2018-11-30 16:08:19 +01:00
ChrisTerBeke	269d596f5d	Fix typing for cluster list	2018-11-26 14:54:24 +01:00
ChrisTerBeke	856276d8b7	Cleanup plugin imports	2018-11-26 14:53:08 +01:00