6121 commits

Author	SHA1	Message	Date
Lipu Fei	f2d7f93101	Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding_machine_action	2019-03-21 08:35:06 +01:00
Lipu Fei	7e176e0f2c	Fix merge conflicts	2019-03-21 08:34:07 +01:00
Remco Burema	1f2fea14ce	Little refactors (apply review comments). [CURA-6294]	2019-03-20 16:08:50 +01:00
Lipu Fei	5d45dba8f3	Fix DiscoveredMachineModel test	2019-03-20 16:00:39 +01:00
Lipu Fei	a17642a5a1	Merge WIP_onboarding_by_ip	2019-03-20 13:42:15 +01:00
Lipu Fei	615241a416	Fix module renaming	2019-03-20 13:39:08 +01:00
Remco Burema	ad6603bab8	Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip	2019-03-20 13:33:19 +01:00
Lipu Fei	c3c9c53f13	Merge WIP_onboarding	2019-03-20 11:28:30 +01:00
Lipu Fei	ccc4ba0bde	Simplify code in WelcomePagesModel	2019-03-20 11:09:09 +01:00
Lipu Fei	da351da611	Update comments for associateActiveMachineWithPrinterDevice()	2019-03-20 10:48:04 +01:00
Lipu Fei	105a07fc16	Rename vars and add typing in DiscoveredPrintersModel	2019-03-20 10:42:43 +01:00
Lipu Fei	e623c807ce	Rename SectionName to DiscoverySource in GlobalStacksModel	2019-03-20 10:39:23 +01:00
Lipu Fei	a97410656f	Fix WelcomePagesModel qml type registering typo	2019-03-20 10:00:14 +01:00
Lipu Fei	4078719c58	Move cura.Machine.Models to cura.UI.MachineModels	2019-03-20 09:56:11 +01:00
Lipu Fei	81fbc525e4	Rename ConfigurationModel to PrinterConfigurationModel	2019-03-20 09:52:35 +01:00
Lipu Fei	e555f7da68	Move ConfigurationModel into cura.UI module	2019-03-20 09:51:06 +01:00
Lipu Fei	69eb381f10	Move MaterialOutputModel into cura.UI module	2019-03-20 09:47:44 +01:00
Lipu Fei	2d78c2d7fc	Move ExtruderOutputModel into cura.UI module	2019-03-20 09:45:26 +01:00
Lipu Fei	49c87a1e1d	Move ExtruderConfigurationModel into cura.UI module	2019-03-20 09:44:15 +01:00
Lipu Fei	6a8db55112	Move PrinterOutputModel into cura.UI module	2019-03-20 09:43:10 +01:00
Lipu Fei	2b39d6422c	Move PrinterOutputDevice into cura.PrinterOutput module	2019-03-20 09:43:09 +01:00
Lipu Fei	e30104ff7f	Move PrintJobOutputModel into cura.UI module	2019-03-20 09:27:23 +01:00
Lipu Fei	1f5cf62a7c	Move UserChangesModel into cura.UI module	2019-03-20 09:22:42 +01:00
Lipu Fei	e1d26da528	Move ExtrudersModel into cura.UI module	2019-03-20 09:19:30 +01:00
Lipu Fei	5848174ad4	Move PrintInformation into cura.UI module	2019-03-20 09:13:38 +01:00
Lipu Fei	228270d9d5	Move ObjectModel into cura.UI module	2019-03-20 09:12:21 +01:00
Lipu Fei	dfc53d3604	Move MachineActionManager into cura.UI module	2019-03-20 09:10:48 +01:00
Lipu Fei	8c0cb2b7b8	Move GlobalStackModel into cura.UI module	2019-03-20 09:09:48 +01:00
Lipu Fei	b6216bf4a3	Move CuraSplashScreen into cura.UI module	2019-03-20 09:08:14 +01:00
Lipu Fei	5eb51c6cd4	Move CuraStage into cura.UI module	2019-03-20 09:07:15 +01:00
Lipu Fei	bfd0444fbf	dos2unix CuraStage.py	2019-03-20 09:05:38 +01:00
Lipu Fei	a106a9ddb9	WIP: Cleanup MachineSettingsAction	2019-03-20 08:59:20 +01:00
Lipu Fei	a92971d80e	Merge WIP_boarding_by_ip	2019-03-19 15:51:47 +01:00
Remco Burema	42f7139b42	Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip	2019-03-19 14:39:28 +01:00
Lipu Fei	8d68db9ff0	WIP: Add first-start machine actions	2019-03-19 14:24:57 +01:00
Lipu Fei	d4c0104bc2	WIP: Add FirstStartMachineActionsModel	2019-03-19 12:07:52 +01:00
Lipu Fei	58062cb4de	WIP: Remove unused MachineManagementModel	2019-03-19 11:06:42 +01:00
Lipu Fei	987ebba33b	WIP: Make MachineSetting panel work	2019-03-19 09:51:10 +01:00
Lipu Fei	449740a631	WIP: MachineSettings Printer tab	2019-03-18 14:48:24 +01:00
Ghostkeeper	c79ffab9fb	Merge branch '4.0'	2019-03-18 11:24:23 +01:00
Jaime van Kessel	7bb35cdbf7	Add test cases for the ContainerManager	2019-03-15 16:17:28 +01:00
Jaime van Kessel	8518aba3a5	Adds tests for QualityManager	2019-03-15 14:51:35 +01:00
Remco Burema	5b31feebba	Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057]	2019-03-15 13:58:36 +01:00
Jaime van Kessel	1138baa26f	Added extra tests for materialManager	2019-03-15 13:57:22 +01:00
Remco Burema	4a95564277	Only show Welcome-Pages when needed. [CURA-6057]	2019-03-15 11:30:07 +01:00
Remco Burema	0f116fa3f4	Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057]	2019-03-14 14:59:04 +01:00
Lipu Fei	3e4624774a	WIP: Create new machine settings page	2019-03-14 13:44:15 +01:00
Lipu Fei	49233216ec	Fix machine management page section	2019-03-14 13:43:24 +01:00
Remco Burema	2693eecd33	(Add-by-IP/onboard) Cleanup and use discovered-printer instead of machine-manager. [CURA-6294]	2019-03-14 13:33:24 +01:00
Remco Burema	61821e6378	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip	2019-03-14 11:40:44 +01:00