2 files changed, 19 insertions, 18 deletions
diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
index ca2e04f08..912a97840 100644
--- a/qt-mobile/qml/DiveDetails.qml
+++ b/qt-mobile/qml/DiveDetails.qml
@@ -53,9 +53,13 @@ MobileComponents.Page {
 			iconName: checked ? "view-readermode" : "document-edit"
 			onTriggered: {
 				if (diveDetailsWindow.state == "edit") {
-					manager.commitChanges(dive_id, suit, buddy, divemaster, notes);
+					manager.commitChanges(dive_id, detailsEdit.locationText, detailsEdit.gpsText, detailsEdit.durationText,
+							      detailsEdit.depthText, detailsEdit.airtempText, detailsEdit.watertempText, detailsEdit.suitText,
+							      detailsEdit.buddyText, detailsEdit.divemasterText, detailsEdit.notesText);
+					diveDetailsWindow.state = "view";
+				} else {
+					diveDetailsWindow.state = "edit";
 				}
-				diveDetailsWindow.state = checked ? "edit" : "view";
 				contextDrawer.close();
 				// close drawer?
 			}
diff --git a/qt-mobile/qml/DiveDetailsEdit.qml b/qt-mobile/qml/DiveDetailsEdit.qml
index e3545535c..4ed90cd2d 100644
--- a/qt-mobile/qml/DiveDetailsEdit.qml
+++ b/qt-mobile/qml/DiveDetailsEdit.qml
@@ -7,7 +7,14 @@ import org.subsurfacedivelog.mobile 1.0
 import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
 
 Item {
-
+	property alias locationText: txtLocation.text
+	property string gpsText
+	property alias airtempText: txtAirTemp.text
+	property alias watertempText: txtWaterTemp.text
+	property alias suitText: txtSuit.text
+	property alias buddyText: txtBuddy.text
+	property alias divemasterText: txtDiveMaster.text
+	property alias notesText: txtNotes.text
 	ColumnLayout {
 		anchors {
 			left: parent.left
@@ -36,6 +43,11 @@ Item {
 				Layout.fillWidth: true
 			}
 
+			// we should add a checkbox here that allows the user
+			// to add the current location as the dive location
+			// (think of someone adding a dive while on the boat or
+			//  at the dive site)
+
 			MobileComponents.Label {
 				Layout.alignment: Qt.AlignRight
 				text: "Air Temp:"
@@ -59,15 +71,11 @@ Item {
 			MobileComponents.Label {
 				Layout.alignment: Qt.AlignRight
 				text: "Suit:"
-
 			}
 			TextField {
 				id: txtSuit
 				text: suit
 				Layout.fillWidth: true
-				onEditingFinished: {
-					suit = text;
-				}
 			}
 
 			MobileComponents.Label {
@@ -78,9 +86,6 @@ Item {
 				id: txtBuddy
 				text: buddy
 				Layout.fillWidth: true
-				onEditingFinished: {
-					buddy = text;
-				}
 			}
 
 			MobileComponents.Label {
@@ -91,9 +96,6 @@ Item {
 				id: txtDiveMaster
 				text: divemaster
 				Layout.fillWidth: true
-				onEditingFinished: {
-					divemaster = text;
-				}
 			}
 
 			MobileComponents.Label {
@@ -109,11 +111,6 @@ Item {
 				Layout.minimumHeight: MobileComponents.Units.gridUnit * 6
 				selectByMouse: true
 				wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
-// there is no onEditingFinished signal... not sure how to get the value
-// out of this field when we're done editing
-//				onEditingFinished: {
-//					diveDetailsWindow.notes = text;
-//				}
 			}
 		}
 		Item {