1166 Commits

Author SHA1 Message Date
Jaime van Kessel
4a5d7cbc73 Bindings of inheritance icon now correctly update when switching between machines
CURA-2752
2016-10-27 13:08:10 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Simon Edwards
cc33b3be22 Change for the "Advanced" tab to "Custom".
CURA-2751 Change settings label "Simple" to "Recommended"
2016-10-26 10:43:00 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Arjen Hiemstra
b0d6d7034a Ensure we re-evaluate the inheritance icon binding when it changes
Contributes to CURA-2752
2016-10-25 13:11:04 +02:00
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +02:00
Arjen Hiemstra
bef3666a88 Still show the inherit button even when the revert is visible
It was not a bug like I assumed

Contributes to CURA-2752
2016-10-25 11:40:05 +02:00
Arjen Hiemstra
aed23ca17e Merge branch '2.3'
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
2016-10-24 17:10:41 +02:00
Arjen Hiemstra
8ce81fec9f Expand logic for showing the inherit button in SettingItem
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.

Contributes to CURA-2752
2016-10-24 17:10:26 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.

Contributes to issue CURA-2737.
2016-10-21 14:00:43 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
2016-10-21 13:06:49 +02:00
Ghostkeeper
57b0275384
Show layer height in profile selection menu
It's shown in the 'inactive' font colour, which isn't entirely semantically correct but has the behaviour we want regardless of how the theme changes in the future.

Contributes to issue CURA-2723.
2016-10-20 17:16:06 +02:00
Jack Ha
d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors".
CURA-2730
2016-10-20 16:16:33 +02:00
Jack Ha
a23a922eec Drag profile into Cura; added importProfile(s), exportProfile to ContainerManager. CURA-787 2016-10-20 13:55:39 +02:00
Simon Edwards
28f00e2089 Merge branch '2.3' 2016-10-20 12:59:51 +02:00
Simon Edwards
d228f6ce9f CURA-2751 Change settings label "Simple" to "Recommended" 2016-10-20 12:51:19 +02:00
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
fieldOfView
d3e3c0c659 Fix translation of machines page and some other references to Uranium
CURA-570
2016-10-18 15:34:52 +02:00
Jack Ha
9195961806 Fixed translation of 4 words in profilespage. remains of CURA-570 2016-10-18 15:05:18 +02:00
fieldOfView
e2d32ef963 Change references from Uranium to Cura 2016-10-17 14:17:28 +02:00
fieldOfView
98a2ebc157 Fix translation of machines page and some other references to Uranium
CURA-570
2016-10-17 14:10:02 +02:00
Jack Ha
1cd5052666 Fixed translation of 4 words in profiles page. CURA-570 2016-10-17 13:57:24 +02:00
Jaime van Kessel
3afd813e5e Profiles page is now correctly updated when single extrusion machine is used 2016-10-15 19:23:07 +02:00
Jaime van Kessel
d12219cab8 Right profile is now checked again in dropdown
CURA-2690
2016-10-15 17:10:26 +02:00
Jaime van Kessel
ff24def63c Use globalProfileId to check if we need to show changed settings
CURA-2690
2016-10-15 17:05:55 +02:00
fieldOfView
a291131aca Fix qml warning when no printer is connected 2016-10-13 21:18:17 +02:00
fieldOfView
fe60b2fab8 Add missing elide for "Print Setup" label
And fix some code style
2016-10-13 13:18:51 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag.
CURA-2271
2016-10-12 15:57:50 +02:00
fieldOfView
34630fa646 Also show the "unsupported" warning when a custom profile is selected
...by making sure we're looking at the quality container (not quality_changes) of the active extruder/stack

CURA-2271
2016-10-11 16:36:32 +02:00
fieldOfView
95fabbaf6d Don't allow creating profiles based on empty_profile
...because empty_profile has no quality_type
CURA-2271
2016-10-11 15:22:17 +02:00
fieldOfView
0af42587b0 Fix jobname when opening multiple files at once 2016-10-10 18:42:55 +02:00
fieldOfView
fea0dfdfa1 Put material selection in warning state for unsupported materials
CURA-2271
2016-10-10 13:19:20 +02:00
Ghostkeeper
608248bec8
Fix display of inherited materials
Materials are sometimes inherited, such as for UM2E+. The activeQualityDefinitionId is the definition from which it should get its profiles, including material profiles. Likewise for activeQualityVariantId.

Contributes to issue CURA-2576.
2016-10-08 17:14:24 +02:00
fieldOfView
90c3a09bc0 Add tooltip for formulas on profile overview tabs 2016-10-08 15:15:12 +02:00
fieldOfView
6bea0ad7b4 Select the currently active extruder on the profiles tab 2016-10-08 15:14:11 +02:00
fieldOfView
5d3d13e9ef Make whole row for user & quality_changes values italic
The italic pattern is now shared between the sidebar and the profile overview. Current settings (user) and the values set in the custom profile (quality_changes) are now made italic in both places.
2016-10-08 14:52:39 +02:00
Jack Ha
ab23637f3b Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 15:23:14 +02:00
Jack Ha
8b61215270 Added infill_mesh and infill_mesh_order to excluded list in SettingView. CURA-1993 2016-10-06 15:23:04 +02:00
Ghostkeeper
8644fb7113
Never animate progress bars if they are invisible
This is now the responsibility of the theme rather than the interface element, since the theme defines the animation itself. This makes it that the interface element doesn't need to worry about things like its style or animation.

Contributes to issue CURA-2497.
2016-10-06 11:54:21 +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 99f53cb8322e07f1ff94195e44ecbcde0b82e841. 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
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
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
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
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