2017-04-27 18:30:36 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2017-10-29 07:44:06 +00:00
|
|
|
import QtQuick 2.6
|
2017-10-29 12:44:22 +00:00
|
|
|
import QtQuick.Controls 2.2 as Controls
|
2015-12-04 00:38:04 +00:00
|
|
|
import QtQuick.Dialogs 1.2
|
2017-10-30 10:26:47 +00:00
|
|
|
import QtQuick.Layouts 1.2
|
2015-12-04 00:38:04 +00:00
|
|
|
import org.subsurfacedivelog.mobile 1.0
|
QML UI: Kirigami to 2.2
When first tested this commit, especially the dive list was looking
terrible. However, after including newer SHA's from libkirigami, and
correcting lots of spacing/margin issue, a retest of this commit shows
no strange artifact any more, and the amount of warnings in the log
output is reduced significantly. So now, it appears save to
upgrade.
Notice that main.qml still uses Kirigami 2.0. and is not updated in
this commit. With version 2.2, there is a new way of theming, that
is not (yet) compatible with our current code. Blindly upgrading to
2.2 leads to a almost black dive list, wrong button colors, and
runtime errors in the log, due to the fact the direct setting from
QML Kirigami's Theme colors is not allowed any more.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-10-14 19:13:01 +00:00
|
|
|
import org.kde.kirigami 2.2 as Kirigami
|
2015-12-04 00:38:04 +00:00
|
|
|
|
|
|
|
Item {
|
2016-01-12 00:15:02 +00:00
|
|
|
id: detailsEdit
|
|
|
|
property int dive_id
|
|
|
|
property int number
|
2016-01-05 14:59:04 +00:00
|
|
|
property alias dateText: txtDate.text
|
2018-03-09 14:24:54 +00:00
|
|
|
property alias locationText: locationBox.editText
|
|
|
|
property alias locationIndex: locationBox.currentIndex
|
2016-04-15 12:17:39 +00:00
|
|
|
property alias gpsText: txtGps.text
|
2015-12-27 06:57:47 +00:00
|
|
|
property alias airtempText: txtAirTemp.text
|
|
|
|
property alias watertempText: txtWaterTemp.text
|
2016-05-16 17:59:05 +00:00
|
|
|
property alias suitIndex: suitBox.currentIndex
|
2018-02-11 11:06:27 +00:00
|
|
|
property alias suitText: suitBox.editText
|
2016-05-16 17:59:05 +00:00
|
|
|
property alias buddyIndex: buddyBox.currentIndex
|
2018-02-11 11:06:27 +00:00
|
|
|
property alias buddyText: buddyBox.editText
|
2016-05-16 17:59:05 +00:00
|
|
|
property alias divemasterIndex: divemasterBox.currentIndex
|
2018-02-11 11:06:27 +00:00
|
|
|
property alias divemasterText: divemasterBox.editText
|
2016-08-30 14:24:19 +00:00
|
|
|
property alias cylinderIndex: cylinderBox.currentIndex
|
2018-02-11 11:06:27 +00:00
|
|
|
property alias cylinderText: cylinderBox.editText
|
2015-12-27 06:57:47 +00:00
|
|
|
property alias notesText: txtNotes.text
|
2016-01-01 08:23:15 +00:00
|
|
|
property alias durationText: txtDuration.text
|
2016-01-01 08:32:30 +00:00
|
|
|
property alias depthText: txtDepth.text
|
2016-01-29 02:26:37 +00:00
|
|
|
property alias weightText: txtWeight.text
|
2016-02-09 16:20:17 +00:00
|
|
|
property alias startpressureText: txtStartPressure.text
|
|
|
|
property alias endpressureText: txtEndPressure.text
|
2016-02-13 17:34:31 +00:00
|
|
|
property alias gasmixText: txtGasMix.text
|
2016-04-15 12:17:39 +00:00
|
|
|
property alias gpsCheckbox: checkboxGPS.checked
|
2016-05-20 16:48:36 +00:00
|
|
|
property alias suitModel: suitBox.model
|
|
|
|
property alias divemasterModel: divemasterBox.model
|
|
|
|
property alias buddyModel: buddyBox.model
|
2016-08-30 14:24:19 +00:00
|
|
|
property alias cylinderModel: cylinderBox.model
|
2018-03-09 14:24:54 +00:00
|
|
|
property alias locationModel: locationBox.model
|
2017-07-28 15:43:26 +00:00
|
|
|
property int rating
|
|
|
|
property int visibility
|
2016-01-29 02:26:37 +00:00
|
|
|
|
mobile: clear internal data when edit/add dive is finished
When editing (or adding) a dive, the internal data containing the
attributes on the edit page was not cleared when editing was
finished (in any way, by saving the edit or by cancelling it).
As long as the user only edits existing dives, all this poses
no problem, as at the start of a dive edit, the data is filled
from the dive to be edited. However, when adding a dive, data
coming from previous edits shows up. This not clearing data
also causes the strange effect as written in issue #950: adding
a dive, deleting it, and adding a dive again, added the first
added dive data, without the edit screen being shown.
All this can be solved by clearing the data from the edit when
editing is done.
Fixes: #950
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-15 16:13:15 +00:00
|
|
|
function clearDetailsEdit() {
|
|
|
|
detailsEdit.dive_id = 0
|
|
|
|
detailsEdit.number = 0
|
|
|
|
detailsEdit.dateText = ""
|
|
|
|
detailsEdit.locationText = ""
|
|
|
|
detailsEdit.durationText = ""
|
|
|
|
detailsEdit.depthText = ""
|
|
|
|
detailsEdit.airtempText = ""
|
|
|
|
detailsEdit.watertempText = ""
|
2018-01-28 10:28:01 +00:00
|
|
|
detailsEdit.divemasterText = ""
|
|
|
|
detailsEdit.buddyText = ""
|
mobile: clear internal data when edit/add dive is finished
When editing (or adding) a dive, the internal data containing the
attributes on the edit page was not cleared when editing was
finished (in any way, by saving the edit or by cancelling it).
As long as the user only edits existing dives, all this poses
no problem, as at the start of a dive edit, the data is filled
from the dive to be edited. However, when adding a dive, data
coming from previous edits shows up. This not clearing data
also causes the strange effect as written in issue #950: adding
a dive, deleting it, and adding a dive again, added the first
added dive data, without the edit screen being shown.
All this can be solved by clearing the data from the edit when
editing is done.
Fixes: #950
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-15 16:13:15 +00:00
|
|
|
suitBox.currentIndex = -1
|
|
|
|
buddyBox.currentIndex = -1
|
|
|
|
divemasterBox.currentIndex = -1
|
|
|
|
cylinderBox.currentIndex = -1
|
|
|
|
detailsEdit.notesText = ""
|
|
|
|
detailsEdit.rating = 0
|
|
|
|
detailsEdit.visibility = 0
|
|
|
|
}
|
|
|
|
|
2016-02-14 05:25:10 +00:00
|
|
|
function saveData() {
|
2017-10-05 04:53:40 +00:00
|
|
|
diveDetailsPage.state = "view" // run the transition
|
2016-02-14 05:25:10 +00:00
|
|
|
// apply the changes to the dive_table
|
2018-03-09 14:24:54 +00:00
|
|
|
manager.commitChanges(dive_id, detailsEdit.dateText, locationBox.editText, detailsEdit.gpsText, detailsEdit.durationText,
|
2018-02-11 11:06:27 +00:00
|
|
|
detailsEdit.depthText, detailsEdit.airtempText, detailsEdit.watertempText,
|
2018-02-11 13:27:04 +00:00
|
|
|
suitBox.currentText != "" ? suitBox.currentText : suitBox.editText, buddyBox.editText,
|
2018-02-11 11:06:27 +00:00
|
|
|
divemasterBox.currentText != "" ? divemasterBox.currentText : divemasterBox.editText,
|
|
|
|
detailsEdit.weightText, detailsEdit.notesText, detailsEdit.startpressureText,
|
|
|
|
detailsEdit.endpressureText, detailsEdit.gasmixText,
|
|
|
|
cylinderBox.currentText != "" ? cylinderBox.currentText : cylinderBox.editText,
|
|
|
|
detailsEdit.rating,
|
2017-07-28 17:28:52 +00:00
|
|
|
detailsEdit.visibility)
|
2016-02-28 14:49:21 +00:00
|
|
|
// trigger the profile to be redrawn
|
|
|
|
QMLProfile.diveId = dive_id
|
|
|
|
|
2016-02-14 05:25:10 +00:00
|
|
|
// 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
|
2016-03-02 17:02:00 +00:00
|
|
|
var newIdx = diveModel.getIdxForId(dive_id)
|
|
|
|
diveDetailsListView.currentIndex = newIdx
|
2016-02-14 05:25:10 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.date = detailsEdit.dateText
|
2018-03-09 14:24:54 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.location = locationBox.currentText
|
2016-02-14 05:25:10 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.duration = detailsEdit.durationText
|
|
|
|
diveDetailsListView.currentItem.modelData.depth = detailsEdit.depthText
|
|
|
|
diveDetailsListView.currentItem.modelData.airtemp = detailsEdit.airtempText
|
|
|
|
diveDetailsListView.currentItem.modelData.watertemp = detailsEdit.watertempText
|
2016-05-16 17:59:05 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.suit = suitBox.currentText
|
|
|
|
diveDetailsListView.currentItem.modelData.buddy = buddyBox.currentText
|
|
|
|
diveDetailsListView.currentItem.modelData.divemaster = divemasterBox.currentText
|
2016-08-30 14:24:19 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.cylinder = cylinderBox.currentText
|
2016-02-14 05:25:10 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.notes = detailsEdit.notesText
|
2017-07-28 17:28:52 +00:00
|
|
|
diveDetailsListView.currentItem.modelData.rating = detailsEdit.rating
|
|
|
|
diveDetailsListView.currentItem.modelData.visibility = detailsEdit.visibility
|
2016-02-14 05:25:10 +00:00
|
|
|
Qt.inputMethod.hide()
|
2016-03-02 12:47:51 +00:00
|
|
|
// now make sure we directly show the saved dive (this may be a new dive, or it may have moved)
|
2016-03-02 17:02:00 +00:00
|
|
|
showDiveIndex(newIdx)
|
mobile: clear internal data when edit/add dive is finished
When editing (or adding) a dive, the internal data containing the
attributes on the edit page was not cleared when editing was
finished (in any way, by saving the edit or by cancelling it).
As long as the user only edits existing dives, all this poses
no problem, as at the start of a dive edit, the data is filled
from the dive to be edited. However, when adding a dive, data
coming from previous edits shows up. This not clearing data
also causes the strange effect as written in issue #950: adding
a dive, deleting it, and adding a dive again, added the first
added dive data, without the edit screen being shown.
All this can be solved by clearing the data from the edit when
editing is done.
Fixes: #950
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-15 16:13:15 +00:00
|
|
|
clearDetailsEdit()
|
2016-02-14 05:25:10 +00:00
|
|
|
}
|
|
|
|
|
2016-01-20 22:07:06 +00:00
|
|
|
height: editArea.height
|
2017-10-04 19:27:13 +00:00
|
|
|
width: diveDetailsPage.width - diveDetailsPage.leftPadding - diveDetailsPage.rightPadding - Kirigami.Units.smallSpacing * 2
|
2015-12-04 00:38:04 +00:00
|
|
|
ColumnLayout {
|
2016-01-20 22:07:06 +00:00
|
|
|
id: editArea
|
2016-03-08 20:26:54 +00:00
|
|
|
spacing: Kirigami.Units.smallSpacing
|
2017-07-31 17:43:56 +00:00
|
|
|
width: parent.width
|
2015-12-04 00:38:04 +00:00
|
|
|
|
|
|
|
GridLayout {
|
|
|
|
id: editorDetails
|
|
|
|
width: parent.width
|
|
|
|
columns: 2
|
|
|
|
|
2016-03-08 20:26:54 +00:00
|
|
|
Kirigami.Heading {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.columnSpan: 2
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Dive %1").arg(number)
|
2016-01-05 14:59:04 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-01-05 14:59:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Date:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-01-05 14:59:04 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-01-05 14:59:04 +00:00
|
|
|
id: txtDate;
|
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Location:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2018-02-11 11:06:27 +00:00
|
|
|
Controls.ComboBox {
|
2018-03-09 14:24:54 +00:00
|
|
|
id: locationBox
|
2018-02-11 11:06:27 +00:00
|
|
|
editable: true
|
|
|
|
flat: true
|
|
|
|
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
|
2018-03-09 13:49:15 +00:00
|
|
|
manager.locationList : null
|
2017-11-22 15:19:44 +00:00
|
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.fillWidth: true
|
2018-02-11 11:06:27 +00:00
|
|
|
onAccepted: {
|
2018-02-11 15:23:04 +00:00
|
|
|
focus = false
|
2018-03-09 16:27:13 +00:00
|
|
|
gpsText = manager.getGpsFromSiteName(editText)
|
|
|
|
}
|
|
|
|
onActivated: {
|
|
|
|
focus = false
|
|
|
|
gpsText = manager.getGpsFromSiteName(editText)
|
2017-11-22 18:22:02 +00:00
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-04-15 12:17:39 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Coordinates:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-04-15 12:17:39 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-04-15 12:17:39 +00:00
|
|
|
id: txtGps
|
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-04-15 12:17:39 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-01-02 01:23:29 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Use current\nGPS location:")
|
2016-04-18 05:57:14 +00:00
|
|
|
visible: manager.locationServiceAvailable
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-01-02 01:23:29 +00:00
|
|
|
}
|
2017-07-24 18:29:32 +00:00
|
|
|
SsrfCheckBox {
|
2016-01-02 01:23:29 +00:00
|
|
|
id: checkboxGPS
|
2016-04-18 05:57:14 +00:00
|
|
|
visible: manager.locationServiceAvailable
|
2016-01-02 01:23:29 +00:00
|
|
|
onCheckedChanged: {
|
|
|
|
if (checked)
|
|
|
|
gpsText = manager.getCurrentPosition()
|
|
|
|
}
|
|
|
|
}
|
2018-04-14 18:12:07 +00:00
|
|
|
Connections {
|
|
|
|
target: manager
|
|
|
|
onWaitingForPositionChanged: {
|
|
|
|
gpsText = manager.getCurrentPosition()
|
|
|
|
}
|
|
|
|
}
|
2015-12-27 06:57:47 +00:00
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-01-01 08:32:30 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Depth:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-01-01 08:32:30 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-01-01 08:32:30 +00:00
|
|
|
id: txtDepth
|
|
|
|
Layout.fillWidth: true
|
2016-02-21 05:50:11 +00:00
|
|
|
validator: RegExpValidator { regExp: /[^-]*/ }
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-01-01 08:32:30 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-01-01 08:23:15 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Duration:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-01-01 08:23:15 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-01-01 08:23:15 +00:00
|
|
|
id: txtDuration
|
|
|
|
Layout.fillWidth: true
|
2016-02-21 05:50:11 +00:00
|
|
|
validator: RegExpValidator { regExp: /[^-]*/ }
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-01-01 08:23:15 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Air Temp:")
|
2017-07-31 13:55:30 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2015-12-04 00:38:04 +00:00
|
|
|
id: txtAirTemp
|
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Water Temp:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2015-12-04 00:38:04 +00:00
|
|
|
id: txtWaterTemp
|
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Suit:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2018-02-11 11:06:27 +00:00
|
|
|
Controls.ComboBox {
|
2016-05-16 17:59:05 +00:00
|
|
|
id: suitBox
|
2018-02-11 11:06:27 +00:00
|
|
|
editable: true
|
|
|
|
flat: true
|
|
|
|
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
|
|
|
|
manager.suitList : null
|
2016-05-16 17:59:05 +00:00
|
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.fillWidth: true
|
2017-12-08 13:58:23 +00:00
|
|
|
onActivated: {
|
|
|
|
focus = false
|
|
|
|
}
|
2018-02-11 15:23:04 +00:00
|
|
|
onAccepted: {
|
|
|
|
focus = false
|
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Buddy:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2018-02-11 11:06:27 +00:00
|
|
|
Controls.ComboBox {
|
2016-05-16 17:59:05 +00:00
|
|
|
id: buddyBox
|
2018-02-11 11:06:27 +00:00
|
|
|
editable: true
|
|
|
|
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
|
|
|
|
manager.buddyList : null
|
2016-05-16 17:59:05 +00:00
|
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.fillWidth: true
|
2017-12-08 13:58:23 +00:00
|
|
|
onActivated: {
|
|
|
|
focus = false
|
|
|
|
}
|
2018-02-11 15:23:04 +00:00
|
|
|
onAccepted: {
|
|
|
|
focus = false
|
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2017-02-27 11:14:22 +00:00
|
|
|
text: qsTr("Divemaster:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2018-02-11 11:06:27 +00:00
|
|
|
Controls.ComboBox {
|
2016-05-16 17:59:05 +00:00
|
|
|
id: divemasterBox
|
2018-02-11 11:06:27 +00:00
|
|
|
editable: true
|
|
|
|
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
|
|
|
|
manager.divemasterList : null
|
2016-05-16 17:59:05 +00:00
|
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
2015-12-04 00:38:04 +00:00
|
|
|
Layout.fillWidth: true
|
2017-12-08 13:58:23 +00:00
|
|
|
onActivated: {
|
|
|
|
focus = false
|
|
|
|
}
|
2018-02-11 15:23:04 +00:00
|
|
|
onAccepted: {
|
|
|
|
focus = false
|
|
|
|
}
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-01-29 02:26:37 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Weight:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-01-29 02:26:37 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-01-29 02:26:37 +00:00
|
|
|
id: txtWeight
|
2017-03-31 14:15:14 +00:00
|
|
|
readOnly: text === "cannot edit multiple weight systems"
|
2016-01-29 02:26:37 +00:00
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-01-29 02:26:37 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-08-30 14:24:19 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
|
|
|
text: qsTr("Cylinder:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-08-30 14:24:19 +00:00
|
|
|
}
|
2018-02-11 11:06:27 +00:00
|
|
|
Controls.ComboBox {
|
2016-08-30 14:24:19 +00:00
|
|
|
id: cylinderBox
|
2017-12-08 13:57:59 +00:00
|
|
|
flat: true
|
2017-08-05 07:08:21 +00:00
|
|
|
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
|
|
|
|
diveDetailsListView.currentItem.modelData.dive.cylinderList : null
|
2016-08-30 14:24:19 +00:00
|
|
|
inputMethodHints: Qt.ImhNoPredictiveText
|
|
|
|
Layout.fillWidth: true
|
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-02-13 17:34:31 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Gas mix:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-02-13 17:34:31 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-02-13 17:34:31 +00:00
|
|
|
id: txtGasMix
|
|
|
|
Layout.fillWidth: true
|
2016-04-08 05:56:37 +00:00
|
|
|
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-02-13 17:34:31 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-02-09 16:20:17 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Start Pressure:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-02-09 16:20:17 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-02-09 16:20:17 +00:00
|
|
|
id: txtStartPressure
|
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-02-09 16:20:17 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-02-09 16:20:17 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("End Pressure:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2016-02-09 16:20:17 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextField {
|
2016-02-09 16:20:17 +00:00
|
|
|
id: txtEndPressure
|
|
|
|
Layout.fillWidth: true
|
2017-07-31 16:37:19 +00:00
|
|
|
onEditingFinished: {
|
|
|
|
focus = false
|
|
|
|
}
|
2016-02-09 16:20:17 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2017-07-28 17:28:52 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
|
|
|
text: qsTr("Rating:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2017-07-28 17:28:52 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.SpinBox {
|
2017-07-28 17:28:52 +00:00
|
|
|
id: ratingPicker
|
|
|
|
from: 0
|
|
|
|
to: 5
|
|
|
|
value: rating
|
|
|
|
onValueChanged: rating = value
|
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2017-07-28 17:28:52 +00:00
|
|
|
Layout.alignment: Qt.AlignRight
|
|
|
|
text: qsTr("Visibility:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2017-07-28 17:28:52 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.SpinBox {
|
2017-07-28 17:28:52 +00:00
|
|
|
id: visibilityPicker
|
|
|
|
from: 0
|
|
|
|
to: 5
|
|
|
|
value: visibility
|
|
|
|
onValueChanged: visibility = value
|
|
|
|
}
|
|
|
|
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.Label {
|
2016-01-21 21:09:10 +00:00
|
|
|
Layout.columnSpan: 2
|
|
|
|
Layout.alignment: Qt.AlignLeft
|
2016-05-03 19:24:00 +00:00
|
|
|
text: qsTr("Notes:")
|
2017-07-28 18:09:59 +00:00
|
|
|
font.pointSize: subsurfaceTheme.smallPointSize
|
2015-12-04 00:38:04 +00:00
|
|
|
}
|
2017-10-12 12:25:22 +00:00
|
|
|
Controls.TextArea {
|
2016-01-21 21:09:10 +00:00
|
|
|
Layout.columnSpan: 2
|
|
|
|
width: parent.width
|
2015-12-04 00:38:04 +00:00
|
|
|
id: txtNotes
|
2016-01-07 07:03:07 +00:00
|
|
|
textFormat: TextEdit.RichText
|
2015-12-04 00:38:04 +00:00
|
|
|
focus: true
|
|
|
|
Layout.fillWidth: true
|
|
|
|
Layout.fillHeight: true
|
2016-03-08 20:26:54 +00:00
|
|
|
Layout.minimumHeight: Kirigami.Units.gridUnit * 6
|
2015-12-04 00:38:04 +00:00
|
|
|
selectByMouse: true
|
|
|
|
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Item {
|
2016-03-08 20:26:54 +00:00
|
|
|
height: Kirigami.Units.gridUnit * 3
|
2015-12-04 00:38:04 +00:00
|
|
|
width: height // just to make sure the spacer doesn't produce scrollbars, but also isn't null
|
|
|
|
}
|
|
|
|
}
|
2015-12-08 06:24:56 +00:00
|
|
|
}
|