GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-23 21:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 290 Branches 265 Tags
Commit Graph

711 Commits

Author SHA1 Message Date
ChrisTerBeke
f57fc6bb72 Merge branch 'master' into fix_dark_theme 2017-09-14 13:26:11 +02:00
ChrisTerBeke
17986aa4ad CURA-4318 add border to toolbar buttons in dark theme, outline fix for unknown printer status icon in dark theme 2017-09-14 13:04:29 +02:00
ChrisTerBeke
3073fcf6f7 CURA-4318 add white icon for unknown printer status in dark theme 2017-09-14 12:43:07 +02:00
ChrisTerBeke
96c1e7ea8b CURA-4182 dark design fixes for quality slider 2017-09-14 10:58:22 +02:00
ChrisTerBeke
e7ad4b7f17 Merge branch 'master' into feature_slider_for_quality 2017-09-14 10:34:34 +02:00
ChrisTerBeke
c5c6ed8b2b CURA-4318 fix colors and layouts for dark design 2017-09-14 09:59:13 +02:00
Lipu Fei
d82a1daacf Add new quality/resolution slider 
CURA-4182
 2017-09-13 16:53:04 +02:00
fieldOfView
764514bb90 Subdue volume outline 2017-09-13 16:15:38 +02:00
fieldOfView
eed96473b1 Brighten z axis for readability on dark colors 2017-09-13 16:07:50 +02:00
fieldOfView
f2dbde0fe1 Fix readability of top bar buttons 2017-09-13 16:04:06 +02:00
fieldOfView
72b85fe69a Fix control hover/activefocus indication 2017-09-13 15:58:39 +02:00
fieldOfView
b0c7ade930 Fix logo readability 2017-09-13 15:50:30 +02:00
fieldOfView
a29bdf1ebc Move status icon to correct folder 2017-09-13 15:47:38 +02:00
fieldOfView
7b32ba7a9b Subdue buildplate colors 2017-09-13 15:45:48 +02:00
fieldOfView
f20f214379 Fix status unknown color and background 2017-09-13 15:39:36 +02:00
alekseisasin
6a9c7539c4 Merge branch 'feature_new_splash_window' 
CURA-4215
 2017-09-12 16:06:22 +02:00
ChrisTerBeke
9564b4753e Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-12 15:41:43 +02:00
ChrisTerBeke
fa72c47866 CURA-4203 update margins 2017-09-12 15:41:20 +02:00
fieldOfView
65a339ed3d Merge branch 'master' into feature_plate_shader 
# Conflicts:
#	resources/themes/cura/theme.json
 2017-09-12 15:09:57 +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
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
ChrisTerBeke
8f2ee96f40 CURA-4203 message progress bar color dark 2017-09-12 10:27:07 +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
ChrisTerBeke
7cc8656be3 Merge branch 'master' into CURA-4203-message-redesign 2017-09-12 09:13:37 +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
fieldOfView
6658e1a9ae Draw grid lines using shader 2017-09-11 23:41:10 +02:00
fieldOfView
461d4be310 Fix hover state of Monitor button in the topbar 2017-09-11 20:35:24 +02:00
Lipu Fei
1d38193bcd Fix letter 'r' alignment in logo 
CURA-4215

The letter 'r' in the logo was not aligned properly.
 2017-09-11 18:05:19 +02:00
ChrisTerBeke
cd3d4dc80f CURA-4203 updated message style for light theme, add shadows 2017-09-11 16:58:07 +02:00
ChrisTerBeke
485b71c010 top bar improvements 2017-09-11 15:08:06 +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
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
546dc9ff4d Better positioning for the material circle in the ExtruderButton 2017-09-11 08:49:07 +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
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
Lipu Fei
c8a92f2c59 Move LayerView slider down 
CURA-4212
 2017-09-07 17:04:14 +02:00
Lipu Fei
d89fc220fc Make LayerView panel vertically longer 
CURA-4212
 2017-09-07 16:24:47 +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