Insure digitizing is cancelled or finished prior to going to home scr…

…een (#5310)
opengisch · Jun 19, 2024 · ad16405 · ad16405 · qfield-fairy · Jun 19, 2024
1 parent dca9277
commit ad16405
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/qml/DigitizingToolbar.qml b/src/qml/DigitizingToolbar.qml
@@ -19,6 +19,7 @@ VisibilityFadingRow {
   property VectorLayer geometryRequestedLayer
 
   property alias digitizingLogger: digitizingLogger
+  property alias cancelDialog: cancelDialog
 
   readonly property bool isDigitizing: rubberbandModel ? rubberbandModel.vertexCount > 1 : false //!< Readonly
 
@@ -92,6 +93,7 @@ VisibilityFadingRow {
     bgcolor: Theme.darkRed
 
     onClicked: {
+      homeButton.waitingForDigitizingFinish = false
       if (stateMachine.state !== "measure") {
         cancelDialog.open();
       } else {
@@ -121,6 +123,7 @@ VisibilityFadingRow {
     bgcolor: Theme.mainColor
 
     onClicked: {
+      homeButton.waitingForDigitizingFinish = false
       confirm()
     }
   }

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -2006,6 +2006,10 @@ ApplicationWindow {
               geometryRequested = false
             }
           }
+
+          if (homeButton.waitingForDigitizingFinish) {
+            openWelcomeScreen()
+          }
         }
 
         onConfirmed: {
@@ -2196,6 +2200,14 @@ ApplicationWindow {
     id: bookmarkProperties
   }
 
+  function openWelcomeScreen(){
+    mainMenu.close()
+    dashBoard.close()
+    welcomeScreen.visible = true
+    welcomeScreen.focus = true
+    homeButton.waitingForDigitizingFinish = false
+  }
+
   Menu {
     id: mainMenu
     title: qsTr( "Main Menu" )
@@ -2228,6 +2240,7 @@ ApplicationWindow {
       property color hoveredColor: Qt.hsla(Theme.mainTextColor.hslHue, Theme.mainTextColor.hslSaturation, Theme.mainTextColor.hslLightness, 0.2)
 
       QfToolButton {
+        id: homeButton
         anchors.verticalCenter: parent.verticalCenter
         height: 48
         width: 48
@@ -2236,12 +2249,16 @@ ApplicationWindow {
         iconColor: Theme.mainTextColor
         bgcolor: hovered ? parent.hoveredColor : "#00ffffff"
 
+        property bool waitingForDigitizingFinish: false
+
         onClicked: {
-          mainMenu.close()
-          dashBoard.close()
-          welcomeScreen.visible = true
-          welcomeScreen.focus = true
-          highlighted = false
+          if (currentRubberband && currentRubberband.model.vertexCount > 1) {
+            digitizingToolbar.cancelDialog.open();
+            waitingForDigitizingFinish = true
+          } else if (!waitingForDigitizingFinish) {
+            openWelcomeScreen()
+            highlighted = false
+          }
         }
       }