GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,425 Commits 292 Branches 265 Tags
Commit Graph

358 Commits

Author SHA1 Message Date
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
Ghostkeeper
f296b77d2c
Fix check for presence of global_inherits_stack 
My mistake.

Contributes to issue CURA-2006.
 2016-08-22 14:17:47 +02:00
Ghostkeeper
42399e82fb
) 
Contributes to issue CURA-2006.
 2016-08-22 11:36:33 +02:00
Ghostkeeper
1c1bfbe114
Fix providing of global_inherits_stack settings 
I've rewritten this part and documented what each case catches. There is a base case which is not required any more since we removed the global tab, but I left it in for defense.

Contributes to issue CURA-2006.
 2016-08-22 11:34:17 +02:00
Ghostkeeper
eaa7d716f5 Revert "Properly send global settings to the global stack" 
This reverts commit 9d0acf5b036ee4749af0034969c683e39cc547d3.
It was not so proper after all.

Contributes to issue CURA-2006.
 2016-08-19 15:48:35 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
5a92269a08 Testing. CURA-2007 2016-08-15 09:32:51 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00
fieldOfView
6075536497 Fix settingtextfield validator in PerObjectSettings 
CURA-2115
 2016-08-11 14:37:58 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials 
CURA-1971
 2016-08-10 14:37:59 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +02:00
fieldOfView
2edda68021 Improve validator for numeric fields 
Do not accept fractional input for "int" settings
Also only accept a "-" as the first character
 2016-08-05 15:12:13 +02:00
Jack Ha
c0dd19ce08 Seems to work, except for the tooltip (shows global value). CURA-2007 2016-08-04 19:23:23 +02:00
Jack Ha
bfabf8d11a Merge, fix qml files. Contributes to CURA-2007. 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
 2016-08-04 18:22:36 +02:00
Arjen Hiemstra
9d0acf5b03 Properly send global settings to the global stack 
Contributes to CURA-2006
 2016-08-04 17:35:01 +02:00
Arjen Hiemstra
7613274686 Properly hide link icon if setting is not settable per extruder 
Contributes to CURA-2006
 2016-08-04 17:34:41 +02:00
Jack Ha
2402ba3d0e Bed temperature is now either a resolved value or a global value. 
Contributes to CURA-2007
 2016-08-04 14:30:48 +02:00
Arjen Hiemstra
6eed25f145 Only write property changes to extruder stack if we actually should 
Now global settings are once again stored in the global stack

Contributes to CURA-2006
 2016-08-04 02:09:02 +02:00
Arjen Hiemstra
4f9fab9418 Set the right default extruder for the main property provider 
Fixes CURA-2024
 2016-08-02 14:49:57 +02:00
fieldOfView
ed1d12d21d Hide linked settings icon for single extrusion printers 
CURA-2020
 2016-07-29 17:43:38 +02:00
fieldOfView
1bbf987921 Fix SettingComboBox and SettingExtruder in some contexts 
Use propertyProvider instead of provider; fixes comboboxes in PostProcessing plugin.
 2016-07-28 13:45:11 +02:00
fieldOfView
87abed39f0 Fix two warnings on startup 
CURA-1758
 2016-07-25 11:41:54 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
Jaime van Kessel
cafb46cb1d First container is now updated withouth recursion possible 
We now use a set of keys that we are handling in order to prevent the lock

CURA-1758
 2016-07-22 10:43:26 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up) 
CURA-1758
 2016-07-21 21:42:02 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack 
CURA-1758
 2016-07-21 20:54:02 +02:00
fieldOfView
0857017ac6 Add a context-menu item to copy a value to all extruders. 
CURA-1758
 2016-07-21 15:12:30 +02:00
fieldOfView
7302baa7da Add icon to settings that can only be set globally (for all extruders) 
CURA-1758
 2016-07-21 15:12:25 +02:00
fieldOfView
121cd19e83 Disable the settings in the global tab 
CURA-1758
 2016-07-21 15:12:24 +02:00
Jaime van Kessel
3e4ff9241e Moved the BlurSettings signal to cura main window 
This reduces the number of focus changes from O(N) to O(1) by the blur event
 2016-07-18 15:38:57 +02:00
Jaime van Kessel
c92b2bc385 Changed order of setting properties 
CURA-1842
 2016-07-13 17:22:54 +02:00
fieldOfView
a7cfe1b5af Emphasize settings that have a value in the user or quality profile 
(in a subtle way)
 2016-07-11 21:15:09 +02:00
Arjen Hiemstra
8c8caa2cac Use the right property for the property provider 
Otherwise we get a bunch of errors from the per object settings tool
 2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +02:00
Jaime van Kessel
1bab4032fd Fixed broken perobject setting panel 
CURA-1725
 2016-06-15 09:41:32 +02:00
Arjen Hiemstra
e473d7a4e9 Ensure the control has active focus when clicking a SettingItem 
This way we ensure that things update properly when for example changing
infill pattern.

Fixes CURA-1494
 2016-06-14 17:29:05 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
 2016-06-13 18:23:53 +02:00
fieldOfView
a545cde4a8 Force setting fields to update when discarding changes 
Textfields that have the focus don't (always) update when a new value is set.
CURA-1585
 2016-06-13 11:53:57 +02:00
fieldOfView
0952dd0327 Removed warnings about undefined properties 
CURA-1278
 2016-06-09 16:01:08 +02:00
Arjen Hiemstra
98c9f202a2 Do not produce an error when a setting has been filtered out 
Contributes to CURA-340
 2016-06-09 15:32:41 +02:00
Arjen Hiemstra
abf634c0b0 Filter visible settings based on if they can be set per extruder 
Contributes to CURA-340
 2016-06-09 15:14:32 +02:00
Jaime van Kessel
e4e307cd2a Inheritance button now works if instance containers contain functions 
CURA-1686
 2016-06-09 10:25:01 +02:00
Jaime van Kessel
a070684ade Fixed minor issue for inheritance button 
It didn't always reset to correct value. CURA-1278
 2016-06-09 09:59:06 +02:00
Jaime van Kessel
85d5247deb Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-08 17:47:46 +02:00
Jaime van Kessel
fcd6f0959f Inheritance button now only shows if there is a function in the container stack at some point 
CURA-1278
 2016-06-08 17:47:23 +02:00
Arjen Hiemstra
1131623278 Disable the property editor when the value of the setting is not used 
Contributes to CURA-1278
 2016-06-08 16:34:19 +02:00