Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2020-08-04 14:30:39 +0300
committerJaime van Kessel <nallath@gmail.com>2020-08-04 14:30:39 +0300
commitaf9a078d414fbb8ea6814a82b68348ef8b7e4bc9 (patch)
tree299bb6d0850c9dd074ea8c2465aa3053ff197bb7 /resources
parent955b2950e81fbd58b4b69c5a284486127c2e85ba (diff)
parent949837f04160172d7e9d34d9673799247286ece3 (diff)
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/WelcomePages/AddCloudPrintersView.qml1
-rw-r--r--resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml1
2 files changed, 2 insertions, 0 deletions
diff --git a/resources/qml/WelcomePages/AddCloudPrintersView.qml b/resources/qml/WelcomePages/AddCloudPrintersView.qml
index 14ce694615..32e6ffec39 100644
--- a/resources/qml/WelcomePages/AddCloudPrintersView.qml
+++ b/resources/qml/WelcomePages/AddCloudPrintersView.qml
@@ -63,6 +63,7 @@ Item
id: waitingIndicator
anchors.horizontalCenter: parent.horizontalCenter
running: searchingForCloudPrinters
+ palette.dark: UM.Theme.getColor("text")
}
Label
{
diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
index af60c9c723..9d79c421bd 100644
--- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
+++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml
@@ -41,6 +41,7 @@ Item
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label", "There is no printer found over your network.")
+ color: UM.Theme.getColor("text")
renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter
visible: networkPrinterListView.count == 0 // Do not show if there are discovered devices.