3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add missing theme-ing to cloud first run screen

Browse source 
CURA-7627
This commit is contained in:
Jaime van Kessel 2020-08-03 15:38:20 +02:00
parent 6050d042f4
commit d8427b4109
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

71
resources/qml/WelcomePages/AddCloudPrintersView.qml
View file

@ -23,7 +23,7 @@ Item
property var discoveredCloudPrintersModel: CuraApplication.getDiscoveredCloudPrintersModel() property var discoveredCloudPrintersModel: CuraApplication.getDiscoveredCloudPrintersModel()
// The area where either the discoveredCloudPrintersScrollView or the busyIndicator will be displayed // The area where either the discoveredCloudPrintersScrollView or the busyIndicator will be displayed
Rectangle Item
{ {
id: cloudPrintersContent id: cloudPrintersContent
width: parent.width width: parent.width
@ -73,6 +73,7 @@ Item
text: catalog.i18nc("@label", "Waiting for Cloud response") text: catalog.i18nc("@label", "Waiting for Cloud response")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: UM.Theme.getColor("text")
} }
Label Label
{ {
@ -83,6 +84,7 @@ Item
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: catalog.i18nc("@label", "No printers found in your account?") text: catalog.i18nc("@label", "No printers found in your account?")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
} }
Label Label
{ {
@ -118,6 +120,7 @@ Item
text: catalog.i18nc("@label", "The following printers in your account have been added in Cura:") text: catalog.i18nc("@label", "The following printers in your account have been added in Cura:")
height: contentHeight + 2 * UM.Theme.getSize("default_margin").height height: contentHeight + 2 * UM.Theme.getSize("default_margin").height
visible: discoveredCloudPrintersModel.count > 0 visible: discoveredCloudPrintersModel.count > 0
color: UM.Theme.getColor("text")
} }
// The scrollView that contains the list of newly discovered Ultimaker Cloud printers. Visible only when // The scrollView that contains the list of newly discovered Ultimaker Cloud printers. Visible only when
@ -150,43 +153,43 @@ Item
id: discoveredCloudPrintersRepeater id: discoveredCloudPrintersRepeater
model: discoveredCloudPrintersModel model: discoveredCloudPrintersModel
delegate: Item delegate: Item
{ {
width: discoveredCloudPrintersScrollView.width width: discoveredCloudPrintersScrollView.width
height: contentColumn.height height: contentColumn.height
Column Column
{
id: contentColumn
Label
{ {
id: contentColumn id: cloudPrinterNameLabel
Label leftPadding: UM.Theme.getSize("default_margin").width
{ text: model.name
id: cloudPrinterNameLabel font: UM.Theme.getFont("large_bold")
leftPadding: UM.Theme.getSize("default_margin").width color: UM.Theme.getColor("text")
text: model.name elide: Text.ElideRight
font: UM.Theme.getFont("large_bold") }
color: UM.Theme.getColor("text") Label
elide: Text.ElideRight {
} id: cloudPrinterTypeLabel
Label leftPadding: 2 * UM.Theme.getSize("default_margin").width
{ topPadding: UM.Theme.getSize("thin_margin").height
id: cloudPrinterTypeLabel text: {"Type: " + model.machine_type}
leftPadding: 2 * UM.Theme.getSize("default_margin").width font: UM.Theme.getFont("medium")
topPadding: UM.Theme.getSize("thin_margin").height color: UM.Theme.getColor("text")
text: {"Type: " + model.machine_type} elide: Text.ElideRight
font: UM.Theme.getFont("medium") }
color: UM.Theme.getColor("text") Label
elide: Text.ElideRight {
} id: cloudPrinterFirmwareVersionLabel
Label leftPadding: 2 * UM.Theme.getSize("default_margin").width
{ text: {"Firmware version: " + model.firmware_version}
id: cloudPrinterFirmwareVersionLabel font: UM.Theme.getFont("medium")
leftPadding: 2 * UM.Theme.getSize("default_margin").width color: UM.Theme.getColor("text")
text: {"Firmware version: " + model.firmware_version} elide: Text.ElideRight
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
} }
} }
}
} }
} }
} }