Mark
|
766bc9ae97
|
Changed bold fonts to normal
CURA-4148
|
2017-09-12 14:37:29 +02:00 |
|
ChrisTerBeke
|
4b0aa65ae5
|
Merge branch 'CURA-4318_themes_cleanup'
|
2017-09-12 13:42:45 +02:00 |
|
ChrisTerBeke
|
2ffc5d2b58
|
fix color swatch to be the same as layer view color swatch
|
2017-09-12 13:39:39 +02:00 |
|
ChrisTerBeke
|
3a098f4b4c
|
CURA-4319 material compatibility link style
|
2017-09-12 13:24:33 +02:00 |
|
Ghostkeeper
|
53dbf1c55d
|
Remove switch_extruder_* settings from UM2+
UM2+ is a single-extrusion printer after all, so these settings aren't used.
|
2017-09-12 13:21:59 +02:00 |
|
Ghostkeeper
|
6b08a435b3
|
Improve retraction settings for PVA
These are new retraction settings as tested by the materials & processing team.
|
2017-09-12 13:21:58 +02:00 |
|
ChrisTerBeke
|
9b33bc8194
|
CURA-4319 fix combobox hover states
|
2017-09-12 12:50:12 +02:00 |
|
ChrisTerBeke
|
073c2d3335
|
style and code improvements for combobox with color swatch
|
2017-09-12 12:11:23 +02:00 |
|
ChrisTerBeke
|
3f60bc9287
|
Cleanup combobox styling
|
2017-09-12 11:59:21 +02:00 |
|
Lipu Fei
|
1070e99ec2
|
Add message_border back
CURA-4203
Sadly QtGraphicalEffects is not available in Qt 5.8, so we have to use
the less fancy border for message boxes.
|
2017-09-12 11:52:19 +02:00 |
|
ChrisTerBeke
|
9e62c4db15
|
CURA-4318 remove active printer hover underline, theme inheritance, theme names
|
2017-09-12 11:39:48 +02:00 |
|
Ghostkeeper
|
14e10c6987
|
Move skin extra wall count from experimental to shell category
Nobody sees any risk in this.
|
2017-09-12 11:27:35 +02:00 |
|
Ghostkeeper
|
3fe75d9c95
|
Update default values of new settings
These settings have now been tested and good defaults have been found for them.
|
2017-09-12 11:24:49 +02:00 |
|
ChrisTerBeke
|
31339bca32
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2017-09-12 10:57:41 +02:00 |
|
ChrisTerBeke
|
8f2ee96f40
|
CURA-4203 message progress bar color dark
|
2017-09-12 10:27:07 +02:00 |
|
ChrisTerBeke
|
92617e2177
|
remove layerview toolbox arrow
|
2017-09-12 10:15:08 +02:00 |
|
ChrisTerBeke
|
7d719c4ab5
|
layer view toolbox height depending on color scheme mode
|
2017-09-12 09:54:24 +02:00 |
|
ChrisTerBeke
|
670d1784c4
|
Fix layer mode combobox hover not transparent
|
2017-09-12 09:45:45 +02:00 |
|
Lipu Fei
|
dfacde31b8
|
Merge pull request #2418 from eloipr/multiply_group_fix
add ConvexHullDecorator when grouping
|
2017-09-12 09:18:43 +02:00 |
|
ChrisTerBeke
|
7cc8656be3
|
Merge branch 'master' into CURA-4203-message-redesign
|
2017-09-12 09:13:37 +02:00 |
|
ChrisTerBeke
|
4143effbe1
|
only show slider track when layers are available
|
2017-09-12 09:13:16 +02:00 |
|
Lipu Fei
|
ed6adeabe9
|
Merge pull request #2416 from fieldOfView/fix_topbar_monitor_hover
Fix hover state of Monitor button in the topbar
|
2017-09-12 08:54:23 +02:00 |
|
Eloi Pardo
|
1aa46045af
|
add ConvexHullDecorator when grouping
|
2017-09-12 08:42:17 +02:00 |
|
fieldOfView
|
461d4be310
|
Fix hover state of Monitor button in the topbar
|
2017-09-11 20:35:24 +02:00 |
|
alekseisasin
|
637b536536
|
Merge pull request #2342 from hroncok/localefix
Relocate locales to proper locations
|
2017-09-11 17:23:12 +02:00 |
|
ChrisTerBeke
|
cd3d4dc80f
|
CURA-4203 updated message style for light theme, add shadows
|
2017-09-11 16:58:07 +02:00 |
|
ChrisTerBeke
|
89cbaca257
|
Hide layer view toolset when in monitoring mode
|
2017-09-11 15:20:46 +02:00 |
|
ChrisTerBeke
|
bd0b145036
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2017-09-11 15:08:10 +02:00 |
|
ChrisTerBeke
|
485b71c010
|
top bar improvements
|
2017-09-11 15:08:06 +02:00 |
|
Mark
|
af3b799cfa
|
Renamed the views to * view
CURA-4212
|
2017-09-11 14:23:32 +02:00 |
|
Lipu Fei
|
4507f6c8e2
|
Update job name prefix when machine is changed
CURA-4305
|
2017-09-11 12:39:59 +02:00 |
|
ChrisTerBeke
|
7efe3a3b9e
|
Merge branch 'master' into feature_top_right_layer_view
|
2017-09-11 11:50:18 +02:00 |
|
Lipu Fei
|
a041d005fa
|
Merge pull request #2335 from fieldOfView/fix_simple_mode_disabled_features
Hide adhesion & support options if they are disabled
|
2017-09-11 11:43:48 +02:00 |
|
ChrisTerBeke
|
9623ed75ac
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2017-09-11 11:36:04 +02:00 |
|
ChrisTerBeke
|
005b43cc5d
|
CURA-4148 small fixes for layer view settings panel
|
2017-09-11 11:35:40 +02:00 |
|
Lipu Fei
|
08882a3f12
|
Fix LayerView text colour
CURA-4212
|
2017-09-11 11:26:22 +02:00 |
|
Lipu Fei
|
f4bfa499d4
|
Remove debugging line
CURA-4284
|
2017-09-11 11:23:33 +02:00 |
|
Mark
|
a9cc10dd7b
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2017-09-11 11:21:41 +02:00 |
|
Mark
|
0a5744b74b
|
Tweaked the update setting
CURA-4301
|
2017-09-11 11:21:31 +02:00 |
|
Lipu Fei
|
94a8d2dfc6
|
Fix LayerView text colour
CURA-4212
|
2017-09-11 11:15:56 +02:00 |
|
ChrisTerBeke
|
98babfade7
|
CURA-4284 remove debug logging
|
2017-09-11 11:11:45 +02:00 |
|
Lipu Fei
|
e26be6b14a
|
Merge remote-tracking branch 'master'
|
2017-09-11 11:11:24 +02:00 |
|
Lipu Fei
|
96678b11ca
|
Update LayerView slider according to new style
CURA-4212
|
2017-09-11 11:10:56 +02:00 |
|
ChrisTerBeke
|
8a518ff610
|
Merge branch 'master' of https://github.com/Ultimaker/Cura
|
2017-09-11 10:56:41 +02:00 |
|
ChrisTerBeke
|
5c30658012
|
CURA-4284 fix relationship dependencies in per object settings
|
2017-09-11 10:56:34 +02:00 |
|
Lipu Fei
|
09bb090cd9
|
Change setting_control_text to almost black colour
CURA-4148
|
2017-09-11 10:53:17 +02:00 |
|
Lipu Fei
|
327c84d9ef
|
Change tool panel and checkbox text colours
CURA-4148
- Change tool panel background colour to white
- Change checkbox text colour to almost black
|
2017-09-11 10:48:31 +02:00 |
|
Lipu Fei
|
b2eead7736
|
Resolve merge conflicts from master
CURA-4212
|
2017-09-11 10:32:34 +02:00 |
|
Lipu Fei
|
f50255f1c9
|
Disable relative_extrusion for UMs
CURA-4219
|
2017-09-11 10:27:13 +02:00 |
|
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 |
|