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: don't show nothing for the location

Browse source 
We use 'Dive details' as page title, everywhere else we use
'<unnamed dive site>'.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2019-10-22 16:45:37 -04:00
parent 320d2c47aa
commit e03d3ac5d6
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,8 @@ Kirigami.Page {
property alias cylinderModel3: detailsEdit.cylinderModel3 property alias cylinderModel3: detailsEdit.cylinderModel3
property alias cylinderModel4: detailsEdit.cylinderModel4 property alias cylinderModel4: detailsEdit.cylinderModel4
title: currentItem && currentItem.modelData ? currentItem.modelData.location : qsTr("Dive details") title: currentItem && currentItem.modelData && currentItem.modelData.location && "" !== currentItem.modelData.location ?
currentItem.modelData.location : qsTr("Dive details")
state: "view" state: "view"
leftPadding: 0 leftPadding: 0
topPadding: Kirigami.Units.gridUnit / 2 topPadding: Kirigami.Units.gridUnit / 2

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

@ -36,7 +36,7 @@ Item {
anchors.left: parent.left anchors.left: parent.left
Controls.Label { Controls.Label {
id: locationText id: locationText
text: location text: (undefined !== location && "" !== location) ? location : qsTr("<unnamed dive site>")
font.weight: Font.Bold font.weight: Font.Bold
font.pointSize: subsurfaceTheme.titlePointSize font.pointSize: subsurfaceTheme.titlePointSize
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere

2
mobile-widgets/qml/DiveList.qml
View file

@ -155,7 +155,7 @@ Kirigami.ScrollablePage {
anchors.left: leftBarDive.right anchors.left: leftBarDive.right
Controls.Label { Controls.Label {
id: locationText id: locationText
text: (undefined !== location) ? location : "" text: (undefined !== location && "" != location) ? location : qsTr("<unnamed dive site>")
font.weight: Font.Bold font.weight: Font.Bold
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
elide: Text.ElideRight elide: Text.ElideRight