17 Commits

Author SHA1 Message Date
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Jaime van Kessel
d379f94775 Make the dark theme a bit more readable 2018-12-14 13:23:28 +01:00
Jaime van Kessel
c3aca8907c Fix extruder number not being visible in dark theme 2018-12-14 12:02:52 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13.
Contributes to CURA-6025.
2018-12-12 17:50:21 +01:00
Ghostkeeper
b565b111c8
Adjust disabled extruder colour
This also introduces a more global 'disabled' colour as defined by the style guide. I hope that we can gradually transition to this one, but we'll have to adjust some colours here and there.

Contributes to issue CURA-5876.
2018-12-07 15:38:08 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages
It is now the default in Uranium.

Contributes to issue CURA-5876.
2018-12-04 15:04:51 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
2018-11-27 15:01:48 +01:00
Ghostkeeper
7f2f2090da
Make small and very_small fonts actually smaller
Rather than the same as default_bold and default.
This also makes the extruder_icon font obsolete. Turns out it's actually just a very small font.

Contributes to issue CURA-5876.
2018-11-26 17:37:50 +01:00
Diego Prado Gesto
b890e40e81 Close the popup panel when the user clicks in some of the buttons in the
printer selector.

Contributes to CURA-5942.
2018-11-22 10:54:25 +01:00
Diego Prado Gesto
a1f3ebc25b Fix typo.
Contributes to CURA-5785.
2018-11-21 13:58:21 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design
CURA-5785
2018-11-21 13:46:50 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review
CURA-5785
2018-11-21 13:17:36 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly
CURA-5785
2018-11-16 16:04:11 +01:00
Jaime van Kessel
88234f7e21 Change ExtruderIcon to match the new design
CURA-5785
2018-11-09 10:48:22 +01:00
Diego Prado Gesto
84adfa14ee Add license to the top of a file
Contributes to CURA-5772.
2018-10-18 17:26:10 +02:00
Jaime van Kessel
11a08d0e47 Move whole bunch of QML components to their new locations
The tooltips are still not working correctly, it might be that it needs rework

CURA-5772
2018-10-12 13:32:23 +02:00
Jaime van Kessel
f18d490ca1 Move extruderIcon to it's own location
This also simplifies the qml that actually handles the display

CURA-5772
2018-10-11 13:08:57 +02:00