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

Fix theming

Browse source 
CURA-6435
This commit is contained in:
Lipu Fei 2019-04-17 08:41:13 +02:00
parent 9b603d1f4b
commit 904a8ab26c
19 changed files with 81 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
View file

@ -57,6 +57,7 @@ Item
{ {
text: catalog.i18nc("@title:label", "Printer Settings") text: catalog.i18nc("@title:label", "Printer Settings")
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -172,6 +173,7 @@ Item
{ {
text: catalog.i18nc("@title:label", "Printhead Settings") text: catalog.i18nc("@title:label", "Printhead Settings")
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

7
plugins/UltimakerMachineActions/BedLevelMachineAction.qml
View file

@ -29,7 +29,8 @@ Cura.MachineAction
width: parent.width width: parent.width
text: catalog.i18nc("@title", "Build Plate Leveling") text: catalog.i18nc("@title", "Build Plate Leveling")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pointSize: 18 font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -41,6 +42,8 @@ Cura.MachineAction
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.") text: catalog.i18nc("@label", "To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -52,6 +55,8 @@ Cura.MachineAction
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.") text: catalog.i18nc("@label", "For every position; insert a piece of paper under the nozzle and adjust the print build plate height. The print build plate height is right when the paper is slightly gripped by the tip of the nozzle.")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

1
plugins/UltimakerMachineActions/UM2UpgradeSelectionMachineAction.qml
View file

@ -29,6 +29,7 @@ Cura.MachineAction
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label", "Please select any upgrades made to this Ultimaker 2.") text: catalog.i18nc("@label", "Please select any upgrades made to this Ultimaker 2.")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

1
plugins/UltimakerMachineActions/UMOUpgradeSelectionMachineAction.qml
View file

@ -29,6 +29,7 @@ Cura.MachineAction
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original") text: catalog.i18nc("@label","Please select any upgrades made to this Ultimaker Original")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

1
resources/qml/MachineSettings/ComboBoxWithOptions.qml
View file

@ -59,6 +59,7 @@ UM.TooltipArea
anchors.verticalCenter: comboBox.verticalCenter anchors.verticalCenter: comboBox.verticalCenter
visible: text != "" visible: text != ""
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

6
resources/qml/MachineSettings/GcodeTextArea.qml
View file

@ -41,6 +41,7 @@ UM.TooltipArea
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -59,13 +60,16 @@ UM.TooltipArea
hoverEnabled: true hoverEnabled: true
selectByMouse: true selectByMouse: true
text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
font: UM.Theme.getFont("fixed") font: UM.Theme.getFont("fixed")
renderType: Text.NativeRendering renderType: Text.NativeRendering
text: (propertyProvider.properties.value) ? propertyProvider.properties.value : "" color: UM.Theme.getColor("text")
wrapMode: TextEdit.NoWrap wrapMode: TextEdit.NoWrap
background: Rectangle background: Rectangle
{ {
color: UM.Theme.getColor("main_background")
border.color: border.color:
{ {
if (!gcodeTextArea.enabled) if (!gcodeTextArea.enabled)

2
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View file

@ -66,6 +66,7 @@ UM.TooltipArea
anchors.verticalCenter: textFieldWithUnit.verticalCenter anchors.verticalCenter: textFieldWithUnit.verticalCenter
visible: text != "" visible: text != ""
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
@ -135,6 +136,7 @@ UM.TooltipArea
hoverEnabled: true hoverEnabled: true
selectByMouse: true selectByMouse: true
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
// When the textbox gets focused by TAB, select all text // When the textbox gets focused by TAB, select all text

1
resources/qml/MachineSettings/SimpleCheckBox.qml
View file

@ -53,6 +53,7 @@ UM.TooltipArea
anchors.verticalCenter: checkBox.verticalCenter anchors.verticalCenter: checkBox.verticalCenter
visible: text != "" visible: text != ""
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

2
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -142,6 +142,7 @@ Item
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
text: button.text text: button.text
font: UM.Theme.getFont("default_bold") font: UM.Theme.getFont("default_bold")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }
@ -203,6 +204,7 @@ Item
text: catalog.i18nc("@label", "Printer name") text: catalog.i18nc("@label", "Printer name")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

54
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -61,6 +61,7 @@ Item
anchors.top: parent.top anchors.top: parent.top
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.") text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.")
} }
@ -129,6 +130,7 @@ Item
anchors.top: parent.top anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
visible: visible:
@ -162,6 +164,7 @@ Item
id: printerNameLabel id: printerNameLabel
anchors.top: parent.top anchors.top: parent.top
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
text: "???" text: "???"
@ -175,14 +178,53 @@ Item
columns: 2 columns: 2
columnSpacing: UM.Theme.getSize("default_margin").width columnSpacing: UM.Theme.getSize("default_margin").width
Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Type"); renderType: Text.NativeRendering } Label
Label { id: typeText; font: UM.Theme.getFont("default"); text: "?"; renderType: Text.NativeRendering } {
text: catalog.i18nc("@label", "Type")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Label
{
id: typeText
text: "?"
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Firmware version"); renderType: Text.NativeRendering } Label
Label { id: firmwareText; font: UM.Theme.getFont("default"); text: "0.0.0.0"; renderType: Text.NativeRendering } {
text: catalog.i18nc("@label", "Firmware version")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Label
{
id: firmwareText
text: "0.0.0.0"
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Address"); renderType: Text.NativeRendering } Label
Label { id: addressText; font: UM.Theme.getFont("default"); text: "0.0.0.0"; renderType: Text.NativeRendering } {
text: catalog.i18nc("@label", "Address")
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Label
{
id: addressText
text: "0.0.0.0"
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
}
Connections Connections
{ {

2
resources/qml/WelcomePages/CloudContent.qml
View file

@ -52,7 +52,6 @@ Item
topMargin: UM.Theme.getSize("default_margin").height topMargin: UM.Theme.getSize("default_margin").height
} }
// Pictures and texts are arranged using Columns with spacing. The whole picture and text area is centered in // Pictures and texts are arranged using Columns with spacing. The whole picture and text area is centered in
// the cloud contents area. // the cloud contents area.
Column Column
@ -105,6 +104,7 @@ Item
} }
textFormat: Text.RichText textFormat: Text.RichText
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }

1
resources/qml/WelcomePages/DataCollectionsContent.qml
View file

@ -71,6 +71,7 @@ Item
textFormat: Text.RichText textFormat: Text.RichText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
MouseArea MouseArea

2
resources/qml/WelcomePages/DropDownHeader.qml
View file

@ -21,7 +21,7 @@ Cura.RoundedRectangle
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
color: hovered ? UM.Theme.getColor("secondary_button_hover") : UM.Theme.getColor("secondary_button") color: UM.Theme.getColor("secondary")
radius: UM.Theme.getSize("default_radius").width radius: UM.Theme.getSize("default_radius").width
cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All cornerSide: contentShown ? Cura.RoundedRectangle.Direction.Up : Cura.RoundedRectangle.Direction.All

1
resources/qml/WelcomePages/UserAgreementContent.qml
View file

@ -44,6 +44,7 @@ Item
textFormat: Text.RichText textFormat: Text.RichText
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

1
resources/qml/WelcomePages/WelcomeContent.qml
View file

@ -46,6 +46,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@text", "Please follow these steps to set up\nUltimaker Cura. This will only take a few moments.") text: catalog.i18nc("@text", "Please follow these steps to set up\nUltimaker Cura. This will only take a few moments.")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }

1
resources/qml/Widgets/CheckBox.qml
View file

@ -70,6 +70,7 @@ CheckBox
leftPadding: control.indicator.width + control.spacing leftPadding: control.indicator.width + control.spacing
text: control.text text: control.text
font: control.font font: control.font
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }

1
resources/qml/Widgets/RadioButton.qml
View file

@ -49,6 +49,7 @@ RadioButton
leftPadding: radioButton.indicator.width + radioButton.spacing leftPadding: radioButton.indicator.width + radioButton.spacing
text: radioButton.text text: radioButton.text
font: radioButton.font font: radioButton.font
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
} }

2
resources/qml/Widgets/ScrollableTextArea.qml
View file

@ -19,6 +19,7 @@ ScrollView
background: Rectangle // Border background: Rectangle // Border
{ {
color: UM.Theme.getColor("main_background")
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
} }
@ -27,6 +28,7 @@ ScrollView
{ {
id: _textArea id: _textArea
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
textFormat: TextEdit.PlainText textFormat: TextEdit.PlainText
renderType: Text.NativeRendering renderType: Text.NativeRendering
selectByMouse: true selectByMouse: true

3
resources/qml/Widgets/TextField.qml
View file

@ -20,6 +20,7 @@ TextField
hoverEnabled: true hoverEnabled: true
selectByMouse: true selectByMouse: true
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
states: [ states: [
@ -49,6 +50,8 @@ TextField
{ {
id: backgroundRectangle id: backgroundRectangle
color: UM.Theme.getColor("main_background")
anchors.margins: Math.round(UM.Theme.getSize("default_lining").width) anchors.margins: Math.round(UM.Theme.getSize("default_lining").width)
radius: UM.Theme.getSize("setting_control_radius").width radius: UM.Theme.getSize("setting_control_radius").width