3854 Commits

Author	SHA1	Message	Date
Lipu Fei	0a8a25860c	Update network troubleshooting URL	2019-03-27 13:09:25 +01:00
Lipu Fei	6dbae6f088	Show machine actions page optionally	2019-03-27 09:34:48 +01:00
Lipu Fei	56a3b2dfa7	Fix merge conflicts	2019-03-26 16:33:13 +01:00
Lipu Fei	6c7ae309a1	Add network troubleshooting url	2019-03-26 16:27:06 +01:00
Lipu Fei	1dd48c5728	Show welcome page if no printer	2019-03-26 16:21:07 +01:00
Lipu Fei	1c39d0c015	Fix merge conflicts	2019-03-26 15:55:58 +01:00
Lipu Fei	6843fb1ffb	Load change log from file for on-boarding page	2019-03-26 15:49:40 +01:00
Lipu Fei	98b7df790d	Implement More-info button on Data Collection page	2019-03-26 15:20:18 +01:00
Lipu Fei	2511b7a26a	Implement More-info button on Data Collection page	2019-03-26 15:18:54 +01:00
Ghostkeeper	377c7f1438	Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4	2019-03-26 15:00:31 +01:00
Lipu Fei	f99affd4f5	Create Cura.RadioButton	2019-03-26 14:46:06 +01:00
Lipu Fei	839d8c2227	Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action	2019-03-26 12:07:25 +01:00
Lipu Fei	e564687722	Use themed margins	2019-03-26 12:06:46 +01:00
Lipu Fei	f6d212dc88	Use screenScaleFactor for WelcomeDialog size	2019-03-26 11:59:44 +01:00
Lipu Fei	a6d05aa3bb	Fix misc issues	2019-03-26 11:47:09 +01:00
Lipu Fei	af9f9fc857	Fix merge conflicts	2019-03-26 11:46:35 +01:00
Lipu Fei	418ad73a63	Move page index logic into WelcomePagesModel	2019-03-26 11:34:44 +01:00
Lipu Fei	20bd9ea501	Fix binding loop in CloudContent	2019-03-26 11:08:35 +01:00
Lipu Fei	fd0a60f8dc	Rename StepPanel to WizardPanel	2019-03-26 11:06:43 +01:00
Lipu Fei	60be55802e	Refactor StepPanel and WelcomeDialog	2019-03-26 11:04:17 +01:00
Lipu Fei	92d95a1c00	Move page index logic into WelcomePagesModel	2019-03-26 10:34:38 +01:00
Lipu Fei	d52f9600b1	Fix binding loop in CloudContent	2019-03-26 09:02:28 +01:00
Lipu Fei	a85f2ce156	Fix merge conflicts	2019-03-26 09:01:01 +01:00
Satish	85a7d814d8	Added id to machine selector for integration tests	2019-03-25 14:34:00 +01:00
Thomas Karl Pietrowski	8b0e1e9f5d	PrintSetupSelector: "G code" -> "G-code" ... Noticed that "g-code" is written at some places with and without a hyphen. Since it think it should be written with, I'm correcting it at this point.	2019-03-22 19:42:01 +01:00
Diego Prado Gesto	a793a06b60	Add a maximumWidth to the ActionButton ... In case the text is too long, it can exceed the limits of the container. This is an optional flag that will work only in case it's set up. Contributes to CURA-6412.	2019-03-22 17:10:42 +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