Commit graph

7424 commits

Author SHA1 Message Date
Jaime van Kessel
8cbd6443be UM3 familiy printers now set their machine type
CURA-2475
2016-10-05 14:31:41 +02:00
Jaime van Kessel
2b117c0450 Added printer type to output device
CURA-2475
2016-10-05 14:31:12 +02:00
Jaime van Kessel
f24fd5660d Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 13:49:11 +02:00
Jaime van Kessel
e582607e41 Added todo comment 2016-10-05 13:48:09 +02:00
Ghostkeeper
06a0a0b95e
Progress bar never indeterminate if invisible
Because if the progress bar is indeterminate, it triggers redraws for every frame to create the animation of the progress bar bouncing, regardless of whether it is visible or not. So now we make it indeterminate regardless of what state it is in.

Contributes to issue CURA-2497.
2016-10-05 13:35:12 +02:00
Ghostkeeper
8a5026bdb1
Revert "Early cop-out if there is no printer connected"
This reverts commit 99f53cb832. That commit caused the progress bar to be indeterminate if the progress bar was not visible, which is semantically correct but in reality causes QML to redraw the screen constantly for the animation of the indeterminate progress bar. This was taking up CPU. Now the CPU is only taken up during the pausing and resuming states when the progress bar is visible and indeterminate, but then it is actually required.

Contributes to issue CURA-2497.
2016-10-05 13:28:53 +02:00
Ghostkeeper
6f412c0825
Improve translation context for some labels
These translations went sort of wrong in the Turkish translation, because the context was unclear. I've tried to clarify it better.

Contributes to issue CURA-570.
2016-10-05 11:39:29 +02:00
Jaime van Kessel
6e369bec57 Disabled exporting for read-only profiles
CURA-2496
2016-10-05 10:36:33 +02:00
Jaime van Kessel
448c8436dc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 09:40:46 +02:00
Jaime van Kessel
ad80678bc2 Gracefully handle case if no material was found
CURA-2494
2016-10-05 09:40:16 +02:00
Simon Edwards
963fac7806 Filter the list of quality changes taking into account the quality(-type) profile they depend on.
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-10-05 09:32:18 +02:00
fieldOfView
029fda72e3 Fix warning when there is no current printer 2016-10-04 19:09:10 +02:00
fieldOfView
6d0da0d754 Revert "global_profile" reference changes while refixing import
CURA-2518 and CURA-2478
2016-10-04 17:21:33 +02:00
Jack Ha
e66548099a Fixed signal routing when switching between different machines. CURA-2232 2016-10-04 15:25:22 +02:00
fieldOfView
85d1fa8a39 Fix error on profiles page when there is no active machine 2016-10-04 14:51:04 +02:00
Ghostkeeper
8bd3b7ea9b
Revert "Reinitialise Zeroconf network socket upon refresh/start"
This reverts commit a31a4a1e90.
2016-10-04 14:50:08 +02:00
fieldOfView
77370d8599 Fix error duplicating profiles
CURA-2478
2016-10-04 14:49:56 +02:00
fieldOfView
7b42f52be9 Properly use classmethod to make sure ContainerManager is a singleton
CURA-2478
2016-10-04 14:28:39 +02:00
fieldOfView
4f1000c70e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:15:05 +02:00
fieldOfView
d47f3c482f Static methods cannot call class methods 2016-10-04 14:14:55 +02:00
Jaime van Kessel
e4c6b58611 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 14:08:10 +02:00
fieldOfView
d4556ba4c5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:06:06 +02:00
fieldOfView
ff12f999be Fixed error when duplicating protected profiles
CURA-2478
2016-10-04 14:05:55 +02:00
Tim Kuipers
93186dedd0 JSON fix: disable prime position by default for each machine (CURA-2521) 2016-10-04 14:02:34 +02:00
Jaime van Kessel
c99b460927 Merge branch 'feature_better_warning_formulas' of github.com:Ultimaker/Cura 2016-10-04 13:51:51 +02:00
Ghostkeeper
a31a4a1e90
Reinitialise Zeroconf network socket upon refresh/start
Reinitialising Zeroconf entirely causes CPU usage to go through the proverbial roof. This is sort of a hack, since we're touching the _listen_socket variable inside Zeroconf, which it hasn't exposed. But it works to still be able to refresh Zeroconf after network switches, and to not have high CPU usage afterwards.

