358 Commits

Author	SHA1	Message	Date
Lipu Fei	a85f2ce156	Fix merge conflicts	2019-03-26 09:01:01 +01:00
Lipu Fei	85b28a0c90	Use themed values for margins	2019-03-22 14:34:02 +01:00
Lipu Fei	6f911f9924	Use rounding for width	2019-03-22 14:29:32 +01:00
Lipu Fei	ec0b197b6e	Fix merge conflicts	2019-03-22 14:28:23 +01:00
Lipu Fei	a9431b270f	Rearrange items in WelcomeContent.qml	2019-03-22 14:19:26 +01:00
Lipu Fei	f8c4cee2de	Simplify user agreement page layout	2019-03-22 13:50:02 +01:00
Remco Burema	b25df557d3	Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding	2019-03-22 13:20:43 +01:00
Remco Burema	8de055dd33	Adjust add-by-ip to latest review comments. [CURA-6294]	2019-03-22 13:19:19 +01:00
Lipu Fei	eb02b302f5	Rearrange items in DataCollectionsContent.qml	2019-03-22 13:18:33 +01:00
Remco Burema	1f75d00cd3	Adapt add-by-ip-qml to handle unresponsive address. [CURA-6294]	2019-03-22 13:10:31 +01:00
Lipu Fei	457eb93758	Remove debug code	2019-03-22 13:08:51 +01:00
Lipu Fei	2074bf9133	Use theme	2019-03-22 13:06:57 +01:00
Lipu Fei	26acad3dbc	Cleanup unnecessary hard-coded numbers in styling	2019-03-22 12:55:45 +01:00
Lipu Fei	67428aee53	Cleanup unnecessary hard-coded numbers in styling	2019-03-22 12:55:25 +01:00
Lipu Fei	a2c2424d69	Use Label for SignIn button	2019-03-22 12:24:11 +01:00
Lipu Fei	9e7c687853	Fix merge conflicts	2019-03-22 12:07:59 +01:00
Lipu Fei	92dea8a52f	Add welcome_pages_default_margin	2019-03-22 11:50:10 +01:00
Lipu Fei	378c6da7ed	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-22 11:17:36 +01:00
Lipu Fei	090e176969	Arrange CloudContent.qml differently	2019-03-22 11:15:43 +01:00
Lipu Fei	1e3945810f	Remove text_light_blue and use primary	2019-03-22 10:50:03 +01:00
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	639c4ba9f6	Remove unneeded property assignment	2019-03-22 10:35:41 +01:00
Lipu Fei	ab06264950	Rename to AddNetworkOrLocalPrinterContent	2019-03-22 10:28:17 +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
Remco Burema	8250c91fc4	Make remove manual device (also) work (as failure-state of add manual device). [CURA-6294]	2019-03-21 18:45:57 +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	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
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