Lipu Fei
dd62367937
Move View mode button and LayerView panel to top right
...
CURA-4212
2017-09-07 16:24:43 +02:00
Lipu Fei
d561af63e0
Merge branch 'master' into feature_move_logo_icons
2017-09-06 15:36:22 +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
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
77adfe345d
Fix merge conflicts from master
...
CURA-4213
2017-09-05 08:41:44 +02:00
Jaime van Kessel
88c74b30c2
Added missing QML properties
2017-09-04 11:48:54 +02:00
Ghostkeeper
bec786b140
Move printer status icon outside of the monitor button
...
It's positioned on the right side now above the side bar.
Contributes to issue CURA-4213.
2017-08-31 17:13:56 +02:00
Ghostkeeper
c6d614156f
Move the Cura logo into the top bar
...
Looks ugly there, I think, but the colours will be changed eventually so we'll see.
Contributes to issue CURA-4213.
2017-08-31 16:09:16 +02:00
Ghostkeeper
6f77cfc763
Always show plain monitor icon, never with_status
...
The status icons are just overlaid on top of the monitor icon.
No need for any specialised icon with a background or anything.
Contributes to issue CURA-4148.
2017-08-30 15:02:43 +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
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
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
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
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
Mark
64f6cd237f
Rename Print tab to Monitor
...
CURA-4106
2017-08-22 13:58:01 +02:00
Ghostkeeper
d73bbabda9
Change top bar text colour depending on hover and active state
...
Too bad we have to introduce additional theme entries for this sort of thing. Makes it harder to modify the theme!
Contributes to issue CURA-4148.
2017-08-21 14:11:16 +02:00
Jaime van Kessel
95cacb8300
Added missing translate to topbar
2017-07-06 10:46:29 +02:00
Arjen Hiemstra
ec25164731
Cleanup monitoringPrint stuff by properly passing things as properties
...
Instead of relying on the property magically being propagated from the
root object, which causes crashes.
Contributes to CURA-3964
2017-07-04 11:37:04 +02:00
Jaime van Kessel
7e07482dec
Added topbar to Cura
...
CURA-3964
2017-07-03 15:44:42 +02:00
