GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 03:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,051 Commits 295 Branches 268 Tags
Commit Graph

3051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
76f78295c4
Translation correction suggested by BagelOrb 
BagelOrb indicated the translation wrongly at first. This is apparently correct.

Contributes to issue CURA-1549.
 2016-05-12 10:28:18 +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
Ghostkeeper
c79d064107
Convert raft_airgap settings to float before computing 
Can't subtract strings from each other, after all.

Contributes to issue CURA-1549.
 2016-05-11 18:26:18 +02:00
Ghostkeeper
acd0a987a1 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-05-11 18:01:38 +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
fieldOfView
9f2e87fdcb Force updating the convex hull of a group node if one of its children is removed 
Before this fix, if a subselection of a group was deleted from the group, the convex hull would not update.

CURA-1054
 2016-05-11 17:44:58 +02:00
Ghostkeeper
5a7486a32e
Add conversion of First Layer Airgap from legacy 
First Layer Airgap's internal name is raft_airgap (yeah don't ask).

Contributes to issue CURA-1549.
 2016-05-11 17:27:14 +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
f91a4f9369 Moved registration of MachineManager model to before QML is read 
Else the model is undefined on first run, which caused a number of silly issues.
CURA-1278
 2016-05-11 16:13:30 +02:00
Jaime van Kessel
573c1c1a5a Added MachineManagerModel to Cura 
CURA-1278
 2016-05-11 15:35:41 +02:00
fieldOfView
4830943113 Refactor grouping/ungrouping into an operation that is undoable 
CURA-1543
 2016-05-11 15:21:01 +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
fa8fbb2560 Added global only to setting type for CuraApplication 
CURA-1278
 2016-05-10 14:42:53 +02:00
Jaime van Kessel
bdccab4b60 Re-added BuildVolume 
CURA-1278
 2016-05-10 14:35:45 +02:00
Jaime van Kessel
5fdd0e8156 BuildVolume no longer crashes when width/height/depth is None 
CURA-1278
 2016-05-10 14:34:07 +02:00
Jaime van Kessel
67b6c5aa29 Re-added platform again 
CURA-1278
 2016-05-10 13:47:27 +02:00
Jaime van Kessel
6f9071aa4e Merge pull request #737 from thopiekar/patch-1 
Listing of all paths for every OS
 2016-05-10 13:37:45 +02:00
Thomas Karl Pietrowski
57bc87f25f Listing of all paths for every OS 
Only cosmetics
 2016-05-10 13:35:49 +02:00
Jaime van Kessel
162295da8e Actually adding a new machine is now possible 
CURA-1278
 2016-05-10 13:31:26 +02:00
Jaime van Kessel
170df747b3 Use globalContainer stack instead of activeInstance 
CURA-1278
 2016-05-10 11:40:36 +02:00
Jaime van Kessel
93227c0b56 Updated removabledrive plugin to use metadata 
CURA-1278
 2016-05-10 11:28:57 +02:00