Commit graph

12854 commits

Author SHA1 Message Date
Jaime van Kessel
c99b460927 Merge branch 'feature_better_warning_formulas' of github.com:Ultimaker/Cura 2016-10-04 13:51:51 +02:00
Tim Kuipers
ed0f8c0235 Merge branch 'master' into feature_better_warning_formulas 2016-10-04 13:43:04 +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
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
Tim Kuipers
6240baaaca JSON fix: better warning formulas (CURA-905) 2016-10-03 17:56:03 +02:00
Tim Kuipers
9b342a9a3e JSON fix: removed circular dependency (CURA-905) 2016-10-03 17:35:28 +02:00
Tim Kuipers
2513c64d7d JSON fix: more feasible warnings (CURA-905) 2016-10-03 17:29:25 +02:00
fieldOfView
e7da471199 Fix showing profile values for extruders
The profiles page would show the setting values in the quality profile, ignoring the quality_changes profile, because it could not find the appropriate quality_changes profile for the extruders

CURA-2478
2016-10-03 17:04:46 +02:00
Simon Edwards
5d1b77c551 Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 2 of 2.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-10-03 15:19:32 +02:00
Tim Kuipers
4e4171fc53 JSON fix: resolveOrValue for support_type (CURA-2410) 2016-10-03 14:52:33 +02:00
Tim Kuipers
4c46985c75 JSON fix: resolveOrValue for retraction_combing (CURA-2410) 2016-10-03 14:51:28 +02:00
Tim Kuipers
91bed05d63 JSON fix: resolveOrValue for prime_tower_size (CURA-2410) 2016-10-03 14:50:20 +02:00
Tim Kuipers
dee434b958 JSON fix: resolveOrValue for ooze_shield_enalbed (CURA-2410) 2016-10-03 14:49:01 +02:00
Tim Kuipers
c7fbaa9fb8 JSON fix: resolveOrValue for layer_height_0 (CURA-2410) 2016-10-03 14:46:36 +02:00
Tim Kuipers
8696d2ff34 JSON fix: resolveOrValue for jerk_enabled (CURA-2410) 2016-10-03 14:44:14 +02:00
Tim Kuipers
6564ada60d JSON bugfix: prusa i3 had wrong adhesion setting (CURA-2410) 2016-10-03 14:42:14 +02:00
Tim Kuipers
16a07a3c3e JSON fix: RigidBot had weird outdated enabled formulas for skirt settings (CURA-2410) 2016-10-03 14:41:09 +02:00
Tim Kuipers
8363f40a2f JSON fix: resolveOrValue for acceleration_enabled (CURA-2410) 2016-10-03 14:35:31 +02:00
Tim Kuipers
b722a6260c JSON fix: new resolve functions (CURA-2410) 2016-10-03 14:34:49 +02:00
Tim Kuipers
d4d8ab6fad JSON: refine dual settings warning formulas (CURA-905) 2016-09-30 18:13:18 +02:00
Tim Kuipers
dbb472436d JSON: refine raft settings warning formulas (CURA-905) 2016-09-30 18:03:52 +02:00
Tim Kuipers
61d9ee9241 JSON: refine skirt/brim settings warning formulas (CURA-905) 2016-09-30 17:56:56 +02:00
Tim Kuipers
2e24cddbc7 JSON: refine support settings warning formulas (CURA-905) 2016-09-30 17:46:09 +02:00
Tim Kuipers
e12e8e3d2e JSON: refine material settings warning formulas (CURA-905) 2016-09-30 17:20:00 +02:00
Tim Kuipers
bab01b9ca2 JSON: refine infill settings warning formulas (CURA-905) 2016-09-30 16:55:28 +02:00
Tim Kuipers
163b8a4256 JSON: refine shell settings warning formulas (CURA-905) 2016-09-30 16:50:39 +02:00
Tim Kuipers
4ad36e94c5 JSON: refine line width warning formulas (CURA-905) 2016-09-30 16:45:40 +02:00
Tim Kuipers
1cef991082 JSON fix: don't perform Outer Wall inset when printing the outer wall firt (CURA-2446) 2016-09-30 16:35:56 +02:00
Ghostkeeper
cd120c6be5
Make the hurting stop
Terugduwen is a mistake. Prime is a printing term and should therefore not be translated.

Contributes to issue CURA-570.
2016-09-29 20:16:45 +02:00
Ghostkeeper
a77c2614a3
Add invisible character to satisfy gettext
This is a zero-width space. It should be invisible in the interface. It is required, however, because gettext breaks when it sees that the original text has \n and the translation doesn't. In this case, the \n is just our text though, and it is allowed to be in a different place in the translation. So I'm silencing gettext by adding a character in front of it.

Contributes to issue CURA-570.
2016-09-29 19:13:07 +02:00
Ghostkeeper
f909ffca2e
Update translations
These translations have not been checked yet, but we want them in tomorrow's build. I'll compile them now and then check them.

Contributes to issue CURA-570.
2016-09-29 16:17:15 +02:00
Jack Ha
8934555bd6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
Simon Edwards
2742a4ef65 Show the correct list of qualities and quality change profiles.
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-09-29 12:34:46 +02:00
Tim Kuipers
b7ca569b84 JSON fix: prime_tower_wipe_enabled is now true by default (CURA-2420) 2016-09-29 12:09:31 +02:00
Simon Edwards
a7c58c33f7 Fixed up the profiles menu to handle multiple extruders better.
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-28 15:15:18 +02:00
Ghostkeeper
99f53cb832
Early cop-out if there is no printer connected
This indeterminate state is never visible, since showProgress is false then, but it might prevent some error message behind the scenes.

Contributes to issue CURA-2060.
2016-09-28 09:36:06 +02:00
Jaime van Kessel
1f830e68bb Min & max values for extruder prime pos are now enforced for Ultimaker machines
CURA-2375
2016-09-27 16:12:02 +02:00