summaryrefslogtreecommitdiffstats
path: root/mobile-widgets/qml
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-22 16:45:37 -0400
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-10-26 11:38:26 -0700
commite03d3ac5d67dba0ac8343730f4f903a4c1fb7583 (patch)
tree3ca03a8293ce84a7aa17b1b0670cea59dce7324c /mobile-widgets/qml
parent320d2c47aab4bada071c665509f5eba499ed5780 (diff)
downloadsubsurface-e03d3ac5d67dba0ac8343730f4f903a4c1fb7583.tar.gz
Mobile: don't show nothing for the location
We use 'Dive details' as page title, everywhere else we use '<unnamed dive site>'. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qml')
-rw-r--r--mobile-widgets/qml/DiveDetails.qml3
-rw-r--r--mobile-widgets/qml/DiveDetailsView.qml2
-rw-r--r--mobile-widgets/qml/DiveList.qml2
3 files changed, 4 insertions, 3 deletions
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index e84cf843e..a30984a9a 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -52,7 +52,8 @@ Kirigami.Page {
property alias cylinderModel3: detailsEdit.cylinderModel3
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"
leftPadding: 0
topPadding: Kirigami.Units.gridUnit / 2
diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index 4febf688b..ee3b0902e 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -36,7 +36,7 @@ Item {
anchors.left: parent.left
Controls.Label {
id: locationText
- text: location
+ text: (undefined !== location && "" !== location) ? location : qsTr("<unnamed dive site>")
font.weight: Font.Bold
font.pointSize: subsurfaceTheme.titlePointSize
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index 07fd7ba4e..d4173d5f7 100644
--- a/mobile-widgets/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
@@ -155,7 +155,7 @@ Kirigami.ScrollablePage {
anchors.left: leftBarDive.right
Controls.Label {
id: locationText
- text: (undefined !== location) ? location : ""
+ text: (undefined !== location && "" != location) ? location : qsTr("<unnamed dive site>")
font.weight: Font.Bold
font.pointSize: subsurfaceTheme.regularPointSize
elide: Text.ElideRight