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/UI: use our small label template

Browse source 
This saves 66 lines of code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-12-30 12:45:17 -08:00
parent 2e26051bd6
commit 2d6710bdef
1 changed files with 33 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,11 +175,9 @@ Item {
} }
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Coordinates:") text: qsTr("Coordinates:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtGps id: txtGps
@ -187,12 +185,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Use current\nGPS location:") text: qsTr("Use current\nGPS location:")
visible: manager.locationServiceAvailable visible: manager.locationServiceAvailable
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfCheckBox { SsrfCheckBox {
id: checkboxGPS id: checkboxGPS
@ -209,11 +205,9 @@ Item {
} }
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Depth:") text: qsTr("Depth:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtDepth id: txtDepth
@ -221,11 +215,9 @@ Item {
validator: RegExpValidator { regExp: /[^-]*/ } validator: RegExpValidator { regExp: /[^-]*/ }
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Duration:") text: qsTr("Duration:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtDuration id: txtDuration
@ -234,11 +226,9 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Air Temp:") text: qsTr("Air Temp:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtAirTemp id: txtAirTemp
@ -246,11 +236,9 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Water Temp:") text: qsTr("Water Temp:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtWaterTemp id: txtWaterTemp
@ -258,11 +246,9 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Suit:") text: qsTr("Suit:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateEditComboBox { TemplateEditComboBox {
id: suitBox id: suitBox
@ -270,11 +256,9 @@ Item {
manager.suitList : null manager.suitList : null
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Buddy:") text: qsTr("Buddy:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateEditComboBox { TemplateEditComboBox {
id: buddyBox id: buddyBox
@ -282,11 +266,9 @@ Item {
manager.buddyList : null manager.buddyList : null
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Divemaster:") text: qsTr("Divemaster:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateEditComboBox { TemplateEditComboBox {
id: divemasterBox id: divemasterBox
@ -294,11 +276,9 @@ Item {
manager.divemasterList : null manager.divemasterList : null
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Weight:") text: qsTr("Weight:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtWeight id: txtWeight
@ -308,11 +288,9 @@ Item {
} }
// all cylinder info should be able to become dynamic instead of this blob of code. // all cylinder info should be able to become dynamic instead of this blob of code.
// first cylinder // first cylinder
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder1:") text: qsTr("Cylinder1:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateComboBox { TemplateComboBox {
id: cylinderBox0 id: cylinderBox0
@ -323,11 +301,9 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:") text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtGasMix0 id: txtGasMix0
@ -337,11 +313,9 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:") text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtStartPressure0 id: txtStartPressure0
@ -350,11 +324,9 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:") text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
id: txtEndPressure0 id: txtEndPressure0
@ -363,12 +335,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
//second cylinder //second cylinder
Controls.Label { TemplateLabelSmall {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder2:") text: qsTr("Cylinder2:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateComboBox { TemplateComboBox {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
@ -380,12 +350,10 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:") text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
@ -396,12 +364,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:") text: qsTr("Start Pressure:")
color: subsurfaceTheme.textColor
font.pointSize: subsurfaceTheme.smallPointSize
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
@ -411,12 +377,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:") text: qsTr("End Pressure:")
color: subsurfaceTheme.textColor
font.pointSize: subsurfaceTheme.smallPointSize
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[1] != null ? true : false visible: usedCyl[1] != null ? true : false
@ -426,12 +390,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
// third cylinder // third cylinder
Controls.Label { TemplateLabelSmall {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder3:") text: qsTr("Cylinder3:")
color: subsurfaceTheme.textColor
font.pointSize: subsurfaceTheme.smallPointSize
} }
TemplateComboBox { TemplateComboBox {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
@ -444,12 +406,10 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:") text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
@ -459,12 +419,10 @@ Item {
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 }
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:") text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
@ -474,12 +432,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:") text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[2] != null ? true : false visible: usedCyl[2] != null ? true : false
@ -489,12 +445,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
// fourth cylinder // fourth cylinder
Controls.Label { TemplateLabelSmall {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder4:") text: qsTr("Cylinder4:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateComboBox { TemplateComboBox {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
@ -507,12 +461,10 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:") text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
@ -523,12 +475,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:") text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
@ -538,12 +488,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:") text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[3] != null ? true : false visible: usedCyl[3] != null ? true : false
@ -553,12 +501,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
// fifth cylinder // fifth cylinder
Controls.Label { TemplateLabelSmall {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Cylinder5:") text: qsTr("Cylinder5:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateComboBox { TemplateComboBox {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
@ -571,12 +517,10 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Gas mix:") text: qsTr("Gas mix:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
@ -587,12 +531,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Start Pressure:") text: qsTr("Start Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
@ -602,12 +544,10 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("End Pressure:") text: qsTr("End Pressure:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
SsrfTextField { SsrfTextField {
visible: usedCyl[4] != null ? true : false visible: usedCyl[4] != null ? true : false
@ -617,11 +557,9 @@ Item {
flickable: detailsEditFlickable flickable: detailsEditFlickable
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Rating:") text: qsTr("Rating:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateSpinBox { TemplateSpinBox {
id: ratingPicker id: ratingPicker
@ -631,11 +569,9 @@ Item {
onValueChanged: rating = value onValueChanged: rating = value
} }
Controls.Label { TemplateLabelSmall {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
text: qsTr("Visibility:") text: qsTr("Visibility:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
TemplateSpinBox { TemplateSpinBox {
id: visibilityPicker id: visibilityPicker
@ -645,12 +581,10 @@ Item {
onValueChanged: visibility = value onValueChanged: visibility = value
} }
Controls.Label { TemplateLabelSmall {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
text: qsTr("Notes:") text: qsTr("Notes:")
font.pointSize: subsurfaceTheme.smallPointSize
color: subsurfaceTheme.textColor
} }
Controls.TextArea { Controls.TextArea {
Layout.columnSpan: 2 Layout.columnSpan: 2