3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
5521 commits 307 branches 272 tags 787 MiB
Commit graph

2336 commits

Author SHA1 Message Date
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
Ghostkeeper
f4d13713a2
Replace progress bar with actual ProgressBar element 
QML has this progress bar that has more functionality than the progress bar we're using. We need an indeterminate state for the pausing and resuming states, so instead of implementing that myself, I'm using the QML ProgressBar element.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
3b2c173cd6
Keep showing progress while pausing/resuming 
I've chosen the blue 'progress' colour to be displayed while pausing and resuming.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
22f0a2dabf
Add TODOs for text to be added after string freeze 
We currently have a string freeze, so we can't add these cases here.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Arjen Hiemstra
c92dfc8af3 Remove "ExtraBold" font variant from Theme 
For some reason, on OSX ExtraBold seems to replace Regular font style. Since
it is unused anyway, just drop the ExtraBold for now.

Contributes to CURA-879
 2016-09-26 15:23:36 +02:00
Jaime van Kessel
4299dbb90b Force refresh display when activating profile 
CURA-2448
 2016-09-26 15:22:23 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
fieldOfView
f23af4f295 Optimise icons 
Mostly done using svgo:
svgo -f resources/themes/cura/icons --pretty --enable=removeDimensions
 2016-09-23 11:50:50 +02:00
fieldOfView
774eadc7d1 Recolor toolbar icons 
While cleaning up the theme icons I discovered that the toolbar icons were incorrectly relying on the color specified in the icon.
 2016-09-23 10:40:49 +02:00
fieldOfView
9499acf0d5 Fix expand/collapse icon when using the inherit icon to expand a category 
CURA-2361
 2016-09-22 10:36:38 +02:00
fieldOfView
038c736756 Tweak margins of print monitor 2016-09-22 09:01:07 +02:00
Jaime van Kessel
51dee95c8f Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 16:37:39 +02:00
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well 
CURA-2424
 2016-09-21 16:36:45 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent. 
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-09-21 15:26:20 +02:00
Jaime van Kessel
70212e2cb7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 15:01:40 +02:00
Jaime van Kessel
6c7a0d73c3 Resolve now also returns value if resolve was undefined 
CURA-2319
 2016-09-21 15:01:08 +02:00
fieldOfView
7238a7b029 Expand category when clicking its inheritance button 
CURA-2361
 2016-09-21 14:50:02 +02:00
Tim Kuipers
9e128aae69 JSON fix: raft_margin had no settable_per information (CURA-2282) 2016-09-21 11:37:21 +02:00
Arjen Hiemstra
b972d26b67 Remove old fdmprinter pot and add new fdmprinter and fdmextruder pot files 
Contributes to CURA-2412
 2016-09-20 15:01:25 +02:00