Merge branch 'master' into master_selectableToolbar

MerginMaps · Dec 19, 2023 · 1cf2d6a · 1cf2d6a
2 parents c024b12 + d260b4a
commit 1cf2d6a
Show file tree

Hide file tree

Showing 18 changed files with 174 additions and 558 deletions.
diff --git a/app/icons/Add.svg b/app/icons/Add.svg
diff --git a/app/icons/Home.svg b/app/icons/Home.svg
diff --git a/app/icons/Layers.svg b/app/icons/Layers.svg
diff --git a/app/icons/LocalChanges.svg b/app/icons/LocalChanges.svg
diff --git a/app/icons/MapThemes.svg b/app/icons/MapThemes.svg
diff --git a/app/icons/PositionTracking.svg b/app/icons/PositionTracking.svg
diff --git a/app/icons/Settings.svg b/app/icons/Settings.svg
diff --git a/app/icons/Sync.svg b/app/icons/Sync.svg
diff --git a/app/icons/SyncGreen.svg b/app/icons/SyncGreen.svg
diff --git a/app/icons/ZoomToProject.svg b/app/icons/ZoomToProject.svg
diff --git a/app/icons/icons.qrc b/app/icons/icons.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>AcceptInvitationImage.svg</file>
         <file>AcceptInvitationLogoImage.svg</file>
+        <file>Add.svg</file>
         <file>Archaeology.svg</file>
         <file>ArrowDown.svg</file>
         <file>ArrowLinkRight.svg</file>
@@ -22,16 +23,22 @@
         <file>Environmental.svg</file>
         <file>Error.svg</file>
         <file>Facebook.svg</file>
+        <file>Globe.svg</file>
         <file>Hide.svg</file>
+        <file>Home.svg</file>
         <file>Info.svg</file>
+        <file>Layers.svg</file>
         <file>Linkedin.svg</file>
+        <file>LocalChanges.svg</file>
         <file>Mastodon.svg</file>
+        <file>MapThemes.svg</file>
         <file>More.svg</file>
         <file>MorePhotos.svg</file>
         <file>Mouth.svg</file>
         <file>NaturalResources.svg</file>
         <file>Other.svg</file>
         <file>Others.svg</file>
+        <file>PositionTracking.svg</file>
         <file>ProjectButtonMore.svg</file>
         <file>QGIS.svg</file>
         <file>QRCode.svg</file>
@@ -40,10 +47,12 @@
         <file>Search.svg</file>
         <file>Show.svg</file>
         <file>SocialMedia.svg</file>
+        <file>Settings.svg</file>
         <file>StateAndLocal.svg</file>
         <file>Stop.svg</file>
         <file>Subscriptions.svg</file>
         <file>Sync.svg</file>
+        <file>SyncGreen.svg</file>
         <file>Teacher.svg</file>
         <file>Telecommunication.svg</file>
         <file>Terms.svg</file>
@@ -59,5 +68,6 @@
         <file>Global.svg</file>
         <file>Home.svg</file>
         <file>Projects.svg</file>
+        <file>ZoomToProject.svg</file>
     </qresource>
 </RCC>
diff --git a/app/mmstyle.h b/app/mmstyle.h
@@ -80,6 +80,14 @@ class MMStyle: public QObject
     Q_PROPERTY( QColor shadowColor READ shadowColor CONSTANT )
 
     // Icons
+    Q_PROPERTY( QUrl addIcon READ addIcon CONSTANT )
+    Q_PROPERTY( QUrl homeIcon READ homeIcon CONSTANT )
+    Q_PROPERTY( QUrl layersIcon READ layersIcon CONSTANT )
+    Q_PROPERTY( QUrl localChangesIcon READ localChangesIcon CONSTANT )
+    Q_PROPERTY( QUrl mapThemesIcon READ mapThemesIcon CONSTANT )
+    Q_PROPERTY( QUrl positionTrackingIcon READ positionTrackingIcon CONSTANT )
+    Q_PROPERTY( QUrl zoomToProjectIcon READ zoomToProjectIcon CONSTANT )
+    Q_PROPERTY( QUrl settingsIcon READ settingsIcon CONSTANT )
     Q_PROPERTY( QUrl archaeologyIcon READ archaeologyIcon CONSTANT )
     Q_PROPERTY( QUrl arrowDownIcon READ arrowDownIcon CONSTANT )
     Q_PROPERTY( QUrl arrowLinkRightIcon READ arrowLinkRightIcon CONSTANT )
@@ -125,6 +133,7 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl stopIcon READ stopIcon CONSTANT )
     Q_PROPERTY( QUrl subscriptionsIcon READ subscriptionsIcon CONSTANT )
     Q_PROPERTY( QUrl syncIcon READ syncIcon CONSTANT )
+    Q_PROPERTY( QUrl syncGreenIcon READ syncGreenIcon CONSTANT )
     Q_PROPERTY( QUrl teacherIcon READ teacherIcon CONSTANT )
     Q_PROPERTY( QUrl telecommunicationIcon READ telecommunicationIcon CONSTANT )
     Q_PROPERTY( QUrl termsIcon READ termsIcon CONSTANT )
@@ -207,6 +216,14 @@ class MMStyle: public QObject
     QColor errorBgInputColor() {return QColor::fromString( "#FEFAF9" );}
     QColor shadowColor() {return QColor::fromString( "#66777777" );}
 
+    QUrl addIcon() {return QUrl( "qrc:/Add.svg" );}
+    QUrl layersIcon() {return QUrl( "qrc:/Layers.svg" );}
+    QUrl homeIcon() {return QUrl( "qrc:/Home.svg" );}
+    QUrl localChangesIcon() {return QUrl( "qrc:/LocalChanges.svg" );}
+    QUrl mapThemesIcon() {return QUrl( "qrc:/MapThemes.svg" );}
+    QUrl positionTrackingIcon() {return QUrl( "qrc:/PositionTracking.svg" );}
+    QUrl settingsIcon() {return QUrl( "qrc:/Settings.svg" );}
+    QUrl zoomToProjectIcon() {return QUrl( "qrc:/ZoomToProject.svg" );}
     QUrl archaeologyIcon() {return QUrl( "qrc:/Archaeology.svg" );}
     QUrl arrowDownIcon() {return QUrl( "qrc:/ArrowDown.svg" );}
     QUrl arrowLinkRightIcon() {return QUrl( "qrc:/ArrowLinkRight.svg" );}
@@ -252,6 +269,7 @@ class MMStyle: public QObject
     QUrl stopIcon() {return QUrl( "qrc:/Stop.svg" );}
     QUrl subscriptionsIcon() {return QUrl( "qrc:/Subscriptions.svg" );}
     QUrl syncIcon() {return QUrl( "qrc:/Sync.svg" );}
+    QUrl syncGreenIcon() {return QUrl( "qrc:/SyncGreen.svg" );}
     QUrl teacherIcon() {return QUrl( "qrc:/Teacher.svg" );}
     QUrl telecommunicationIcon() {return QUrl( "qrc:/Telecommunication.svg" );}
     QUrl termsIcon() {return QUrl( "qrc:/Terms.svg" );}

diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -153,7 +153,6 @@ set(MM_QML
     InputStyle.qml
     LogPanel.qml
     LoginForm.qml
-    MainPanel.qml
     ManageInvitationsPage.qml
     MapThemePanel.qml
     Notification.qml