3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 09:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change all uses of 'small' and 'very small' fonts to default

Browse source 
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.
This commit is contained in:
Ghostkeeper 2018-11-26 17:33:37 +01:00
parent a03e1be601
commit a3fe9839ba
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
15 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
View file

@ -86,13 +86,13 @@ Item
Label Label
{ {
text: catalog.i18nc("@label", "Website") + ":" text: catalog.i18nc("@label", "Website") + ":"
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
} }
Label Label
{ {
text: catalog.i18nc("@label", "Email") + ":" text: catalog.i18nc("@label", "Email") + ":"
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
} }
} }
@ -118,7 +118,7 @@ Item
} }
return "" return ""
} }
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)
@ -134,7 +134,7 @@ Item
} }
return "" return ""
} }
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)

2
plugins/Toolbox/resources/qml/ToolboxCompatibilityChart.qml
View file

@ -210,7 +210,7 @@ Item
} }
return result return result
} }
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)

16
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View file

@ -82,25 +82,25 @@ Item
Label Label
{ {
text: catalog.i18nc("@label", "Version") + ":" text: catalog.i18nc("@label", "Version") + ":"
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
} }
Label Label
{ {
text: catalog.i18nc("@label", "Last updated") + ":" text: catalog.i18nc("@label", "Last updated") + ":"
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
} }
Label Label
{ {
text: catalog.i18nc("@label", "Author") + ":" text: catalog.i18nc("@label", "Author") + ":"
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
} }
Label Label
{ {
text: catalog.i18nc("@label", "Downloads") + ":" text: catalog.i18nc("@label", "Downloads") + ":"
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
} }
} }
@ -119,7 +119,7 @@ Item
Label Label
{ {
text: details === null ? "" : (details.version || catalog.i18nc("@label", "Unknown")) text: details === null ? "" : (details.version || catalog.i18nc("@label", "Unknown"))
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }
Label Label
@ -133,7 +133,7 @@ Item
var date = new Date(details.last_updated) var date = new Date(details.last_updated)
return date.toLocaleString(UM.Preferences.getValue("general/language")) return date.toLocaleString(UM.Preferences.getValue("general/language"))
} }
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }
Label Label
@ -153,7 +153,7 @@ Item
return "<a href=\"" + details.website + "\">" + details.author_name + "</a>" return "<a href=\"" + details.website + "\">" + details.author_name + "</a>"
} }
} }
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link") linkColor: UM.Theme.getColor("text_link")
onLinkActivated: Qt.openUrlExternally(link) onLinkActivated: Qt.openUrlExternally(link)
@ -161,7 +161,7 @@ Item
Label Label
{ {
text: details === null ? "" : (details.download_count || catalog.i18nc("@label", "Unknown")) text: details === null ? "" : (details.download_count || catalog.i18nc("@label", "Unknown"))
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }
} }

2
plugins/Toolbox/resources/qml/ToolboxDownloadsGridTile.qml
View file

@ -81,7 +81,7 @@ Item
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
} }
} }
} }

2
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View file

@ -52,7 +52,7 @@ Item
id: buildplateLabel id: buildplateLabel
color: "#191919" // TODO: Theme! color: "#191919" // TODO: Theme!
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("very_small") // 12pt, regular font: UM.Theme.getFont("default") // 12pt, regular
text: "" text: ""
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:

4
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View file

@ -49,7 +49,7 @@ Item
} }
color: "#191919" // TODO: Theme! color: "#191919" // TODO: Theme!
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("very_small") // 12pt, regular font: UM.Theme.getFont("default") // 12pt, regular
text: "" text: ""
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:
@ -66,7 +66,7 @@ Item
} }
color: "#191919" // TODO: Theme! color: "#191919" // TODO: Theme!
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("small") // 12pt, bold font: UM.Theme.getFont("default_bold") // 12pt, bold
text: "" text: ""
// FIXED-LINE-HEIGHT: // FIXED-LINE-HEIGHT:

4
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -50,7 +50,7 @@ Column
text: PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long) text: PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long)
source: UM.Theme.getIcon("clock") source: UM.Theme.getIcon("clock")
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
} }
Cura.IconLabel Cura.IconLabel
@ -79,7 +79,7 @@ Column
return totalWeights + "g · " + totalLengths.toFixed(2) + "m" return totalWeights + "g · " + totalLengths.toFixed(2) + "m"
} }
source: UM.Theme.getIcon("spool") source: UM.Theme.getIcon("spool")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
} }
} }

