Lipu Fei
8010fa9c85
White background for checkboxes
...
CURA-4148
2017-09-06 16:09:25 +02:00
Lipu Fei
24e5c72e47
Update colour for light theme
...
CURA-4148
2017-09-06 16:04:31 +02:00
Lipu Fei
1dd5f7b0ee
Update machine state icons
...
CURA-4148
2017-09-06 16:04:31 +02:00
Mark
24fee977a8
Merge pull request #2352 from Ultimaker/feature_move_logo_icons
...
Move Logo and Top Bar Icons
2017-09-06 16:02:47 +02:00
Lipu Fei
e18528d2ca
Fix position of the material compatibility warning
...
CURA-4148
2017-09-06 15:49:54 +02:00
Lipu Fei
d561af63e0
Merge branch 'master' into feature_move_logo_icons
2017-09-06 15:36:22 +02:00
Mark
34f8db5450
Changed some margins to improve alignment
...
CURA-4211
2017-09-06 14:52:16 +02:00
fieldOfView
371ca36047
Remove home bed from abort sequence
...
On printers that home the bed to the bottom (ie: printhead moves towards the bed), homing the bed when aborting a print could cause the printhead to crash into the aborted print.
2017-09-06 13:21:17 +02:00
Lipu Fei
e163cc0d84
Remove "Extruder Configuration" text
...
CURA-4211
2017-09-06 12:43:42 +02:00
Lipu Fei
fc7207e77e
Remove "Sync" button
...
CURA-4211
2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d
Update extruder button styles
...
CURA-4211
2017-09-06 12:00:53 +02:00
Jaime van Kessel
81b6675518
Improved logging for network output
2017-09-06 11:15:40 +02:00
Lipu Fei
60c7d2f22e
Update topbar
...
CURA-4213
2017-09-05 18:05:30 +02:00
Brecht Nuyttens
3b4460feb0
Added vertex delta k8800
2017-09-05 15:24:02 +02:00
Jaime van Kessel
8472830fb9
Fix adding machine prefix
...
CURA-4276
2017-09-05 13:30:42 +02:00
Lipu Fei
63e75ec6b7
Merge branch 'master'
...
CURA-4213
2017-09-05 12:42:23 +02:00
Jaime van Kessel
a365fec1ac
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-05 11:42:32 +02:00
Jaime van Kessel
204e1ee834
PrintJobname is now only set when it was empty or if it's set to empty
...
CURA-4276 fixes #2346
2017-09-05 11:41:30 +02:00
Lipu Fei
4b08a5611a
Make topbar transparent and update text style
...
CURA-4213
2017-09-05 11:37:05 +02:00
Lipu Fei
3f6f4a1291
Fix merge conflict for topbar monitor button
...
CURA-4106
2017-09-05 11:12:49 +02:00
Lipu Fei
3e3f15d33f
Larger gap between the logo and topbar buttons
...
CURA-4213
2017-09-05 11:12:47 +02:00
Lipu Fei
afb8850155
Update topbar button style
...
CURA-4213
2017-09-05 11:12:22 +02:00
Lipu Fei
e44aedc4b9
Make logo smaller
...
CURA-4213
2017-09-05 10:56:55 +02:00
Jaime van Kessel
bcd8e2ca67
Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura
2017-09-05 09:57:14 +02:00
Jaime van Kessel
295a4af22b
Merge pull request #2380 from fieldOfView/fix_camera_leak
...
Prevent a possible memory leak while showing a stuck camera stream
2017-09-05 09:19:21 +02:00
Lipu Fei
77adfe345d
Fix merge conflicts from master
...
CURA-4213
2017-09-05 08:41:44 +02:00
Lipu Fei
90240af80f
Correct stdout and stderr redirect location on Mac
2017-09-05 07:54:20 +02:00
Jaime van Kessel
bed74dab37
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-04 17:37:06 +02:00
Jaime van Kessel
08766ee66f
Fix wrong indentation for camera view
2017-09-04 17:36:44 +02:00
Lipu Fei
4249274af0
Move license window size to light theme
...
CURA-4279
The light theme is now the default and it's a base theme, so the window
size needs to be there.
2017-09-04 17:25:58 +02:00
Lipu Fei
f803e72c18
Use Screen.devicePixelRatio for plugin browser
...
CURA-4279
2017-09-04 17:25:30 +02:00
fieldOfView
308e1793bc
Fix simple mode adhesion checkbox
2017-09-04 16:56:35 +02:00
Jaime van Kessel
7d12ebe860
Merge pull request #2368 from smartavionics/mb-fix-layer-start-min-values
...
Now layer start X/Y can be < 0 when machine centre is zero.
2017-09-04 16:52:49 +02:00
fieldOfView
46b333bfc9
Merge branch 'master' into fix_simple_mode_disabled_features
...
# Conflicts:
# resources/qml/SidebarSimple.qml
2017-09-04 16:44:59 +02:00
fieldOfView
adc1630a20
Merge branch 'master' into fix_simple_mode_disabled_features
...
# Conflicts:
# resources/qml/SidebarSimple.qml
2017-09-04 16:38:32 +02:00
Mark
e3f319a644
less margin when support extruder pops up
...
CURA-4148
2017-09-04 16:23:19 +02:00
Lipu Fei
51547bf37a
Update setting_version to 3 for XMLMaterial
...
CURA-4270
Technically, this is not right. This is just to postpone a time bomb...
The XML material profile needs a setting number instead of getting it
derived from the schema version.
2017-09-04 15:51:31 +02:00
fieldOfView
7e60d459b4
Prevent a possible memory leak while showing a stuck camera stream
2017-09-04 15:47:44 +02:00
Lipu Fei
fdf5dc049e
Update all containers to setting_version 3
...
CURA-4270
2017-09-04 15:47:04 +02:00
Lipu Fei
e9551d2173
Add upgrade script for 2.7 to 3.0
...
CURA-4270
Changes for the Skin Pre-shrink settings requires upgrade.
2017-09-04 15:39:10 +02:00
Jaime van Kessel
dd7ea80b68
Also added canPreheatBed option
2017-09-04 15:33:04 +02:00
Jaime van Kessel
182c2f9fb6
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-04 15:17:27 +02:00
Jaime van Kessel
8683275d4f
Added canAbort & canPause feature to PrinterOutputDevice
2017-09-04 15:16:55 +02:00
Lipu Fei
a67a0f161b
Merge branch 'master' into skin_preshrink_to_close
2017-09-04 14:37:16 +02:00
Lipu Fei
b70a89d0e1
Fix stdout and stderr redirecting file location
2017-09-04 14:08:03 +02:00
Lipu Fei
1b66eaea22
Move extruder button sizes to cura-light theme
...
CURA-4211
2017-09-04 12:14:18 +02:00
Jaime van Kessel
88c74b30c2
Added missing QML properties
2017-09-04 11:48:54 +02:00
Jaime van Kessel
20ffb0cd6d
Merge pull request #2369 from vivekanand1101/patch-1
...
CuraApplication: Minor pep8 fix
2017-09-04 09:53:16 +02:00
Lipu Fei
0358b1fcae
Fix User-Agent header in PluginBrowser
2017-09-04 09:23:46 +02:00
Lipu Fei
8e774dede4
Change extruder combobox style for simple mode
...
CURA-4211
2017-09-04 08:42:55 +02:00