Contributes to issue CURA-2497.
2016-10-04 13:49:01 +02:00
Tim Kuipers
ed0f8c0235 Merge branch 'master' into feature_better_warning_formulas 2016-10-04 13:43:04 +02:00
Jaime van Kessel
601fdf51fc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 13:40:39 +02:00
Jaime van Kessel
bac0ea94a1 Removed nozzle offset from prime area
CURA-2520
2016-10-04 13:40:31 +02:00
Arjen Hiemstra
5a14c5e5ba Replace manual function calls to updateCurrentIndex with an explicit binding
This is mostly in support of Uranium PR #165 . That changes
SettingPropertyProvider so that the "properties" property does not
always change. However, in general this is the more correct approach.

Relates to CURA-2232
2016-10-04 13:22:20 +02:00
fieldOfView
fc310f2732 Fix duplicating profiles
CURA-2478
2016-10-04 13:21:17 +02:00
fieldOfView
eb1cb3c0f2 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 13:14:27 +02:00
fieldOfView
10dc8f98b8 Highlight quality_changes values in manage profiles tabs...
and strike out values that are overridden by a user value

CURA-2514
2016-10-04 13:14:04 +02:00
Ghostkeeper
d0019cee16
Fix bounding box string in Turkish
This is a key and should not have been translated.

Contributes to issue CURA-570.
2016-10-04 12:02:08 +02:00
Ghostkeeper
9f41d81e86
Sort language list by language code
This makes it slightly easier to find your language. English is an exception, it is always put in front.

Contributes to issue CURA-570.
2016-10-04 11:41:37 +02:00
Ghostkeeper
5339fc8e8d
Put translation drop-down in their native language
This makes it slightly easier to select your native language if you don't know the current language. Of course, you have to find the drop-down first... But this is how many applications do it.

Contributes to issue CURA-570.
2016-10-04 11:41:37 +02:00
Ghostkeeper
04545406cd
Add Turkish language to drop-down
The translation files are already in there (though the template all languages were based on is not entirely complete). But it wasn't yet in the drop-down so it couldn't be selected.

Contributes to issue CURA-570.
2016-10-04 11:41:37 +02:00
Jack Ha
1ad39a3332 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:13:47 +02:00
Jack Ha
7c18d320c4 SettingView: Only removeUnusedValue when no resolve. Contributes to CURA-2232 2016-10-04 11:13:33 +02:00
Jaime van Kessel
2e9fa7ece1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 11:04:06 +02:00
Ghostkeeper
3b6d8f40aa
Also hide support interface line width if support is disabled
Also, the extruderValue call is superfluous since the setting is already limited to this extruder.
2016-10-04 11:00:29 +02:00
Jaime van Kessel
7ef14b08a4 Merge branch 'feature_resolvement_functions' of github.com:Ultimaker/Cura 2016-10-04 10:53:40 +02:00
Jaime van Kessel
faf98e40f8 Inherit button now correctly removes values if needed for multi extrusion machines
CURA-2374
2016-10-04 10:46:13 +02:00
Jaime van Kessel
72bd268e2d Export now exports correct extruder profiles as well
CURA-2496
2016-10-04 10:37:48 +02:00
fieldOfView
556431b984 Fix error when no machine is selected 2016-10-03 22:40:28 +02:00
fieldOfView
f55c35df6e Load extruder profiles into the correct extruder
CURA-2478
2016-10-03 22:40:05 +02:00
fieldOfView
144dcb5a65 Slightly more defensive programming in case of extruder mismatch 2016-10-03 22:18:38 +02:00
fieldOfView
046d0b5956 Rename extruder quality changes files when renaming a custom profile
CURA-2484
2016-10-03 22:17:56 +02:00
fieldOfView
e1d70ed4b6 Fix selecting quality_changes profiles for extruders
Now that containers in a quality_changes set don't share a common name, the quality_changes containers for extruders have a metadata entry "global_profile" pointing to the global quality_changes container id.

Contributes to CURA-2478 and CURA-2484
2016-10-03 21:58:34 +02:00
Tim Kuipers
6240baaaca JSON fix: better warning formulas (CURA-905) 2016-10-03 17:56:03 +02:00