7685 Commits

Author SHA1 Message Date
Jaime van Kessel
f6cbb0f88c
Prevent continued connect / disconnect loop
If a cloud printer was connected, it would time out all the time. In some cases
it would do this in a single update loop (so connect and disconnect). Depending
on the machine of the user, this would either be visible or not at all.
2020-08-25 17:02:39 +02:00
Jaime van Kessel
bf9c413516
Change wording of logline
The log was incorrect. At that point the device isn't connected yet,
it's state is connecting!
2020-08-25 16:31:11 +02:00
Jaime van Kessel
6f3298385f
Increase timeout time for the cluster output
We got reports that 10 seconds can cause connection to be lost
2020-08-25 16:07:46 +02:00
Ghostkeeper
d021fd10fb
Don't crash when trying to upload two jobs at the same time
This will now result in a job being put in the queue but not automatically printing, but there is at least a workaround for that.

Fixes Sentry issue CURA-14A.
2020-08-25 12:23:58 +02:00
Kostas Karmas
4e87f37791 Fix visual issues with long labels in the open project dialog
The following issues are fixed:
 * Printer/Quality/Material names will be wrapped if they are too long
 * The width of the window is determined based on the content of the dialog.
	With that there will not longer be overlap between the dialog content and the buttons.
2020-08-21 14:50:00 +02:00
Ghostkeeper
37855e7d19
Merge branch '4.7' 2020-08-21 11:18:39 +02:00
Ghostkeeper
a399c8f5fb
Hide Shared Heater functionality
See the explanation in the comment here as to why.
2020-08-21 11:18:20 +02:00
Ghostkeeper
9ea418c0a1
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
This reverts commit 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
2020-08-20 16:35:52 +02:00
Ghostkeeper
a757dc7fa0
Merge branch '4.7' 2020-08-20 16:34:58 +02:00
Ghostkeeper
28f4d8513d
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"
This reverts commit 7f47f12bf0a9cf305542b6c21600ce9b804c1dfd, reversing
changes made to dd42c87da762d2030ee2220bc6f0a3e44cf85c28.
2020-08-20 16:01:46 +02:00
Ghostkeeper
74b9771c7d
Code style: Fields have lower camel casing
As specified in the Ultimaker/Meta repository.
2020-08-19 15:46:08 +02:00
Ghostkeeper
9145a7e9e6
Remove unused import
Done during investigation of #8075.
2020-08-19 15:35:57 +02:00
Jaime van Kessel
7f47f12bf0
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-14 10:01:26 +02:00
Jaime van Kessel
1374c2faa9
Properly fix the translation crash 2020-08-13 15:13:11 +02:00
Jaime van Kessel
aba76d8bca
Merge branch 'CURA-7586_striped_in_layerview' of github.com:Ultimaker/Cura 2020-08-13 14:54:55 +02:00
Jaime van Kessel
5c8132a944
Fix translation crash 2020-08-13 14:54:34 +02:00
Remco Burema
99cd8ab1b0
Show models outside of BP clearly in layerview.
CURA-7586
2020-08-12 17:42:10 +02:00
Jaime van Kessel
dd42c87da7
Merge branch 'CURA-7646_Settings_not_applied_when_creating_new_CFFF_from_project_file' of github.com:Ultimaker/Cura into 4.7 2020-08-12 13:42:14 +02:00
Ghostkeeper
4ecab892e5
Further improve translated strings
Remove this formatting from the translated part.
2020-08-12 10:53:37 +02:00
Ghostkeeper
5ec57d42d0
Improve translatability of cloud printer syncing texts
Here are a number of improvements to the translated texts that make it easier for the translators to translate them:
* Never include layout elements such as <ul> or <li> in the translated text. The translators don't know what to do with them. Instead, leave the tags out of the translated parts and then wrap them around it in Python.
* If there are replacement keys in the source text, explain all of them in the context.
* Use a name within the brackets, to make it clear from context what the brackets mean and to disambiguate multiple keys if there are multiple.
* No invisible whitespace (such as space at the end of a line).
* Use plural forms with i18ncp if applicable (or i18np if no context is necessary).

I also changed the catalogue variable to lowercase with underscores, as per our code style.
2020-08-12 09:45:51 +02:00
Ghostkeeper
c49056f319
Merge branch '4.7' 2020-08-11 13:30:09 +02:00
Ghostkeeper
55dbb1ea0c
Temporarily remove warning message for cloud cameras
It's incorrect; the camera is possible with development firmware, but not implemented yet in Cura.

