24413 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
Jaime van Kessel
afb29724ff
Give the machineButton selectors a fixed width
This prevents them from popping out of the interface for certain
languages
2020-08-25 10:59:14 +02:00
Ghostkeeper
792f81315b
Merge branch '4.7' 2020-08-24 12:09:25 +02:00
Ghostkeeper
97c271a7d4
Add change log for Cura 4.7
Needed lots of corrections from our previously published change log for the beta. Also some additions.

Contributes to issue CURA-7658.
4.7.0
2020-08-24 12:08:28 +02:00
Jaime van Kessel
0a681a3a36
Merge branch 'master' of github.com:Ultimaker/Cura 2020-08-24 10:12:04 +02:00
Jaime van Kessel
1097dbdfa5
Fix copypaste mistake 2020-08-24 10:11:49 +02:00
Ghostkeeper
5842c2cea8
Merge branch '4.7' 2020-08-24 09:50:22 +02:00
Ghostkeeper
6a816f9c11
Fix string without ending delimeter
Oops, small typo.

Contributes to issue CURA-7622.
2020-08-24 09:50:00 +02:00
Ghostkeeper
38286e7802
Merge branch '4.7' 2020-08-24 09:47:59 +02:00
Ghostkeeper
e50d6dd6ea
Merge branch '4.7' of https://github.com/Patola/Cura into Patola-4.7 2020-08-24 09:47:28 +02:00
Jaime van Kessel
f6eb008574
Merge branch 'master' of github.com:Ultimaker/Cura 2020-08-24 09:34:11 +02:00
Jaime van Kessel
13600504d4
Fix mypy failure 2020-08-24 09:33:56 +02:00
Patola
087a6fa247
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:16:46 +02:00
Patola
a48e744c02
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:16:36 +02:00
Patola
58e32197c1
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:16:27 +02:00
Patola
4943a1df01
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:16:13 +02:00
Patola
607367a1e4
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:16:03 +02:00
Patola
cefba2efdb
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:15:50 +02:00
Patola
6ddef17a28
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:15:35 +02:00
Patola
af4be494b2
Update resources/i18n/pt_BR/cura.po
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 17:15:26 +02:00
Ghostkeeper
6b8fe48ddd
Merge branch '4.7' 2020-08-21 17:12:09 +02:00
Ghostkeeper
81ef3ef125
Escape these double quotes
Otherwise it's a syntax error.

Contributes to issue CURA-7622.
2020-08-21 17:11:55 +02:00
Ghostkeeper
5735849a71
Merge branch '4.7' 2020-08-21 16:45:23 +02:00
Ghostkeeper
25323e704b
Apply suggestions from code review
Further fixes to translations

Some small changes.

Contributes to issue CURA-7622.

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 16:43:26 +02:00
Ghostkeeper
222d6604e0
Clarifications and fixes to source strings
Found during work on CURA-7622.
2020-08-21 16:40:24 +02:00
Jaime van Kessel
87fb495e07
Add some property tests for MachineManager 2020-08-21 16:36:04 +02:00
Ghostkeeper
2020453109
Found one more mistake
Contributes to issue CURA-7622.
2020-08-21 16:32:43 +02:00
Ghostkeeper
0eb9e0e0d0
Fix issues found with the translations during review
These are things we could fix ourselves.

Contributes to issue CURA-7622.
2020-08-21 16:23:57 +02:00
Ghostkeeper
f3102159ae
Apply suggestions from code review
Implement most of the suggested changes by Konskarm.

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-08-21 16:13:08 +02:00
Jaime van Kessel
1affc345b9
Add test for clearUserSettingAllCurrentStacks 2020-08-21 16:02:26 +02:00
Ghostkeeper
d37794fe7a
Fix missing plural case
Contributes to issue CURA-7622.
2020-08-21 15:55:10 +02:00
Jaime van Kessel
4a47606176
Fix mypy issue 2020-08-21 15:52:13 +02:00
Jaime van Kessel
eb599a837d
Merge branch 'master' of github.com:Ultimaker/Cura 2020-08-21 15:39:18 +02:00
Jaime van Kessel
ef4fae5b80
Expand tests for hasUserSettings 2020-08-21 15:39:03 +02:00
Jaime van Kessel
e1e0a4d32c
Expand the getMachine test 2020-08-21 15:16:29 +02:00
Jaime van Kessel
ce930220e9
Add tests for SetActiveMachine 2020-08-21 15:14:44 +02:00
Ghostkeeper
a4e179533f
Copy plural forms to translation
The import script doesn't handle these.

Contributes to issue CURA-7622.
2020-08-21 14:51:27 +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
fdd168257c
Add Czech translations for Cura 4.7
We received these via e-mail.

Contributes to issue CURA-7622.
2020-08-21 14:00:12 +02:00
Ghostkeeper
add2b5784f
Add Taiwanese translations
We received those via e-mail.

Contributes to issue CURA-7622.
2020-08-21 13:56:00 +02:00
Ghostkeeper
501361dd2b
Update PO-revision-dates
The import script should really be doing this automatically for us... Oh well.

Contributes to issue CURA-7622.
2020-08-21 13:42:07 +02:00
Ghostkeeper
1c459679b9
Import translations from Lionbridge
These are the result of running the lionbridge_import.py script on the translation files that we received from Lionbridge through Smartling. It contains the new translations for Cura 4.7.

Contributes to issue CURA-7622.
2020-08-21 13:38:15 +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
Jaime van Kessel
af05aa61b7
Remove unneeded binding
This binding wasn't needed to prevent a binding loop, but it did cause
the length to not be updated correctly sometimes

CURA-7589
2020-08-20 16:05:52 +02:00