6791 Commits

Author SHA1 Message Date
Nino van Hooff
c31c1dd6fb Refactor: simplify SimulationSliderLabel font metrics 2019-11-12 14:56:56 +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
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
4335acb19f
Fix text jitter for the layer slider
CURA-6854
2019-11-11 14:27:31 +01:00
Lipu Fei
534b432e7e Fix another is None check for typing 2019-11-11 09:08:13 +01:00
Lipu Fei
7495d7900f Fix is None check for typing 2019-11-11 09:03:21 +01:00
Lipu Fei
adaea90d50 Fix typing 2019-11-11 08:48:04 +01:00
Jaime van Kessel
9940bc8551
Merge branch 'master' of github.com:Ultimaker/Cura 2019-11-08 13:38:58 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Lipu Fei
832b4f28dc Fix merge conflicts with 4.4 2019-11-07 13:56:20 +01:00
ninovanhooff
d503f9df25
Merge pull request #6635 from Ultimaker/CURA-6854_align_layer_label_top_bottom
Fix window resize bug in LayerSlider concerning handle position
2019-11-07 13:04:01 +01:00
Nino van Hooff
ba6cf8eae5 Fix window resize bug in LayerSlider concerning handle position
Upper handle position would not be updated on resize

CURA-6854
2019-11-07 12:46:45 +01:00
ChrisTerBeke
7dc38cd55d Merge branch '4.4' into CS-476_improve_packages_api_speed 2019-11-07 10:31:37 +01:00
Lipu Fei
5e255b548e Fix TestLegacyProfileReader 2019-11-07 10:21:01 +01:00
Lipu Fei
7c36b6a8ba Resolve merge conflicts with master 2019-11-06 12:01:49 +01:00
Jaime van Kessel
cb7552a926
Merge branch 'CURA-6854_align_layer_label_top_bottom' of github.com:Ultimaker/Cura 2019-11-05 13:23:34 +01:00
Lipu Fei
af909b25a2
Merge pull request #6624 from Ultimaker/CURA-6569_mandatory_marketplace_login
WIP: CURA-6569_mandatory_marketplace_login
2019-11-05 11:04:14 +01:00
Lipu Fei
8baa009f1f Use IsEnterpriseVersion in Toolbox
CURA-6569
2019-11-05 10:53:52 +01:00
Lipu Fei
b843210fd3 Add machine name to the machine settings dialog 2019-11-05 10:48:18 +01:00
Nino van Hooff
ed7134ded8 Organize Toolbox (marketplace) qml files according to type
CURA-6569
2019-11-04 17:35:24 +01:00
Ghostkeeper
b34c0e8eb7
Don't check A: and B: drives for USB sticks
Fixes #2438.
2019-11-04 16:35:49 +01:00
Nino van Hooff
7af5f132e0 Only show toolbox/marketplace welcome screen for Essentials builds
CURA-6569
2019-11-04 16:15:00 +01:00
Nino van Hooff
3d352b3585 Show welcome page in marketplace window when not logged in
TODO: marketplace logo

CURA-6569
2019-11-04 15:44:04 +01:00
Jaime van Kessel
ad85e29c0a
Fix stupid identation issue 2019-11-04 13:11:46 +01:00
ChrisTerBeke
b1316b8a05 Fix installed_packages query params 2019-11-04 12:56:41 +01:00
Ghostkeeper
e13108f267
Don't request updates if update checking is disabled
I remember remarking this at one point but then it was said that we'd only need to implement the 'Minimum Viable Product' for the Toolbox. Well this is what happens then...
2019-11-04 11:52:11 +01:00
Jaime van Kessel
aa5b788b59
Fix issue with profiles getting added to non creality printers in upgrade 2019-11-04 11:30:48 +01:00
Jaime van Kessel
141bd0f127
Remove spammy New Cloud Printer detected message
ST-3153
2019-11-04 11:10:30 +01:00
Remco Burema
3dabd6023b
Merge branch 'master' into CURA-6856_signed_plugins_and_packages 2019-11-01 16:45:42 +01:00
Jaime van Kessel
c2e6116983
Add names to all the threads 2019-11-01 16:20:42 +01:00
Ghostkeeper
2fea780fd2
Merge branch '4.4' 2019-11-01 13:19:34 +01:00
Ghostkeeper
36d4162f35
Fix fallback to global if extruder_nr doesn't exist
Fixes #6590.
2019-11-01 13:19:16 +01:00
Ghostkeeper
cf2108ec4a
Merge branch '4.4' 2019-11-01 11:55:42 +01:00
Ghostkeeper
eaedca1917
Convert unit of adaptive layers threshold and change name
This usage is hopefully more intuitive than the previous one.
2019-11-01 11:54:17 +01:00
Nino van Hooff
96bd641d93 Fix: upper/lower handle not losing focus when range handle pressed 2019-11-01 11:06:16 +01:00
Nino van Hooff
94d291a20c Merge branch 'master' into CURA-6854_align_layer_label_top_bottom
# Conflicts:
#	plugins/SimulationView/SimulationViewMainComponent.qml
2019-11-01 10:51:21 +01:00
ChrisTerBeke
b919be48bc Introduce new API call for fetching package updates 2019-11-01 10:50:02 +01:00
ninovanhooff
1cdad60b5b
Merge pull request #5765 from Ultimaker/log_litho
Logarithmic lithophane thickness
2019-11-01 10:32:39 +01:00
Nino van Hooff
90f580494b Change default image reader algorithm from logarithmic to linear
The log curve might have some benefits but is also harder to understand
and configure, so let's keep the default at linear.

CURA-6540
2019-11-01 10:31:34 +01:00
Remco Burema
aca7f4551e
Make verified material containers read-only, even for variants.
part CURA-6856
2019-10-31 19:01:23 +01:00
Remco Burema
5908ff60ee
Move verification check from plugin to the import of containers.
part of CURA-6856
2019-10-31 18:50:24 +01:00
Jaime van Kessel
9dccbcdd8e
Merge branch 'CURA-6874_path_slider_layout' of github.com:Ultimaker/Cura 2019-10-31 13:15:01 +01:00
Nino van Hooff
d63499fb24 Remove redundant visibility properties from Items
CURA-6874
2019-10-30 10:57:03 +01:00
Nino van Hooff
958a922808 Cleanup debugging things for cura-6874
CURA-6874
2019-10-30 10:54:22 +01:00
Remco Burema
298eb27c7f
Add possibility to check material-profiles.
Needed to add the filename to deserialize, feels a bit unsafe as an optional parameter, will discuss tomorrow.
part of CURA-6856
2019-10-29 17:45:19 +01:00