Close dashboard when opening cloud popup, cleanup dashboard signals

opengisch · Jan 21, 2025 · e061855 · e061855
1 parent 556d25c
commit e061855
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/src/qml/DashBoard.qml b/src/qml/DashBoard.qml
@@ -13,12 +13,12 @@ Drawer {
   id: dashBoard
   objectName: "dashBoard"
 
-  signal showMenu
-  signal showCloudMenu
+  signal showMainMenu(point p)
+  signal showPrintLayouts(point p)
+  signal showCloudPopup
+  signal showProjectFolder
+  signal toggleMeasurementTool
   signal returnHome
-  signal measurementClicked
-  signal printClicked(Item item)
-  signal projectFolderClicked
 
   property bool allowInteractive: true
   property alias allowActiveLayerChange: legend.allowActiveLayerChange
@@ -47,9 +47,6 @@ Drawer {
   focus: visible
   clip: true
 
-  onShowMenu: mainMenu.popup(menuButton.x + menuButton.width - mainMenu.width - 2, menuButton.y - 2)
-  onShowCloudMenu: qfieldCloudPopup.show()
-
   onActiveLayerChanged: {
     if (activeLayer && activeLayer.readOnly && stateMachine.state == "digitize")
       displayToast(qsTr("The layer %1 is read only.").arg(activeLayer.name));
@@ -120,7 +117,7 @@ Drawer {
             iconColor: Theme.mainOverlayColor
             bgcolor: "transparent"
             onClicked: {
-              measurementClicked();
+              toggleMeasurementTool();
               highlighted = false;
             }
           }
@@ -132,7 +129,8 @@ Drawer {
             iconSource: Theme.getThemeVectorIcon("ic_print_black_24dp")
             iconColor: Theme.mainOverlayColor
             onClicked: {
-              printClicked(printItem);
+              const p = mapToItem(mainWindow.contentItem, 0, 0);
+              showPrintLayouts(p);
               highlighted = false;
             }
           }
@@ -183,7 +181,7 @@ Drawer {
               if (featureForm.visible) {
                 featureForm.hide();
               }
-              showCloudMenu();
+              showCloudPopup();
             }
             bottomRightIndicatorText: cloudProjectsModel.layerObserver.deltaFileWrapper.count > 0 ? cloudProjectsModel.layerObserver.deltaFileWrapper.count : cloudProjectsModel.layerObserver.deltaFileWrapper.count >= 10 ? '+' : ''
 
@@ -217,7 +215,7 @@ Drawer {
             iconColor: Theme.mainOverlayColor
             round: true
             onClicked: {
-              projectFolderClicked();
+              showProjectFolder();
             }
           }
         }
@@ -230,7 +228,10 @@ Drawer {
         iconSource: Theme.getThemeVectorIcon('ic_dot_menu_black_24dp')
         iconColor: Theme.mainOverlayColor
         bgcolor: "transparent"
-        onClicked: showMenu()
+        onClicked: {
+            let p = mapToItem(mainWindow.contentItem, width, 0);
+            showMainMenu(p)
+        }
       }
     }
 

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -2331,18 +2331,27 @@ ApplicationWindow {
       }
     }
 
-    onMeasurementClicked: {
+    onShowMainMenu: p => {
+        mainMenu.popup(p.x- mainMenu.width - 2, p.y - 2)
+    }
+
+    onShowCloudPopup: {
+        dashBoard.close();
+        qfieldCloudPopup.show()
+    }
+
+    onToggleMeasurementTool: {
       if (featureForm.state === "ProcessingAlgorithmForm") {
         cancelAlgorithmDialog.visible = true;
       } else {
         activateMeasurementMode();
       }
     }
 
-    onPrintClicked: printItem => {
+    onShowPrintLayouts: p => {
       if (layoutListInstantiator.count > 1) {
-        printMenu.popup(mainMenu.x, mainMenu.y + printItem.y);
-      } else if (layoutListInstantiator.count == 1) {
+        printMenu.popup(p.x, p.y);
+      } else if (layoutListInstantiator.count === 1) {
         mainMenu.close();
         displayToast(qsTr('Printing...'));
         printMenu.printName = layoutListInstantiator.model.titleAt(0);
@@ -2355,7 +2364,7 @@ ApplicationWindow {
       }
     }
 
-    onProjectFolderClicked: {
+    onShowProjectFolder: {
       dashBoard.close();
       qfieldLocalDataPickerScreen.projectFolderView = true;
       qfieldLocalDataPickerScreen.model.resetToPath(projectInfo.filePath);