diff --git a/images/images.qrc b/images/images.qrc index a015ce0902d..bc69634490f 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -443,10 +443,14 @@ themes/default/styleicons/style-point.png themes/default/styleicons/style-polygon.png themes/default/symbologyAdd.png + themes/default/symbologyAdd.svg themes/default/symbologyDown.png + themes/default/symbologyDown.svg themes/default/symbologyEdit.png themes/default/symbologyRemove.png + themes/default/symbologyRemove.svg themes/default/symbologyUp.png + themes/default/symbologyUp.svg themes/default/text.png themes/default/tracking.png themes/default/transformed.png diff --git a/images/themes/default/mActionArrowDown.png b/images/themes/default/mActionArrowDown.png index ea9c00cf8b9..1f4ab816bad 100644 Binary files a/images/themes/default/mActionArrowDown.png and b/images/themes/default/mActionArrowDown.png differ diff --git a/images/themes/default/mActionArrowLeft.png b/images/themes/default/mActionArrowLeft.png index 4fe46614c70..50a086fdc96 100644 Binary files a/images/themes/default/mActionArrowLeft.png and b/images/themes/default/mActionArrowLeft.png differ diff --git a/images/themes/default/mActionArrowRight.png b/images/themes/default/mActionArrowRight.png index 28a25b79711..edffdef5f6e 100644 Binary files a/images/themes/default/mActionArrowRight.png and b/images/themes/default/mActionArrowRight.png differ diff --git a/images/themes/default/mActionArrowUp.png b/images/themes/default/mActionArrowUp.png index d6c2b99cc71..0046e155723 100644 Binary files a/images/themes/default/mActionArrowUp.png and b/images/themes/default/mActionArrowUp.png differ diff --git a/images/themes/default/symbologyAdd.png b/images/themes/default/symbologyAdd.png index e2823bac78a..57f0c345296 100644 Binary files a/images/themes/default/symbologyAdd.png and b/images/themes/default/symbologyAdd.png differ diff --git a/images/themes/default/symbologyAdd.svg b/images/themes/default/symbologyAdd.svg new file mode 100644 index 00000000000..19356425e2f --- /dev/null +++ b/images/themes/default/symbologyAdd.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/images/themes/default/symbologyDown.png b/images/themes/default/symbologyDown.png index ea9c00cf8b9..1f4ab816bad 100644 Binary files a/images/themes/default/symbologyDown.png and b/images/themes/default/symbologyDown.png differ diff --git a/images/themes/default/symbologyDown.svg b/images/themes/default/symbologyDown.svg new file mode 100644 index 00000000000..43f5df7fdd0 --- /dev/null +++ b/images/themes/default/symbologyDown.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/themes/default/symbologyRemove.png b/images/themes/default/symbologyRemove.png index b9a1a6a56a3..6ed60958792 100644 Binary files a/images/themes/default/symbologyRemove.png and b/images/themes/default/symbologyRemove.png differ diff --git a/images/themes/default/symbologyRemove.svg b/images/themes/default/symbologyRemove.svg new file mode 100644 index 00000000000..5194a175d6d --- /dev/null +++ b/images/themes/default/symbologyRemove.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/themes/default/symbologyUp.png b/images/themes/default/symbologyUp.png index d6c2b99cc71..0046e155723 100644 Binary files a/images/themes/default/symbologyUp.png and b/images/themes/default/symbologyUp.png differ diff --git a/images/themes/default/symbologyUp.svg b/images/themes/default/symbologyUp.svg new file mode 100644 index 00000000000..26ed7c60279 --- /dev/null +++ b/images/themes/default/symbologyUp.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp index 6224ac52699..de62a7e7487 100644 --- 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 index 4e4d9b40431..877e38852c0 100644 --- 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 index e69ff15ff52..9e0b28c377c 100644 --- 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 diff --git a/src/ui/qgsattributeselectiondialogbase.ui b/src/ui/qgsattributeselectiondialogbase.ui index 2eadeb33135..fed43410241 100644 --- a/src/ui/qgsattributeselectiondialogbase.ui +++ b/src/ui/qgsattributeselectiondialogbase.ui @@ -33,7 +33,7 @@ - :/images/themes/default/symbologyUp.png:/images/themes/default/symbologyUp.png + :/images/themes/default/symbologyUp.svg:/images/themes/default/symbologyUp.svg @@ -44,7 +44,7 @@ - :/images/themes/default/symbologyDown.png:/images/themes/default/symbologyDown.png + :/images/themes/default/symbologyDown.svg:/images/themes/default/symbologyDown.svg @@ -55,7 +55,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -66,7 +66,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg diff --git a/src/ui/qgscomposermapwidgetbase.ui b/src/ui/qgscomposermapwidgetbase.ui index ab6c44f7c07..7830f267562 100755 --- a/src/ui/qgscomposermapwidgetbase.ui +++ b/src/ui/qgscomposermapwidgetbase.ui @@ -469,7 +469,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -483,7 +483,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg @@ -497,7 +497,7 @@ - :/images/themes/default/mActionArrowUp.png:/images/themes/default/mActionArrowUp.png + :/images/themes/default/symbologyUp.svg:/images/themes/default/symbologyUp.svg @@ -511,7 +511,7 @@ - :/images/themes/default/mActionArrowDown.png:/images/themes/default/mActionArrowDown.png + :/images/themes/default/symbologyDown.svg:/images/themes/default/symbologyDown.svg @@ -1227,7 +1227,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -1241,7 +1241,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg @@ -1255,7 +1255,7 @@ - :/images/themes/default/mActionArrowUp.png:/images/themes/default/mActionArrowUp.png + :/images/themes/default/symbologyUp.svg:/images/themes/default/symbologyUp.svg @@ -1269,7 +1269,7 @@ - :/images/themes/default/mActionArrowDown.png:/images/themes/default/mActionArrowDown.png + :/images/themes/default/symbologyDown.svg:/images/themes/default/symbologyDown.svg diff --git a/src/ui/qgsfieldspropertiesbase.ui b/src/ui/qgsfieldspropertiesbase.ui index c43ca07fdc2..2d3b7dbf6be 100644 --- a/src/ui/qgsfieldspropertiesbase.ui +++ b/src/ui/qgsfieldspropertiesbase.ui @@ -345,7 +345,7 @@ MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.< - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -356,7 +356,7 @@ MyForms.py must live on PYTHONPATH, .qgis/python, or inside the project folder.< - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg