From e9a8ae15f36fae3009d2fdc28523874014dbd733 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 3 Oct 2017 14:02:07 +0200 Subject: [PATCH] Move text back to label and remove unused font --- resources/qml/SaveButton.qml | 2 +- resources/qml/Sidebar.qml | 2 +- resources/qml/SidebarHeader.qml | 2 +- resources/qml/SidebarSimple.qml | 4 ++-- resources/qml/SidebarTooltip.qml | 2 +- resources/themes/cura-light/theme.json | 4 ---- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index b613b1217e..7423fc2368 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -43,7 +43,7 @@ Item { } } - Text { + Label { id: statusLabel width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width anchors.top: parent.top diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index ca62d5dd47..b1c5008d38 100755 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -114,7 +114,7 @@ Rectangle } } - Text { + Label { id: settingsModeLabel text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified"); anchors.left: parent.left diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index d20feca8d6..9269984a2a 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -363,7 +363,7 @@ Column visible: !Cura.MachineManager.isCurrentSetupSupported } - Text { + Label { id: materialInfoLabel wrapMode: Text.WordWrap text: catalog.i18nc("@label", "Check material compatibility") diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 9aa7c4e025..7ab220c9e1 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -385,7 +385,7 @@ Item anchors.top: infillCellLeft.top anchors.topMargin: UM.Theme.getSize("sidebar_margin").height - Text { + Label { id: selectedInfillRateText //anchors.top: parent.top @@ -566,7 +566,7 @@ Item } } - Text { + Label { id: gradualInfillLabel anchors.left: enableGradualInfillCheckBox.right anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width / 2 diff --git a/resources/qml/SidebarTooltip.qml b/resources/qml/SidebarTooltip.qml index 057bd63203..60d01dd6f6 100644 --- a/resources/qml/SidebarTooltip.qml +++ b/resources/qml/SidebarTooltip.qml @@ -43,7 +43,7 @@ UM.PointingRectangle { base.opacity = 0; } - Text { + Label { id: label; anchors { top: parent.top; diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 96ccd469b6..b41ea96846 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -17,10 +17,6 @@ "size": 1.15, "family": "Open Sans" }, - "default_little_big": { - "size": 1.17, - "family": "Open Sans" - }, "default_bold": { "size": 1.15, "bold": true,