4475 commits

Author	SHA1	Message	Date
Jaime van Kessel	aeb2887796	Merge branch 'CURA-5979_gcode_loading_new_ui' of github.com:Ultimaker/Cura into ui_rework_4_0	2018-11-28 10:15:07 +01:00
Jaime van Kessel	94c4366194	Merge branch 'master' of github.com:Ultimaker/Cura into ui_rework_4_0	2018-11-27 17:55:13 +01:00
Jaime van Kessel	d8c430abf6	Fix typing	2018-11-27 17:54:53 +01:00
Diego Prado Gesto	dad2031e4b	Switch to the preview stage before to switch to simulation view ... ... since now the list of views are in a different stage. Contributes to CURA-5979.	2018-11-27 16:06:37 +01:00
Jaime van Kessel	854755277c	Fix styling of comments ... Because sentences should start with capitals	2018-11-27 14:37:01 +01:00
Jaime van Kessel	3ad1802ab6	Prevent a KeyError from messing ... CURA-5978	2018-11-27 14:34:29 +01:00
Diego Prado Gesto	ea75a60dd8	Merge branch 'master' into ui_rework_4_0	2018-11-27 13:17:10 +01:00
Diego Prado Gesto	c56098d82c	Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin ... Tests for um3networkplugin	2018-11-27 12:59:44 +01:00
Diego Prado Gesto	a01ff9419d	Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector	2018-11-27 11:13:34 +01:00
Diego Prado Gesto	729d37cabb	Merge branch 'master' into ui_rework_4_0	2018-11-27 11:12:48 +01:00
Lipu Fei	2e81b97623	Use global_stack.extruders to find extruders ... CURA-5978	2018-11-27 08:45:45 +01:00
Diego Prado Gesto	52b916d45c	Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector	2018-11-26 14:33:41 +01:00
Mark	8bae9fa667	Merge branch 'master' into ui_rework_4_0	2018-11-26 13:41:25 +01:00
Jaime van Kessel	4990f20566	Use QStringList instead of QVariantList since the return value is a list of strings. ... Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>	2018-11-26 10:55:32 +01:00
Ghostkeeper	5469613c17	Don't fail the samefile check if second file didn't exist ... If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.	2018-11-26 09:40:14 +01:00
Ghostkeeper	c9eb57cead	Don't copy preference file to the same location ... This crashes Cura on start-up for some people.	2018-11-26 09:32:59 +01:00
Diego Prado Gesto	692868a0b4	Create a function that given a printer type name, it will return and ... abbreviated name. Contributes to CURA-5942.	2018-11-22 15:45:38 +01:00
Diego Prado Gesto	9720512f50	Add a new printer selector button that is connected to the output ... devices and shows labels containing the type of printers that are in the same group. Contributes to CURA-5942.	2018-11-22 13:54:10 +01:00
ChrisTerBeke	4e8979334e	Switch Ultimaker Account OAuth2 client ... The new client has access to more permissions and is labeled as "Ultimaker Cura" instead of "Cura Backups Plugin". Also removes `self._cloud_api_root` as that's not used anymore now that `self._oauth_root` is used for the redirect URLs.	2018-11-20 19:18:48 +01:00
Diego Prado Gesto	20285f26d6	Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu	2018-11-20 11:20:26 +01:00
Diego Prado Gesto	1844a9bed2	Merge branch 'master' into ui_rework_4_0	2018-11-20 11:08:05 +01:00
ChrisTerBeke	951a21ead7	Merge branch 'master' into tests-for-um3networkplugin	2018-11-19 10:58:07 +01:00
ChrisTerBeke	23e957e1c5	Some more refactoring, splitting up methods	2018-11-19 10:44:24 +01:00
Jaime van Kessel	7f99ed1af3	ExtruderIcon will now display that it's disabled correctly ... CURA-5785	2018-11-16 16:04:11 +01:00
Jaime van Kessel	93bd5fee53	Fix wrong push free shadow for one at a time. ... It was applying the size twice. CURA-5822	2018-11-16 13:44:46 +01:00
Ghostkeeper	bee563f01b	Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu	2018-11-16 13:02:24 +01:00
Jaime van Kessel	401a6b5f8b	Merge pull request #4794 from fieldOfView/fix_adhesion_type_error ... Fix adhesion type error during startup	2018-11-16 11:24:29 +01:00
Ghostkeeper	d732a2f953	Merge branch 'master' into ui_rework_4_0	2018-11-15 15:55:08 +01:00
fieldOfView	b671a3153a	Catch an error getting an extruder value before extruders are added to the global stack	2018-11-14 14:21:39 +01:00
fieldOfView	66c3cc9204	Prevent an error during start up	2018-11-14 14:20:42 +01:00
alekseisasin	103d79c89d	Merge pull request #4781 from Ultimaker/fix_legacy_profile_importer ... Fix legacy profile importer	2018-11-14 13:00:39 +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
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
Remco Burema	5f4e3948d3	Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning	2018-11-13 13:16:22 +01:00
Ghostkeeper	6d1b64465a	Fix URL in error message ... Contributes to issue CURA-5929.	2018-11-12 12:50:18 +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	9c555bf67f	Add typing and always add error message if loading failed ... There were some places where it would return None. Then in the QML it would give a QML error that the null object has no dictionary items. Contributes to issue CURA-5929.	2018-11-12 11:02:43 +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
Ghostkeeper	161b200a67	Fix typo in label ID	2018-11-09 11:41:43 +01:00
Diego Prado Gesto	7a12cc53cc	Merge branch 'master' into ui_rework_4_0	2018-11-09 08:53:31 +01:00
Diego Prado Gesto	3ab8568a87	Merge pull request #4679 from fieldOfView/fix_create_new_material ... Use preferred material instead of generic PLA when creating a new material	2018-11-08 17:16:36 +01:00
Lipu Fei	75f2f40534	Make API version configuration for Application ... CURA-5840	2018-11-08 12:04:43 +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
Diego Prado Gesto	98534533a2	Merge branch '3.6'	2018-11-07 11:27:31 +01:00
Remco Burema	94924783b6	Defensive coding: Old file-extensions may have been saved as all-caps. [CURA-5896]	2018-11-06 17:16:29 +01:00
Diego Prado Gesto	2c59419dbb	Merge branch 'cura4.0_header' into CURA-5829-Add-preview-stage	2018-11-06 17:01:18 +01:00
Diego Prado Gesto	2d59ca02ca	Merge branch 'ui_rework_4_0' into cura4.0_header	2018-11-06 16:59:07 +01:00
Lipu Fei	3db85b2493	Try to strip extra curaproject extensions ... CURA-5896	2018-11-06 13:48:22 +01:00
Lipu Fei	ce517f1517	Merge from 3.6	2018-11-06 11:26:09 +01:00
Lipu Fei	fad8ad5d47	Merge pull request #4730 from Ultimaker/CURA-5898-duplicating-material-results-in-not-supported-warning ... Make quality manager also include profiles with same GUID in fallback.	2018-11-06 11:23:10 +01:00