3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-04 04:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch '4.0'

Browse source
This commit is contained in:
Ghostkeeper 2019-01-03 11:09:28 +01:00
commit 78ee666919
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
47 changed files with 89 additions and 85 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
@ -289,7 +289,7 @@ UM.Dialog
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")
} }

4
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -43,7 +43,7 @@ Cura.ExpandableComponent
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
height: parent.height height: parent.height
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -60,7 +60,7 @@ Cura.ExpandableComponent
} }
height: parent.height height: parent.height
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

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

@ -30,7 +30,7 @@ Row
width: contentWidth width: contentWidth
anchors.verticalCenter: starIcon.verticalCenter anchors.verticalCenter: starIcon.verticalCenter
color: starIcon.color color: starIcon.color
font: UM.Theme.getFont("small") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }

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

9
plugins/Toolbox/resources/qml/ToolboxBackColumn.qml
View file

@ -61,8 +61,13 @@ Item
id: labelStyle id: labelStyle
text: control.text text: control.text
color: control.enabled ? (control.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive") color: control.enabled ? (control.hovered ? UM.Theme.getColor("primary") : UM.Theme.getColor("text")) : UM.Theme.getColor("text_inactive")
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("medium_bold")
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignLeft
anchors
{
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
}
width: control.width width: control.width
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

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

@ -59,7 +59,7 @@ Item
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
} }
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")
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight

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

@ -22,7 +22,7 @@ Column
text: gridArea.heading text: gridArea.heading
width: parent.width width: parent.width
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("large")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Grid Grid

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

@ -112,7 +112,7 @@ Item
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
anchors.top: name.bottom anchors.top: name.bottom
anchors.bottom: rating.top anchors.bottom: rating.top

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

@ -23,7 +23,7 @@ Rectangle
text: catalog.i18nc("@label", "Featured") text: catalog.i18nc("@label", "Featured")
width: parent.width width: parent.width
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("large")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Grid Grid

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

@ -37,7 +37,7 @@ ScrollView
width: page.width width: page.width
text: catalog.i18nc("@title:tab", "Plugins") text: catalog.i18nc("@title:tab", "Plugins")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("large")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Rectangle Rectangle

5
plugins/Toolbox/resources/qml/ToolboxInstalledTile.qml
View file

@ -49,13 +49,14 @@ Item
width: parent.width width: parent.width
height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) height: Math.floor(UM.Theme.getSize("toolbox_property_label").height)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("large_bold")
color: pluginInfo.color color: pluginInfo.color
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Label Label
{ {
text: model.description text: model.description
font: UM.Theme.getFont("default")
maximumLineCount: 3 maximumLineCount: 3
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
@ -82,6 +83,7 @@ Item
return model.author_name return model.author_name
} }
} }
font: UM.Theme.getFont("medium")
width: parent.width width: parent.width
height: Math.floor(UM.Theme.getSize("toolbox_property_label").height) height: Math.floor(UM.Theme.getSize("toolbox_property_label").height)
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
@ -96,6 +98,7 @@ Item
Label Label
{ {
text: model.version text: model.version
font: UM.Theme.getFont("default")
width: parent.width width: parent.width
height: UM.Theme.getSize("toolbox_property_label").height height: UM.Theme.getSize("toolbox_property_label").height
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")

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

@ -81,7 +81,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:
@ -185,7 +185,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")
{ {
@ -236,7 +236,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/MonitorQueue.qml
View file

@ -23,7 +23,7 @@ Item
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")
} }

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

@ -50,7 +50,8 @@ Column
text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long) text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long)
source: UM.Theme.getIcon("clock") source: UM.Theme.getIcon("clock")
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("large_bold")
PrintInformationWidget PrintInformationWidget
{ {
id: printInformationPanel id: printInformationPanel

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

@ -44,9 +44,9 @@ Column
{ {
id: autoSlicingLabel id: autoSlicingLabel
width: parent.width width: parent.width
visible: prepareButtons.autoSlice && (widget.backendState == UM.Backend.Processing || widget.backendState == UM.Backend.NotStarted) visible: progressBar.visible
text: catalog.i18nc("@label:PrintjobStatus", "Auto slicing...") text: catalog.i18nc("@label:PrintjobStatus", "Slicing...")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
renderType: Text.NativeRendering renderType: Text.NativeRendering

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/ExpandableComponentHeader.qml
View file

@ -25,7 +25,7 @@ Cura.RoundedRectangle
{ {
id: headerLabel id: headerLabel
text: "" text: ""
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
color: UM.Theme.getColor("small_button_text") color: UM.Theme.getColor("small_button_text")

4
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")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
width: contentWidth width: contentWidth
height: contentHeight height: contentHeight
@ -66,7 +66,7 @@ Item
sourceSize.height: width sourceSize.height: width
source: UM.Theme.getIcon("cross1") source: UM.Theme.getIcon("cross1")
visible: !extruderEnabled visible: !extruderEnabled
color: "black" color: UM.Theme.getColor("text")
} }
} }
} }

4
resources/qml/JobSpecs.qml
View file

