From ab44c789939fc4472dfc8106b9cb5f709cbe7e1c Mon Sep 17 00:00:00 2001
From: Grace Karanja <gracie.karanja89@gmail.com>
Date: Tue, 21 Jul 2015 15:00:29 +0300
Subject: QML UI: Move DiveDetails to the StackView

Add a DiveDetails.qml to hold the dive details, and display it in
the stack view when the user taps on a dive.

Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
---
 qt-mobile/mobile-resources.qrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'qt-mobile/mobile-resources.qrc')

diff --git a/qt-mobile/mobile-resources.qrc b/qt-mobile/mobile-resources.qrc
index d0fe06701..a82976eb0 100644
--- a/qt-mobile/mobile-resources.qrc
+++ b/qt-mobile/mobile-resources.qrc
@@ -4,5 +4,6 @@
         <file>TextButton.qml</file>
         <file>Preferences.qml</file>
         <file>DiveList.qml</file>
+        <file>DiveDetails.qml</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3-70-g09d2


From e93bb9230f19a054888fc6db09f3757412ab7cc5 Mon Sep 17 00:00:00 2001
From: Grace Karanja <gracie.karanja89@gmail.com>
Date: Thu, 23 Jul 2015 14:46:02 +0300
Subject: QML UI: Add download from divecomputer window

Add a window to be used when downloading from dive computers.

Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
---
 qt-mobile/DownloadFromDiveComputer.qml | 97 ++++++++++++++++++++++++++++++++++
 qt-mobile/main.qml                     | 15 ++++++
 qt-mobile/mobile-resources.qrc         |  1 +
 3 files changed, 113 insertions(+)
 create mode 100644 qt-mobile/DownloadFromDiveComputer.qml

(limited to 'qt-mobile/mobile-resources.qrc')

diff --git a/qt-mobile/DownloadFromDiveComputer.qml b/qt-mobile/DownloadFromDiveComputer.qml
new file mode 100644
index 000000000..d23754407
--- /dev/null
+++ b/qt-mobile/DownloadFromDiveComputer.qml
@@ -0,0 +1,97 @@
+import QtQuick 2.3
+import QtQuick.Controls 1.2
+import QtQuick.Window 2.2
+import QtQuick.Dialogs 1.2
+import QtQuick.Layouts 1.1
+import org.subsurfacedivelog.mobile 1.0
+
+Item {
+	id: diveComputerDownloadWindow
+	anchors.top: parent.top
+	width: parent.width
+	height: parent.height
+
+	GridLayout {
+		columns: 2
+		anchors.top: parent.top
+		width: parent.width
+		height: parent.height
+		ColumnLayout {
+			height: parent.height
+			width: parent.width
+			ColumnLayout {
+				width: parent.width
+				Layout.fillHeight: true
+				ColumnLayout {
+					Layout.fillHeight: true
+					Layout.fillWidth: true
+					ColumnLayout {
+						height: parent.height
+						Layout.fillWidth: true
+						Text { text: "Vendor" }
+						ComboBox { Layout.fillWidth: true }
+						Text { text: "Dive Computer" }
+						ComboBox { Layout.fillWidth: true }
+						Text { text: "Device or mount point" }
+						RowLayout {
+							Layout.fillWidth: true
+							TextField { Layout.fillWidth: true }
+							Button { text: "..." }
+						}
+						GridLayout {
+							columns: 2
+							CheckBox { text: "Force download of all dives" }
+							CheckBox { text: "Always prefer downloaded dives" }
+							CheckBox { text: "Download into new trip" }
+							CheckBox { text: "Save libdivecomputer logfile" }
+							CheckBox { text: "Save libdivecomputer dumpfile" }
+							CheckBox { text: "Choose Bluetooth download mode" }
+						}
+
+						RowLayout {
+							Layout.fillWidth: true
+							ProgressBar { Layout.fillWidth: true }
+							Button { text: "Download" }
+						}
+					}
+				}
+				ColumnLayout {
+					height: parent.height
+					Layout.fillWidth: true
+					RowLayout {
+						Text {
+							text: "Downloaded dives"
+						}
+						Button {
+							text: "Select All"
+						}
+						Button {
+							text: "Unselect All"
+						}
+					}
+					TableView {
+						Layout.fillWidth: true
+						Layout.fillHeight: true
+					}
+				}
+			}
+			RowLayout {
+				width: parent.width
+				Button {
+					text: "OK"
+
+					onClicked: {
+						stackView.pop();
+					}
+				}
+				Button {
+					text: "Cancel"
+
+					onClicked: {
+						stackView.pop();
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/qt-mobile/main.qml b/qt-mobile/main.qml
index adceb9a02..9553197b6 100644
--- a/qt-mobile/main.qml
+++ b/qt-mobile/main.qml
@@ -55,6 +55,16 @@ ApplicationWindow {
 							}
 						}
 
+						Button {
+							id: downloadDivesButton
+							text: "Download Dives"
+							onClicked: {
+								downloadDivesWindow.height = parent.height
+								downloadDivesWindow.width = parent.width
+								stackView.push(downloadDivesWindow)
+							}
+						}
+
 						Button {
 							id: saveChanges
 							text: "Save Changes"
@@ -108,4 +118,9 @@ ApplicationWindow {
 		id: detailsWindow
 		visible: false
 	}
+
+	DownloadFromDiveComputer {
+		id: downloadDivesWindow
+		visible: false
+	}
 }
diff --git a/qt-mobile/mobile-resources.qrc b/qt-mobile/mobile-resources.qrc
index a82976eb0..969f727d9 100644
--- a/qt-mobile/mobile-resources.qrc
+++ b/qt-mobile/mobile-resources.qrc
@@ -5,5 +5,6 @@
         <file>Preferences.qml</file>
         <file>DiveList.qml</file>
         <file>DiveDetails.qml</file>
+        <file>DownloadFromDiveComputer.qml</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3-70-g09d2