summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar jan Iversen <jan@casacondor.com>2019-12-21 22:26:06 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-12-24 15:53:14 -0800
commit11810d5d0677ea1845ac4272c8578010132a8e1e (patch)
tree4d6eed53a41a9be35b8834d4971fbbf025271290
parentb83dcc4b2543d6c33a665c5e3b18c2d088635b52 (diff)
downloadsubsurface-11810d5d0677ea1845ac4272c8578010132a8e1e.tar.gz
mobile UI/login: remove startpage dependency in divelist
DiveList should not depend on StartPage, so remove references to startPage. Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--mobile-widgets/qml/DiveList.qml19
1 files changed, 5 insertions, 14 deletions
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index 7b441b521..52861443a 100644
--- a/mobile-widgets/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
@@ -499,8 +499,6 @@ Kirigami.ScrollablePage {
ListView {
id: diveListView
anchors.fill: parent
- opacity: 1.0 - startPage.opacity
- visible: opacity > 0
model: diveListModel
currentIndex: -1
delegate: diveDelegate
@@ -571,18 +569,11 @@ Kirigami.ScrollablePage {
}
onBackRequested: {
- if (startPage.visible && diveListView.count > 0 &&
- prefs.credentialStatus !== CloudStatus.CS_INCORRECT_USER_PASSWD) {
- prefs.credentialStatus = oldStatus
- event.accepted = true;
- }
- if (!startPage.visible) {
- if (Qt.platform.os != "ios") {
- manager.quit()
- }
- // let's make sure Kirigami doesn't quit on our behalf
- event.accepted = true
- }
+ if (Qt.platform.os != "ios")
+ manager.quit()
+
+ // let's make sure Kirigami doesn't quit on our behalf
+ event.accepted = true
}
function setCurrentDiveListIndex(idx, noScroll) {