Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace map toolbar #2968

Merged
merged 3 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/icons/Add.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/icons/Home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/icons/Layers.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/icons/LocalChanges.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/icons/MapThemes.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/icons/PositionTracking.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/icons/Settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions app/icons/Sync.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/icons/SyncGreen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions app/icons/ZoomToProject.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion app/icons/icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -55,6 +64,6 @@
<file>XMark.svg</file>
<file>XTwitter.svg</file>
<file>Youtube.svg</file>
<file>Globe.svg</file>
<file>ZoomToProject.svg</file>
</qresource>
</RCC>
18 changes: 18 additions & 0 deletions app/mmstyle.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -121,6 +129,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 )
Expand Down Expand Up @@ -204,6 +213,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" );}
Expand Down Expand Up @@ -246,6 +263,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" );}
Expand Down
1 change: 0 additions & 1 deletion app/qml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ set(MM_QML
InputStyle.qml
LogPanel.qml
LoginForm.qml
MainPanel.qml
ManageInvitationsPage.qml
MapThemePanel.qml
Notification.qml
Expand Down
Loading