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:
Diffstat (limited to 'resources/qml/Settings/SettingItem.qml')
-rw-r--r--resources/qml/Settings/SettingItem.qml15
1 files changed, 10 insertions, 5 deletions
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index 6787855775..228de4a9d6 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -5,7 +5,7 @@ import QtQuick 2.7
import QtQuick.Layouts 1.2
import QtQuick.Controls 2.0
-import UM 1.1 as UM
+import UM 1.5 as UM
import Cura 1.0 as Cura
import "."
@@ -62,13 +62,19 @@ Item
var affected_by_list = ""
for (var i in affected_by)
{
- affected_by_list += "<li>%1</li>\n".arg(affected_by[i].label)
+ if(affected_by[i].label != "")
+ {
+ affected_by_list += "<li>%1</li>\n".arg(affected_by[i].label)
+ }
}
var affects_list = ""
for (var i in affects)
{
- affects_list += "<li>%1</li>\n".arg(affects[i].label)
+ if(affects[i].label != "")
+ {
+ affects_list += "<li>%1</li>\n".arg(affects[i].label)
+ }
}
var tooltip = "<b>%1</b>\n<p>%2</p>".arg(definition.label).arg(definition.description)
@@ -129,7 +135,7 @@ Item
}
}
- Label
+ UM.Label
{
id: label
@@ -140,7 +146,6 @@ Item
text: definition.label
elide: Text.ElideMiddle
- renderType: Text.NativeRendering
textFormat: Text.PlainText
color: UM.Theme.getColor("setting_control_text")