Merge pull request #2125 from nirvn/symbology_arrows_refresh-v3

[GUI] refresh the symbology add/remove/arrow icons
qgis · Jun 9, 2015 · 03ad6ac · 03ad6ac
2 parents 558f0b2 + 3e17d56
commit 03ad6ac
Show file tree

Hide file tree

Showing 19 changed files with 349 additions and 26 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -443,10 +443,14 @@
         <file>themes/default/styleicons/style-point.png</file>
         <file>themes/default/styleicons/style-polygon.png</file>
         <file>themes/default/symbologyAdd.png</file>
+        <file>themes/default/symbologyAdd.svg</file>
         <file>themes/default/symbologyDown.png</file>
+        <file>themes/default/symbologyDown.svg</file>
         <file>themes/default/symbologyEdit.png</file>
         <file>themes/default/symbologyRemove.png</file>
+        <file>themes/default/symbologyRemove.svg</file>
         <file>themes/default/symbologyUp.png</file>
+        <file>themes/default/symbologyUp.svg</file>
         <file>themes/default/text.png</file>
         <file>themes/default/tracking.png</file>
         <file>themes/default/transformed.png</file>

diff --git a/images/themes/default/mActionArrowDown.png b/images/themes/default/mActionArrowDown.png
diff --git a/images/themes/default/mActionArrowLeft.png b/images/themes/default/mActionArrowLeft.png
diff --git a/images/themes/default/mActionArrowRight.png b/images/themes/default/mActionArrowRight.png
diff --git a/images/themes/default/mActionArrowUp.png b/images/themes/default/mActionArrowUp.png
diff --git a/images/themes/default/symbologyAdd.png b/images/themes/default/symbologyAdd.png
diff --git a/images/themes/default/symbologyAdd.svg b/images/themes/default/symbologyAdd.svg
diff --git a/images/themes/default/symbologyDown.png b/images/themes/default/symbologyDown.png
diff --git a/images/themes/default/symbologyDown.svg b/images/themes/default/symbologyDown.svg
diff --git a/images/themes/default/symbologyRemove.png b/images/themes/default/symbologyRemove.png
diff --git a/images/themes/default/symbologyRemove.svg b/images/themes/default/symbologyRemove.svg
diff --git a/images/themes/default/symbologyUp.png b/images/themes/default/symbologyUp.png
diff --git a/images/themes/default/symbologyUp.svg b/images/themes/default/symbologyUp.svg
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -93,11 +93,11 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )
   setupUi( this );
 
   // setup icons
-  mAddToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
+  mAddToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.svg" ) ) );
   mEditPushButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.png" ) ) );
-  mRemoveToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
-  mMoveUpToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
-  mMoveDownToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );
+  mRemoveToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.svg" ) ) );
+  mMoveUpToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.svg" ) ) );
+  mMoveDownToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.svg" ) ) );
   mCountToolButton->setIcon( QIcon( QgsApplication::iconPath( "mActionSum.png" ) ) );
 
   mFontColorButton->setColorDialogTitle( tr( "Select font color" ) );

diff --git a/src/gui/effects/qgseffectstackpropertieswidget.cpp b/src/gui/effects/qgseffectstackpropertieswidget.cpp
@@ -104,10 +104,10 @@ QgsEffectStackPropertiesWidget::QgsEffectStackPropertiesWidget( QgsEffectStack *
 
   setupUi( this );
 
-  mAddButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
-  mRemoveButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
-  mUpButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
-  mDownButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );
+  mAddButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.svg" ) ) );
+  mRemoveButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.svg" ) ) );
+  mUpButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.svg" ) ) );
+  mDownButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.svg" ) ) );
 
   mModel = new QStandardItemModel();
   // Set the effect

diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
@@ -157,14 +157,14 @@ QgsSymbolV2SelectorDialog::QgsSymbolV2SelectorDialog( QgsSymbolV2* symbol, QgsSt
     layout()->setContentsMargins( 0, 0, 0, 0 );
   }
   // setup icons
-  btnAddLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) );
-  btnRemoveLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
+  btnAddLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.svg" ) ) );
+  btnRemoveLayer->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.svg" ) ) );
   QIcon iconLock;
   iconLock.addFile( QgsApplication::iconPath( "locked.svg" ), QSize(), QIcon::Normal, QIcon::On );
   iconLock.addFile( QgsApplication::iconPath( "unlocked.svg" ), QSize(), QIcon::Normal, QIcon::Off );
   btnLock->setIcon( iconLock );
-  btnUp->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
-  btnDown->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );
+  btnUp->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.svg" ) ) );
+  btnDown->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.svg" ) ) );
 
   model = new QStandardItemModel();
   // Set the symbol