port these as well to mobilecomponents

Signed-off-by: Sebastian Kügler <sebas@kde.org>

3 files changed, 51 insertions, 52 deletions

diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml
index 4f147bf6d..2a9c53de6 100644
--- a/qt-mobile/qml/DiveList.qml
+++ b/qt-mobile/qml/DiveList.qml
@@ -1,9 +1,10 @@
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
 import QtQuick.Dialogs 1.2
+import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
 import org.subsurfacedivelog.mobile 1.0
-import QtQuick.Layouts 1.0
 
 Rectangle {
 	id: page
@@ -16,7 +17,7 @@ Rectangle {
 
 			property real detailsOpacity : 0
 
-			width: diveListView.width - units.smallSpacing
+			width: diveListView.width - MobileComponents.Units.smallSpacing
 			height: childrenRect.height
 
 			//Mouse region: When clicked, the mode changes to details view
@@ -41,17 +42,17 @@ Rectangle {
 			//Layout of the page: (mini profile, dive no, date at the top
 			//And other details at the bottom.
 			Item {
-				x: units.smallSpacing
-				width: parent.width - units.smallSpacing * 2
-				height: childrenRect.height + units.smallSpacing * 2
-				//spacing: units.smallSpacing / 2
-				anchors.margins: units.smallSpacing
+				x: MobileComponents.Units.smallSpacing
+				width: parent.width - MobileComponents.Units.smallSpacing * 2
+				height: childrenRect.height + MobileComponents.Units.smallSpacing * 2
+				//spacing: MobileComponents.Units.smallSpacing / 2
+				anchors.margins: MobileComponents.Units.smallSpacing
 
 				Text {
 					id: locationText
 					text: location
-					color: theme.textColor
-					//font.pointSize: Math.round(units.fontMetrics.pointSize * 1.2) // why this doesn't work is a mystery to me, so ...
+					color: MobileComponents.Theme.textColor
+					//font.pointSize: Math.round(MobileComponents.Units.fontMetrics.pointSize * 1.2) // why this doesn't work is a mystery to me, so ...
 					scale: 1.2 // Let's see how this works, otherwise, we'll need the default point size somewhere
 					transformOrigin: Item.TopLeft
 					elide: Text.ElideRight
@@ -66,12 +67,12 @@ Rectangle {
 					id: dateLabel
 					text: date
 					opacity: 0.6
-					color: theme.textColor
-					font.pointSize: units.smallPointSize
+					color: MobileComponents.Theme.textColor
+					font.pointSize: smallPointSize
 					anchors {
 						right: parent.right
 						top: parent.top
-						bottomMargin: units.smallSpacing / 2
+						bottomMargin: MobileComponents.Units.smallSpacing / 2
 					}
 				}
 				Row {
@@ -84,41 +85,41 @@ Rectangle {
 					Text {
 						text: 'Depth: '
 						opacity: 0.6
-						color: theme.textColor
+						color: MobileComponents.Theme.textColor
 					}
 					Text {
 						text: depth
-						width: Math.max(units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview
-						color: theme.textColor
+						width: Math.max(MobileComponents.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview
+						color: MobileComponents.Theme.textColor
 					}
 					Text {
 						text: 'Duration: '
 						opacity: 0.6
-						color: theme.textColor
+						color: MobileComponents.Theme.textColor
 					}
 					Text {
 						text: duration
-						color: theme.textColor
+						color: MobileComponents.Theme.textColor
 					}
 				}
 				Text {
 					id: numberText
 					text: "#" + diveNumber
-					color: theme.textColor
+					color: MobileComponents.Theme.textColor
 					scale: 1.2
 					transformOrigin: Item.BottomRight
 					opacity: 0.4
 					anchors {
 						right: parent.right
-						topMargin: units.smallSpacing
+						topMargin: MobileComponents.Units.smallSpacing
 						top: locationText.bottom
 					}
 				}
 				//Text { text: location; width: parent.width }
 				Rectangle {
-					color: theme.textColor
+					color: MobileComponents.Theme.textColor
 					opacity: .2
-					height: Math.max(1, units.gridUnit / 24) // we really want a thin line
+					height: Math.max(1, MobileComponents.Units.gridUnit / 24) // we really want a thin line
 					anchors {
 						left: parent.left
 						right: parent.right
@@ -132,8 +133,8 @@ Rectangle {
 	Component {
 		id: tripHeading
 		Item {
-			width: page.width - units.smallSpacing * 2
-			height: childrenRect.height + units.smallSpacing * 2
+			width: page.width - MobileComponents.Units.smallSpacing * 2
+			height: childrenRect.height + MobileComponents.Units.smallSpacing * 2
 
 			Text {
 				id: sectionText
@@ -141,21 +142,21 @@ Rectangle {
 				anchors {
 					top: parent.top
 					left: parent.left
-					leftMargin: units.smallSpacing
+					leftMargin: MobileComponents.Units.smallSpacing
 					right: parent.right
 				}
-				color: theme.textColor
+				color: MobileComponents.Theme.textColor
 				font.pointSize: 16
 			}
 			Rectangle {
-				height: Math.max(2, units.gridUnit / 12) // we want a thicker line
+				height: Math.max(2, MobileComponents.Units.gridUnit / 12) // we want a thicker line
 				anchors {
 					top: sectionText.bottom
 					left: parent.left
-					leftMargin: units.smallSpacing
+					leftMargin: MobileComponents.Units.smallSpacing
 					right: parent.right
 				}
-				color: theme.accentColor
+				color: MobileComponents.Theme.accentColor
 			}
 		}
 	}
@@ -166,7 +167,7 @@ Rectangle {
 		model: diveModel
 		delegate: diveDelegate
 		boundsBehavior: Flickable.StopAtBounds
-		//highlight: Rectangle { color: theme.highlightColor; width: units.smallSpacing }
+		//highlight: Rectangle { color: MobileComponents.Theme.highlightColor; width: MobileComponents.Units.smallSpacing }
 		focus: true
 		clip: true
 		section.property: "trip"
@@ -177,7 +178,7 @@ Rectangle {
 		anchors.fill: parent
 		opacity: (diveListView.count == 0) ? 1.0 : 0
 		visible: opacity > 0
-		Behavior on opacity { NumberAnimation { duration: units.shortDuration } }
+		Behavior on opacity { NumberAnimation { duration: MobileComponents.Units.shortDuration } }
 		Component.onCompleted: {
 			print("diveListView.count " + diveListView.count);
 		}
diff --git a/qt-mobile/qml/ThemeTest.qml b/qt-mobile/qml/ThemeTest.qml
index 7452acc1b..b65bc9eef 100644
--- a/qt-mobile/qml/ThemeTest.qml
+++ b/qt-mobile/qml/ThemeTest.qml
@@ -1,11 +1,12 @@
 import QtQuick 2.5
 import QtQuick.Layouts 1.1
+import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
 
 GridLayout {
 	id: themetest
 	columns: 2
 
-	Label {
+	MobileComponents.Label {
 		Layout.columnSpan: 2
 		Layout.fillHeight: true
 		text: "Theme Information"
@@ -15,39 +16,39 @@ GridLayout {
 		id: fm
 	}
 
-	Label {
-		text: "units.gridUnit:"
+	MobileComponents.Label {
+		text: "MobileComponents.Units.gridUnit:"
 	}
-	Label {
-		text: units.gridUnit
+	MobileComponents.Label {
+		text: MobileComponents.Units.gridUnit
 	}
 
-	Label {
-		text: "units.devicePixelRatio:"
+	MobileComponents.Label {
+		text: "MobileComponents.Units.devicePixelRatio:"
 	}
-	Label {
-		text: units.devicePixelRatio
+	MobileComponents.Label {
+		text: MobileComponents.Units.devicePixelRatio
 	}
 
-	Label {
+	MobileComponents.Label {
 		text: "FontMetrics pointSize:"
 	}
-	Label {
+	MobileComponents.Label {
 		text: fm.font.pointSize
 	}
 
-	Label {
+	MobileComponents.Label {
 		text: "FontMetrics pixelSize:"
 	}
-	Label {
+	MobileComponents.Label {
 		text: fm.height
 
 	}
 
-	Label {
+	MobileComponents.Label {
 		text: "hand-computed devicePixelRatio:"
 	}
-	Label {
+	MobileComponents.Label {
 		text: fm.height / fm.font.pointSize
 	}
 
@@ -65,7 +66,7 @@ GridLayout {
 		text: font.pointSize
 	}
 
-	Label {
+	MobileComponents.Label {
 		Layout.columnSpan: 2
 		Layout.fillHeight: true
 	}
diff --git a/qt-mobile/qml/components/Label.qml b/qt-mobile/qml/components/Label.qml
index acbc079e2..65af7e0db 100644
--- a/qt-mobile/qml/components/Label.qml
+++ b/qt-mobile/qml/components/Label.qml
@@ -1,9 +1,6 @@
 import QtQuick 2.5
-//import QtQuick.Controls 1.2 as QuickControls
-import QtQuick.Window 2.2
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.1
+import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
 
 Text {
-	color: theme.textColor
+	color: MobileComponents.Theme.textColor
 }