GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:46:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move text back to label and remove unused font

Browse Source
This commit is contained in:
Mark 2017-10-03 14:02:07 +02:00 committed by Ghostkeeper
parent e07e7bc9e7
commit e9a8ae15f3
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/SaveButton.qml
View File

@ -43,7 +43,7 @@ Item {
} }
} }
Text { Label {
id: statusLabel id: statusLabel
width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width width: parent.width - 2 * UM.Theme.getSize("sidebar_margin").width
anchors.top: parent.top anchors.top: parent.top

2
resources/qml/Sidebar.qml
View File

@ -114,7 +114,7 @@ Rectangle
} }
} }
Text { Label {
id: settingsModeLabel id: settingsModeLabel
text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified"); 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 anchors.left: parent.left

2
resources/qml/SidebarHeader.qml
View File

@ -363,7 +363,7 @@ Column
visible: !Cura.MachineManager.isCurrentSetupSupported visible: !Cura.MachineManager.isCurrentSetupSupported
} }
Text { Label {
id: materialInfoLabel id: materialInfoLabel
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "<a href='%1'>Check material compatibility</a>") text: catalog.i18nc("@label", "<a href='%1'>Check material compatibility</a>")

4
resources/qml/SidebarSimple.qml
View File

@ -385,7 +385,7 @@ Item
anchors.top: infillCellLeft.top anchors.top: infillCellLeft.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
Text { Label {
id: selectedInfillRateText id: selectedInfillRateText
//anchors.top: parent.top //anchors.top: parent.top
@ -566,7 +566,7 @@ Item
} }
} }
Text { Label {
id: gradualInfillLabel id: gradualInfillLabel
anchors.left: enableGradualInfillCheckBox.right anchors.left: enableGradualInfillCheckBox.right
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width / 2 anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width / 2

2
resources/qml/SidebarTooltip.qml
View File

@ -43,7 +43,7 @@ UM.PointingRectangle {
base.opacity = 0; base.opacity = 0;
} }
Text { Label {
id: label; id: label;
anchors { anchors {
top: parent.top; top: parent.top;

4
resources/themes/cura-light/theme.json
View File

@ -17,10 +17,6 @@
"size": 1.15, "size": 1.15,
"family": "Open Sans" "family": "Open Sans"
}, },
"default_little_big": {
"size": 1.17,
"family": "Open Sans"
},
"default_bold": { "default_bold": {
"size": 1.15, "size": 1.15,
"bold": true, "bold": true,