Commit graph

4596 commits

Author SHA1 Message Date
Lipu Fei
ab6d90d0a7 Merge pull request #2308 from smartavionics/mb-relative-extrusion
Add relative_extrusion setting to special modes category.
2017-09-11 10:20:45 +02:00
Lipu Fei
546dc9ff4d Better positioning for the material circle in the ExtruderButton 2017-09-11 08:49:07 +02:00
Ruben D
32c5583a3d
Reduce minimum jerk value to 0
A jerk of 0 is very possible, because Jerk in 3D printing doesn't mean the derivative of acceleration but rather the maximum instantaneous change in velocity on an axis.

Fixes #2338.
2017-09-10 13:52:27 +02:00
Mark
41ab160e62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-08 16:35:17 +02:00
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended
CURA-4148
2017-09-08 16:35:08 +02:00
Diego Prado Gesto
b3a01d5fcc Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-08 16:22:53 +02:00
Diego Prado Gesto
c3d6023418 Fixed an issue that doesn't generate the jobname again once the user removes the models. - CURA-4276 2017-09-08 16:22:45 +02:00
Mark
db77a4690c Made the selected borders a little thicker
CURA-4148
2017-09-08 15:18:40 +02:00
Mark
748c72760b Typo 2017-09-08 13:53:21 +02:00
Mark
c8b199c8f7 Merge pull request #2393 from Ultimaker/feature_change_icons_margins
CURA-4148: Change icons and margins
2017-09-08 13:50:16 +02:00
Mark
a485781900 Add new unknown icon
CURA-4148
2017-09-08 13:06:08 +02:00
Mark
8264b6fe67 Fix default action_button color and checkbox onHover color
CURA-4148
2017-09-08 11:58:24 +02:00
Mark
a50e228ba1 Fix onHover border for extruder buttons
CURA-4148
2017-09-08 11:56:37 +02:00
Lipu Fei
b0916e4b67 Fix job name mismatching
CURA-4276
2017-09-06 18:09:19 +02:00
Lipu Fei
b239eb9eaf No extruder numbers for per-object settings
CURA-4284
2017-09-06 16:35:58 +02:00
Lipu Fei
40b60a2d95 Fix colour for LayView panel and per object settings panel
CURA-4148
2017-09-06 16:23:29 +02:00
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
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
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
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
Mark
e3f319a644 less margin when support extruder pops up
CURA-4148
2017-09-04 16:23:19 +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
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
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