55 Commits

Author SHA1 Message Date
Jack Ha
f3a6f50e2c CURA-4234 fix topbar resize issues and removed hard coding numbers 2017-12-13 16:47:38 +01:00
Jack Ha
3605edc565 CURA-4234 remove debugging logline 2017-12-13 14:16:35 +01:00
Jack Ha
63eec848fc CURA-4234 view mode button now also moves with the sidebar 2017-12-13 14:15:27 +01:00
Aleksei S
3516d01f3d Move back machine selection
CURA-4234
2017-12-12 15:30:19 +01:00
Aleksei S
6968c089db Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
CURA-4234
2017-12-12 11:26:17 +01:00
Aleksei S
a5cb4cd316 Expand/Collapse sidebar
CURA-4234
2017-12-11 10:53:48 +01:00
ChrisTerBeke
faf77b2795 Cleanup 2017-12-07 11:50:01 +01:00
ChrisTerBeke
9e3c681d66 Fix top bar tab layout when it has an icon 2017-12-06 18:47:11 +01:00
ChrisTerBeke
548761fcc3 Some cleanup 2017-12-06 18:15:17 +01:00
ChrisTerBeke
28c5debd61 Fix hiding topbar buttons in monitor stage 2017-12-06 18:11:46 +01:00
ChrisTerBeke
2d044a37ae Sidebar and main view via loader 2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b Make sidebar view working for active stage 2017-12-06 12:23:41 +01:00
ChrisTerBeke
0e1c9146cf Implement stage model in top bar 2017-12-06 09:58:50 +01:00
ChrisTerBeke
f1b9a17611 Remove sidebar controller implementation in favor of stages 2017-12-06 09:44:30 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Aleksei Sasin
1141368682 Hide icons if monitor view is selected CURA-4527 2017-11-23 12:54:53 +01:00
Aleksei S
d7b230269b The icons changed
CURA-4527
2017-11-22 11:10:25 +01:00
Aleksei S
ce0510cee3 Hide icons if they overlap monitor button
CURA-4527
2017-11-15 16:34:22 +01:00
Aleksei S
3d2868c336 Added icons
CURA-4527
2017-11-15 00:43:17 +01:00
Aleksei S
7722e438c9 Changed orientation button location, adjusted call functins
CURA-4527
2017-11-06 10:28:07 +01:00
Aleksei S
938ae5af1d Added function to catch prepare and monitor button click
CURA-4062
2017-10-26 14:36:23 +02:00
Jaime van Kessel
a7e1017aa2 Added some missing widths en heights
GammaRay complained about some objects not having a size
2017-10-12 19:14:22 +02:00
Lipu Fei
5e970fa5a5 Use more descriptive function name
CURA-4411
2017-10-05 15:08:08 +02:00
ChrisTerBeke
9ef1caff50 Fix view combobox not updating when using view menu item, code cleanup, CURA-4411 2017-10-05 15:01:19 +02:00
ChrisTerBeke
edc10e0630 fix topbar colors in monitor mode for UM3 networking 2017-10-03 11:21:47 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
ChrisTerBeke
eb39d857e9 CURA-4341 add documentation for Qt checkbox binding workaround 2017-09-22 15:00:55 +02:00
ChrisTerBeke
14429d81cc CURA-4313 fix re-binding checkboxes after manually clicking them 2017-09-22 14:31:19 +02:00
ChrisTerBeke
07161f5d50 CURA-4341 use existing signals instead to update topbar monitoring 2017-09-22 13:40:55 +02:00
ChrisTerBeke
b748bf2011 CURA-4341 add bi-directional signal to update topbar when monitoring 2017-09-22 13:11:57 +02:00
ChrisTerBeke
9e62c4db15 CURA-4318 remove active printer hover underline, theme inheritance, theme names 2017-09-12 11:39:48 +02:00
ChrisTerBeke
485b71c010 top bar improvements 2017-09-11 15:08:06 +02:00
Lipu Fei
c59bd6cc09 Change LayView Mode button to a dropdown
CURA-4212
2017-09-07 16:24:49 +02:00
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