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

228 Commits

Author SHA1 Message Date
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
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
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
Ghostkeeper
b9f2d498b4
Fix typo in documentation 2016-06-02 14:17:12 +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
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
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
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
Arjen Hiemstra
b1df8e9448 Use MachineManager and PropertyProvider to restore several bits of behavioiur 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
89928dc6a9 Make Setting item loading asynchronous and fix its size 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
38e9661fe1 Fix setting type names 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
cdc8b04c5c Use the configureSettingVisiblity action from Actions when needed 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
b7fd97737c Simplify tooltip handling for settings 
Rather than use three different signals, use a single showTooltip signal
with a
text property. This makes it possible to show any tooltip from within a
setting
item.
 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
4c9b9b68ef Add add/remove transitions so expand/collapse is animated 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
fa7e186b2f Import Uranium's SettingView related files and start making them work 
This is too cura-specific now so we should not put it in Uranium.
 2016-05-10 17:31:18 +02:00