GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 20:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,169 Commits 290 Branches 260 Tags
Commit Graph

968 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Jaime van Kessel
4299dbb90b Force refresh display when activating profile 
CURA-2448
 2016-09-26 15:22:23 +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
Jaime van Kessel
9ba78dec54 After deletion of material the slection is refreshed 
CURA-2388
 2016-09-20 13:58:44 +02:00
fieldOfView
e4cfbc8fdf Only update camera source if the camera view is showing 2016-09-19 14:34:35 +02:00
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate 
CURA-2361
 2016-09-16 15:32:16 +02:00
Jaime van Kessel
4f547fff8d Category setting icon now becomes invible if clicked 
CURA-2361
 2016-09-16 13:58:26 +02:00
Jaime van Kessel
132ed1d258 Pressing inheritance button for category now makes all inherited children visible 
CURA-2361
 2016-09-16 13:10:14 +02:00
Jaime van Kessel
e3d78c17ea SettingItem now uses settingInheritanceManager for visibility check 
CURA-2361
 2016-09-16 11:22:50 +02:00
Jaime van Kessel
e282e35b9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-16 11:19:19 +02:00
Jaime van Kessel
5d84490d70 SettingInheritance manager now has a complete list of all settings that have inheritance overridden 
CURA-2361
 2016-09-16 11:18:20 +02:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager 
CURA-2361
 2016-09-16 09:38:52 +02:00
Jack Ha
effddcbc5e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-15 15:30:16 +02:00
Jack Ha
5c553d7bcd Fix custom profile visibility for different variants, materials and machines. CURA-2248 2016-09-15 15:29:57 +02:00
fieldOfView
7ab7b2f561 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-15 14:44:55 +02:00
fieldOfView
04ce21d48e Only show additional components info for the currently active printer 
CURA-2276
 2016-09-15 14:44:40 +02:00
Arjen Hiemstra
d0ad654108 Re-enable selectMultiple for the open file dialog 
Fixes CURA-2198
 2016-09-15 13:40:25 +02:00
fieldOfView
0af26cc4a7 Prevent qml warning when no printer is connected 2016-09-15 13:15:19 +02:00
fieldOfView
790ad4a09e Show simple extruder names in Printers menu 2016-09-15 10:20:25 +02:00
fieldOfView
cf7a6730d1 Add a menuitem to load the nozzle/material loaded on the printer 
CURA-2276
 2016-09-14 17:39:49 +02:00
fieldOfView
a47ffb2288 Remove commented out code 2016-09-14 14:57:26 +02:00
fieldOfView
549766e5f6 Fix layout of buttons on profile page 
CURA-2368
 2016-09-14 14:15:34 +02:00
fieldOfView
ab50ac0d89 Don't show possibly incorrect materials in print monitor 2016-09-14 13:59:00 +02:00
Jaime van Kessel
8b71364ee8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-14 11:44:41 +02:00
Jaime van Kessel
e12acb8110 We now remove all material containers instead of the active machine variant 
CURA-2210
 2016-09-14 11:44:08 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
fieldOfView
e43dbcd0b7 Code style 
CURA-2235
 2016-09-14 09:37:53 +02:00
fieldOfView
6334f74fc6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-14 08:52:05 +02:00
fieldOfView
21e413ca4f Hide extruder, nozzle & material selection in Print Monitor 2016-09-14 08:19:57 +02:00