4502 commits

Author	SHA1	Message	Date
Diego Prado Gesto	f0257e2b79	Merge branch 'master' into ui_rework_4_0	2018-12-11 10:29:46 +01:00
Diego Prado Gesto	77703e1fb8	Catch an exception from numpy that happens when loading some models	2018-12-11 09:58:23 +01:00
Diego Prado Gesto	d318bb5c87	Merge branch 'master' into ui_rework_4_0	2018-12-10 15:41:28 +01:00
Diego Prado Gesto	11d8831d7a	Use the capitalized version of the buildplate name	2018-12-10 15:40:18 +01:00
Diego Prado Gesto	e479772f4d	Merge branch 'master' into ui_rework_4_0	2018-12-10 11:43:24 +01:00
Ellecross	3db3203e0d	Merge pull request #4951 from Ultimaker/CURA-5939_crash_dialog ... Merging this Cura 5939 crash dialog together with Aleksei!	2018-12-10 10:28:00 +01:00
Ghostkeeper	c44b74454f	Revert "No longer make BuildVolume set max bounds." ... This reverts commit 1467e703ae. This variable was actually used... In Uranium, by the scale tiny models feature.	2018-12-07 14:22:39 +01:00
Diego Prado Gesto	15f81da95b	Do not show the layer height in the header panel when the profile is not supported	2018-12-07 13:47:58 +01:00
Ghostkeeper	05b32548f3	Code style: Start comments with a space ... Contributes to issue CURA-5876.	2018-12-06 16:27:56 +01:00
Aleksei S	e8cf9e034d	Catch All Exception except: SystemExit, KeyboardInterrupt, GeneratorException ... CURA-5939	2018-12-06 13:41:50 +01:00
Aleksei S	84c85439ff	The trigger_early_crash did not trigger early crash for testing purposes ... CURA-5939	2018-12-06 12:00:26 +01:00
Ghostkeeper	024bf409c9	Merge branch 'CURA-5876-Configuration_dropdown' into ui_rework_4_0	2018-12-05 13:29:06 +01:00
Lipu Fei	a13fb4a81e	Merge remote-tracking branch 'origin/master' into ui_rework_4_0	2018-12-04 17:12:24 +01:00
Ghostkeeper	82d8410d18	Don't emit enabledChanged signal if it didn't change ... Contributes to issue CURA-5876.	2018-12-04 13:58:54 +01:00
Ian Paschal	0363c1257c	Improve exposed progress prop ... Contributes to CL-1153	2018-12-04 10:18:09 +01:00
Ian Paschal	3d80e28174	Add some typings ... Contributes to CL-1153	2018-12-03 12:15:38 +01:00
Ian Paschal	665e2d3060	Move isActive and timeRemaining logic from QML to Python ... Contributes to CL-1153	2018-12-03 12:15:25 +01:00
Ghostkeeper	7df4c01814	Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown ... Conflicts: cura/Settings/MachineManager.py -> rowCount vs. count resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten. resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed. resources/qml/Toolbar.qml -> Git was wrong, not a conflict. resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.	2018-12-03 11:45:05 +01:00
Ghostkeeper	f3af5a72ad	Use ListModel.count instead of rowCount ... The .count property properly updates when the model is changed. Contributes to issue CURA-5876.	2018-12-03 11:13:26 +01:00
Ghostkeeper	18bb403413	No longer switch away from extruder when disabling ... It feels confusing when this happens. Contributes to issue CURA-5876.	2018-11-30 15:42:46 +01:00
Ghostkeeper	4e2f51e7e8	Use public activeExtruderIndex rather than internal _activeExtruderIndex ... So that this getter still does what it needs to do if we ever decide to add side-effects. Contributes to issue CURA-5876.	2018-11-30 11:13:04 +01:00
Ghostkeeper	1c96c81ba9	Remove unnecessary extra setMetaDataEntry ... This is a relic from when you first had to add the metadata entry. Now it does nothing any more because it's being set directly afterwards to the actual value that is desired in the end. Contributes to issue CURA-5876.	2018-11-30 11:11:17 +01:00
Lipu Fei	5df7cdde48	Merge remote-tracking branch 'origin/master' into ui_rework_4_0	2018-11-29 08:54:22 +01:00
Jaime van Kessel	7d42fdf183	Add missing typing	2018-11-28 11:52:30 +01:00
Jaime van Kessel	0baa4d20b3	Gracefully handle the case where machine definition is no in the map	2018-11-28 11:42:54 +01:00
Jaime van Kessel	adf16310c7	Merge pull request #4883 from Ultimaker/CURA-5879_experimental_qualities ... CURA-5879 experimental qualities	2018-11-28 11:34:21 +01:00
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
Lipu Fei	2c8ed99281	Add is_experimental to Qt models and QMLs ... CURA-5879	2018-11-27 15:50:03 +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