mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 02:13:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move endEditMode() to DiveDetails.qml

Browse source 
Having endEditMode() in main.qml seemed wrong somehow.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2016-02-07 22:23:07 +01:00 • committed by Dirk Hohndel
parent d976310094
commit 47403588e5
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-mobile/qml/DiveDetails.qml
View file

@ -47,9 +47,7 @@ MobileComponents.Page {
iconName: state !== "view" ? "dialog-cancel" : "document-edit"
onTriggered: {
if (state === "edit") {
// just cancel the edit state
state = "view"
Qt.inputMethod.hide()
endEditMode()
} else if (state === "add") {
// edit was canceled - so remove the dive from the dive list
manager.addDiveAborted(dive_id)
@ -66,6 +64,12 @@ MobileComponents.Page {
diveDetailsListView.positionViewAtIndex(index, ListView.Beginning);
}
function endEditMode() {
// just cancel the edit state
state = "view";
Qt.inputMethod.hide();
}
function startEditMode() {
// set things up for editing - so make sure that the detailsEdit has
// all the right data (using the property aliases set up above)

2
qt-mobile/qml/TopBar.qml
View file

@ -138,7 +138,7 @@ Rectangle {
height: parent.height
width: parent.width
onClicked: {
endEditMode()
detailsWindow.endEditMode()
}
}
}

17
qt-mobile/qml/main.qml
View file

@ -20,11 +20,6 @@ MobileComponents.ApplicationWindow {
visible: false
opacity: 0
function endEditMode() {
detailsWindow.state = "view"
// somehow also should deal with the icon for the Action Button
}
globalDrawer: MobileComponents.GlobalDrawer {
title: "Subsurface"
titleIcon: "qrc:/qml/subsurface-mobile-icon.png"
@ -37,21 +32,21 @@ MobileComponents.ApplicationWindow {
for (var i=stackView.depth; i>1; i--) {
stackView.pop()
}
endEditMode()
detailsWindow.endEditMode()
}
},
Action {
text: "Cloud credentials"
onTriggered: {
stackView.push(cloudCredWindow)
endEditMode()
detailsWindow.endEditMode()
}
},
Action {
text: "Preferences"
onTriggered: {
stackView.push(prefsWindow)
endEditMode()
detailsWindow.endEditMode()
}
},
MobileComponents.ActionGroup {
@ -61,7 +56,7 @@ MobileComponents.ApplicationWindow {
Action {
text: "Download from computer"
onTriggered: {
endEditMode()
detailsWindow.endEditMode()
stackView.push(downloadDivesWindow)
}
}
@ -89,14 +84,14 @@ MobileComponents.ApplicationWindow {
Action {
text: "Refresh"
onTriggered: {
endEditMode()
detailsWindow.endEditMode()
manager.loadDives();
}
}
Action {
text: "Upload to cloud"
onTriggered: {
endEditMode()
detailsWindow.endEditMode()
manager.saveChanges();
}
}