mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
6f8e50f860
Fixes: #490 items 1) and 2). 1) Reference to isBluetooth.leftPadding is removed as the isBooltooth checkbox is gone. 2) Do not set background color of downloaded dives. The checkbox is used to denote "selected or not". In addition, incorrect references to subsurfaceTheme.PrimaryColor (which does not exist) are replaced by the correct subsurfaceTheme.primaryColor. Finally, an obvious copy/paste error width: childrenRect.height. that is supposed to be width: childrenRect.width. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
287 lines
8.3 KiB
QML
287 lines
8.3 KiB
QML
// SPDX-License-Identifier: GPL-2.0
|
|
import QtQuick 2.3
|
|
import QtQuick.Controls 2.0
|
|
import QtQuick.Dialogs 1.2
|
|
import QtQuick.Layouts 1.1
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
import org.kde.kirigami 2.0 as Kirigami
|
|
|
|
Item {
|
|
id: detailsEdit
|
|
property int dive_id
|
|
property int number
|
|
property alias dateText: txtDate.text
|
|
property alias locationText: txtLocation.text
|
|
property alias gpsText: txtGps.text
|
|
property alias airtempText: txtAirTemp.text
|
|
property alias watertempText: txtWaterTemp.text
|
|
property alias suitIndex: suitBox.currentIndex
|
|
property alias suitText: suitBox.text
|
|
property alias buddyIndex: buddyBox.currentIndex
|
|
property alias buddyText: buddyBox.text
|
|
property alias divemasterIndex: divemasterBox.currentIndex
|
|
property alias divemasterText: divemasterBox.text
|
|
property alias cylinderIndex: cylinderBox.currentIndex
|
|
property alias cylinderText: cylinderBox.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
|
|
property alias gpsCheckbox: checkboxGPS.checked
|
|
property alias suitModel: suitBox.model
|
|
property alias divemasterModel: divemasterBox.model
|
|
property alias buddyModel: buddyBox.model
|
|
property alias cylinderModel: cylinderBox.model
|
|
|
|
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, suitBox.text, buddyBox.text,
|
|
divemasterBox.text, detailsEdit.weightText, detailsEdit.notesText, detailsEdit.startpressureText,
|
|
detailsEdit.endpressureText, detailsEdit.gasmixText, cylinderBox.text)
|
|
// 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
|
|
var newIdx = diveModel.getIdxForId(dive_id)
|
|
diveDetailsListView.currentIndex = newIdx
|
|
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 = suitBox.currentText
|
|
diveDetailsListView.currentItem.modelData.buddy = buddyBox.currentText
|
|
diveDetailsListView.currentItem.modelData.divemaster = divemasterBox.currentText
|
|
diveDetailsListView.currentItem.modelData.cylinder = cylinderBox.currentText
|
|
diveDetailsListView.currentItem.modelData.notes = detailsEdit.notesText
|
|
diveDetailsPage.state = "view"
|
|
Qt.inputMethod.hide()
|
|
// now make sure we directly show the saved dive (this may be a new dive, or it may have moved)
|
|
showDiveIndex(newIdx)
|
|
}
|
|
|
|
height: editArea.height
|
|
width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding
|
|
ColumnLayout {
|
|
id: editArea
|
|
spacing: Kirigami.Units.smallSpacing
|
|
width: parent.width - 2 * Kirigami.Units.gridUnit
|
|
|
|
GridLayout {
|
|
id: editorDetails
|
|
width: parent.width
|
|
columns: 2
|
|
|
|
Kirigami.Heading {
|
|
Layout.columnSpan: 2
|
|
text: qsTr("Dive %1").arg(number)
|
|
}
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Date:")
|
|
}
|
|
TextField {
|
|
id: txtDate;
|
|
Layout.fillWidth: true
|
|
}
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Location:")
|
|
}
|
|
TextField {
|
|
id: txtLocation;
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Coordinates:")
|
|
}
|
|
TextField {
|
|
id: txtGps
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Use current\nGPS location:")
|
|
visible: manager.locationServiceAvailable
|
|
}
|
|
CheckBox {
|
|
id: checkboxGPS
|
|
visible: manager.locationServiceAvailable
|
|
onCheckedChanged: {
|
|
if (checked)
|
|
gpsText = manager.getCurrentPosition()
|
|
}
|
|
indicator: Rectangle {
|
|
implicitWidth: 20
|
|
implicitHeight: 20
|
|
x: checkboxGPS.leftPadding
|
|
y: parent.height / 2 - height / 2
|
|
radius: 4
|
|
border.color: checkboxGPS.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
|
|
color: subsurfaceTheme.backgroundColor
|
|
|
|
Rectangle {
|
|
width: 12
|
|
height: 12
|
|
x: 4
|
|
y: 4
|
|
radius: 3
|
|
color: checkboxGPS.down ? subsurfaceTheme.primaryColor : subsurfaceTheme.darkerPrimaryColor
|
|
visible: checkboxGPS.checked
|
|
}
|
|
}
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Depth:")
|
|
}
|
|
TextField {
|
|
id: txtDepth
|
|
Layout.fillWidth: true
|
|
validator: RegExpValidator { regExp: /[^-]*/ }
|
|
}
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Duration:")
|
|
}
|
|
TextField {
|
|
id: txtDuration
|
|
Layout.fillWidth: true
|
|
validator: RegExpValidator { regExp: /[^-]*/ }
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Air Temp:")
|
|
}
|
|
TextField {
|
|
id: txtAirTemp
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Water Temp:")
|
|
}
|
|
TextField {
|
|
id: txtWaterTemp
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Suit:")
|
|
}
|
|
HintsTextEdit {
|
|
id: suitBox
|
|
model: diveDetailsListView.currentItem ? diveDetailsListView.currentItem.modelData.dive.suitList : null
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Buddy:")
|
|
}
|
|
HintsTextEdit {
|
|
id: buddyBox
|
|
model: diveDetailsListView.currentItem ? diveDetailsListView.currentItem.modelData.dive.buddyList : null
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Divemaster:")
|
|
}
|
|
HintsTextEdit {
|
|
id: divemasterBox
|
|
model: diveDetailsListView.currentItem ? diveDetailsListView.currentItem.modelData.dive.divemasterList : null
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Weight:")
|
|
}
|
|
TextField {
|
|
id: txtWeight
|
|
readOnly: text === "cannot edit multiple weight systems"
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Cylinder:")
|
|
}
|
|
HintsTextEdit {
|
|
id: cylinderBox
|
|
model: diveDetailsListView.currentItem ? diveDetailsListView.currentItem.modelData.dive.cylinderList : null
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Gas mix:")
|
|
}
|
|
TextField {
|
|
id: txtGasMix
|
|
Layout.fillWidth: true
|
|
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("Start Pressure:")
|
|
}
|
|
TextField {
|
|
id: txtStartPressure
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.alignment: Qt.AlignRight
|
|
text: qsTr("End Pressure:")
|
|
}
|
|
TextField {
|
|
id: txtEndPressure
|
|
Layout.fillWidth: true
|
|
}
|
|
|
|
Kirigami.Label {
|
|
Layout.columnSpan: 2
|
|
Layout.alignment: Qt.AlignLeft
|
|
text: qsTr("Notes:")
|
|
}
|
|
TextArea {
|
|
Layout.columnSpan: 2
|
|
width: parent.width
|
|
id: txtNotes
|
|
textFormat: TextEdit.RichText
|
|
focus: true
|
|
Layout.fillWidth: true
|
|
Layout.fillHeight: true
|
|
Layout.minimumHeight: Kirigami.Units.gridUnit * 6
|
|
selectByMouse: true
|
|
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
|
|
}
|
|
}
|
|
Item {
|
|
height: Kirigami.Units.gridUnit * 3
|
|
width: height // just to make sure the spacer doesn't produce scrollbars, but also isn't null
|
|
}
|
|
}
|
|
}
|