MMMissingAuthDialog

MerginMaps · Feb 29, 2024 · c0844c0 · c0844c0
1 parent a5d4d33
commit c0844c0
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 2 deletions.
diff --git a/app/images/SignIn.svg b/app/images/SignIn.svg
diff --git a/app/images/images.qrc b/app/images/images.qrc
@@ -35,5 +35,6 @@
         <file>NoWifi.svg</file>
         <file>SyncFailed.svg</file>
         <file>NoPermissions.svg</file>
+        <file>SignIn.svg</file>
     </qresource>
 </RCC>
diff --git a/app/mmstyle.h b/app/mmstyle.h
@@ -184,6 +184,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl noMapThemesImage READ noMapThemesImage CONSTANT )
     Q_PROPERTY( QUrl syncFailedImage READ syncFailedImage CONSTANT )
     Q_PROPERTY( QUrl noPermissionsImage READ noPermissionsImage CONSTANT )
+    Q_PROPERTY( QUrl signInImage READ signInImage CONSTANT )
     Q_PROPERTY( QUrl warnLogoImage READ warnLogoImage CONSTANT )
     Q_PROPERTY( QUrl mmLogoImage READ mmLogoImage CONSTANT )
     Q_PROPERTY( QUrl lutraLogoImage READ lutraLogoImage CONSTANT )
@@ -421,6 +422,7 @@ class MMStyle: public QObject
     QUrl noMapThemesImage() {return QUrl( "qrc:/images/NoMapThemesImage.svg" );}
     QUrl syncFailedImage() {return QUrl( "qrc:/images/SyncFailed.svg" );}
     QUrl noPermissionsImage() {return QUrl( "qrc:/images/NoPermissions.svg" );}
+    QUrl signInImage() {return QUrl( "qrc:/images/SignIn.svg" );}
     QUrl reachedDataLimitImage() {return QUrl( "qrc:/images/ReachedDataLimit.svg" );}
     QUrl warnLogoImage() {return QUrl( "qrc:/images/WarnLogoImage.svg" );}
     QUrl mapPinImage() {return QUrl( "qrc:/images/MapPin.svg" );}

diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -7,7 +7,7 @@ set(MM_QML
     components/Symbol.qml
     components/TextWithIcon.qml
     dialogs/MigrateToMerginDialog.qml
-    dialogs/MissingAuthDialog.qml
+    dialogs/MMMissingAuthDialog.qml
     dialogs/MMNoPermissionsDialog.qml
     dialogs/SplittingFailedDialog.qml
     dialogs/SyncFailedDialog.qml

diff --git a/app/qml/dialogs/MMMissingAuthDialog.qml b/app/qml/dialogs/MMMissingAuthDialog.qml
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+import QtQuick
+
+import "../components"
+
+MMDrawerDialog {
+  id: root
+
+  signal singInRequested()
+
+  picture: __style.signInImage
+  bigTitle: qsTr( "Sign in to Mergin" )
+  description: qsTr( "You need to be signed in to your Mergin Maps account in order to synchronize the project." )
+  primaryButton: qsTr( "Yes, I want to sign in" )
+  secondaryButton: qsTr( "No, thanks" )
+
+  onPrimaryButtonClicked: {
+    root.singInRequested()
+    close()
+  }
+
+  onSecondaryButtonClicked: {
+    close()
+  }
+}
diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -827,7 +827,7 @@ ApplicationWindow {
       id: syncFailedDialog
     }
 
-    MissingAuthDialog {
+    MMMissingAuthDialog {
       id: missingAuthDialog
 
       onSingInRequested: {

diff --git a/gallery/qml.qrc b/gallery/qml.qrc
@@ -124,5 +124,6 @@
         <file>../app/qml/gps/MMBluetoothConnectionDrawer.qml</file>
         <file>../app/qml/dialogs/MMSyncFailedDialog.qml</file>
         <file>../app/qml/dialogs/MMNoPermissionsDialog.qml</file>
+        <file>../app/qml/dialogs/MMMissingAuthDialog.qml</file>
     </qresource>
 </RCC>
diff --git a/gallery/qml/pages/DrawerPage.qml b/gallery/qml/pages/DrawerPage.qml
@@ -98,6 +98,14 @@ Page {
           noPermissionsDialog.open()
         }
       }
+
+      MMButton {
+        text: "MMMissingAuthDialog"
+
+        onClicked: {
+          missingAuthDialog.open()
+        }
+      }
     }
   }
 
@@ -217,4 +225,8 @@ Page {
   MMNoPermissionsDialog {
     id: noPermissionsDialog
   }
+
+  MMMissingAuthDialog {
+    id: missingAuthDialog
+  }
 }
diff --git a/gallery/qml/pages/ImagesPage.qml b/gallery/qml/pages/ImagesPage.qml
@@ -50,6 +50,7 @@ ScrollView {
         Column { Image { source: __style.noWifiImage } Text { text: "noWifiImage" } }
         Column { Image { source: __style.syncFailedImage  } Text { text: "syncFailedImage " } }
         Column { Image { source: __style.noPermissionsImage } Text { text: "noPermissionsImage" } }
+        Column { Image { source: __style.signInImage } Text { text: "signInImage" } }
       }
     }