summaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qml/Settings.qml
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2017-10-12 14:25:22 +0200
committerGravatar Jan Mulder <jlmulder@xs4all.nl>2017-10-17 15:32:27 +0200
commitd623eccdefa8f19da76bd853ec16cba108aa37d1 (patch)
tree4e222c2845567b2f3c83836c1f34085bf20f627f /mobile-widgets/qml/Settings.qml
parentf7da06c76bfab30fb21224955626ba74095251ba (diff)
downloadsubsurface-d623eccdefa8f19da76bd853ec16cba108aa37d1.tar.gz
mobile: silence deprecated messages in logging about Kirigami.Label
Commit 8f6827ab122 brought a new SHA for Kirigami, but that introduces a very noisy logging of "Kirigami.Label is deprecated. Use QtQuickControls2.Label instead". So, thats what done here. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'mobile-widgets/qml/Settings.qml')
-rw-r--r--mobile-widgets/qml/Settings.qml28
1 files changed, 14 insertions, 14 deletions
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index c66226169..34041246c 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
import QtQuick 2.3
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
@@ -34,13 +34,13 @@ Kirigami.ScrollablePage {
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Email")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: gridWidth * 0.15
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
}
- Kirigami.Label {
+ Controls.Label {
text: manager.credentialStatus === QMLManager.CS_NOCLOUD ? qsTr("Not applicable") : manager.cloudUserName
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: gridWidth * 0.60
@@ -55,13 +55,13 @@ Kirigami.ScrollablePage {
rootItem.returnTopPage()
}
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Status")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: gridWidth * 0.15
Layout.preferredHeight: Kirigami.Units.gridUnit * 2
}
- Kirigami.Label {
+ Controls.Label {
text: describe[manager.credentialStatus]
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: gridWidth * 0.60
@@ -88,7 +88,7 @@ Kirigami.ScrollablePage {
Layout.bottomMargin: Kirigami.Units.largeSpacing / 2
Layout.columnSpan: 3
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Blue")
color: subsurfaceTheme.textColor
rightPadding: Kirigami.Units.gridUnit
@@ -140,7 +140,7 @@ Kirigami.ScrollablePage {
}
}
- Kirigami.Label {
+ Controls.Label {
id: pinkLabel
text: qsTr("Pink")
rightPadding: Kirigami.Units.gridUnit
@@ -193,7 +193,7 @@ Kirigami.ScrollablePage {
}
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Dark")
color: subsurfaceTheme.textColor
rightPadding: Kirigami.Units.gridUnit
@@ -266,13 +266,13 @@ Kirigami.ScrollablePage {
Layout.columnSpan: 2
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Distance threshold (meters)")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: gridWidth * 0.75
}
- TextField {
+ Controls.TextField {
id: distanceThreshold
text: manager.distanceThreshold
Layout.preferredWidth: gridWidth * 0.25
@@ -282,13 +282,13 @@ Kirigami.ScrollablePage {
}
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Time threshold (minutes)")
Layout.alignment: Qt.AlignRight
Layout.preferredWidth: gridWidth * 0.75
}
- TextField {
+ Controls.TextField {
id: timeThreshold
text: manager.timeThreshold
Layout.preferredWidth: gridWidth * 0.25
@@ -318,7 +318,7 @@ Kirigami.ScrollablePage {
Layout.columnSpan: 2
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Save detailed log")
Layout.preferredWidth: gridWidth * 0.75
}
@@ -350,7 +350,7 @@ Kirigami.ScrollablePage {
Layout.columnSpan: 2
}
- Kirigami.Label {
+ Controls.Label {
text: qsTr("Display Developer menu")
Layout.preferredWidth: gridWidth * 0.75
}