3755 Commits

Author	SHA1	Message	Date
Lipu Fei	03155d24da	Remove unneeded property assignment	2019-03-22 10:43:01 +01:00
Lipu Fei	e632b508eb	Rename to AddNetworkOrLocalPrinterContent	2019-03-22 10:43:01 +01:00
Lipu Fei	77720c9039	Fix merge conflicts	2019-03-22 10:25:07 +01:00
Lipu Fei	4573733bb7	Remove unnecessary "visible: true"	2019-03-22 10:22:19 +01:00
Lipu Fei	2b0e2d84bb	Rename gotoPage to goToPage	2019-03-22 10:21:17 +01:00
Lipu Fei	a8e2fcf5f5	Add comments for properties in AddPrinterByIpContent	2019-03-22 10:19:38 +01:00
Lipu Fei	0c8afbfa45	Use Item instead of Rectangle	2019-03-22 10:14:34 +01:00
Lipu Fei	c4d2cb26a0	Fix comments	2019-03-22 10:07:26 +01:00
Lipu Fei	528a6b651d	Fix code style	2019-03-22 10:06:47 +01:00
Lipu Fei	80dff49b8a	Fix merge conflicts	2019-03-22 10:00:57 +01:00
Lipu Fei	47d74950dc	Add docs for properties in AddLocalPrinterScrollView.qml	2019-03-22 09:59:07 +01:00
Lipu Fei	c3175e5322	Theme welcome_pages_button	2019-03-21 16:01:50 +01:00
Lipu Fei	f13ceb2a4d	Use default margin for network printer button	2019-03-21 15:53:21 +01:00
Lipu Fei	570b6b9804	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 15:49:12 +01:00
Lipu Fei	bff9287094	Simplify the horizontal-line in network printer panel	2019-03-21 15:47:17 +01:00
Lipu Fei	6742348a95	Theme radio_button size	2019-03-21 15:20:39 +01:00
Lipu Fei	11252ce0f7	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 15:00:15 +01:00
Lipu Fei	4e5d08f320	Fix merge conflicts with master	2019-03-21 14:59:53 +01:00
Diego Prado Gesto	fceffce56e	Show the slider in the middle when there is only one quality profile available. ... Contributes to CURA-6121.	2019-03-21 14:18:07 +01:00
Lipu Fei	3db6b74b36	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-21 09:58:48 +01:00
Lipu Fei	0671f68616	Remove unnecessary code	2019-03-21 09:57:20 +01:00
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