Commit graph

15419 commits

Author SHA1 Message Date
Jaime van Kessel
d8e4aa9078 Moved machinePage to Cura
CURA-1278
2016-05-12 11:24:09 +02:00
fieldOfView
9b1867cdaf Hide output device selection when there is only one option
CURA-1539
2016-05-12 11:23:05 +02:00
Tim Kuipers
5716069fe4 JSON fix: First Layer Z OVerlap ==> Inital Layer ... (CURA-1549) 2016-05-12 11:01:46 +02:00
Jaime van Kessel
133229d086 Merge branch 'settings_rework' of https://github.com/Ultimaker/Cura into settings_rework 2016-05-12 09:31:43 +02:00
fieldOfView
12140fb7f1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-11 21:55:26 +02:00
fieldOfView
7c154c78bf Add keyboard shortcuts for grouping/ungrouping
Contributes (in a way) to CURA-1054, \sa CURA-1531
2016-05-11 17:58:10 +02:00
Jaime van Kessel
ac9b391e7f Fixed available printers in dropdown menu
CURA-1278
2016-05-11 17:20:09 +02:00
Arjen Hiemstra
3514d4839d Fix combo box setting item so it displays the right things 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d1d2dc04c5 Display the correct tooltips for reset and inherits buttons 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d4b5cd519b Fix SettingCheckbox so it displays correctly 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
2b479e5651 Add a hovered property to SettingItem 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
9ec93bedab Fix type and spacing of SettingItem contents 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
4390c6a6ff Remove configureSettingsAction property from sidebar as it is no longer needed 2016-05-11 17:19:31 +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
d68f274a09 Improve positioning of tooltips in advanced mode 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
2abb9a47c1 Stop using SettingItemStyle
Since everything is now in Cura, using SettingItemStyle does not make a
lot of sense anymore
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
fa9f9b41ab Fix SettingUnknown setting handler to display correctly 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
d761409bf2 Remove SettingItemStyle from the cura theme
As it is no longer needed
2016-05-11 17:19:31 +02:00
Arjen Hiemstra
3bfe18e76f Add a configureSettingVisibility action 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
8c5b3c8b1d Directly implement onTriggered in Actions for several actions
Since they use global objects we can directly call those methods. This
makes
it simpler to call these actions from other objects.
2016-05-11 17:19:31 +02:00
Arjen Hiemstra
5e226038d9 Instantiate models instead of using the Models object
Since Models has been removed
2016-05-11 17:19:31 +02:00
Arjen Hiemstra
207bdb3cd5 Update Cura.qml to use Actions as singleton instead of instantiating them 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
fbbe6cde78 Expose the Actions object as a QML singleton
This makes it much simpler to use actions from within other objects
2016-05-11 17:19:31 +02:00
Tim Kuipers
9993fcc3cf JSON feat: layer_0_z_overlap (CURA-1549) 2016-05-11 17:14:49 +02:00
Tim Kuipers
21f5766416 JSON feat: switch_extruder_retraction_hop (CURA-1061) 2016-05-11 16:39:44 +02:00
Jaime van Kessel
66a29a2f1c Added name for active machine
CURA-1278
2016-05-11 16:21:09 +02:00
Jaime van Kessel
573c1c1a5a Added MachineManagerModel to Cura
CURA-1278
2016-05-11 15:35:41 +02:00
Jaime van Kessel
9fcc3930ff ContainerStackModel is now used for listing all added machines
CURA-1278
2016-05-11 14:30:44 +02:00
Tim Kuipers
0b0e53dcf5 JSON fix: max infill combine is 8 layers cause of cura statically defined array length (CURA-1255) 2016-05-11 09:37:21 +02:00
Arjen Hiemstra
27f31a19b5 Use the local SettingView in SidebarAdvanced 2016-05-10 17:31:32 +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
Arjen Hiemstra
199a30099e Comment away everything related to activeprofile and machine manager in SidebarSimple
To make SidebarSimple at least display again
2016-05-10 17:29:29 +02:00
Arjen Hiemstra
3a99a2bc45 Import the right version of the UM module
Since it was changed to 1.2 for the setting models
2016-05-10 17:28:41 +02:00
Jaime van Kessel
162295da8e Actually adding a new machine is now possible
CURA-1278
2016-05-10 13:31:26 +02:00
Tim Kuipers
8785e4ceda JSON fix: bug in enabled function (CURA-1443)
there was a space instead of an underscore in jerk_enabled
2016-05-10 09:41:23 +02:00
Tim Kuipers
1919c63f0c JSON feat: prime tower and raft acceleration and jerk (CURA-1443) 2016-05-09 18:48:45 +02:00
Tim Kuipers
9112ce3a4d JSON feat: acceleration and jerk settings per feature type (CURA-1443) 2016-05-09 18:30:51 +02:00
Jaime van Kessel
6dc7476839 Removed final parent_value from functions
CURA-1278
2016-05-09 15:45:58 +02:00
Jaime van Kessel
293fd5e80d Moved fdmprinter.def.json to definitions folder
CURA-1278
2016-05-09 15:44:04 +02:00
Jaime van Kessel
1b9c29579b Reworked add machine (Still stub)
CURA-1278
2016-05-09 14:55:01 +02:00
Arjen Hiemstra
44246c0676 Comment out all things that use settings related things so we can at least start 2016-05-09 12:06:11 +02:00
fieldOfView
f3c16198c9 Only show support extruder selection when printing support is enabled
CURA-790
2016-05-09 08:25:56 +02:00
Tim Kuipers
581edfeaa5 JSON: fix: better max infill_sparse_thickness (CURA-1255) 2016-05-04 16:21:53 +02:00
Tim Kuipers
51ed0f317b JSON feat: conical_overhang_angle (CURA-1412) 2016-05-04 15:49:07 +02:00
Tim Kuipers
46f4caab32 JSON feat: conical_overhang_enabled (CURA-1412) 2016-05-04 15:32:20 +02:00
Tim Kuipers
4aaa528ea2 JSON feat: settings split: Compensate Overlapping wall parts ==> outer ; inner wall parts (CURA-995) 2016-05-04 15:11:11 +02:00