1616 Commits

Author SHA1 Message Date
Remco Burema
9afbc64934
Merge branch '4.8' 2020-11-10 11:31:53 +01:00
Ghostkeeper
1927f78d5a
Publish Ultimaker 2+ Connect profiles
This is the new printer from Ultimaker.
2020-11-10 11:01:08 +01:00
Kostas Karmas
bcfb42d861 Merge branch '4.8' 2020-11-02 11:17:59 +01:00
Ghostkeeper
cfccf94914
Don't use deprecated 'address' property of ServiceInfo
It's been replaced by 'addresses'. In the newest Zeroconf version, 'address' has been removed entirely.

Contributes to issue CURA-7501.
2020-10-30 17:45:58 +01:00
Kostas Karmas
c8e3c4ff12 Display the queue by default if there are no capabilities
If the capabilities list is missing, display the queue anyway, even if it is always empty

CURA-7784
2020-10-30 12:49:39 +01:00
Kostas Karmas
adc8072991 Hide queue in Monitor page if printer does not support it
CURA-7784
2020-10-30 12:44:59 +01:00
Jaime van Kessel
10ed7c1288
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-10-22 13:41:44 +02:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0
In preparation for release of the 4.8.

CURA-7795
2020-10-22 11:29:25 +02:00
Ghostkeeper
c9fdf5954a
Merge branch '4.8' 2020-10-20 15:28:12 +02:00
Jaime van Kessel
5c5a26bf35
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-10-20 13:45:50 +02:00
Kostas Karmas
f576e07c11 Add "preparing" status in monitor page
CURA-7745
2020-10-20 09:49:11 +02:00
Ghostkeeper
5cd62ae15b
Optimise images losslessly
This runs a filter optimisation to choose the best PNG filters for compression, then RLE optimisation. The pixel value output is still the same, but file size somewhat smaller.
2020-10-19 11:21:21 +02:00
Ghostkeeper
13d0fbdea7
Don't attempt to send the empty material
We can't send it because sending it looks up the serialised form on disk, and there is no file for this one on disk.

Contributes to issue CURA-7501.
2020-10-16 14:32:00 +02:00
Jaime van Kessel
70d081afaa
Dont immediately show the "not a group host" message
By delaying a bit, we can ensure that this only happens if the cluster
itself isn't offline

CURA-7360
2020-10-16 11:45:47 +02:00
Ghostkeeper
81217880fd
Merge branch 'CURA-7745-fix-montior-page-hacks' 2020-10-15 09:57:34 +02:00
Ghostkeeper
bcb30caf98
Show error message when print job queue is full on the printer
Implements issue CURA-7760.
2020-10-13 17:32:47 +02:00
Ghostkeeper
0e14eef47d
Allow for a callback when the HttpRequestManager doesn't catch the error
There are really two types of errors that the HttpRequestManager can throw: Errors that it understands and errors that it doesn't understand. We must now intercept an error that it doesn't understand.

Contributes to issue CURA-7760.
2020-10-13 17:31:53 +02:00
jelle Spijker
d78ddd6c17
Created Print job upload Queue Full Message
This message is shown to the user in Cura when the digital
factory returns a 409, because the queue is full

CURA-7760 sending multiple printjobs notifications
2020-10-12 16:55:57 +02:00
Jaime van Kessel
3ad5219f5d
Simplify the printer state display
CURA-7745
2020-10-12 11:06:49 +02:00
Jaime van Kessel
77290451e1
Remove a bunch of unneeded properties from the labels
CURA-7745
2020-10-08 18:00:53 +02:00
Jaime van Kessel
ec5796400b
Remove hardcoded narrow_margins
CURA-7745
2020-10-08 17:55:11 +02:00
Jaime van Kessel
3e67d20890
Remove monitor_text_primary
It's so close to the text one that it really doesn't make sense to keep it.
Boyscouting the code a bit here

CURA-7745
2020-10-08 17:31:19 +02:00
Jaime van Kessel
910d8ec472
Fix reference error
CURA-7745
2020-10-08 17:22:24 +02:00
Jaime van Kessel
99f42c179f
Remove hardcoded value for num extruders
CURA-7745
2020-10-08 17:18:24 +02:00
Kostas Karmas
3d2d651b73 Fix crashing if QNetworkReply contains no status code
Display an appropriate message instead
2020-09-24 12:08:16 +02:00
Kostas Karmas
17177eccfa Remove unused keyword argument
I18ncp already puts the number of printers in the text, so the keyword argument is not longer
necessary.

CURA-7665
2020-09-07 16:33:16 +02:00
Jaime van Kessel
bde6e1bb97
Fix crash when removing cloud printers
CURA-7665
2020-09-07 11:27:36 +02:00
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
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
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
Jaime van Kessel
1374c2faa9
Properly fix the translation crash 2020-08-13 15:13:11 +02:00
Jaime van Kessel
5c8132a944
Fix translation crash 2020-08-13 14:54:34 +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
Ghostkeeper
1f09ea58cc
Merge branch '4.7' 2020-08-10 11:26:25 +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
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
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
955b2950e8
Change tertiary button to use link text color
CURA-7627
2020-08-04 13:30:01 +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
Nino van Hooff
49f83cbdb5 Fix printer counts for the auto-added printer message
CURA-7546
2020-07-02 16:23:46 +02:00
Ghostkeeper
43c5d05853
Merge branch 'CURA-7505_Refactor_registration_of_cloud_printers' 2020-06-18 17:21:05 +02:00
Kostas Karmas
18f3d187d5 Remove extra newlines in printers added from account message
Since \n are now replaced by <br>, the \n should be removed from this specific message.
Required after the changes in efaad4f6c8
2020-06-18 14:08:35 +02:00
Kostas Karmas
8abaf69873 Update CloudOutputDevice of the machine when it is rediscovered
Even though the metadata of the machine was updated when it was
rediscovered, the new cluster id was not updated in all its references
(such as in the _remote_clusters and in the _um_cloud_printers dicts).
This commit fixes that issue by properly updating all the entries
that depend on the machine's cluster id.

CURA-7505
2020-06-17 16:11:18 +02:00