24244 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kostas Karmas	4e20c7dddc	Rework the open project dialog to contain only 1 dropdown ... With the caveat that the qtQuickControls had to be updated to 2.3, due to a qt bug in 1.x that did not update the dropdown popup list according to the ListModel. This leads to a different look in the dropdowns and in the buttons of the open project dialog, compaired to the rest of the application. CURA-7609	2020-08-04 16:33:11 +02:00
Kostas Karmas	e5d3271698	Fix mypy complaining that Application has no createQmlComponent ... Using CuraApplication instead fixes the problem CURA-7609	2020-08-03 17:43:14 +02:00
Kostas Karmas	9ad046654a	Add typing in WorkspaceDialog.py ... In response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309170 CURA-7609	2020-08-03 17:31:21 +02:00
Kostas Karmas	6c59616e39	Process feedback comments ... Comments https://github.com/Ultimaker/Cura/pull/8142#discussion_r464309980 and https://github.com/Ultimaker/Cura/pull/8142#discussion_r464310281 CURA-7609	2020-08-03 17:30:21 +02:00
Kostas Karmas	60cfb6a8be	Change name of updatable_machines to updatable_machine_names ... Since it is a list of name strings and not a list of machines. Response to feedback comment https://github.com/Ultimaker/Cura/pull/8142#discussion_r464307564 CURA-7609	2020-08-03 17:28:44 +02:00
Kostas Karmas	ce72bb1a0b	Fix creating new machine being reverted to overridde in some cases ... CURA-7609	2020-08-03 15:47:01 +02:00
Kostas Karmas	37febc9f60	Remove comment ... CURA-7609	2020-08-03 09:24:40 +02:00
Kostas Karmas	db857c8c20	Add extra spacing between categories in the open project dialog ... CURA-7609	2020-08-03 09:21:16 +02:00
Kostas Karmas	ff4e4ccf55	Change text in the combobox ... Since it was anyway truncated CURA-7609	2020-08-03 09:07:20 +02:00
Kostas Karmas	52ea3e8fcc	Change variable names (available -> updatable) ... CURA-7609	2020-07-29 17:19:24 +02:00
Kostas Karmas	98cc87d1cf	Allow picking any printer of the same type when opening project file ... A ComboBox was added under the "Update existing" combobox which will display all the available printers that are of the same type with the printer in the project file. With this feature, the user will be able to select any same-type preexisting printer in Cura to be updated, instead of always create a new one when the project file's printer is not in Cura. CURA-7609	2020-07-29 13:02:34 +02:00
Jaime van Kessel	f9c6bbb092	Fix strict noneCHeck mypy issue	2020-07-29 12:24:38 +02:00
Jaime van Kessel	fb2f40fba7	Add missing typing	2020-07-29 12:12:54 +02:00
Jaime van Kessel	65377770c4	Remove invalid quality_changes from the container registry ... Fixes CURA-3T	2020-07-29 12:03:03 +02:00
Jaime van Kessel	6934e9521f	Make sure that loading an invalid container gets handled correctly ... Previously it would still add them, which caused issues.	2020-07-29 11:08:10 +02:00
Jaime van Kessel	60a50ee393	Codestyle & readability cleanup for g-codeprofile reader	2020-07-29 10:47:49 +02:00
Jaime van Kessel	1f7c2be1bc	Merge branch 'CURA-7608_Ignore_network_information_while_importing_project_files' of github.com:Ultimaker/Cura	2020-07-28 11:33:34 +02:00
Jaime van Kessel	56fc5f9706	Create i18Catalog for QualitySettingsModel ... CURA-7575	2020-07-28 11:20:23 +02:00
Kostas Karmas	daa66a89f3	Ignore machine network metadata when reading a project file ... CURA-7608	2020-07-28 11:18:04 +02:00
Kostas Karmas	4b72db90ee	Revert ignoring network information in VersionUpgrader ... As this will also remove them from machines that go through the VersionUpgrader.	2020-07-28 10:27:34 +02:00
Konstantinos Karmas	7bf1af99a5	CURA-7608 Ignore machine network information when handling project files (#8116) ... CURA-7608	2020-07-28 09:57:10 +02:00
Konstantinos Karmas	d6a2c1d46d	Merge pull request #8077 from mahtDFR/master ... Change "Save..." to "Save Project..." in file menu	2020-07-27 17:12:04 +02:00
Kostas Karmas	83c5df84d5	Change cloud labels in UM3NetworkPrinting plugin ... To be aligned with the Digital Factory. CURA-7605	2020-07-27 12:00:27 +02:00
Kostas Karmas	8a7dd2cfdf	Update Toolbox labels to be aligned with the Digital Factory ... CURA-7605	2020-07-27 11:58:55 +02:00
Kostas Karmas	2c6cbc7be4	Fix qml warnings in ToolboxAuthorPage	2020-07-27 10:40:53 +02:00
Konstantinos Karmas	47f02a8d28	Merge pull request #8074 from maukcc/master ... HMS434 update	2020-07-23 16:37:37 +02:00
Kostas Karmas	3527e94b24	Remove references to support_tree_enable in 3rd-party printers ... CURA-6711	2020-07-23 15:49:55 +02:00
Jaime van Kessel	94fb779dff	Merge branch 'CURA-7606_remove_ratings' of github.com:Ultimaker/Cura	2020-07-22 14:56:24 +02:00
Remco Burema	3898516607	More remove rating packages/materials. ... Forgot some lines in the previous commit. CURA-7606	2020-07-22 13:56:22 +02:00
Remco Burema	51a13675a5	Remove rating packages/materials. ... Online teams decided not to support ratings anymore, making this a rather useless feature in the upcoming release. CURA-7606	2020-07-22 12:51:20 +02:00
Kostas Karmas	032eea83da	Hide Support Structure if Support is disabled ... Support Structure will now be visible only if the "Generate Support" is enabled or there are support meshses in the scene. CURA-6425	2020-07-22 12:13:01 +02:00
Jaime van Kessel	6362d5145e	Merge branch 'master' of github.com:Ultimaker/Cura	2020-07-22 11:24:48 +02:00
Jaime van Kessel	ae33053369	Add missing setting version from g-code profile writer	2020-07-22 11:24:23 +02:00
Remco Burema	302e0c6277	Remove redundant button. ... As discussed in the CCB this morning. Since the new profile will be the _changed to_ profile rather than the _changed from_ (the latter of which would make the button useful, but since the profile is already switched at that point it would be a lot of work), the 'Create New Profile ...' button (in the Keep/Discard dialog) is redundant, since you can always create a new profile if you select keep changes.	2020-07-22 11:04:58 +02:00
Ghostkeeper	9daab5ed9b	Workaround for bug in PySerial: Don't crash if file doesn't exist ... Gonna report this upstream at the PySerial folks, if nobody else found this yet. Fixes Sentry issue CURA-11W.	2020-07-22 09:50:46 +02:00
Ghostkeeper	8714ff9edb	Add more explanations for HWID being None	2020-07-21 17:32:59 +02:00
Jaime van Kessel	2e32ac8465	Merge branch 'master' of github.com:Ultimaker/Cura	2020-07-21 10:47:03 +02:00
Jaime van Kessel	f591fa79bf	Move all tree support settings to support category ... CURA-6425	2020-07-21 10:46:30 +02:00
Ghostkeeper	c7b960edfa	Don't send -1 as profile count ... The server gives an error about this and we got complaints about it. As far as we know this can only happen when users mess with their profile folders. Still, it's good to not send -1. The original implementation of this is indeed very naive, but we don't have the resources to refactor that now.	2020-07-21 10:42:24 +02:00
Jaime van Kessel	f948b7c4fc	Add bit more logging around MachineNode loading	2020-07-20 16:03:06 +02:00
Jaime van Kessel	527e5775a7	Also set clipping for string	2020-07-20 15:25:55 +02:00
Jaime van Kessel	1d1f10f853	Merge branch 'master' of github.com:Ultimaker/Cura	2020-07-20 15:25:37 +02:00
Jaime van Kessel	4bb9cf29d0	Merge branch 'CURA-6980_tower_brim_disallowed_areas' of github.com:Ultimaker/Cura	2020-07-20 15:08:38 +02:00
Ghostkeeper	db15bc84cf	Correct and consistent spelling of g-code ... This spelling is in Ultimaker's style guide. We use g-code, and capitalise the G if it's at the start of a sentence or header. Pretty good score, considering there are literally thousands of user- or log-visible strings mentioning g-code across Cura.	2020-07-20 13:36:49 +02:00
Ghostkeeper	e6c305de40	Merge branch 'master' of github.com:Ultimaker/Cura	2020-07-20 13:27:41 +02:00
Ghostkeeper	a84598a8c9	Remove default value for g-code before pause ... It's best to just leave it as is. Not everyone appreciates bleeps. Contributes to issue CURA-7599.	2020-07-20 13:24:18 +02:00
Jaime van Kessel	6a1d7bc996	Merge branch 'CURA-6711_Fix_preferences_not_updating_in_project_files' of github.com:Ultimaker/Cura	2020-07-20 13:24:09 +02:00
Jaime van Kessel	1dae415a31	Merge branch 'master' of github.com:Ultimaker/Cura	2020-07-20 13:23:34 +02:00
Ghostkeeper	13ff186c8e	Correct spelling of 'g-code' ... This is the convention we're holding in this application.	2020-07-20 13:23:24 +02:00
Ghostkeeper	ededb2a8d2	Merge branch 'master' of https://github.com/rodrigosclosa/Cura into rodrigosclosa-master ... Conflicts: plugins/PostProcessingPlugin/scripts/PauseAtHeight.py -> Merging other pausing scripts into this one plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py -> Has been removed upstream	2020-07-20 13:17:27 +02:00