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

core: replace dive master by dive guide

Browse source 
In general, replace "dive master" by "dive guide".

However, do not change written dive logs for now. On reading,
accept both versions.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-02-12 14:03:18 +01:00 • committed by Dirk Hohndel
parent 889827aadb
commit 9e0712d5dc
38 changed files with 141 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mobile-widgets/qml/CopySettings.qml
View file

@ -57,15 +57,15 @@ Kirigami.ScrollablePage {
}
}
Controls.Label {
text: qsTr("Dive master")
text: qsTr("Dive guide")
font.pointSize: subsurfaceTheme.regularPointSize
Layout.preferredWidth: gridWidth * 0.75
}
SsrfSwitch {
checked: manager.toggleDiveMaster(false)
checked: manager.toggleDiveGuide(false)
Layout.preferredWidth: gridWidth * 0.25
onClicked: {
manager.toggleDiveMaster(true)
manager.toggleDiveGuide(true)
}
}
Controls.Label {

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

@ -19,9 +19,9 @@ Kirigami.Page {
property alias buddyIndex: detailsEdit.buddyIndex
property alias buddyText: detailsEdit.buddyText
property alias buddyModel: detailsEdit.buddyModel
property alias divemasterIndex: detailsEdit.divemasterIndex
property alias divemasterText: detailsEdit.divemasterText
property alias divemasterModel: detailsEdit.divemasterModel
property alias diveguideIndex: detailsEdit.diveguideIndex
property alias diveguideText: detailsEdit.diveguideText
property alias diveguideModel: detailsEdit.diveguideModel
property alias tagText: detailsEdit.tagText
property alias depth: detailsEdit.depthText
property alias duration: detailsEdit.durationText
@ -351,7 +351,7 @@ Kirigami.Page {
watertemp = modelData.waterTemp
suitIndex = manager.suitList.indexOf(modelData.suit)
buddyText = modelData.buddy;
divemasterText = modelData.diveMaster
diveguideText = modelData.diveGuide
tagText = modelData.tags
notes = modelData.notes
if (modelData.singleWeight) {

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

@ -20,8 +20,8 @@ Item {
property alias suitText: suitBox.editText
property alias buddyIndex: buddyBox.currentIndex
property alias buddyText: buddyBox.editText
property alias divemasterIndex: divemasterBox.currentIndex
property alias divemasterText: divemasterBox.editText
property alias diveguideIndex: diveguideBox.currentIndex
property alias diveguideText: diveguideBox.editText
property alias tagText: txtTag.text
property alias cylinderIndex0: cylinderBox0.currentIndex
property alias cylinderIndex1: cylinderBox1.currentIndex
@ -36,7 +36,7 @@ Item {
property var endpressure: []
property var startpressure: []
property alias suitModel: suitBox.model
property alias divemasterModel: divemasterBox.model
property alias diveguideModel: diveguideBox.model
property alias buddyModel: buddyBox.model
property alias cylinderModel0: cylinderBox0.model
property alias cylinderModel1: cylinderBox1.model
@ -64,11 +64,11 @@ Item {
detailsEdit.depthText = ""
detailsEdit.airtempText = ""
detailsEdit.watertempText = ""
detailsEdit.divemasterText = ""
detailsEdit.diveguideText = ""
detailsEdit.buddyText = ""
suitBox.currentIndex = -1
buddyBox.currentIndex = -1
divemasterBox.currentIndex = -1
diveguideBox.currentIndex = -1
cylinderBox0.currentIndex = -1
cylinderBox1.currentIndex = -1
cylinderBox2.currentIndex = -1
@ -118,7 +118,7 @@ Item {
// apply the changes to the dive_table
manager.commitChanges(dive_id, detailsEdit.number, detailsEdit.dateText, locationBox.editText, detailsEdit.gpsText, detailsEdit.durationText,
detailsEdit.depthText, detailsEdit.airtempText, detailsEdit.watertempText,
suitBox.editText, buddyBox.editText, divemasterBox.editText, detailsEdit.tagText,
suitBox.editText, buddyBox.editText, diveguideBox.editText, detailsEdit.tagText,
detailsEdit.weightText, detailsEdit.notesText, startpressure,
endpressure, usedGas, usedCyl,
detailsEdit.rating,
@ -296,13 +296,13 @@ Item {
TemplateLabelSmall {
Layout.preferredWidth: Kirigami.Units.gridUnit * 4
horizontalAlignment: Text.AlignRight
text: qsTr("Divemaster:")
text: qsTr("Dive guide:")
}
TemplateEditComboBox {
id: divemasterBox
id: diveguideBox
flickable: detailsEditFlickable
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
manager.divemasterList : null
manager.diveguideList : null
}
}
RowLayout {

6
mobile-widgets/qml/DiveDetailsView.qml
View file

@ -481,7 +481,7 @@ Item {
// fifth row
//-----------
TemplateLabelSmall {
text: qsTr("Divemaster:")
text: qsTr("Dive guide:")
opacity: 0.6
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
@ -501,8 +501,8 @@ Item {
// sixth row
//-----------
TemplateLabelSmall {
id: txtDiveMaster
text: diveMaster
id: txtDiveGuide
text: diveGuide
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
Layout.maximumWidth: detailsView.col1Width
color: subsurfaceTheme.textColor

6
mobile-widgets/qml/main.qml
View file

@ -157,9 +157,9 @@ Kirigami.ApplicationWindow {
detailsWindow.buddyIndex = -1
detailsWindow.buddyText = ""
detailsWindow.depth = ""
detailsWindow.divemasterModel = manager.divemasterList
detailsWindow.divemasterIndex = -1
detailsWindow.divemasterText = ""
detailsWindow.diveguideModel = manager.diveguideList
detailsWindow.diveguideIndex = -1
detailsWindow.diveguideText = ""
detailsWindow.notes = ""
detailsWindow.location = ""
detailsWindow.gps = ""