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

Mobile: display all used gases on the edit page

Browse source 
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
Jocke 2018-07-28 15:07:43 +02:00 • committed by Dirk Hohndel
parent f9e81c7326
commit 9c9450748b
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mobile-widgets/qml/DiveDetails.qml
View file

@ -40,7 +40,7 @@ Kirigami.Page {
property alias cylinderIndex2: detailsEdit.cylinderIndex2 property alias cylinderIndex2: detailsEdit.cylinderIndex2
property alias cylinderIndex3: detailsEdit.cylinderIndex3 property alias cylinderIndex3: detailsEdit.cylinderIndex3
property alias cylinderIndex4: detailsEdit.cylinderIndex4 property alias cylinderIndex4: detailsEdit.cylinderIndex4
property alias gasmix0: detailsEdit.gasmixText0 property alias usedGas: detailsEdit.usedGas
property alias gpsCheckbox: detailsEdit.gpsCheckbox property alias gpsCheckbox: detailsEdit.gpsCheckbox
property int updateCurrentIdx: manager.updateSelectedDive property int updateCurrentIdx: manager.updateSelectedDive
property alias rating: detailsEdit.rating property alias rating: detailsEdit.rating
@ -264,7 +264,7 @@ Kirigami.Page {
} }
startpressure0 = currentItem.modelData.dive.startPressure startpressure0 = currentItem.modelData.dive.startPressure
endpressure0 = currentItem.modelData.dive.endPressure endpressure0 = currentItem.modelData.dive.endPressure
gasmix0 = currentItem.modelData.dive.firstGas usedGas = currentItem.modelData.dive.firstGas
usedCyl = currentItem.modelData.dive.getCylinder usedCyl = currentItem.modelData.dive.getCylinder
cylinderIndex0 = currentItem.modelData.dive.cylinderList.indexOf(usedCyl[0]) cylinderIndex0 = currentItem.modelData.dive.cylinderList.indexOf(usedCyl[0])
cylinderIndex1 = currentItem.modelData.dive.cylinderList.indexOf(usedCyl[1]) cylinderIndex1 = currentItem.modelData.dive.cylinderList.indexOf(usedCyl[1])

7
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -33,7 +33,7 @@ Item {
property alias weightText: txtWeight.text property alias weightText: txtWeight.text
property alias startpressureText0: txtStartPressure0.text property alias startpressureText0: txtStartPressure0.text
property alias endpressureText0: txtEndPressure0.text property alias endpressureText0: txtEndPressure0.text
property alias gasmixText0: txtGasMix0.text property var usedGas: []
property alias gpsCheckbox: checkboxGPS.checked property alias gpsCheckbox: checkboxGPS.checked
property alias suitModel: suitBox.model property alias suitModel: suitBox.model
property alias divemasterModel: divemasterBox.model property alias divemasterModel: divemasterBox.model
@ -357,6 +357,7 @@ Item {
} }
Controls.TextField { Controls.TextField {
id: txtGasMix0 id: txtGasMix0
text: usedGas[0] != null ? usedGas[0] : null
Layout.fillWidth: true Layout.fillWidth: true
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i } validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: { onEditingFinished: {
@ -415,6 +416,7 @@ Item {
Controls.TextField { Controls.TextField {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
id: txtGasMix1 id: txtGasMix1
text: usedGas[1] != null ? usedGas[1] : null
Layout.fillWidth: true Layout.fillWidth: true
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i } validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: { onEditingFinished: {
@ -478,6 +480,7 @@ Item {
Controls.TextField { Controls.TextField {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
id: txtGasMix2 id: txtGasMix2
text: usedGas[2] != null ? usedGas[2] : null
Layout.fillWidth: true Layout.fillWidth: true
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i } validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: { onEditingFinished: {
@ -541,6 +544,7 @@ Item {
Controls.TextField { Controls.TextField {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
id: txtGasMix3 id: txtGasMix3
text: usedGas[3] != null ? usedGas[3] : null
Layout.fillWidth: true Layout.fillWidth: true
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i } validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: { onEditingFinished: {
@ -604,6 +608,7 @@ Item {
Controls.TextField { Controls.TextField {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
id: txtGasMix4 id: txtGasMix4
text: usedGas[4] != null ? usedGas[4] : null
Layout.fillWidth: true Layout.fillWidth: true
validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i } validator: RegExpValidator { regExp: /(EAN100|EAN\d\d|AIR|100|\d{1,2}|\d{1,2}\/\d{1,2})/i }
onEditingFinished: { onEditingFinished: {