Jaime van Kessel
fb4ce43f0c
Prevent crashes when a variant could not be found
...
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).
Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually
CURA-6992
2019-11-21 12:54:33 +01:00
Remco Burema
9aeb9912c8
Merge branch '4.4'
2019-11-19 15:57:52 +01:00
Remco Burema
df1e0abd93
Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4
2019-11-19 14:23:10 +01:00
Remco Burema
f1f0290458
Re-enable the Polish language.
...
part of CURA-6957
2019-11-19 14:22:53 +01:00
Ellecross
2d35343538
Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4
2019-11-19 13:17:37 +01:00
Ellecross
d425764da8
Added contributors to PRs
2019-11-19 13:17:33 +01:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups
...
Contributes to #6670
2019-11-19 13:00:39 +01:00
Remco Burema
9e32f715bb
Merge branch 'translations_4.4' into 4.4
2019-11-19 12:08:38 +01:00
Remco Burema
1c4998a204
Merge pull request #6668 from Patola/4.4
...
Updated pt_BR strings for Cura 4.4.
2019-11-19 11:59:36 +01:00
Remco Burema
dfe468ef68
Added translations from out Brazilian volunteer.
...
part of CURA-6957
2019-11-19 11:58:39 +01:00
Remco Burema
5cae2fd098
Merge branch '4.4' into translations_4.4
2019-11-19 11:54:08 +01:00
Ellecross
b74ee97048
Update change_log.txt to have 4.4 changes
2019-11-19 11:49:30 +01:00
Remco Burema
4ebec11fc7
Added 16 missing strings from lionbridge.
...
part of CURA-6957
2019-11-19 11:40:11 +01:00
Jaime van Kessel
650377c819
Merge branch '4.4' of github.com:Ultimaker/Cura
2019-11-18 11:38:11 +01:00
Jaime van Kessel
377a21071b
Remove color from discard dialog text, since it uses system style
...
Originally a lot of text would not be readable when in dark theme
because the text would be light, but the background would always be
white.
2019-11-18 11:33:36 +01:00
Cláudio 'Patola' Sampaio
39756b4e27
Updated pt_BR strings for 4.4
2019-11-16 13:16:11 -03:00
Cláudio 'Patola' Sampaio
ec4831f0d0
Updated pt_BR strings for 4.4
2019-11-16 13:15:14 -03:00
Cláudio 'Patola' Sampaio
bce574c10b
Updated pt_BR strings for 4.4
2019-11-16 13:14:07 -03:00
Cláudio 'Patola' Sampaio
5894292935
Updated pt_BR strings for 4.4
2019-11-16 13:09:49 -03:00
Remco Burema
3f90566edc
Added Polish translation by one of our volunteer translators.
...
part of CURA-6957
2019-11-15 17:04:53 +01:00
Jaime van Kessel
08ca213127
Add extra update for Combobox
2019-11-15 11:35:06 +01:00
Remco Burema
22fe13890e
Make sure translations are loaded before init. Intents.
...
part of CURA-6957
2019-11-14 18:26:46 +01:00
Remco Burema
ed63a9037d
Add raw Lionbridge translations.
...
part of CURA-6957
2019-11-14 16:47:08 +01:00
Remco Burema
300990ad89
Add Traditional Chinese from one of our volunteer translators.
...
part of CURA-6957
2019-11-14 16:44:08 +01:00
Jaime van Kessel
33bfebb275
Merge branch 'master' of github.com:Ultimaker/Cura
2019-11-14 11:21:01 +01:00
Jaime van Kessel
c65ccf29b0
Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura
2019-11-14 11:06:12 +01:00
Remco Burema
6127c99b64
Added a public key so the 'enterprise' build will start.
...
(sort of) part of CURA-6856
2019-11-13 17:14:46 +01:00
Lipu Fei
ebea5fbd14
Merge 4.4
2019-11-13 11:22:15 +01:00
Lipu Fei
c08e7df277
Fix typing
...
CURA-6976
2019-11-13 11:10:12 +01:00
Nino van Hooff
fe27193c98
Add dict key check for a crash found in IntentManager
...
CURA-6976
2019-11-13 11:01:03 +01:00
Nino van Hooff
eb4eddd49e
Add dict key check for a crash found in IntentManager
...
CURA-6976
2019-11-12 15:39:44 +01:00
Nino van Hooff
c31c1dd6fb
Refactor: simplify SimulationSliderLabel font metrics
2019-11-12 14:56:56 +01:00
Nino van Hooff
504eacce66
Merge remote-tracking branch 'origin/master'
2019-11-12 14:55:12 +01:00
Nino van Hooff
27b4e9a063
Refactor: simplify SimulationSliderLabel width
2019-11-12 14:55:00 +01:00
Nino van Hooff
f4b9c0fdd4
Fix SimulationSliderLabel width
2019-11-12 14:52:11 +01:00
Nino van Hooff
ae245ed0e5
Cleanup: remove warnings for non-existing margins
2019-11-12 14:51:48 +01:00
Lipu Fei
d70a6e81b1
Merge 4.4
2019-11-12 14:39:30 +01:00
Lipu Fei
77c194464e
Fix tests
2019-11-12 14:33:54 +01:00
Lipu Fei
8228c6a743
Make sure position is not None
...
CURA-6974
2019-11-12 14:22:21 +01:00
Jaime van Kessel
17b8e9930c
Add handling for case where variant could not be found
...
CURA-6975
2019-11-12 13:28:12 +01:00
Jaime van Kessel
3da53a3a89
Merge branch 'CURA-6856_signed_plugins_and_packages' of github.com:Ultimaker/Cura
2019-11-12 10:48:43 +01:00
Jaime van Kessel
2195dbaad0
Make backup window modal
...
It could get hidden on osx quite easily, which is confusing as hell
2019-11-12 10:31:45 +01:00
Remco Burema
c3d1ab0931
Small refactor: Rename in UM.
...
part of CURA-6856
2019-11-12 08:40:50 +01:00
Jaime van Kessel
7e3905059d
Let the simulation slider label scale on actual font size
...
CURA-6854
2019-11-11 16:10:26 +01:00
Jaime van Kessel
4613b62120
Merge branch '4.4' of github.com:Ultimaker/Cura
2019-11-11 16:01:19 +01:00
Jaime van Kessel
e2414ed5c9
Also log the exception when the connection failed to connect
2019-11-11 15:58:39 +01:00
Jaime van Kessel
4335acb19f
Fix text jitter for the layer slider
...
CURA-6854
2019-11-11 14:27:31 +01:00
Jaime van Kessel
3e50cf5253
Fix issues with makeblock definition
2019-11-11 13:43:04 +01:00
Lipu Fei
2fb8375714
Merge pull request #6591 from pkz0313/master
...
Hopefully Adding the Makeblock 3d Printer files to the latest version
2019-11-11 10:55:46 +01:00
Jaime van Kessel
d93f6f25d2
Prevent "sticky" tooltips
...
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
2019-11-11 10:47:53 +01:00
