GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,795 Commits 289 Branches 260 Tags
Commit Graph

107 Commits

Author SHA1 Message Date
Lipu Fei
64ae8bb595 Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-24 10:17:13 +02:00
fieldOfView
4a3329bc6c Remove background from setting buttons (revert, override notice, linked) 
The background now reverts to "transparent". These icon buttons are outside the setting control, so they should not have the background of the control itself.
 2017-01-25 15:26:32 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Jaime van Kessel
9a81a24512 Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura 2016-11-24 14:47:02 +01:00
Jaime van Kessel
716ffe94ff Don't show inheritance icon for resovled values 
CURA-2860
 2016-11-23 12:41:53 +01:00
Jaime van Kessel
75e067cab7 No longer select last_entry that isn't in the list 
CURA-2860
 2016-11-22 15:24:01 +01:00
Jaime van Kessel
9057174691 Resolve is now updated from the base property 
The resolve doesn't update always update well for single extrusion machines, so the wrong value gets used.
There is however, no need for a resolve with a single extrusion machine, so we can disable the resolve for those alltogether.

CURA-2939
 2016-11-21 11:10:23 +01:00
fieldOfView
7fafcef40b Allow making settings visible from the sidebar 2016-11-15 11:09:58 +01:00
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
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
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
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
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
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
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
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
Simon Edwards
8086646de1 When reverting a user setting be sure to delete it from all of the stacks, global and extruder. 
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
 2016-09-13 11:33:33 +02:00
fieldOfView
be6bfdd4af Add a "linked" icon to settings that have "global_inherits_stack" set 2016-09-08 13:58:13 +02:00
Jaime van Kessel
9d6c60ec60 Setting state is now set to calculated after setting the value 
This ensures that the setting of the value does not overide the state

CURA-2221
 2016-09-01 13:00:54 +02:00
Jack Ha
0268bf3f56 Cleanup. CURA-2007 2016-08-23 13:18:20 +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
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
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
fieldOfView
ed1d12d21d Hide linked settings icon for single extrusion printers 
CURA-2020
 2016-07-29 17:43:38 +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
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
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
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
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
Jaime van Kessel
cf15f9e2a1 Added handling of special case when only user & definition were set 
CURA-1278
 2016-06-08 15:31:28 +02:00
Jaime van Kessel
3881ed8a61 Fixed behaviour of inheritance button 
CURA-1278
 2016-06-08 14:58:05 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name 2016-06-08 11:29:24 +02:00
Jaime van Kessel
77431b01a3 Inherit button now has the same behaviour as 2.1 again 
CURA-1278
 2016-06-08 11:02:04 +02:00
Jaime van Kessel
68837a089a Moved some properties to bindings due to bug in qt 5.5.1 
CURA-1494
 2016-06-07 12:50:57 +02:00
Jaime van Kessel
64e4cd0041 Added properties to make setting items more customisable 
CURA-1278
 2016-06-02 15:52:25 +02:00
fieldOfView
14a8b8a1a4 Fix showing formatted tooltip when exiting reset-value-icon 
CURA-1278
 2016-06-02 13:30:26 +02:00
Arjen Hiemstra
803dcdcec7 Stop the Item's hover timer when showing a different tooltip 2016-06-02 08:10:55 +02:00
Arjen Hiemstra
d616a72bb1 Display affects/affected by in the tooltip again 
Contributes to CURA-1278
 2016-05-30 16:25:20 +02:00