Browse Source

Unify the fonts to only have 8 instead of 13.

Contributes to CURA-6025.
Diego Prado Gesto 6 years ago
parent
commit
77ede1ae6b

+ 2 - 2
plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -61,7 +61,7 @@ UM.Dialog
                 anchors.leftMargin: base.textMargin
                 anchors.right: parent.right
                 anchors.rightMargin: base.textMargin
-                font: UM.Theme.getFont("large")
+                font: UM.Theme.getFont("large_bold")
                 elide: Text.ElideRight
             }
             ListView
@@ -276,7 +276,7 @@ UM.Dialog
                 anchors.rightMargin: base.textMargin
                 elide: Text.ElideRight
                 height: 20 * screenScaleFactor
-                font: UM.Theme.getFont("large")
+                font: UM.Theme.getFont("large_bold")
                 color: UM.Theme.getColor("text")
             }
 

+ 1 - 1
plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml

@@ -55,7 +55,7 @@ Item
                 bottomMargin: UM.Theme.getSize("default_margin").height
             }
             text: details.name || ""
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             wrapMode: Text.WordWrap
             width: parent.width
             height: UM.Theme.getSize("toolbox_property_label").height

+ 1 - 1
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml

@@ -60,7 +60,7 @@ Item
                 bottomMargin: UM.Theme.getSize("default_margin").height
             }
             text: details === null ? "" : (details.name || "")
-            font: UM.Theme.getFont("large")
+            font: UM.Theme.getFont("large_bold")
             color: UM.Theme.getColor("text")
             wrapMode: Text.WordWrap
             width: parent.width

+ 1 - 1
plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml

@@ -223,7 +223,7 @@ Cura.MachineAction
                     width: parent.width
                     wrapMode: Text.WordWrap
                     text: base.selectedDevice ? base.selectedDevice.name : ""
-                    font: UM.Theme.getFont("large")
+                    font: UM.Theme.getFont("large_bold")
                     elide: Text.ElideRight
                     renderType: Text.NativeRendering
                 }

+ 3 - 3
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml

@@ -76,7 +76,7 @@ Item
                     text: printer && printer.name ? printer.name : ""
                     color: "#414054" // TODO: Theme!
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("large") // 16pt, bold
+                    font: UM.Theme.getFont("large_bold") // 16pt, bold
                     width: parent.width
 
                     // FIXED-LINE-HEIGHT:
@@ -178,7 +178,7 @@ Item
                     verticalCenter: parent.verticalCenter
                 }
                 color: "#414054" // TODO: Theme!
-                font: UM.Theme.getFont("large") // 16pt, bold
+                font: UM.Theme.getFont("large_bold") // 16pt, bold
                 text: {
                     if (printer && printer.state == "disabled")
                     {
@@ -229,7 +229,7 @@ Item
                     id: printerJobNameLabel
                     color: printer.activePrintJob && printer.activePrintJob.isActive ? "#414054" : "#babac1" // TODO: Theme!
                     elide: Text.ElideRight
-                    font: UM.Theme.getFont("large") // 16pt, bold
+                    font: UM.Theme.getFont("large_bold") // 16pt, bold
                     text: base.printer.activePrintJob ? base.printer.activePrintJob.name : "Untitled" // TODO: I18N
                     width: parent.width
 

+ 1 - 1
plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml

@@ -97,7 +97,7 @@ Component
                     top: parent.top
                 }
                 color: UM.Theme.getColor("text")
-                font: UM.Theme.getFont("large_nonbold")
+                font: UM.Theme.getFont("large")
                 text: catalog.i18nc("@label", "Queued")
             }
 

+ 1 - 1
resources/qml/Account/AccountDetails.qml

@@ -44,7 +44,7 @@ Column
         horizontalAlignment: Text.AlignHCenter
         renderType: Text.NativeRendering
         text: loggedIn ? profile["username"] : catalog.i18nc("@label", "Please log in or create an account to\nenjoy all features of Ultimaker Cura.")
-        font: loggedIn ? UM.Theme.getFont("large") : UM.Theme.getFont("default")
+        font: loggedIn ? UM.Theme.getFont("large_bold") : UM.Theme.getFont("default")
         color: UM.Theme.getColor("text")
     }
 

+ 1 - 1
resources/qml/ActionButton.qml

@@ -62,7 +62,7 @@ Button
             id: buttonText
             text: button.text
             color: button.enabled ? (button.hovered ? button.textHoverColor : button.textColor): button.textDisabledColor
-            font: UM.Theme.getFont("action_button")
+            font: UM.Theme.getFont("medium")
             visible: text != ""
             renderType: Text.NativeRendering
             anchors.verticalCenter: parent.verticalCenter

+ 1 - 1
resources/qml/Dialogs/AboutDialog.qml

@@ -51,7 +51,7 @@ UM.Dialog
         id: version
 
         text: catalog.i18nc("@label","version: %1").arg(UM.Application.version)
-        font: UM.Theme.getFont("large")
+        font: UM.Theme.getFont("large_bold")
         color: UM.Theme.getColor("text")
         anchors.right : logo.right
         anchors.top: logo.bottom

+ 1 - 1
resources/qml/ExtruderIcon.qml

@@ -48,7 +48,7 @@ Item
             id: extruderNumberText
             anchors.centerIn: parent
             text: index + 1
-            font: UM.Theme.getFont("very_small")
+            font: UM.Theme.getFont("small")
             width: contentWidth
             height: contentHeight
             visible: extruderEnabled

Some files were not shown because too many files changed in this diff