QML-UI: use our styled elements

This gets us consistent look and feel as otherwise the labels aren't styled the
same as for the rest of the application.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 22 insertions, 16 deletions

diff --git a/qt-mobile/qml/CloudCredentials.qml b/qt-mobile/qml/CloudCredentials.qml
index bada5c04d..fafa26091 100644
--- a/qt-mobile/qml/CloudCredentials.qml
+++ b/qt-mobile/qml/CloudCredentials.qml
@@ -24,7 +24,7 @@ Item {
 			Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2
 		}
 
-		Label {
+		MobileComponents.Label {
 			text: "Email"
 		}
 
@@ -34,7 +34,7 @@ Item {
 			Layout.fillWidth: true
 		}
 
-		Label {
+		MobileComponents.Label {
 			text: "Password"
 		}
 
@@ -44,22 +44,28 @@ Item {
 			echoMode: TextInput.Password
 			Layout.fillWidth: true
 		}
+		GridLayout {
+			columns: 2
 
-		CheckBox {
-			text: "Show password"
-			checked: false
-			id: showPassword
-			onCheckedChanged: {
-				password.echoMode = checked ? TextInput.Normal : TextInput.Password
+			CheckBox {
+				checked: false
+				id: showPassword
+				onCheckedChanged: {
+					password.echoMode = checked ? TextInput.Normal : TextInput.Password
+				}
+			}
+			MobileComponents.Label {
+				text: "Show password"
 			}
-		}
 
-		CheckBox {
-			text: "Remember"
-			checked: manager.saveCloudPassword
-			id: savePassword
+			CheckBox {
+				checked: manager.saveCloudPassword
+				id: savePassword
+			}
+			MobileComponents.Label {
+				text: "Remember"
+			}
 		}
-
 		Item { width: MobileComponents.Units.gridUnit; height: width }
 		Item {
 			height: saveButton.height
diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml
index de70d17b0..df06c42e7 100644
--- a/qt-mobile/qml/Preferences.qml
+++ b/qt-mobile/qml/Preferences.qml
@@ -29,7 +29,7 @@ Item {
 			Layout.columnSpan: 2
 		}
 
-		Label {
+		MobileComponents.Label {
 			text: "Distance threshold (meters)"
 			Layout.alignment: Qt.AlignRight
 		}
@@ -40,7 +40,7 @@ Item {
 			Layout.fillWidth: true
 		}
 
-		Label {
+		MobileComponents.Label {
 			text: "Time threshold (minutes)"
 			Layout.alignment: Qt.AlignRight
 		}