@ -97,7 +97,7 @@ Item
style: TextFieldStyle style: TextFieldStyle
{ {
textColor: UM.Theme.getColor("text_scene") textColor: UM.Theme.getColor("text_scene")
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default")
background: Rectangle background: Rectangle
{ {
opacity: 0 opacity: 0
@ -115,7 +115,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("default_bold") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text_scene") color: UM.Theme.getColor("text_scene")
text: CuraApplication.getSceneBoundingBoxString text: CuraApplication.getSceneBoundingBoxString
} }

1
resources/qml/MainWindow/MainWindowHeader.qml
View file

@ -102,6 +102,7 @@ Item
{ {
id: label id: label
text: marketplaceButton.text text: marketplaceButton.text
font: UM.Theme.getFont("default")
color: marketplaceButton.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text") color: marketplaceButton.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text")
width: contentWidth width: contentWidth
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

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("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("small_button_text") color: UM.Theme.getColor("small_button_text")
height: contentHeight height: contentHeight
renderType: Text.NativeRendering renderType: Text.NativeRendering

22
resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml
View file

@ -189,25 +189,13 @@ Button
height: childrenRect.height height: childrenRect.height
visible: configuration.buildplateConfiguration != "" && false //Buildplate is disabled as long as we have no printers that properly support buildplate swapping (so we can't test). visible: configuration.buildplateConfiguration != "" && false //Buildplate is disabled as long as we have no printers that properly support buildplate swapping (so we can't test).
UM.RecolorImage // Show the type of buildplate. The first letter is capitalized
{ Cura.IconWithText
id: buildplateIcon
anchors.left: parent.left
width: UM.Theme.getSize("main_window_header_button_icon").width
height: UM.Theme.getSize("main_window_header_button_icon").height
source: UM.Theme.getIcon("buildplate")
color: UM.Theme.getColor("text")
}
Label
{ {
id: buildplateLabel id: buildplateLabel
anchors.left: buildplateIcon.right source: UM.Theme.getIcon("buildplate")
anchors.verticalCenter: buildplateIcon.verticalCenter text: configuration.buildplateConfiguration.charAt(0).toUpperCase() + configuration.buildplateConfiguration.substr(1)
anchors.leftMargin: UM.Theme.getSize("narrow_margin").height anchors.left: parent.left
text: configuration.buildplateConfiguration
renderType: Text.NativeRendering
color: UM.Theme.getColor("text")
} }
} }
} }

4
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View file

@ -86,7 +86,7 @@ Cura.ExpandablePopup
{ {
text: model.material text: model.material
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -107,7 +107,7 @@ Cura.ExpandablePopup
{ {
text: catalog.i18nc("@label", "Select configuration") text: catalog.i18nc("@label", "Select configuration")
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
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("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("small_button_text") color: UM.Theme.getColor("small_button_text")
height: contentHeight height: contentHeight
renderType: Text.NativeRendering renderType: Text.NativeRendering

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

@ -39,7 +39,7 @@ Row
text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.name : " " //Use space so that the height is still correct. text: printCoreConfiguration.material.brand ? printCoreConfiguration.material.name : " " //Use space so that the height is still correct.
renderType: Text.NativeRendering renderType: Text.NativeRendering
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
} }
Label Label

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")
} }
} }

2
resources/qml/PrintSetupSelector/Custom/GlobalProfileSelector.qml
View file

@ -25,7 +25,7 @@ Item
right: globalProfileSelection.left right: globalProfileSelection.left
} }
text: catalog.i18nc("@label", "Profile") text: catalog.i18nc("@label", "Profile")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }

4
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -29,6 +29,7 @@ RowLayout
} }
return "" return ""
} }
font: UM.Theme.getFont("medium")
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -43,6 +44,7 @@ RowLayout
{ {
source: UM.Theme.getIcon("category_infill") source: UM.Theme.getIcon("category_infill")
text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
font: UM.Theme.getFont("medium")
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -57,6 +59,7 @@ RowLayout
{ {
source: UM.Theme.getIcon("category_support") source: UM.Theme.getIcon("category_support")
text: supportEnabled.properties.value == "True" ? enabledText : disabledText text: supportEnabled.properties.value == "True" ? enabledText : disabledText
font: UM.Theme.getFont("medium")
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -71,6 +74,7 @@ RowLayout
{ {
source: UM.Theme.getIcon("category_adhesion") source: UM.Theme.getIcon("category_adhesion")
text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
font: UM.Theme.getFont("medium")
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {

1
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
View file

@ -26,6 +26,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
source: UM.Theme.getIcon("category_adhesion") source: UM.Theme.getIcon("category_adhesion")
text: catalog.i18nc("@label", "Adhesion") text: catalog.i18nc("@label", "Adhesion")
font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
} }

2
resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml
View file

@ -63,6 +63,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
source: UM.Theme.getIcon("category_infill") source: UM.Theme.getIcon("category_infill")
text: catalog.i18nc("@label", "Infill") + " (%)" text: catalog.i18nc("@label", "Infill") + " (%)"
font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
} }
@ -140,6 +141,7 @@ Item
Label Label
{ {
text: index text: index
font: UM.Theme.getFont("default")
visible: (index % 20) == 0 // Only show steps of 20% visible: (index % 20) == 0 // Only show steps of 20%
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
y: UM.Theme.getSize("thin_margin").height y: UM.Theme.getSize("thin_margin").height

2
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -173,6 +173,7 @@ Item
id: qualityRowTitle id: qualityRowTitle
source: UM.Theme.getIcon("category_layer_height") source: UM.Theme.getIcon("category_layer_height")
text: catalog.i18nc("@label", "Layer Height") text: catalog.i18nc("@label", "Layer Height")
font: UM.Theme.getFont("medium")
anchors.left: parent.left anchors.left: parent.left
anchors.right: customisedSettings.left anchors.right: customisedSettings.left
} }
@ -271,6 +272,7 @@ Item
return Math.round((settingsColumnWidth / qualityModel.totalTicks) * index - (width / 2)) return Math.round((settingsColumnWidth / qualityModel.totalTicks) * index - (width / 2))
} }
} }
font: UM.Theme.getFont("default")
} }
} }
} }

