5336 Commits

Author	SHA1	Message	Date
Jaime van Kessel	fcfe95c7d0	Move OpenFile button to be instantiated left so it's tooltip doesn't get messed up ... CURA-5785	2018-11-14 12:57:57 +01:00
Jaime van Kessel	fb72f9a059	Fixed size of expandableItem not being the correct width ... CURA-5785	2018-11-14 09:59:56 +01:00
Jaime van Kessel	1569fd7396	Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-14 09:34:08 +01:00
Jaime van Kessel	12c2962414	Update the look & feel of openButton to the new design ... CURA-5785	2018-11-13 16:59:02 +01:00
Jaime van Kessel	a9fdd455eb	Add seperator lines for the stageMenu's ... CURA-5785	2018-11-13 16:47:39 +01:00
Jaime van Kessel	551bc2fbd4	Removed line around the headerbar ... I was checking an old design, the new one doesn't have a line around it CURA-5785	2018-11-13 16:40:51 +01:00
Jaime van Kessel	b83175a380	Add rounded corners to stage menus ... CURA-5785	2018-11-13 16:32:24 +01:00
Ghostkeeper	266e08fdff	Merge branch 'master' into ui_rework_4_0 ... Conflicts: plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml - The compatibility chart being added in 3.6 which was kind of hacky. resources/qml/SidebarHeader.qml - Removed in UI rework, edited on master.	2018-11-13 16:23:36 +01:00
Jaime van Kessel	20e2f317de	Add background to viewModeSelection ... CURA-5785	2018-11-13 16:02:45 +01:00
Jaime van Kessel	785c2661a2	Make SimulationViewMenuComponent also use the ExpandableComponent ... CURA-5785	2018-11-13 15:57:00 +01:00
Jaime van Kessel	deb5fd1926	Fix PrintSetupSelector for previewStage ... CURA-5785	2018-11-13 15:35:05 +01:00
Remco Burema	5f4e3948d3	Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning	2018-11-13 13:16:22 +01:00
Ghostkeeper	87cbc3907c	Convert to string before storing in configparser ... Because configparser can only handle strings. Contributes to issue CURA-5929.	2018-11-13 12:05:14 +01:00
Ghostkeeper	7bd55f5064	Add test for read() function ... This is complex. I don't want to get into the actual translations from the DoD here. Contributes to issue CURA-5929.	2018-11-12 16:28:29 +01:00
Jaime van Kessel	4c1a45f904	Added sizes to the stage menu ... This isn't themed, but right now it does adhere to the sizes I got from UX CURA-5785	2018-11-12 15:53:09 +01:00
Ghostkeeper	bfe5ae6f9c	Merge branch '3.6'	2018-11-12 15:48:22 +01:00
Jaime van Kessel	f14687a749	Merge branch 'ui_rework_4_0' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu	2018-11-12 14:32:06 +01:00
Ghostkeeper	7e87a303cb	Remove config_section parameter ... Just always take 'profile'. We don't need to test with anything else. Just adjust the data to it. Contributes to issue CURA-5929.	2018-11-12 13:49:13 +01:00
Ghostkeeper	e18ea4bca4	Expect a NoSectionError if testing with a section that is missing ... We want to get that error in order to debug. Contributes to issue CURA-5929.	2018-11-12 13:47:24 +01:00
Ghostkeeper	53c9cdc3fe	Add alternative scenarios for prepareLocals ... Contributes to issue CURA-5929.	2018-11-12 13:42:14 +01:00
Ghostkeeper	91e8c177fe	Add test for prepareLocal ... Contributes to issue CURA-5929.	2018-11-12 13:35:18 +01:00
Ghostkeeper	0bf7bf4cbe	Fix handling dictionaries without 'defaults' section ... According to the test, this should return an empty dict then. Contributes to issue CURA-5929.	2018-11-12 13:33:44 +01:00
Ghostkeeper	bbbb08c793	Add test for prepareDefaults ... Contributes to issue CURA-5929.	2018-11-12 13:02:28 +01:00
Ghostkeeper	27aff4e5da	Fix typing issues ... Because this function now has typing, it's raising a load of issues with it. Contributes to issue CURA-5929.	2018-11-12 12:48:49 +01:00
Ghostkeeper	6022ed0f23	Update target version in DoD ... There are no changes to these settings, luckily. This target version is now only here for documentation (like source_version was). It is no longer actually used by the code. Contributes to issue CURA-5929.	2018-11-12 12:06:00 +01:00
Ghostkeeper	6ad682b00d	Don't serialise legacy profile via Profile instance ... That profile instance was being explicitly set to version 1 (but then serialised as version 4) and then deserialised with upgrade, so the upgrade was thinking it was upgrading from version 1 to 4, but it was actually upgrading a file which was already at version 4. We shouldn't use the Profile() instance at all but just perform the upgrade on simple string data generated by the configparser. This also updates the format to the newest version (since that was easiest for me to reimplement) but we don't need to ever update this again because it gets passed through the version upgrade system, which upgrades it from version 4000005 to the latest version in the future. Contributes to issue CURA-5929.	2018-11-12 12:02:49 +01:00
Ghostkeeper	9d94b0d63e	Rename input vs. output parsers ... Technically you could re-use the variable name but that is confusing. Contributes to issue CURA-5929.	2018-11-12 11:16:33 +01:00
Jaime van Kessel	b60977e435	Convert PrintSetupSelector to an ExpandableComponent ... CURA-5785	2018-11-12 11:14:39 +01:00
Mark	3d1a9a6f5b	Increase lines shown from 3 to 6	2018-11-12 09:28:48 +01:00
Diego Prado Gesto	38a80ecae5	Make some tweaks in the UI for the preview stage. ... Clean up the default theme a bit by removing unused entries. Contributes to CURA-5829.	2018-11-11 14:06:52 +01:00
Remco Burema	8e05c2adcb	Have translation instead of plain string for Safety Data Sheets and Printing Guidelines. [CURA-5922]	2018-11-09 15:27:02 +01:00
Jaime van Kessel	2c7bdba7d0	Update ConfigurationSelector header to that it looks more like the new design ... CURA-5785	2018-11-09 15:23:10 +01:00
Remco Burema	9bc85fcda7	Merge branch 'CURA-5922_add_safety_data_sheet_links' of https://github.com/Ultimaker/Cura into master_CURA-5922_add_safety_data_sheet_links	2018-11-09 15:16:22 +01:00
Ghostkeeper	7f54cacd0f	Code style ... Discovered during work on CURA-5840.	2018-11-09 14:11:38 +01:00
Remco Burema	c8d9ad37ff	Add Printing Guidelines links to materials in Marketplace. [CURA-5922]	2018-11-09 13:49:14 +01:00
Remco Burema	21d4cd8f9f	Add Safety Data Sheet links to materials in Marketplace. [CURA-5922]	2018-11-09 13:44:42 +01:00
Lipu Fei	c2e6bb8bc6	Merge remote-tracking branch 'origin/3.6'	2018-11-09 09:48:05 +01:00
Lipu Fei	80bf7bb989	Merge pull request #4757 from Ultimaker/CURA-5915_quality_profiles_upgrade ... Add version upgrade for quality profiles	2018-11-09 09:20:45 +01:00
Diego Prado Gesto	7a12cc53cc	Merge branch 'master' into ui_rework_4_0	2018-11-09 08:53:31 +01:00
Jaime van Kessel	d3302938b2	Fix technical data sheet not showing if there is no support_configs	2018-11-08 16:38:38 +01:00
Diego Prado Gesto	94e27fbbdb	Add the quality folder to the version upgrade in order to update quality ... profiles. Contributes to CURA-5915.	2018-11-08 15:42:39 +01:00
Lipu Fei	369747d106	Merge remote-tracking branch 'origin/3.6'	2018-11-08 15:28:42 +01:00
Lipu Fei	75f2f40534	Make API version configuration for Application ... CURA-5840	2018-11-08 12:04:43 +01:00
Simon Edwards	69c9ffaf61	Merge pull request #4755 from Ultimaker/CL-1040_show_print_time_in_monitor ... CL-1140 Show print time in monitor tab	2018-11-08 11:53:47 +01:00
Ian Paschal	aa6ec9e44b	Make text black ... Contributes to CL-1040	2018-11-08 11:48:22 +01:00
Lipu Fei	de6ab02422	Merge pull request #4678 from fieldOfView/fix_networkprinter_post ... Fix type error in NetworkedPrinterOutputDevice.post	2018-11-08 11:05:47 +01:00
Lipu Fei	59b8bdec54	Merge pull request #4678 from fieldOfView/fix_networkprinter_post ... Fix type error in NetworkedPrinterOutputDevice.post	2018-11-08 11:02:57 +01:00
Ian Paschal	35ed234991	Show print time in monitor tab ... Contributes to CL-1040	2018-11-08 10:49:22 +01:00
Ghostkeeper	d8a1d458cf	Merge branch '3.6'	2018-11-08 09:49:15 +01:00
Diego Prado Gesto	9f663cfd18	Change the gradient for the LinearGradient that works in the new versions of Qt. ... I also changed it because we had a TODO here and I thought it was the right moment to do it. Contributes to CURA-5829.	2018-11-07 17:25:43 +01:00