35982 Commits

Author SHA1 Message Date
Jaime van Kessel
5dbe0bdc03 Machine variants can now be selected from dropdown menu
CURA-1278
2016-05-13 11:46:54 +02:00
Jaime van Kessel
6ffde62bcf Added stubs for hasVariants & hasMaterials
CURA-1278
2016-05-13 11:42:29 +02:00
Jaime van Kessel
f3384b043d Only variants of active machine are now shown
CURA-1278
2016-05-13 11:26:08 +02:00
Jaime van Kessel
e4595dad22 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-05-13 11:04:57 +02:00
Jaime van Kessel
b3e741e90c Added variant selection
CURA-1278
2016-05-13 10:16:58 +02:00
Tim Kuipers
52ea8e76d2 lil: multiple_mesh_overlap can now be changed per object 2016-05-12 20:12:43 +02:00
Tim Kuipers
e57ca0aa53 JSON remove: removed Fill Gaps Between Walls (CURA-996) 2016-05-12 17:52:24 +02:00
Tim Kuipers
8a4fdf8fb3 JSON remove: removed Remove Overlapping Wall Parts (CURA-996) 2016-05-12 17:50:02 +02:00
Jaime van Kessel
f5e63f2e71 Changing the material is now possible
CURA-1278
2016-05-12 17:38:43 +02:00
Jaime van Kessel
89c0644e4b Added activeMaterial property
CURA-1278
2016-05-12 17:01:47 +02:00
Simon Edwards
5f0c96d4a5 Correctly filter the input to the convex hull function for duplicates.
Contributes to CURA-1512
2016-05-12 16:54:34 +02:00
fieldOfView
2345289a4e Fix an error when NetworkPrinterOutputDevicePlugin.addPrinter is called before there is an Active Machine Instance
CURA-49
2016-05-12 16:43:35 +02:00
Jaime van Kessel
0de4f466dc Codestyle & Documentation 2016-05-12 15:38:59 +02:00
Jaime van Kessel
44f5559db3 Moved addMachine to machineManager
CURA-1278
2016-05-12 15:18:13 +02:00
fieldOfView
021bb97fc4 Add a preference for automatic update checking
CURA-1540
2016-05-12 14:03:03 +02:00
Simon Edwards
bac58ecc82 Prevent models from vibrating on the z axis due to fp errors, change the tolerance of the comparison.
Contributes to CURA-1504
2016-05-12 13:48:25 +02:00
Ghostkeeper
34b257d0f4
Add translations for Initial Layer Z Overlap setting
English is a copy of the original. Dutch, French, Spanish and German translations were made by a native speaker. Italian by a non-native speaker. Finnish is machine-translated.

Contributes to issue CURA-1549.
2016-05-12 13:41:39 +02:00
Simon Edwards
43747f3f57 Fix up BuildVolume's override of the AABB.
Contributes to CURA-1504
2016-05-12 13:12:44 +02:00
Jaime van Kessel
a16acddff1 Removed unused code
CURA-1278
2016-05-12 11:59:23 +02:00
Jaime van Kessel
65022c3d18 Fixed adding machine in printer dialog
CURA-1278
2016-05-12 11:53:01 +02:00
Jaime van Kessel
78e9545ece Machines can now be removed
CURA-1278
2016-05-12 11:46:28 +02:00
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
9f226d7552 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-05-12 11:01:59 +02:00
Tim Kuipers
5716069fe4 JSON fix: First Layer Z OVerlap ==> Inital Layer ... (CURA-1549) 2016-05-12 11:01:46 +02:00
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