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

Unify the fonts to only have 8 instead of 13.

Browse source 
Contributes to CURA-6025.
This commit is contained in:
Diego Prado Gesto 2018-12-12 17:50:21 +01:00
parent a505adbf40
commit 77ede1ae6b
25 changed files with 41 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/PostProcessingPlugin/PostProcessingPlugin.qml
View file

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

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

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

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

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

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

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

6
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View file

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

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

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

2
resources/qml/Account/AccountDetails.qml
View file

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

2
resources/qml/ActionButton.qml
View file

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

2
resources/qml/Dialogs/AboutDialog.qml
View file

@ -51,7 +51,7 @@ UM.Dialog
id: version id: version
text: catalog.i18nc("@label","version: %1").arg(UM.Application.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") color: UM.Theme.getColor("text")
anchors.right : logo.right anchors.right : logo.right
anchors.top: logo.bottom anchors.top: logo.bottom

2
resources/qml/ExtruderIcon.qml
View file

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

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

@ -16,7 +16,7 @@ Item
{ {
id: header id: header
text: catalog.i18nc("@header", "Configurations") text: catalog.i18nc("@header", "Configurations")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
height: contentHeight height: contentHeight
renderType: Text.NativeRendering renderType: Text.NativeRendering

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

@ -23,7 +23,7 @@ Item
{ {
id: header id: header
text: catalog.i18nc("@header", "Custom") text: catalog.i18nc("@header", "Custom")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
height: contentHeight height: contentHeight
renderType: Text.NativeRendering renderType: Text.NativeRendering

4
resources/qml/MonitorButton.qml
View file

@ -168,7 +168,7 @@ Item
anchors.leftMargin: UM.Theme.getSize("thick_margin").width anchors.leftMargin: UM.Theme.getSize("thick_margin").width
color: base.statusColor color: base.statusColor
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
text: statusText text: statusText
} }
@ -179,7 +179,7 @@ Item
anchors.right: progressBar.right anchors.right: progressBar.right
color: base.statusColor color: base.statusColor
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
text: Math.round(progress) + "%" text: Math.round(progress) + "%"
visible: showProgress visible: showProgress
} }

2
resources/qml/Preferences/MachinesPage.qml
View file

@ -70,7 +70,7 @@ UM.ManagementPage
{ {
id: machineName id: machineName
text: base.currentItem && base.currentItem.name ? base.currentItem.name : "" text: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
width: parent.width width: parent.width
elide: Text.ElideRight elide: Text.ElideRight
} }

2
resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
View file

@ -65,7 +65,7 @@ Item
Label { Label {
text: materialProperties.name text: materialProperties.name
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
} }
} }

2
resources/qml/Preferences/ProfilesPage.qml
View file

@ -471,7 +471,7 @@ Item
Label { Label {
text: base.currentItemName text: base.currentItemName
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
} }
} }

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

@ -80,7 +80,7 @@ Item
id: extruderCurrentTemperature id: extruderCurrentTemperature
text: Math.round(extruderModel.hotendTemperature) + "°C" text: Math.round(extruderModel.hotendTemperature) + "°C"
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
anchors.right: extruderTargetTemperature.left anchors.right: extruderTargetTemperature.left
anchors.top: parent.top anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
@ -326,7 +326,7 @@ Item
return UM.Theme.getColor("action_button_text"); return UM.Theme.getColor("action_button_text");
} }
} }
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("medium")
text: text:
{ {
if(extruderModel == null) if(extruderModel == null)

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

@ -67,7 +67,7 @@ Item
{ {
id: bedCurrentTemperature id: bedCurrentTemperature
text: printerModel != null ? printerModel.bedTemperature + "°C" : "" text: printerModel != null ? printerModel.bedTemperature + "°C" : ""
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.right: bedTargetTemperature.left anchors.right: bedTargetTemperature.left
anchors.top: parent.top anchors.top: parent.top
@ -320,7 +320,7 @@ Item
return UM.Theme.getColor("action_button_text"); return UM.Theme.getColor("action_button_text");
} }
} }
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("medium")
text: text:
{ {
if(printerModel == null) if(printerModel == null)

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

@ -27,7 +27,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
text: label text: label
font: UM.Theme.getFont("setting_category") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("setting_category_text") color: UM.Theme.getColor("setting_category_text")
} }
} }

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

@ -31,7 +31,7 @@ Item
Label Label
{ {
id: outputDeviceNameLabel id: outputDeviceNameLabel
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top

2
resources/qml/PrinterSelector/MachineSelectorButton.qml
View file

@ -42,7 +42,7 @@ Button
} }
text: machineSelectorButton.text text: machineSelectorButton.text
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("medium")
visible: text != "" visible: text != ""
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

2
resources/qml/Settings/SettingCategory.qml
View file

@ -73,7 +73,7 @@ Button
text: definition.label text: definition.label
textFormat: Text.PlainText textFormat: Text.PlainText
renderType: Text.NativeRendering renderType: Text.NativeRendering
font: UM.Theme.getFont("setting_category") font: UM.Theme.getFont("medium_bold")
color: color:
{ {
if (!base.enabled) if (!base.enabled)

2
resources/qml/ViewsSelector.qml
View file

@ -105,7 +105,7 @@ Cura.ExpandablePopup
id: buttonText id: buttonText
text: viewsSelectorButton.text text: viewsSelectorButton.text
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight elide: Text.ElideRight

6
resources/themes/cura-light/styles.qml
View file

@ -208,8 +208,8 @@ QtObject
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
text: control.text; text: control.text;
font: Theme.getFont("button_tooltip"); font: Theme.getFont("default")
color: Theme.getColor("tooltip_text"); color: Theme.getColor("tooltip_text")
} }
} }
@ -716,7 +716,7 @@ QtObject
return UM.Theme.getColor("action_button_text"); return UM.Theme.getColor("action_button_text");
} }
} }
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("medium")
text: control.text text: control.text
} }
} }

38
resources/themes/cura-light/theme.json
View file

@ -6,63 +6,43 @@
"fonts": { "fonts": {
"large": { "large": {
"size": 1.35, "size": 1.35,
"weight": 63, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"large_nonbold": { "large_bold": {
"size": 1.35, "size": 1.35,
"weight": 50, "weight": 60,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"medium": { "medium": {
"size": 1.16, "size": 1.16,
"weight": 50, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"medium_bold": { "medium_bold": {
"size": 1.16, "size": 1.16,
"weight": 63, "weight": 60,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default": { "default": {
"size": 1.0, "size": 1.0,
"weight": 50, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_bold": { "default_bold": {
"size": 1.0, "size": 1.0,
"weight": 63, "weight": 60,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_italic": { "default_italic": {
"size": 1.0, "size": 1.0,
"weight": 50, "weight": 40,
"italic": true, "italic": true,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"small": { "small": {
"size": 0.85,
"weight": 50,
"family": "Noto Sans"
},
"very_small": {
"size": 0.7, "size": 0.7,
"weight": 50, "weight": 40,
"family": "Noto Sans"
},
"button_tooltip": {
"size": 1.0,
"weight": 50,
"family": "Noto Sans"
},
"setting_category": {
"size": 1.15,
"weight": 63,
"family": "Noto Sans"
},
"action_button": {
"size": 1.15,
"weight": 50,
"family": "Noto Sans" "family": "Noto Sans"
} }
}, },