From 1370a5cd9917a48f83b03b94da56b51c97e65381 Mon Sep 17 00:00:00 2001 From: nirvn Date: Mon, 30 Apr 2018 11:09:33 +0700 Subject: [PATCH] [processing] add vector icons for geoprocessing tools menu --- images/images.qrc | 8 ++++++++ images/themes/default/algorithms/mAlgorithmBuffer.svg | 1 + images/themes/default/algorithms/mAlgorithmClip.svg | 1 + images/themes/default/algorithms/mAlgorithmConvexHull.svg | 1 + images/themes/default/algorithms/mAlgorithmDifference.svg | 1 + images/themes/default/algorithms/mAlgorithmDissolve.svg | 1 + images/themes/default/algorithms/mAlgorithmIntersect.svg | 1 + .../algorithms/mAlgorithmSymmetricalDifference.svg | 1 + images/themes/default/algorithms/mAlgorithmUnion.svg | 1 + src/analysis/processing/qgsalgorithmbuffer.h | 2 ++ src/analysis/processing/qgsalgorithmclip.h | 2 ++ src/analysis/processing/qgsalgorithmconvexhull.h | 2 ++ src/analysis/processing/qgsalgorithmdifference.h | 3 ++- src/analysis/processing/qgsalgorithmdissolve.h | 2 ++ src/analysis/processing/qgsalgorithmintersection.h | 3 ++- .../processing/qgsalgorithmsymmetricaldifference.h | 3 ++- src/analysis/processing/qgsalgorithmunion.h | 3 ++- 17 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 images/themes/default/algorithms/mAlgorithmBuffer.svg create mode 100644 images/themes/default/algorithms/mAlgorithmClip.svg create mode 100644 images/themes/default/algorithms/mAlgorithmConvexHull.svg create mode 100644 images/themes/default/algorithms/mAlgorithmDifference.svg create mode 100644 images/themes/default/algorithms/mAlgorithmDissolve.svg create mode 100644 images/themes/default/algorithms/mAlgorithmIntersect.svg create mode 100644 images/themes/default/algorithms/mAlgorithmSymmetricalDifference.svg create mode 100644 images/themes/default/algorithms/mAlgorithmUnion.svg diff --git a/images/images.qrc b/images/images.qrc index aafb8dfac05..236a5fe6c53 100755 --- a/images/images.qrc +++ b/images/images.qrc @@ -76,6 +76,14 @@ north_arrows/gpsarrow2.svg splash/splash.png composer/missing_image.svg + themes/default/algorithms/mAlgorithmBuffer.svg + themes/default/algorithms/mAlgorithmClip.svg + themes/default/algorithms/mAlgorithmConvexHull.svg + themes/default/algorithms/mAlgorithmDifference.svg + themes/default/algorithms/mAlgorithmDissolve.svg + themes/default/algorithms/mAlgorithmIntersect.svg + themes/default/algorithms/mAlgorithmSymmetricalDifference.svg + themes/default/algorithms/mAlgorithmUnion.svg themes/default/cap_flat.svg themes/default/cap_round.svg themes/default/cap_square.svg diff --git a/images/themes/default/algorithms/mAlgorithmBuffer.svg b/images/themes/default/algorithms/mAlgorithmBuffer.svg new file mode 100644 index 00000000000..58079794261 --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmBuffer.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmClip.svg b/images/themes/default/algorithms/mAlgorithmClip.svg new file mode 100644 index 00000000000..ba712b0202a --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmClip.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmConvexHull.svg b/images/themes/default/algorithms/mAlgorithmConvexHull.svg new file mode 100644 index 00000000000..e6e93aca976 --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmConvexHull.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmDifference.svg b/images/themes/default/algorithms/mAlgorithmDifference.svg new file mode 100644 index 00000000000..6b7107551d1 --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmDifference.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmDissolve.svg b/images/themes/default/algorithms/mAlgorithmDissolve.svg new file mode 100644 index 00000000000..9511e1e3bc6 --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmDissolve.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmIntersect.svg b/images/themes/default/algorithms/mAlgorithmIntersect.svg new file mode 100644 index 00000000000..ba712b0202a --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmIntersect.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmSymmetricalDifference.svg b/images/themes/default/algorithms/mAlgorithmSymmetricalDifference.svg new file mode 100644 index 00000000000..7c4734d06dd --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmSymmetricalDifference.svg @@ -0,0 +1 @@ + diff --git a/images/themes/default/algorithms/mAlgorithmUnion.svg b/images/themes/default/algorithms/mAlgorithmUnion.svg new file mode 100644 index 00000000000..44130185769 --- /dev/null +++ b/images/themes/default/algorithms/mAlgorithmUnion.svg @@ -0,0 +1 @@ + diff --git a/src/analysis/processing/qgsalgorithmbuffer.h b/src/analysis/processing/qgsalgorithmbuffer.h index 5205c2c4a34..5abc47df3c1 100644 --- a/src/analysis/processing/qgsalgorithmbuffer.h +++ b/src/analysis/processing/qgsalgorithmbuffer.h @@ -35,6 +35,8 @@ class QgsBufferAlgorithm : public QgsProcessingAlgorithm QgsBufferAlgorithm() = default; void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override; + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmBuffer.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmBuffer.svg" ) ); } QString name() const override; QString displayName() const override; QStringList tags() const override; diff --git a/src/analysis/processing/qgsalgorithmclip.h b/src/analysis/processing/qgsalgorithmclip.h index 38a10c0f91b..f36f4308a70 100644 --- a/src/analysis/processing/qgsalgorithmclip.h +++ b/src/analysis/processing/qgsalgorithmclip.h @@ -35,6 +35,8 @@ class QgsClipAlgorithm : public QgsProcessingAlgorithm QgsClipAlgorithm() = default; void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override; + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmClip.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmClip.svg" ) ); } QString name() const override; QString displayName() const override; QStringList tags() const override; diff --git a/src/analysis/processing/qgsalgorithmconvexhull.h b/src/analysis/processing/qgsalgorithmconvexhull.h index a24f460c252..3375c189ec5 100644 --- a/src/analysis/processing/qgsalgorithmconvexhull.h +++ b/src/analysis/processing/qgsalgorithmconvexhull.h @@ -35,6 +35,8 @@ class QgsConvexHullAlgorithm : public QgsProcessingFeatureBasedAlgorithm public: QgsConvexHullAlgorithm() = default; + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmConvexHull.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmConvexHull.svg" ) ); } QString name() const override; QString displayName() const override; QStringList tags() const override; diff --git a/src/analysis/processing/qgsalgorithmdifference.h b/src/analysis/processing/qgsalgorithmdifference.h index b8e7da826a6..470eb8d2b32 100644 --- a/src/analysis/processing/qgsalgorithmdifference.h +++ b/src/analysis/processing/qgsalgorithmdifference.h @@ -26,7 +26,8 @@ class QgsDifferenceAlgorithm : public QgsProcessingAlgorithm { public: QgsDifferenceAlgorithm() = default; - + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmDifference.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmDifference.svg" ) ); } virtual QString name() const override; virtual QString displayName() const override; virtual QString group() const override; diff --git a/src/analysis/processing/qgsalgorithmdissolve.h b/src/analysis/processing/qgsalgorithmdissolve.h index 2c98fc5f066..fe4cc3abf3a 100644 --- a/src/analysis/processing/qgsalgorithmdissolve.h +++ b/src/analysis/processing/qgsalgorithmdissolve.h @@ -46,6 +46,8 @@ class QgsDissolveAlgorithm : public QgsCollectorAlgorithm QgsDissolveAlgorithm() = default; void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override; + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmDissolve.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmDissolve.svg" ) ); } QString name() const override; QString displayName() const override; QStringList tags() const override; diff --git a/src/analysis/processing/qgsalgorithmintersection.h b/src/analysis/processing/qgsalgorithmintersection.h index 14277c84544..259d9a1e47f 100644 --- a/src/analysis/processing/qgsalgorithmintersection.h +++ b/src/analysis/processing/qgsalgorithmintersection.h @@ -26,7 +26,8 @@ class QgsIntersectionAlgorithm : public QgsProcessingAlgorithm { public: QgsIntersectionAlgorithm() = default; - + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmIntersect.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmIntersect.svg" ) ); } virtual QString name() const override; virtual QString displayName() const override; virtual QString group() const override; diff --git a/src/analysis/processing/qgsalgorithmsymmetricaldifference.h b/src/analysis/processing/qgsalgorithmsymmetricaldifference.h index 6675bfbc856..af32786eda2 100644 --- a/src/analysis/processing/qgsalgorithmsymmetricaldifference.h +++ b/src/analysis/processing/qgsalgorithmsymmetricaldifference.h @@ -26,7 +26,8 @@ class QgsSymmetricalDifferenceAlgorithm : public QgsProcessingAlgorithm { public: QgsSymmetricalDifferenceAlgorithm() = default; - + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmSymmetricalDifference.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmSymmetricalDifference.svg" ) ); } virtual QString name() const override; virtual QString displayName() const override; virtual QString group() const override; diff --git a/src/analysis/processing/qgsalgorithmunion.h b/src/analysis/processing/qgsalgorithmunion.h index 35e4d0fc5b3..39cce5a6f1b 100644 --- a/src/analysis/processing/qgsalgorithmunion.h +++ b/src/analysis/processing/qgsalgorithmunion.h @@ -27,7 +27,8 @@ class QgsUnionAlgorithm : public QgsProcessingAlgorithm { public: QgsUnionAlgorithm() = default; - + QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmUnion.svg" ) ); } + QString svgIconPath() const override { return QgsApplication::iconPath( QStringLiteral( "/algorithms/mAlgorithmUnion.svg" ) ); } virtual QString name() const override; virtual QString displayName() const override; virtual QString group() const override;