8
resources/qml/ActionPanel/PrintJobInformation.qml
View file

@ -31,7 +31,7 @@ Column
{ {
text: catalog.i18nc("@label", "Time specification").toUpperCase() text: catalog.i18nc("@label", "Time specification").toUpperCase()
color: UM.Theme.getColor("primary") color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -62,7 +62,7 @@ Column
} }
width: parent.width - 2 * UM.Theme.getSize("default_margin").width width: parent.width - 2 * UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: Text.RichText textFormat: Text.RichText
} }
@ -81,7 +81,7 @@ Column
{ {
text: catalog.i18nc("@label", "Material specification").toUpperCase() text: catalog.i18nc("@label", "Material specification").toUpperCase()
color: UM.Theme.getColor("primary") color: UM.Theme.getColor("primary")
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -153,7 +153,7 @@ Column
} }
width: parent.width - 2 * UM.Theme.getSize("default_margin").width width: parent.width - 2 * UM.Theme.getSize("default_margin").width
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering renderType: Text.NativeRendering
textFormat: Text.RichText textFormat: Text.RichText
} }

2
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -49,7 +49,7 @@ Column
text: catalog.i18nc("@label:PrintjobStatus", "Unable to Slice") text: catalog.i18nc("@label:PrintjobStatus", "Unable to Slice")
source: UM.Theme.getIcon("warning") source: UM.Theme.getIcon("warning")
color: UM.Theme.getColor("warning") color: UM.Theme.getColor("warning")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
} }
// Progress bar, only visible when the backend is in the process of slice the printjob // Progress bar, only visible when the backend is in the process of slice the printjob

2
resources/qml/IconLabel.qml
View file

@ -43,7 +43,7 @@ Item
anchors.verticalCenter: icon.verticalCenter anchors.verticalCenter: icon.verticalCenter
text: "Empty label" text: "Empty label"
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }

2
resources/qml/JobSpecs.qml
View file

@ -124,7 +124,7 @@ Item {
} }
height: UM.Theme.getSize("jobspecs_line").height height: UM.Theme.getSize("jobspecs_line").height
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text_scene") color: UM.Theme.getColor("text_scene")
text: CuraApplication.getSceneBoundingBoxString text: CuraApplication.getSceneBoundingBoxString
} }

2
resources/qml/Menus/ConfigurationMenu/ConfigurationListView.qml
View file

@ -46,7 +46,7 @@ Column
section.delegate: Label section.delegate: Label
{ {
text: section text: section
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("configuration_item_text") color: UM.Theme.getColor("configuration_item_text")
bottomPadding: UM.Theme.getSize("default_margin").height bottomPadding: UM.Theme.getSize("default_margin").height
} }

2
resources/qml/PrinterOutput/ExtruderBox.qml
View file

@ -45,7 +45,7 @@ Item
{ {
id: extruderTargetTemperature id: extruderTargetTemperature
text: Math.round(extruderModel.targetHotendTemperature) + "°C" text: Math.round(extruderModel.targetHotendTemperature) + "°C"
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width

2
resources/qml/PrinterOutput/HeatedBedBox.qml
View file

@ -34,7 +34,7 @@ Item
{ {
id: bedTargetTemperature id: bedTargetTemperature
text: printerModel != null ? printerModel.targetBedTemperature + "°C" : "" text: printerModel != null ? printerModel.targetBedTemperature + "°C" : ""
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width

4
resources/qml/PrinterOutput/OutputDeviceHeader.qml
View file

@ -43,7 +43,7 @@ Item
{ {
id: outputDeviceAddressLabel id: outputDeviceAddressLabel
text: (outputDevice != null && outputDevice.address != null) ? outputDevice.address : "" text: (outputDevice != null && outputDevice.address != null) ? outputDevice.address : ""
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
@ -54,7 +54,7 @@ Item
{ {
text: outputDevice != null ? "" : catalog.i18nc("@info:status", "The printer is not connected.") text: outputDevice != null ? "" : catalog.i18nc("@info:status", "The printer is not connected.")
color: outputDevice != null && outputDevice.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") color: outputDevice != null && outputDevice.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("default")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width