297 Commits

Author SHA1 Message Date
Jaime van Kessel
bcd8e2ca67 Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura 2017-09-05 09:57:14 +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
1b66eaea22 Move extruder button sizes to cura-light theme
CURA-4211
2017-09-04 12:14:18 +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
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
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
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
5b36869b32
Update background colour of status icons
This outline needs to be the same colour as the background of the top bar.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
99cae1469e
Copy status icons to dark theme
We want the dark theme to use these icons, but we want to update these icons for the light theme so I'm back-upping the icons for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
a60cf07844
Use black logo for light theme
It's black on white instead of white on black.

Contributes to issue CURA-4148.
2017-08-30 16:08:50 +02:00
Ghostkeeper
c0f7d6aa19
Copy Cura logo from Light theme
We're going to keep this dark theme with the white Cura logo but modify the Light themed one to have a black logo.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
d4e5e10825
Restore vertical margins
We weren't allowed to change that yet.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
f301464987
Update missing colours
And colours that have to change because the behaviour was changed (such as opacities now being themeable.

Contributes to issue CURA-4148.
2017-08-30 16:08:49 +02:00
Ghostkeeper
e619c11e01
New base theme: Cura-light
There is a new theme now, Cura Light, based on the original colours of Cura 15.6 through 2.7. It is now also the base of the themes. It will soon be made the temporary default until the UX team can come up with something better for the dark theme.

Contributes to issue CURA-4148.
2017-08-30 16:08:42 +02:00
Lipu Fei
0781848af5 Reduce margin size for settings in recommended and custom mode
CURA-4148
2017-08-28 17:35:03 +02:00
Lipu Fei
68a89db863 Move star icon in profile dropdown a little to the left
CURA-4148

The star icon in the profile dropdown box is too much to the right,
which overlaps a little with the dropdown arrow button.
2017-08-28 11:18:26 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons
CURA-4148

Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
Ghostkeeper
0aa1f04b1d
Correct width of monitor icon
Because the overlay is wider this one needs to be just as wide.

Contributes to issue CURA-4148.
2017-08-25 14:56:39 +02:00
Ghostkeeper
3db799c661
Remove unnecessary crap from monitor icon
All the metadata and empty tags and no-op groups and such.

Contributes to issue CURA-4148.
2017-08-25 14:55:13 +02:00
Ghostkeeper
aa9347d7be
New icon for monitor tab
Fresh from the press.

Contributes to issue CURA-4148.
2017-08-25 14:53:07 +02:00
Ghostkeeper
0c7fd82e22
Give icons in the top bar a different size
Because one of the icons now needs to be rectangular. All icons in there have the same style so they all have to be resized.

Contributes to issue CURA-4148.
2017-08-25 13:57:24 +02:00
Ghostkeeper
5be0d664f4
Remove unused colour from tab_settings icon
This icon is recoloured so the colour doesn't matter. When there is no colour, the icon preview shows up better in my browser and my file explorer...

Contributes to issue CURA-4148.
2017-08-25 13:51:40 +02:00
Ghostkeeper
78dbe8c56a
Remove offline icon
We don't show an icon in that case any more.

Contributes to issue CURA-4148.
2017-08-25 13:03:50 +02:00
Ghostkeeper
c25b94ce31
Move status icons to the middle-right side of monitor icon
They are actually moved inside the image, rather than in code. This way the theme can still adjust the icon.

Contributes to issue CURA-4148.
2017-08-25 13:02:51 +02:00
Ghostkeeper
4835ffa403
Don't recolor printer status buttons
Just leave it to the actual icons to provide colour. It may be a bit harder to modify the colours in a different theme then, but now we can have multi-colour icons (as per the new theme requires).

Contributes to issue CURA-4148.
2017-08-24 21:22:13 +02:00
Ghostkeeper
26033e3454
Optimised connected icon
Changed rects with rounded corners into circles. Merged two circles that depicted a circle-with-outline into one circle with an outline. Changed the outline path to a polyline with a stroke.

Contributes to issue CURA-4148.
2017-08-24 17:22:34 +02:00
Ghostkeeper
457472ee61
Fix connected icon
It was rendered wrong by the export of Sketch.

Contributes to issue CURA-4148.
2017-08-24 17:11:59 +02:00
Ghostkeeper
f0c446cb28
Optimise status icons
Removed unnecessary transforms. Changed square rects which had their corner radius set to half their width into actual circles. Merged some glyphs that were a stroke and a background into one glyph with an actual stroke and background. Applied necessary transforms to actual coordinates. Dereferenced xlink symbols that were used only once.

Contributes to issue CURA-4148.
2017-08-24 17:10:20 +02:00
Ghostkeeper
974bf9de4d
New printer status icons
These are the new icons from the UX guys for the printer status.

Contributes to issue CURA-4148.
2017-08-24 16:29:11 +02:00
Ghostkeeper
1f29501836
Remove more useless code
These are all unused.

Contributes to issue CURA-4148.
2017-08-24 16:15:19 +02:00
Ghostkeeper
b7261306ec
Remove useless transformations
They ended up in the same place as the original glyph...

Contributes to issue CURA-4148.
2017-08-24 16:12:25 +02:00
Ghostkeeper
36f9ca0efb
New Cura logo image
This one has white letters but should otherwise be more or less the same.

Contributes to issue CURA-4148.
2017-08-24 16:10:18 +02:00
Ghostkeeper
fde4f44a1e
New dark theme
Also from the UX designers: A new dark theme that is exactly the same as the default theme except the background of the scene.

Contributes to issue CURA-4148.
2017-08-23 17:10:54 +02:00
Ghostkeeper
c2e4c14e59
Adjust vertical margins in sidebar
The section size adjusts the size of a setting item, and the actual control is centred within that space so in effect it controls the margins above and below each setting control.

Contributes to issue CURA-4148.
2017-08-23 17:02:07 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar
These are more or less all margins in the side bar.

Contributes to issue CURA-4148.
2017-08-23 16:28:28 +02:00
Ghostkeeper
078b9e8b66
Fix placeholder text colour
It should use the same colour as the normal text, for now.

Contributes to issue CURA-4148.
2017-08-23 15:32:42 +02:00
Ghostkeeper
b52446ed99
Use text colour specific to text in scene for job specs
Because the scene may have a different background colour than the rest, we need to be able to have inverted colours for that part.

Contributes to issue CURA-4148.
2017-08-23 14:58:43 +02:00
Ghostkeeper
f5169f53f3
Remove text_reversed
This theme item is broken by nature since the theme itself allows you to change the colours such that these text elements don't get inversed colours at all. Instead I'm going to use text_emphasis for these which is currently the same. If ever they need to get different colours for these items than the normal colour, the theme item will have to be split up.

Contributes to issue CURA-4148.
2017-08-23 14:44:14 +02:00
Ghostkeeper
d55b8b2957
Add icon after Troubleshooting Guide text
Sadly the colour of this icon is hard-coded into the image... I didn't find any other solution to append an inline image after a multi-line text.

Contributes to issue CURA-4148.
2017-08-23 14:38:35 +02:00
Ghostkeeper
85a1526912
Fix scaling of view mode button
Changed the size to 24x24 and moved the path 5 units down.

Contributes to issue CURA-4148.
2017-08-23 13:59:32 +02:00
Ghostkeeper
17e62ea6c1
Let theme decide upon coloured icons
We shouldn't colour the icons themselves, but rather let UM.RecolourImage choose the colours for just the outlines of the icons.

Contributes to issue CURA-4148.
2017-08-23 13:35:47 +02:00
Ghostkeeper
adb2fa739b
Correct setting_validation_error/warning and background/border
I modified these but forgot to commit them.

Contributes to issue CURA-4148.
2017-08-23 13:33:49 +02:00
Ghostkeeper
ab444943cb
Rename setting_validation_error/warning and border
In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items.

Contributes to issue CURA-4148.
2017-08-23 13:30:25 +02:00
Ghostkeeper
876c6aeced
Replace warning.svg with material_compatibility.svg
The warning icon is only used for the material compatibility warning, so it should just have been mixed.

Contributes to issue CURA-4148.
2017-08-23 13:14:21 +02:00
Ghostkeeper
2a1a41662a
Remove tab_monitor_with_status icon
It must always be the same as tab_monitor, but we'll just draw an additional icon on top of it.

Contributes to issue CURA-4148.
2017-08-23 12:53:07 +02:00