Lipu Fei
1dd5f7b0ee
Update machine state icons
...
CURA-4148
2017-09-06 16:04:31 +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
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
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
Lipu Fei
63e75ec6b7
Merge branch 'master'
...
CURA-4213
2017-09-05 12:42:23 +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
Lipu Fei
77adfe345d
Fix merge conflicts from master
...
CURA-4213
2017-09-05 08:41: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
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
fdf5dc049e
Update all containers to setting_version 3
...
CURA-4270
2017-09-04 15:47:04 +02:00
Jaime van Kessel
dd7ea80b68
Also added canPreheatBed option
2017-09-04 15:33:04 +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
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
Lipu Fei
8e774dede4
Change extruder combobox style for simple mode
...
CURA-4211
2017-09-04 08:42:55 +02:00
Lipu Fei
0025369762
Remove old extruder material icons
...
CURA-4211
2017-09-04 08:30:59 +02:00
Lipu Fei
d0740158b1
Merge branch 'master' into feature_extruder_buttons
...
CURA-4211
Resolve merge conflicts.
2017-09-04 08:29:26 +02:00
Mark
d18d9223a5
refix the alignmet of the support and adhesion chackboxes
...
CURA-4148
2017-09-03 08:18:12 +02:00
Mark Burton
ab4da4ab36
Now layer start X/Y can be < 0 when machine centre is zero.
2017-09-02 08:40:01 +01:00
alekseisasin
24c9dc9bee
Merge branch 'feature_light_colours_icons'
...
CURA-4148
2017-09-01 19:25:29 +02:00
alekseisasin
a288668bae
Adjusted color for the extruder counter number in left toolbox and added
...
extra margin-right in sidebar_category
CURA-4148
2017-09-01 17:45:50 +02:00
Tim Kuipers
837a0b190b
feat: split skin_expand_distance into children and collapse expand_skins checkboxes (CURA-4270)
2017-09-01 16:00:19 +02:00
Tim Kuipers
93c56a9d47
rewording of skin preshrink (CURA-4270)
...
now it is worded as being the close operation which includes the skin expansion in the opposite direction
2017-09-01 15:58:26 +02:00
Jaime van Kessel
98795d8953
Added missing not supported profiles for PP
...
CURA-3977
2017-09-01 14:36:19 +02:00
Jaime van Kessel
2b54d75453
Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura
2017-09-01 13:22:13 +02:00
Jaime van Kessel
9ec7ef8dba
Made print spec invisible when monitoring print
2017-09-01 13:07:00 +02:00
Jaime van Kessel
a6e90270cf
Updated margins so low resolution screens can actually have some settings visible
2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244
Reduce the width of the license window
...
CURA-4222
2017-09-01 10:18:27 +02:00
Mark Burton
125dc75a0f
Now blurb for relative_extrusion says absolute extrusion mode will be set before any gcode script is output.
2017-09-01 07:54:56 +01:00
Lipu Fei
aad628a46f
Change to new design for extruder number settings
...
CURA-4211
2017-08-31 17:49:24 +02:00
Lipu Fei
c2645d0022
Change extruder tabs to buttons
...
CURA-4211
Change extruder tabs to buttons according to the new design.
2017-08-31 17:49:23 +02:00
Lipu Fei
b75140973e
Change extruder tab to use new button style
...
CURA-4211
- Use new button style ("Extruder" text with an extruder icon) for
extruder tabs
- The "Extruder" text will disapear if the width is not enough
2017-08-31 17:49:23 +02:00
Lipu Fei
7de9ccefaa
Change extruder button on the toolbar side
...
CURA-4211
Change the extruder button on the toolbar side according to the new
design.
2017-08-31 17:49:23 +02:00
Lipu Fei
b174d04a9b
Add SVG image for extruder button
...
CURA-4211
2017-08-31 17:49:22 +02:00
Ghostkeeper
31af4b7dde
Remove unused icon
...
Contributes to issue CURA-4213.
2017-08-31 17:34:23 +02:00
