Lipu Fei
a20fb7a479
Fix some coding style
2017-03-07 20:18:31 +01:00
Lipu Fei
a3dce9f6d1
CURA-3471 importProfiles() takes QVariantList
2017-03-07 20:17:29 +01:00
Jack Ha
f47ec27014
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 16:44:41 +01:00
jack
07e6da71d4
Merge pull request #1501 from Ultimaker/layer_view3_layout
...
Layer view3 layout: Single Slider by fieldOfView
2017-03-07 16:44:29 +01:00
Lipu Fei
ba79f44783
CURA-3470 Return list instead of set for QVariantList
2017-03-07 16:42:56 +01:00
Tim Kuipers
3047ff26f1
fix: min warning for skin angle (CURA-3440)
2017-03-07 13:09:30 +01:00
Lipu Fei
897791b0d2
CURA-3221 Use "system" font so texts fit in rows
2017-03-07 12:53:21 +01:00
Lipu Fei
adb37de51c
Code style fixes
2017-03-07 12:53:20 +01:00
Lipu Fei
85bc79bde2
CURA-3221 Smaller settings column width for override profile dialog
2017-03-07 12:53:20 +01:00
Lipu Fei
d2c03b3554
CURA-3221 Larger window size for override profile dialog
2017-03-07 12:53:20 +01:00
Lipu Fei
9c5404401a
CURA-3221 Remove star image
2017-03-07 12:53:20 +01:00
Lipu Fei
79de5eebb7
CURA-3221 Use "default" theme for description text
2017-03-07 12:53:20 +01:00
Ghostkeeper
b25a6423df
Don't offset hull if offset is 0
...
This might speed things up a bit.
2017-03-07 12:47:13 +01:00
Ghostkeeper
0abf455084
Don't always offset with 0.5mm
...
This is no longer needed, since before this happens we would already get an error with calculating the 3D model. Perhaps we should introduce a minkowski offset there but performing Minkowski on a 3D model is fairly expensive.
2017-03-07 12:43:20 +01:00
Jaime van Kessel
c06ffe6cae
Moved auth state changed check to first thing set auth checks
...
This should contribute to the windows authentication issues.
Most windows devices seemed to get all the auth state messages twice.
2017-03-07 11:55:29 +01:00
Jack Ha
afec26eb62
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 11:47:25 +01:00
Jaime van Kessel
6dcd3b44b6
Removed uneeded debug code
...
The method is always put, so no need to log it.
2017-03-07 11:44:40 +01:00
jack
3b1a15e1c4
Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2
...
Use a single draggable range slider in Layerview
2017-03-07 11:43:17 +01:00
Jaime van Kessel
85d979cf50
Removed unneeded check from network printing.
...
We used to not have a printer_state so this check was needed.
2017-03-07 11:41:18 +01:00
Lipu Fei
e9ae531de2
CURA-3397 Set override profile preference option upon visibility change
2017-03-07 11:15:47 +01:00
Jaime van Kessel
059b31b25a
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-07 11:01:59 +01:00
Jaime van Kessel
414337dead
Fixed 3mf writing
...
The type hinting changes also changed the way we handle certain imports, which caused saving to fail.
CURA-3215
2017-03-07 11:01:03 +01:00
Jack Ha
73dff09443
Travel moves now have a width of 0.1. CURA-3321
2017-03-07 10:47:34 +01:00
jack
340cf188a6
Merge pull request #1479 from Ultimaker/layer_view3_layout
...
Layer view layout
2017-03-07 10:41:36 +01:00
Jack Ha
efbc624ea8
More defensive setExtruderOpacity, removed unnecessary part. CURA-3321
2017-03-07 10:40:59 +01:00
Jack Ha
c10dc2f07c
Set old permissions back. CURA-3321
2017-03-07 10:36:30 +01:00
Jack Ha
42d939b34e
Solved merge conflict. CURA-3321
2017-03-07 10:34:53 +01:00
Jack Ha
3468bae732
Add result type.
2017-03-07 10:31:11 +01:00
Mark Burton
c9cdc40807
Merge remote-tracking branch 'upstream/master' into mb-combing-retract-before-outer-wall
2017-03-06 18:07:08 +00:00
fieldOfView
34ac02f5bd
Use Pointing Rectangle for layer number indicator
2017-03-06 18:23:08 +01:00
fieldOfView
2b49484dc7
Hide the slider controls when there are no layers
...
(and code cleanup)
2017-03-06 17:46:42 +01:00
fieldOfView
af265be900
Add up/down key navigation to layernum box
2017-03-06 17:27:37 +01:00
Arjen Hiemstra
8a77dd66fc
Properly handle CMake options that are enabled but not "ON"
...
Contributes to CURA-2787
2017-03-06 17:26:02 +01:00
fieldOfView
65d721cc1d
Merge branch 'layer_view3_layout' into feature_draggable_range_slider2
...
# Conflicts:
# plugins/LayerView/LayerView.qml
2017-03-06 17:19:44 +01:00
fieldOfView
d0c8b05314
Fix setting central value
2017-03-06 17:16:36 +01:00
Ghostkeeper
d1fada78e6
Merge branch '3mf_speedup'
2017-03-06 17:03:42 +01:00
Ghostkeeper
7a93d56f40
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-06 17:01:01 +01:00
Ghostkeeper
37e7971b81
Merge branch 'feature_temp_disable'
2017-03-06 16:51:59 +01:00
fieldOfView
0fa32c3c16
Step by 10 layers with shift key down
2017-03-06 16:48:59 +01:00
fieldOfView
a6bc2b07f8
Fix setting lower value
2017-03-06 16:35:00 +01:00
Jaime van Kessel
856562236e
Merge branch 'feature_CURA-3397_profile_override_dialog_options' of https://github.com/LipuFei/Cura
2017-03-06 16:17:48 +01:00
Jaime van Kessel
04c2186b74
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-06 16:17:30 +01:00
fieldOfView
a664ee88b7
Fix setting upper value
2017-03-06 16:01:00 +01:00
Tim Kuipers
38a9df9d76
fix: more lenient int-list validator parsing (CURA-3275)
...
allow for empty integers
allow the brackets to be omitted
2017-03-06 14:42:11 +01:00
Jaime van Kessel
d459f8bf63
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-06 14:42:10 +01:00
Jaime van Kessel
356d4f9288
Heated bed timeout time now hides correctly if time ran out
...
CURA-3360
2017-03-06 14:41:33 +01:00
fieldOfView
694da25bb7
Show proper values of the active handle of the slider
2017-03-06 14:35:36 +01:00
fieldOfView
a0df6bf542
Jerry-rig single slider to replace dual slider design
2017-03-06 14:33:48 +01:00
Tim Kuipers
87c8ff0e08
Merge branch 'mb-infill-line-angles' of https://github.com/smartavionics/Cura into smartavionics-mb-infill-line-angles
2017-03-06 14:31:57 +01:00
Jack Ha
b2e06bed37
Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321
2017-03-06 14:03:42 +01:00
