mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-01 22:50:31 +00:00
2bf6f4e45d
Normally this is triggered when the DiveDetailsView component is completed, but since QML isn't recreating this component unless we switch to a dive a couple of spots in the dive list away from this one, we wouldn't get any changes in the data reflected in the profile. But since this now redraws the same dive that potentially was drawn last, we need to make sure we call plotDive() with force=true. I also suspect that this could help with the strange bug that sometimes we show a blank profile after certain edits. See #1013 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
233 lines
6.4 KiB
QML
233 lines
6.4 KiB
QML
import QtQuick 2.3
|
|
import QtQuick.Controls 1.2
|
|
import QtQuick.Controls.Styles 1.2
|
|
import QtQuick.Dialogs 1.2
|
|
import QtQuick.Layouts 1.1
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
|
|
|
|
Item {
|
|
id: detailsEdit
|
|
property int dive_id
|
|
property int number
|
|
property alias dateText: txtDate.text
|
|
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
|
|
property alias durationText: txtDuration.text
|
|
property alias depthText: txtDepth.text
|
|
property alias weightText: txtWeight.text
|
|
property alias startpressureText: txtStartPressure.text
|
|
property alias endpressureText: txtEndPressure.text
|
|
property alias gasmixText: txtGasMix.text
|
|
|
|
function saveData() {
|
|
// apply the changes to the dive_table
|
|
manager.commitChanges(dive_id, detailsEdit.dateText, detailsEdit.locationText, detailsEdit.gpsText, detailsEdit.durationText,
|
|
detailsEdit.depthText, detailsEdit.airtempText, detailsEdit.watertempText, detailsEdit.suitText,
|
|
detailsEdit.buddyText, detailsEdit.divemasterText, detailsEdit.weightText, detailsEdit.notesText,
|
|
detailsEdit.startpressureText, detailsEdit.endpressureText, detailsEdit.gasmixText)
|
|
// trigger the profile to be redrawn
|
|
QMLProfile.diveId = dive_id
|
|
|
|
// apply the changes to the dive detail view - since the edit could have changed the order
|
|
// first make sure that we are looking at the correct dive - our model allows us to look
|
|
// up the index based on the unique dive_id
|
|
diveDetailsListView.currentIndex = diveModel.getIdxForId(dive_id)
|
|
diveDetailsListView.currentItem.modelData.date = detailsEdit.dateText
|
|
diveDetailsListView.currentItem.modelData.location = detailsEdit.locationText
|
|
diveDetailsListView.currentItem.modelData.duration = detailsEdit.durationText
|
|
diveDetailsListView.currentItem.modelData.depth = detailsEdit.depthText
|
|
diveDetailsListView.currentItem.modelData.airtemp = detailsEdit.airtempText
|
|
diveDetailsListView.currentItem.modelData.watertemp = detailsEdit.watertempText
|
|
diveDetailsListView.currentItem.modelData.suit = detailsEdit.suitText
|
|
diveDetailsListView.currentItem.modelData.buddy = detailsEdit.buddyText
|
|
diveDetailsListView.currentItem.modelData.divemaster = detailsEdit.divemasterText
|
|
diveDetailsListView.currentItem.modelData.notes = detailsEdit.notesText
|
|
diveDetailsPage.state = "view"
|
|
Qt.inputMethod.hide()
|
|
}
|
|
|
|
height: editArea.height
|
|
ColumnLayout {
|
|
id: editArea
|
|
spacing: MobileComponents.Units.smallSpacing
|
|
width: subsurfaceTheme.columnWidth - 2 * MobileComponents.Units.gridUnit
|
|
|
|
GridLayout {
|
|
id: editorDetails
|
|
width: parent.width
|
|
columns: 2
|
|
|
|
MobileComponents.Heading {
|
|
Layout.columnSpan: 2
|
|
text: "Dive " + number
|
|
}
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Date:"
|
|
}
|
|
TextField {
|
|
id: txtDate;
|
|
Layout.fillWidth: true
|
|
}
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Location:"
|
|
}
|
|
TextField {
|
|
id: txtLocation;
|
|
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: "Use current\nGPS location:"
|
|
}
|
|
CheckBox {
|
|
id: checkboxGPS
|
|
onCheckedChanged: {
|
|
if (checked)
|
|
gpsText = manager.getCurrentPosition()
|
|
}
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Depth:"
|
|
}
|
|
TextField {
|
|
id: txtDepth
|
|
Layout.fillWidth: true
|
|
validator: RegExpValidator { regExp: /[^-]*/ }
|
|
}
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Duration:"
|
|
}
|
|
TextField {
|
|
id: txtDuration
|
|
Layout.fillWidth: true
|
|
validator: RegExpValidator { regExp: /[^-]*/ }
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Air Temp:"
|
|
}
|
|
TextField {
|
|
id: txtAirTemp
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Water Temp:"
|
|
}
|
|
TextField {
|
|
id: txtWaterTemp
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Suit:"
|
|
}
|
|
TextField {
|
|
id: txtSuit
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Buddy:"
|
|
}
|
|
TextField {
|
|
id: txtBuddy
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Dive Master:"
|
|
}
|
|
TextField {
|
|
id: txtDiveMaster
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Weight:"
|
|
}
|
|
TextField {
|
|
id: txtWeight
|
|
readOnly: (text == "cannot edit multiple weight systems" ? true : false)
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Gas mix:"
|
|
}
|
|
TextField {
|
|
id: txtGasMix
|
|
readOnly: (text == "cannot edit multiple gases" ? true : false)
|
|
Layout.fillWidth: true
|
|
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/ }
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "Start Pressure:"
|
|
}
|
|
TextField {
|
|
id: txtStartPressure
|
|
readOnly: (text == "cannot edit multiple cylinders" ? true : false)
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
MobileComponents.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: "End Pressure:"
|
|
}
|
|
TextField {
|
|
id: txtEndPressure
|
|
readOnly: (text == "cannot edit multiple cylinders" ? true : false)
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
|
|
MobileComponents.Label {
|
|
Layout.columnSpan: 2
|
|
Layout.alignment: Qt.AlignLeft
|
|
text: "Notes:"
|
|
}
|
|
TextArea {
|
|
Layout.columnSpan: 2
|
|
width: parent.width
|
|
id: txtNotes
|
|
textFormat: TextEdit.RichText
|
|
focus: true
|
|
Layout.fillWidth: true
|
|
Layout.fillHeight: true
|
|
Layout.minimumHeight: MobileComponents.Units.gridUnit * 6
|
|
selectByMouse: true
|
|
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
|
|
}
|
|
}
|
|
Item {
|
|
height: MobileComponents.Units.gridUnit * 3
|
|
width: height // just to make sure the spacer doesn't produce scrollbars, but also isn't null
|
|
}
|
|
}
|
|
}
|