mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: change the way we extract input data from dive edit

Browse source 
Instead of doing the silly "onEditingFinished" we get the strings from the QML
components at the time we commit the change. Much more logical, much more
straight forward, no issues with the TextArea not having an onEditingFinished
signal.

This still has a few open todos: the temperatures aren't parsed, the edit
screen is missing depth and duration, we can't edit the dive time (and it isn't
passed in on the commit). But it's progress.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-12-26 22:57:47 -08:00
parent 9be42fff81
commit 99a5a743c4
4 changed files with 49 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

29
qt-mobile/qml/DiveDetailsEdit.qml
View file

@ -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 {