19082 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	8780fce7a7	Move MaterialOutputModel back	2019-03-28 14:26:54 +01:00
Lipu Fei	b28fdc2b0b	Use camelcase for pyqtProperty names	2019-03-28 14:22:27 +01:00
Jaime van Kessel	84de34341d	Merge pull request #5470 from Ultimaker/WIP_onboarding_machine_action ... New onboarding flow - machine action	2019-03-28 13:43:48 +01:00
Jaime van Kessel	84aa7fd007	Fix mypy type errors ... CURA-6057	2019-03-27 17:40:33 +01:00
Jaime van Kessel	9091eaa6f8	Re-added the imports to the conftest ... These are really really needed, otherwise the tests wont run. I've added a few more comments to further stress the importance of these. CURA-6057	2019-03-27 17:32:34 +01:00
Jaime van Kessel	5c50ef41cc	Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding	2019-03-27 17:21:16 +01:00
Jaime van Kessel	804e2060ea	Re-added the imports to the conftest ... These are really really needed, otherwise the tests wont run. I've added a few more comments to further stress the importance of these. CURA-6057	2019-03-27 17:20:17 +01:00
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
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
Lipu Fei	705cdedf0b	Remove tiny lines in ultimaker_cloud svg	2019-03-26 08:49:25 +01:00
Lipu Fei	f4cef01c7d	Remove unnecessary IDs in SVGs	2019-03-26 08:41:34 +01:00
Lipu Fei	418daae58e	Remove unnecessary groups in SVG	2019-03-26 08:33:53 +01:00
Lipu Fei	4a171eebf6	Move models around again ... - Move machine related models to cura.Machines.Models - Move printer device related models to cura.PrinterOutput.Models - Other UI/GUI related modules in cura.UI	2019-03-26 08:29:22 +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	2f33beff36	Fix cloud image filename	2019-03-22 11:57:33 +01:00
Lipu Fei	92dea8a52f	Add welcome_pages_default_margin	2019-03-22 11:50:10 +01:00