Removed this in lieu of the actual fix in CURA-7637, which takes too much time to fix for the 4.7 release.
2020-08-11 13:29:53 +02:00
Kostas Karmas
01d5e846aa Document possible theoretical issue when loading a project file
The issue will happen only if the machine_extruder_count is a formula.
In this case, the project loading will not work properly if "Create new" printer is selected,
as the settings of all extruders but the first one will not be applied.
Workaround in this case will be to load the project again and select to update the existing
printer, in which case all settings will load properly.

CURA-7646
2020-08-11 12:37:34 +02:00
Kostas Karmas
84bc7f5094 Merge branch '4.7' 2020-08-11 11:34:30 +02:00
Kostas Karmas
ccd4add3ef Apply different filtering per category when pressing Back
Back now applies the same filters that are applied when pressing the tab buttons.

CURA-7649
2020-08-11 11:32:53 +02:00
Kostas Karmas
7690dc7bac Merge branch '4.7' 2020-08-11 11:23:25 +02:00
Kostas Karmas
c7525719d5 Fix wrong filtering in Marketplace when pressing Back
It was trying to apply a wrong filter, which was causing a slowdown.
It is now applying the correct filter.

Fixes https://github.com/Ultimaker/Cura/issues/8161

CURA-7649
2020-08-11 11:18:37 +02:00
Kostas Karmas
0feeccff85 Appease mypy complaints for AttributeErrors
CURA-7646
2020-08-10 15:30:55 +02:00
Kostas Karmas
f8a15ea29e Display only the relevant materials when opening a project
Ignore the materials of the extruders that are not visible when opening a project file with a CFFF.

CURA-7646
2020-08-10 15:00:08 +02:00
Kostas Karmas
61cc8c9a95 Remove reference to JIRA ticket in comments
CURA-7646
2020-08-10 14:58:59 +02:00
Kostas Karmas
b9d5f0dc15 Take the machine_extruder_count into consideration when opening project
CURA-7646
2020-08-10 14:56:37 +02:00
Ghostkeeper
1f09ea58cc
Merge branch '4.7' 2020-08-10 11:26:25 +02:00
Ghostkeeper
fc6ea28352
Don't crash if CuraStackBuilder failed to create a stack
If it failed to create a global stack, the extruder_stack_dict variable would not be defined, and Cura crashes. It may fail to create a stack because of an indexerror in a malformed project file.

Fixes Sentry issue CURA-137.
2020-08-10 11:25:55 +02:00
Ghostkeeper
cc99c481af
Don't apply printspeed to travel moves
As the documentation says, only apply it to extrusion moves.

Done as a 5 minute fix.
2020-08-07 16:07:42 +02:00
Ghostkeeper
8b522a8a58
Fix crash when processLinearMove gets called on something else than G0 or G1
Return the original line then.
2020-08-07 15:29:55 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7
CURA-7641
2020-08-07 11:12:27 +02:00
Jaime van Kessel
3cdf5a82a4
Use correct property to search container stack
CURA-7609
2020-08-06 15:26:32 +02:00
Jaime van Kessel
ebdab94b98
Merge branch 'CURA-7609_Pick_any_printer_when_opening_a_project_file_single_dropdown' of github.com:Ultimaker/Cura 2020-08-06 15:26:16 +02:00
Jaime van Kessel
c8771124ad
Change function name to better reflect what it does
CURA-7609
2020-08-05 14:56:39 +02:00
Kostas Karmas
4a04126e91 Fix "Fetching Packages" text in the Marketplace in dark mode
CURA-7627
2020-08-05 14:13:39 +02:00
Kostas Karmas
3228766dd5 Fix "Fetching Packages" text in the Marketplace in dark mode
CURA-7627
2020-08-05 14:12:00 +02:00
Remco Burema
deec650668
Merge branch '4.7' 2020-08-05 08:17:10 +02:00
Remco Burema
b394be3583
Remove superfluous theme entry.
It was messing with the dark side. Theme. I mean theme.
part of CURA-7627
2020-08-05 08:16:10 +02:00
Remco Burema
60dd4f411b
Readable text in dark mode.
part of CURA-7627
2020-08-05 08:03:12 +02:00
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
Jaime van Kessel
c8746eced6
Move some HTML codes out of the translation
Due to string freeze we can't fix this for 4.7

CURA-7627
2020-08-04 13:44:33 +02:00
Jaime van Kessel
af9a078d41
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-04 13:30:39 +02:00
Jaime van Kessel
955b2950e8
Change tertiary button to use link text color
CURA-7627
2020-08-04 13:30:01 +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