Lipu Fei
3a4445b656
Fix code style
...
CURA-4672
2018-01-04 12:56:24 +01:00
Lipu Fei
9cb7050681
Remove unused code
...
CURA-4672
2018-01-04 12:56:23 +01:00
ChrisTerBeke
4cec27b181
Fix QML warnings for combo boxes - CURA-4758
2018-01-04 11:53:34 +01:00
ChrisTerBeke
3f7d8997a1
Fix icon positions - CURA-4758
2018-01-04 11:33:12 +01:00
ChrisTerBeke
af9181287a
Merge branch 'master' into qtquick-controls-2.0
2018-01-04 11:17:50 +01:00
ChrisTerBeke
4685230d8d
Add missing super init call - CURA-4525
2018-01-04 10:59:44 +01:00
Jack Ha
d19015e85f
CURA-4523 solved merge conflict
2018-01-04 10:47:24 +01:00
ChrisTerBeke
11a4845931
Move CuraSceneController together with rest of scene related code
2018-01-04 10:41:25 +01:00
jack
915f7273d5
Merge pull request #3029 from Ultimaker/CURA-4525-multi-build-plate-merge
...
CURA-4525 multi build plate (master merged 2018-1-3)
2018-01-04 10:33:40 +01:00
Jack Ha
a5d9aac91b
CURA-4525 placed view menu items in Build Plate submenu
2018-01-04 10:32:54 +01:00
Jack Ha
8854a28d56
CURA-4525 solved merge conflict
2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295
Fix tevo blackwidow json file
2018-01-04 10:14:55 +01:00
ChrisTerBeke
0c504560fa
Merge pull request #3057 from thetobby/master
...
Adding printer definition for Anycubic i3 Mega & Tevo Black Widow
2018-01-04 09:57:31 +01:00
Jack Ha
840eedbb3d
CURA-4525 switch back to build plate 0 when deleting all objects
2018-01-04 09:35:23 +01:00
Jack Ha
8c7a0d4a8e
CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel
2018-01-04 09:26:15 +01:00
ChrisTerBeke
4e10d6ee87
Merge pull request #3030 from TheAssassin/patch-1
...
Reduce amount of movements after print for Tevo Tarantula
2018-01-03 17:49:50 +01:00
Ghostkeeper
e18b3b3669
Remove duplicate setting
...
Some merge conflict, I think.
Contributes to issue CURA-4523.
2018-01-03 17:29:49 +01:00
Lipu Fei
7c4a122767
Fix container_index for MachineSettingsAction
...
CURA-4708
2018-01-03 17:04:40 +01:00
Aleksei S
8aa0cc981b
Merge branch 'master' of github.com:Ultimaker/cura
2018-01-03 16:46:10 +01:00
Aleksei S
49ae078396
Adjust 3d view and add Camera View to the menu bar
...
CURA-4642
2018-01-03 16:45:26 +01:00
Lipu Fei
cbf6f55fd8
Fix perfered material search in auto-update
...
CURA-4708
2018-01-03 16:42:57 +01:00
ChrisTerBeke
80324900b0
Merge pull request #3068 from fieldOfView/feature_multiextruder_replacement_patterns
...
Multiextruder gcode snippet replacement patterns
2018-01-03 16:31:25 +01:00
Lipu Fei
47a12b4128
Prefer materials from the same brand in auto-update
...
CURA-4708
2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c
Fix afterOnEditingFinished()
...
CURA-4708
2018-01-03 16:29:18 +01:00
ChrisTerBeke
5a9e3a8efd
Fix front view button rotation, cleanup view buttons onClicked
2018-01-03 16:18:31 +01:00
Lipu Fei
392be23281
Fix SettingView stakc ID binding
...
CURA-4708
2018-01-03 15:58:30 +01:00
Jack Ha
9e5f0e10b9
CURA-4525 add comment and type hint
2018-01-03 15:49:31 +01:00
Jack Ha
62487e8ea2
CURA-4525 cleanups and change comment and added new-lines
2018-01-03 15:41:08 +01:00
Jack Ha
3991dee14c
Merge branch 'CURA-4525-multi-build-plate-merge' of github.com:Ultimaker/Cura into CURA-4525-multi-build-plate-merge
2018-01-03 15:22:09 +01:00
Jack Ha
e7e5729006
CURA-4525 deselect after move to build plate and build plate change
2018-01-03 15:21:56 +01:00
Ian
e0c2a9e4c7
Fix for CURA-4111
...
When centering a scene node, TranslateOperation is used in lieu of SetTransformOperation, to avoid combinations of mirror operations behaving like rotation operations. Instead, any given node is simply translated to 0,0,0.
2018-01-03 15:13:56 +01:00
ChrisTerBeke
08322d0a5e
Move all decorators in the scene subfolder
2018-01-03 15:09:19 +01:00
ChrisTerBeke
62b06b063b
Also move other operations into operations subfolder
2018-01-03 15:06:20 +01:00
ChrisTerBeke
a5630e5c54
Move all arranging related code into a subfolder
2018-01-03 15:05:06 +01:00
Jack Ha
2f965cc053
CURA-4525 switch locations of build plates and objects list
2018-01-03 14:18:40 +01:00
ChrisTerBeke
7eb507484b
hide sidebar header when in monitoring mode
2018-01-03 14:12:45 +01:00
ChrisTerBeke
1686f951c9
Finish styling mode switch buttons
2018-01-03 14:02:35 +01:00
Jack Ha
bfa33c721c
CURA-4525 solved merge conflicts
2018-01-03 13:52:55 +01:00
ChrisTerBeke
4f77b2ea6d
More layout and font fixes
2018-01-03 13:50:06 +01:00
ChrisTerBeke
1476e95adc
Fix mode switching buttons functionality
2018-01-03 13:45:18 +01:00
Jack Ha
dd989a1a51
CURA-4525 refresh objects list of all items after changing build plate
2018-01-03 13:43:09 +01:00
ChrisTerBeke
b7aadbe3c3
Fix extruder dropdown text model
2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486
Fix text color for extruder comboboxes
2018-01-03 12:52:40 +01:00
Jack Ha
cb1484ee63
CURA-4525 update size and margins of objects list
2018-01-03 12:52:32 +01:00
ChrisTerBeke
3a2b2d3333
Also fix combobox list item heights for extruder dropdowns
2018-01-03 12:48:33 +01:00
Jack Ha
c8243a0ddd
CURA-4525 fix convex hull, changed size of object list
2018-01-03 12:47:09 +01:00
ChrisTerBeke
1fe653b231
Fix combobox dropdown item height
2018-01-03 12:47:08 +01:00
Lipu Fei
6997c2d2dc
Add timeout for Jenkinsfile
2018-01-03 11:58:14 +01:00
ChrisTerBeke
77c8ac3950
Layout fixes for controls 2.0
2018-01-03 11:46:20 +01:00
Lipu Fei
f6168c07f0
Fix material_diameter bindings for metarial menu and page
...
CURA-4708
2018-01-03 11:27:30 +01:00