1
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

@ -27,6 +27,7 @@ Item
visible: enableSupportCheckBox.visible visible: enableSupportCheckBox.visible
source: UM.Theme.getIcon("category_support") source: UM.Theme.getIcon("category_support")
text: catalog.i18nc("@label", "Support") text: catalog.i18nc("@label", "Support")
font: UM.Theme.getFont("medium")
width: labelColumnWidth width: labelColumnWidth
} }

3
resources/qml/PrintSetupTooltip.qml
View file

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

2
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

2
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

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/MachineSelectorList.qml
View file

@ -18,7 +18,7 @@ ListView
{ {
text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Preset printers") text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Preset printers")
width: parent.width width: parent.width
height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0 height: UM.Theme.getSize("action_button").height
leftPadding: UM.Theme.getSize("default_margin").width leftPadding: UM.Theme.getSize("default_margin").width
renderType: Text.NativeRendering renderType: Text.NativeRendering
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")

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("default") font: UM.Theme.getFont("medium_bold")
color: color:
{ {
if (!base.enabled) if (!base.enabled)

2
resources/qml/ToolTip.qml
View file

@ -25,7 +25,7 @@ ToolTip
text: "" text: ""
delay: 500 delay: 500
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
// If the text is not set, just set the height to 0 to prevent it from showing // If the text is not set, just set the height to 0 to prevent it from showing
height: text != "" ? label.contentHeight + 2 * UM.Theme.getSize("thin_margin").width: 0 height: text != "" ? label.contentHeight + 2 * UM.Theme.getSize("thin_margin").width: 0

4
resources/qml/ViewsSelector.qml
View file

@ -51,7 +51,7 @@ Cura.ExpandablePopup
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
height: parent.height height: parent.height
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text_medium") color: UM.Theme.getColor("text_medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -68,7 +68,7 @@ Cura.ExpandablePopup
} }
height: parent.height height: parent.height
elide: Text.ElideRight elide: Text.ElideRight
font: UM.Theme.getFont("default") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

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

@ -207,8 +207,8 @@ QtObject
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
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")
} }
} }

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

@ -6,17 +6,17 @@
"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": 63,
"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": {
@ -25,29 +25,24 @@
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default": { "default": {
"size": 1.0, "size": 0.95,
"weight": 50, "weight": 40,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_bold": { "default_bold": {
"size": 1.0, "size": 0.95,
"weight": 63, "weight": 63,
"family": "Noto Sans" "family": "Noto Sans"
}, },
"default_italic": { "default_italic": {
"size": 1.0, "size": 0.95,
"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" "family": "Noto Sans"
} }
}, },
@ -302,7 +297,7 @@
"printer_config_mismatch": [127, 127, 127, 255], "printer_config_mismatch": [127, 127, 127, 255],
"toolbox_header_button_text_active": [0, 0, 0, 255], "toolbox_header_button_text_active": [0, 0, 0, 255],
"toolbox_header_button_text_inactive": [128, 128, 128, 255], "toolbox_header_button_text_inactive": [0, 0, 0, 255],
"toolbox_header_button_text_hovered": [0, 0, 0, 255], "toolbox_header_button_text_hovered": [0, 0, 0, 255],
"favorites_header_bar": [245, 245, 245, 255], "favorites_header_bar": [245, 245, 245, 255],
@ -491,7 +486,7 @@
"toolbox_detail_header": [1.0, 14.0], "toolbox_detail_header": [1.0, 14.0],
"toolbox_detail_tile": [1.0, 8.0], "toolbox_detail_tile": [1.0, 8.0],
"toolbox_back_column": [6.0, 1.0], "toolbox_back_column": [6.0, 1.0],
"toolbox_back_button": [4.0, 2.0], "toolbox_back_button": [6.0, 2.0],
"toolbox_installed_tile": [1.0, 8.0], "toolbox_installed_tile": [1.0, 8.0],
"toolbox_property_label": [1.0, 2.0], "toolbox_property_label": [1.0, 2.0],
"toolbox_heading_label": [1.0, 3.8], "toolbox_heading_label": [1.0, 3.8],