12 Commits

Author SHA1 Message Date
jelle Spijker
2986d50745
Update QtQuick and QtQuick.Controls
CURA-7813
2021-03-29 17:55:19 +02: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
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Jaime van Kessel
59a81be65c Fixed some leftover graphical issues
CURA-5943
2018-11-30 14:10:42 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
2018-11-26 17:33:37 +01:00
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
2018-10-12 14:56:27 +02:00
Jaime van Kessel
1180fad62f Fix binding loop 2018-08-09 11:33:04 +02:00
Jaime van Kessel
99de75a3fd Fixed connection label state
CL-541
2018-01-08 13:44:20 +01:00
ChrisTerBeke
39921795ce Properly align printer not connected label from top 2018-01-05 14:46:16 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer
CL-541
2018-01-04 10:13:55 +01:00
Jaime van Kessel
89004b8df5 Fixed some QML warnings
CL-541
2017-12-19 17:19:04 +01:00
Jaime van Kessel
e3d07f1806 Moved ExtruderBox and OutputDeviceHeader to their own files.
This makes it a whole lot easier to get an overview.

CL-541
2017-11-21 16:06:30 +01:00