GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,030 Commits 291 Branches 260 Tags
Commit Graph

341 Commits

Author SHA1 Message Date
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
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
Arjen Hiemstra
2cedc69ed1 Remove all special floating point handling code from SettingTextField 
Since we now always send setting values as string and the conversion
from float
to string already does the rounding, there is no need to also do it
here.

Contributes to CURA-1278
Contributes to CURA-389
 2016-06-08 13:46:30 +02:00
Arjen Hiemstra
b53926b9de Exclude machine_settings from the settings visible in the sidebar 
Contrivbutes to CURA-1645
 2016-06-08 13:29:36 +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
51ea6779df Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 12:53:24 +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
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item 
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Simon Edwards
a6870b555b Fix up my comment, make it clearer. 
Fixes CURA-1630 Settings disappear after selecting all options of Experimental Modes
 2016-06-07 10:34:08 +02:00
Ghostkeeper
bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura 
Conflicts:
	cura/MachineManagerModel.py
 2016-06-06 16:41:34 +02:00
Simon Edwards
03914674c7 Cache all of the settings list items instead of recreating them all the time. 
Fixes CURA-1630 Settings disappear after selecting all options of Experimental Modes
 2016-06-06 16:04:26 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Jaime van Kessel
ffd309f816 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-06 10:19:14 +02:00
Jaime van Kessel
c7340c3b21 Temporary removed multi extruder stack so slicing works again 2016-06-06 10:18:19 +02:00
Ghostkeeper
a948c7bcc6
Set colours of extruder selection to material colour 
Ubuntu Unity doesn't seem to listen to these colours at all though.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
c50d0a97da
Load extruder combobox synchronously 
Asynchronously causes Qt 5.4 to give a segfault.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-05 16:18:07 +02:00