Redesign of the NoPermissionsDialog (#3088)

MMNoPermissionsDialog
MerginMaps · Feb 29, 2024 · d8371d5 · d8371d5
1 parent 5a3a2b6
commit d8371d5
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 4 deletions.
diff --git a/app/images/NoPermissions.svg b/app/images/NoPermissions.svg
diff --git a/app/images/images.qrc b/app/images/images.qrc
@@ -29,5 +29,6 @@
         <file>StreamingBootsOrange.svg</file>
         <file>NoWifi.svg</file>
         <file>SyncFailed.svg</file>
+        <file>NoPermissions.svg</file>
     </qresource>
 </RCC>
diff --git a/app/mmstyle.h b/app/mmstyle.h
@@ -182,6 +182,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl uploadImage READ uploadImage CONSTANT )
     Q_PROPERTY( QUrl noMapThemesImage READ noMapThemesImage CONSTANT )
     Q_PROPERTY( QUrl syncFailedImage READ syncFailedImage CONSTANT )
+    Q_PROPERTY( QUrl noPermissionsImage READ noPermissionsImage CONSTANT )
     Q_PROPERTY( QUrl warnLogoImage READ warnLogoImage CONSTANT )
     Q_PROPERTY( QUrl mmLogoImage READ mmLogoImage CONSTANT )
     Q_PROPERTY( QUrl lutraLogoImage READ lutraLogoImage CONSTANT )
@@ -412,6 +413,7 @@ class MMStyle: public QObject
     QUrl uploadImage() {return QUrl( "qrc:/images/UploadImage.svg" );}
     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 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
@@ -8,7 +8,7 @@ set(MM_QML
     components/TextWithIcon.qml
     dialogs/MigrateToMerginDialog.qml
     dialogs/MissingAuthDialog.qml
-    dialogs/NoPermissionsDialog.qml
+    dialogs/MMNoPermissionsDialog.qml
     dialogs/SplittingFailedDialog.qml
     dialogs/SyncFailedDialog.qml
     dialogs/MMSyncFailedDialog.qml

diff --git a/app/qml/dialogs/MMNoPermissionsDialog.qml b/app/qml/dialogs/MMNoPermissionsDialog.qml
@@ -0,0 +1,25 @@
+/***************************************************************************
+ *                                                                         *
+ *   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
+
+  picture: __style.noPermissionsImage
+  bigTitle: qsTr( "No rights to access the project" )
+  description: qsTr( "You are not allowed to synchronize your changes in this project. Contact the project owner to assign you the correct permission. If you are the project owner, log in to the dashboard." )
+  primaryButton: qsTr( "Ok, I understand" )
+
+  onPrimaryButtonClicked: {
+    close()
+  }
+}
diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -819,7 +819,7 @@ ApplicationWindow {
       onMigrationRequested: __syncManager.migrateProjectToMergin( __activeProject.projectFullName() )
     }
 
-    NoPermissionsDialog {
+    MMNoPermissionsDialog {
       id: noPermissionsDialog
     }
 

diff --git a/gallery/qml.qrc b/gallery/qml.qrc
@@ -123,5 +123,6 @@
         <file>../app/qml/settings/MMSettingSwitch.qml</file>
         <file>../app/qml/gps/MMBluetoothConnectionDrawer.qml</file>
         <file>../app/qml/dialogs/MMSyncFailedDialog.qml</file>
+        <file>../app/qml/dialogs/MMNoPermissionsDialog.qml</file>
     </qresource>
 </RCC>
diff --git a/gallery/qml/pages/DrawerPage.qml b/gallery/qml/pages/DrawerPage.qml
@@ -82,8 +82,17 @@ Page {
 
     MMButton {
       text: "MMSyncFailedDialog"
+
       onClicked: {
-        drawer4.open()
+        syncFailedDialog.open()
+      }
+    }
+
+    MMButton {
+      text: "MMNoPermissionsDialog"
+
+      onClicked: {
+        noPermissionsDialog.open()
       }
     }
   }
@@ -198,6 +207,10 @@ Page {
   }
 
   MMSyncFailedDialog {
-    id: drawer4
+    id: syncFailedDialog
+  }
+
+  MMNoPermissionsDialog {
+    id: noPermissionsDialog
   }
 }