3984 Commits

Author	SHA1	Message	Date
Remco Burema	139edbb0b7	Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip ... 'WIP-onboarding-by-ip' into 'parent' branch	2019-03-21 09:52:39 +01:00
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	8f9bd0ad06	Adapted to more review comments. [CURA-6294]	2019-03-20 17:20:06 +01:00
Remco Burema	9a2b800fe8	Future proof: also accept IPv6 address. [CURA-6294]	2019-03-20 17:01:37 +01:00
Remco Burema	1f2fea14ce	Little refactors (apply review comments). [CURA-6294]	2019-03-20 16:08:50 +01:00
Lipu Fei	c6bd31e5f6	Simplify code	2019-03-20 14:07:13 +01:00
Lipu Fei	8cc05a2a62	Bind no printer label visible to item count	2019-03-20 14:05:52 +01:00
Lipu Fei	91acbca141	Bind no printer label visible to item count	2019-03-20 14:05:02 +01:00
Lipu Fei	428fb5a3a1	Use Item instead of transparent Rectangle	2019-03-20 13:49:14 +01:00
Lipu Fei	95a0a5fb24	Theme window_disabled_background	2019-03-20 13:46:54 +01:00
Lipu Fei	a17642a5a1	Merge WIP_onboarding_by_ip	2019-03-20 13:42:15 +01:00
Remco Burema	ad6603bab8	Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip	2019-03-20 13:33:19 +01:00
Remco Burema	61d2aa5c5f	No more hardcoded margins (and other QML fixes) in 'add-by-ip'. [CURA-6294]	2019-03-20 13:16:10 +01:00
Lipu Fei	79ab09ca01	Fix troubleshooting typos	2019-03-20 11:33:43 +01:00
Lipu Fei	c3c9c53f13	Merge WIP_onboarding	2019-03-20 11:28:30 +01:00
Lipu Fei	d46d0f2999	Change Scroll policy to AsNeeded	2019-03-20 11:17:58 +01:00
Lipu Fei	3114072038	Fix code style	2019-03-20 11:16:45 +01:00
Lipu Fei	f0104f6245	Remove unused code	2019-03-20 11:15:33 +01:00
Lipu Fei	838944dc2b	Change scroll policy to AsNeeded	2019-03-20 11:14:34 +01:00
Lipu Fei	3a3e65224b	Remove debugging shortcut	2019-03-20 11:11:30 +01:00
Lipu Fei	e623c807ce	Rename SectionName to DiscoverySource in GlobalStacksModel	2019-03-20 10:39:23 +01:00
Lipu Fei	f810f94b8a	WIP: Fix null warning in SettingsMenu.qml	2019-03-20 08:59:45 +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
Lipu Fei	3911c3d73d	WIP: Cleanup and unify MachineAction styles	2019-03-19 15:40:44 +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	987ebba33b	WIP: Make MachineSetting panel work	2019-03-19 09:51:10 +01:00
Lipu Fei	8242a3801c	WIP: Put all MachineSettings stuff together	2019-03-18 15:56:13 +01:00
Ghostkeeper	cb44223eca	Consistent capitalisation	2019-03-18 15:16:49 +01:00
Lipu Fei	42a304c049	WIP: Create MachineSettings Extruder Tab	2019-03-18 15:07:14 +01:00
Lipu Fei	f75f8f9809	WIP: Move MachineSettings Printer Tab to a separate file	2019-03-18 15:05:19 +01:00
Lipu Fei	449740a631	WIP: MachineSettings Printer tab	2019-03-18 14:48:24 +01:00
Lipu Fei	6c6ccb16b8	WIP: Add X/Y min/max fields	2019-03-18 12:02:25 +01:00
Lipu Fei	a2f845f90e	WIP: Add PrintHeadMinMaxTextField	2019-03-18 12:01:52 +01:00
Ghostkeeper	c79ffab9fb	Merge branch '4.0'	2019-03-18 11:24:23 +01:00
Lipu Fei	0fb9ee6c9a	WIP: Add CheckBox and fix styles	2019-03-18 09:24:20 +01:00
Lipu Fei	cf0e3effc7	WIP: Refactor NumericTextFieldWithUnit	2019-03-18 08:48:29 +01:00
Remco Burema	5b31feebba	Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057]	2019-03-15 13:58:36 +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
Ghostkeeper	0f8a30d37b	Add period to tooltip sentence ... A lot of translators got this wrong. Contributes to issue CURA-6257.	2019-03-14 14:30:57 +01:00
Lipu Fei	752a48cacd	WIP: Refactor and create reusable CuraComboBox	2019-03-14 13:44:15 +01:00
Lipu Fei	3e4624774a	WIP: Create new machine settings page	2019-03-14 13:44:15 +01:00
Lipu Fei	6c2e80d2a1	WIP: Create new Machine Settings dialog widgets	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
Lipu Fei	4f05a2ab5f	WIP: Use GlobalStackModel for Machine management page	2019-03-14 11:21:09 +01:00