GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,456 Commits 289 Branches 260 Tags
Commit Graph

162 Commits

Author SHA1 Message Date
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
Jaime van Kessel
783134031b Settings can now be set by extruder 
CURA-340
 2016-06-05 12:17:35 +02:00
Ghostkeeper
7146c9ab7d
Make a drop-down box for selecting an extruder 
For use by settings such as infill_extruder_nr.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-02 16:09:10 +02:00
Jaime van Kessel
64e4cd0041 Added properties to make setting items more customisable 
CURA-1278
 2016-06-02 15:52:25 +02:00
Ghostkeeper
b9f2d498b4
Fix typo in documentation 2016-06-02 14:17:12 +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
d5aa75f2cf Remove obsolete file 2016-06-02 08:10:55 +02:00
fieldOfView
907de8b586 Improve performance of advanced sidebar 
Prevent a delegate being loaded when the item is "filtered out" by the model.
CURA-1278
 2016-06-02 00:01:08 +02:00
fieldOfView
7d65475bf9 Fix mouseover highlight of checkbox settings 
CURA-1278
 2016-06-01 23:59:09 +02:00
Jaime van Kessel
6164112bf2 Setting textfield now updates correctly, even when mouse is hovering another text field. 
CURA-1278
 2016-06-01 13:35:09 +02:00
Arjen Hiemstra
3b51c3d339 Remove qmldir from qml resources and use proper Cura namespace for everything 
Since we now properly expose all the qml files in the Cura namespace
we should also use it from there.
 2016-05-31 18:07:33 +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
Jaime van Kessel
c2a25b131e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-26 15:35:51 +02:00
Jaime van Kessel
c814e47b0e SettingView now works with PreferenceVisibility handler 
CURA-1278
 2016-05-26 15:35:28 +02:00
Arjen Hiemstra
43ec037c55 Do not load ComboBox items asynchronously 
Since there is a bug with Qt 5.5 that will do strange reordering.

Contributes to CURA-1278
 2016-05-26 15:29:56 +02:00
Arjen Hiemstra
8804c2837f Make reset and restore default buttons work properly again 
Contributes to CURA-1278
 2016-05-26 15:28:57 +02:00
Arjen Hiemstra
5975fa1b0d Fix enabled state of setting items 
Contributes to CURA-1278
 2016-05-26 13:29:56 +02:00
Arjen Hiemstra
332321b991 Disable asynchronous loading of SettingItem when Qt Version < 5.5 2016-05-24 11:50:39 +02:00
Ghostkeeper
b1d5cad898
Document QTbug 
Took a while to find!

Contributes to issue CURA-1278.
 2016-05-24 11:43:57 +02:00
fieldOfView
4877c35f06 Fix layout of SettingTextField items 
CURA-1278
 2016-05-23 13:35:52 +02:00
fieldOfView
570910187f Fix typo in method name 
CURA-1278
 2016-05-19 16:27:51 +02:00
Arjen Hiemstra
3531e4c3e8 Nest all controls inside the mousearea of SettingItem 
This makes hover events work properly without all the hassle
 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
f5e97c5001 Make SettingComboBox work (mostly) properly 
=
 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
06432c3b0b Make SettingCheckBox properly handle the value 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
5b31634d3c Make SettingTextField work 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
b1df8e9448 Use MachineManager and PropertyProvider to restore several bits of behavioiur 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
442d2b6e71 Use the right tooltip for SettingCategory 2016-05-16 18:22:37 +02:00
Arjen Hiemstra
adc699c63b Add a SettingPropertyProvider object to the setting items 2016-05-16 18:16:42 +02:00
Arjen Hiemstra
3514d4839d Fix combo box setting item so it displays the right things 2016-05-11 17:19:31 +02:00