From 9838ea3dbdf2bb6a8b7380bb0531b7c1d537ea43 Mon Sep 17 00:00:00 2001 From: Salvatore Larosa Date: Mon, 22 Jun 2015 16:20:27 +0200 Subject: [PATCH] switch all png icons to svg ones for plus and minus signs: followup 33b49ff and a7191ab --- python/console/console_settings.py | 4 ++-- python/plugins/processing/gui/BatchPanel.py | 4 ++-- src/app/qgscustomprojectiondialog.cpp | 4 ++-- src/app/qgsrasterlayerproperties.cpp | 4 ++-- src/gui/symbology-ng/qgsdashspacedialog.cpp | 4 ++-- .../qgsrulebasedrendererv2widget.cpp | 4 ++-- .../symbology-ng/qgssmartgroupeditordialog.cpp | 2 +- src/plugins/topology/rulesDialog.cpp | 4 ++-- .../qgsrelationreferenceconfigdlgbase.ui | 4 ++-- src/ui/qgsattributeactiondialogbase.ui | 2 +- src/ui/qgsattributeselectiondialogbase.ui | 4 ++-- src/ui/qgscolordialog.ui | 4 ++-- src/ui/qgscomposerlegendwidgetbase.ui | 4 ++-- src/ui/qgsdiagrampropertiesbase.ui | 4 ++-- src/ui/qgsoptionsbase.ui | 8 ++++---- src/ui/qgsprojectpropertiesbase.ui | 16 ++++++++-------- src/ui/qgsrasterlayerpropertiesbase.ui | 4 ++-- src/ui/qgsrelationmanagerdialogbase.ui | 4 ++-- src/ui/qgsrulebasedrendererv2widget.ui | 4 ++-- ...qgssinglebandpseudocolorrendererwidgetbase.ui | 4 ++-- src/ui/qgsstylev2managerdialogbase.ui | 8 ++++---- src/ui/qgsvectorlayerpropertiesbase.ui | 4 ++-- 22 files changed, 52 insertions(+), 52 deletions(-) diff --git a/python/console/console_settings.py b/python/console/console_settings.py index 79517845f73..0c4bdb563da 100644 --- a/python/console/console_settings.py +++ b/python/console/console_settings.py @@ -38,9 +38,9 @@ class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole): self.restoreSettings() self.initialCheck() - self.addAPIpath.setIcon(QIcon(":/images/themes/default/symbologyAdd.png")) + self.addAPIpath.setIcon(QIcon(":/images/themes/default/symbologyAdd.svg")) self.addAPIpath.setToolTip(QCoreApplication.translate("PythonConsole", "Add API path")) - self.removeAPIpath.setIcon(QIcon(":/images/themes/default/symbologyRemove.png")) + self.removeAPIpath.setIcon(QIcon(":/images/themes/default/symbologyRemove.svg")) self.removeAPIpath.setToolTip(QCoreApplication.translate("PythonConsole", "Remove API path")) self.connect( self.preloadAPI, diff --git a/python/plugins/processing/gui/BatchPanel.py b/python/plugins/processing/gui/BatchPanel.py index 6b362f8b579..c928930e461 100644 --- a/python/plugins/processing/gui/BatchPanel.py +++ b/python/plugins/processing/gui/BatchPanel.py @@ -65,8 +65,8 @@ class BatchPanel(BASE, WIDGET): self.btnAdvanced.hide() # Set icons - self.btnAdd.setIcon(QgsApplication.getThemeIcon('/mActionSignPlus.png')) - self.btnRemove.setIcon(QgsApplication.getThemeIcon('/symbologyRemove.png')) + self.btnAdd.setIcon(QgsApplication.getThemeIcon('/symbologyAdd.svg')) + self.btnRemove.setIcon(QgsApplication.getThemeIcon('/symbologyRemove.svg')) self.btnAdvanced.setIcon(QIcon(os.path.join(pluginPath, 'images', 'alg.png'))) self.alg = alg diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp index 83589f1c7d5..f8c05e45aab 100644 --- a/src/app/qgscustomprojectiondialog.cpp +++ b/src/app/qgscustomprojectiondialog.cpp @@ -51,8 +51,8 @@ QgsCustomProjectionDialog::QgsCustomProjectionDialog( QWidget *parent, Qt::Windo QSettings settings; restoreGeometry( settings.value( "/Windows/CustomProjection/geometry" ).toByteArray() ); - pbnAdd->setIcon( QgsApplication::getThemeIcon( "symbologyAdd.png" ) ); - pbnRemove->setIcon( QgsApplication::getThemeIcon( "symbologyRemove.png" ) ); + pbnAdd->setIcon( QgsApplication::getThemeIcon( "symbologyAdd.svg" ) ); + pbnRemove->setIcon( QgsApplication::getThemeIcon( "symbologyRemove.svg" ) ); // user database is created at QGIS startup in QgisApp::createDB // we just check whether there is our database [MD] QFileInfo myFileInfo; diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index d2bee7308d2..2a658309e2a 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -147,9 +147,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv QIcon myPyramidPixmap( QgsApplication::getThemeIcon( "/mIconPyramid.png" ) ); QIcon myNoPyramidPixmap( QgsApplication::getThemeIcon( "/mIconNoPyramid.png" ) ); - pbnAddValuesManually->setIcon( QgsApplication::getThemeIcon( "/mActionSignPlus.png" ) ); + pbnAddValuesManually->setIcon( QgsApplication::getThemeIcon( "/symbologyAdd.svg" ) ); pbnAddValuesFromDisplay->setIcon( QgsApplication::getThemeIcon( "/mActionContextHelp.png" ) ); - pbnRemoveSelectedRow->setIcon( QgsApplication::getThemeIcon( "/symbologyRemove.png" ) ); + pbnRemoveSelectedRow->setIcon( QgsApplication::getThemeIcon( "/symbologyRemove.svg" ) ); pbnDefaultValues->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTable.png" ) ); pbnImportTransparentPixelValues->setIcon( QgsApplication::getThemeIcon( "/mActionFileOpen.svg" ) ); pbnExportTransparentPixelValues->setIcon( QgsApplication::getThemeIcon( "/mActionFileSave.svg" ) ); diff --git a/src/gui/symbology-ng/qgsdashspacedialog.cpp b/src/gui/symbology-ng/qgsdashspacedialog.cpp index 8446a3d78b0..0d1724a638f 100644 --- a/src/gui/symbology-ng/qgsdashspacedialog.cpp +++ b/src/gui/symbology-ng/qgsdashspacedialog.cpp @@ -32,8 +32,8 @@ QgsDashSpaceDialog::QgsDashSpaceDialog( const QVector& v, QWidget* parent { setupUi( this ); - mAddButton->setIcon( QIcon( iconPath( "symbologyAdd.png" ) ) ); - mRemoveButton->setIcon( QIcon( iconPath( "symbologyRemove.png" ) ) ); + mAddButton->setIcon( QIcon( iconPath( "symbologyAdd.svg" ) ) ); + mRemoveButton->setIcon( QIcon( iconPath( "symbologyRemove.svg" ) ) ); double dash = 0; double space = 0; diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp index a64df435cfb..cffb65585ce 100644 --- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp @@ -85,9 +85,9 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye btnRefineRule->setMenu( mRefineMenu ); contextMenu->addMenu( mRefineMenu ); - btnAddRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) ); + btnAddRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.svg" ) ) ); btnEditRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyEdit.png" ) ) ); - btnRemoveRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) ); + btnRemoveRule->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.svg" ) ) ); connect( viewRules, SIGNAL( doubleClicked( const QModelIndex & ) ), this, SLOT( editRule( const QModelIndex & ) ) ); diff --git a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp index f29005d3b40..283d40f66d6 100644 --- a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp +++ b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp @@ -37,7 +37,7 @@ QgsSmartGroupCondition::QgsSmartGroupCondition( int id, QWidget* parent ) : QWid mCondCombo->addItem( tr( "is NOT a member of group" ), QVariant( "!group" ) ); mCondCombo->addItem( tr( "has NO part of name matching" ), QVariant( "!name" ) ); - mRemoveBtn->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) ); + mRemoveBtn->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.svg" ) ) ); connect( mRemoveBtn, SIGNAL( clicked() ), this, SLOT( destruct() ) ); } diff --git a/src/plugins/topology/rulesDialog.cpp b/src/plugins/topology/rulesDialog.cpp index 46dde0467aa..e06ba74efd2 100644 --- a/src/plugins/topology/rulesDialog.cpp +++ b/src/plugins/topology/rulesDialog.cpp @@ -45,8 +45,8 @@ rulesDialog::rulesDialog( QMap testMap, QgisInterface *th mRulesTable->setSelectionBehavior( QAbstractItemView::SelectRows ); mRuleBox->addItems( mTestConfMap.keys() ); - mAddTestButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.png" ) ) ); - mDeleteTestButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) ); + mAddTestButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyAdd.svg" ) ) ); + mDeleteTestButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.svg" ) ) ); connect( mAddTestButton, SIGNAL( clicked() ), this, SLOT( addRule() ) ); connect( mAddTestButton, SIGNAL( clicked() ), mRulesTable, SLOT( resizeColumnsToContents() ) ); diff --git a/src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui b/src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui index 3fd2c4dcea9..be419505787 100644 --- a/src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui +++ b/src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui @@ -104,7 +104,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -115,7 +115,7 @@ - :/images/themes/default/mActionSignMinus.png:/images/themes/default/mActionSignMinus.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg diff --git a/src/ui/qgsattributeactiondialogbase.ui b/src/ui/qgsattributeactiondialogbase.ui index a9292ce93da..382a0445810 100644 --- a/src/ui/qgsattributeactiondialogbase.ui +++ b/src/ui/qgsattributeactiondialogbase.ui @@ -113,7 +113,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/qgsattributeselectiondialogbase.ui b/src/ui/qgsattributeselectiondialogbase.ui index fed43410241..5995946abb5 100644 --- a/src/ui/qgsattributeselectiondialogbase.ui +++ b/src/ui/qgsattributeselectiondialogbase.ui @@ -168,7 +168,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -205,7 +205,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/qgscolordialog.ui b/src/ui/qgscolordialog.ui index fb7455e7fa7..d79b2dd9186 100755 --- a/src/ui/qgscolordialog.ui +++ b/src/ui/qgscolordialog.ui @@ -615,7 +615,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -626,7 +626,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/qgscomposerlegendwidgetbase.ui b/src/ui/qgscomposerlegendwidgetbase.ui index 8bf00f1cafd..0a2a603125e 100644 --- a/src/ui/qgscomposerlegendwidgetbase.ui +++ b/src/ui/qgscomposerlegendwidgetbase.ui @@ -296,7 +296,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -313,7 +313,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/qgsdiagrampropertiesbase.ui b/src/ui/qgsdiagrampropertiesbase.ui index cf22edf8563..3fd356a348f 100644 --- a/src/ui/qgsdiagrampropertiesbase.ui +++ b/src/ui/qgsdiagrampropertiesbase.ui @@ -400,7 +400,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -417,7 +417,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/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui index bafb36f45c7..114f4f8f16e 100644 --- a/src/ui/qgsoptionsbase.ui +++ b/src/ui/qgsoptionsbase.ui @@ -3173,7 +3173,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -3187,7 +3187,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg @@ -4290,7 +4290,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -4301,7 +4301,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/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui index 5a75309ec51..52c06804041 100644 --- a/src/ui/qgsprojectpropertiesbase.ui +++ b/src/ui/qgsprojectpropertiesbase.ui @@ -706,7 +706,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -717,7 +717,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg @@ -1523,7 +1523,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -1534,7 +1534,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg @@ -1582,7 +1582,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -1593,7 +1593,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg @@ -1744,7 +1744,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -1762,7 +1762,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/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui index b1829aeb334..0d95042b222 100644 --- a/src/ui/qgsrasterlayerpropertiesbase.ui +++ b/src/ui/qgsrasterlayerpropertiesbase.ui @@ -1299,7 +1299,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -1330,7 +1330,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/qgsrelationmanagerdialogbase.ui b/src/ui/qgsrelationmanagerdialogbase.ui index 8144fa0a12a..e448fd00d79 100644 --- a/src/ui/qgsrelationmanagerdialogbase.ui +++ b/src/ui/qgsrelationmanagerdialogbase.ui @@ -73,7 +73,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -84,7 +84,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/qgsrulebasedrendererv2widget.ui b/src/ui/qgsrulebasedrendererv2widget.ui index e0fc6acd59a..5fac2d1e466 100644 --- a/src/ui/qgsrulebasedrendererv2widget.ui +++ b/src/ui/qgsrulebasedrendererv2widget.ui @@ -57,7 +57,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -85,7 +85,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/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui index f97bf9cea4d..2ac09fcf585 100644 --- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui +++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui @@ -52,7 +52,7 @@ - :/images/themes/default/mActionSignPlus.png:/images/themes/default/mActionSignPlus.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/qgsstylev2managerdialogbase.ui b/src/ui/qgsstylev2managerdialogbase.ui index 4d30cb49f88..5ac15befcbf 100644 --- a/src/ui/qgsstylev2managerdialogbase.ui +++ b/src/ui/qgsstylev2managerdialogbase.ui @@ -80,7 +80,7 @@ QMenu::item:selected { background-color: gray; } */ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg false @@ -94,7 +94,7 @@ QMenu::item:selected { background-color: gray; } */ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg false @@ -265,7 +265,7 @@ QMenu::item:selected { background-color: gray; } */ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg QToolButton::InstantPopup @@ -285,7 +285,7 @@ QMenu::item:selected { background-color: gray; } */ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg true diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui index 4aaba5a4fc8..011b8dad0b8 100644 --- a/src/ui/qgsvectorlayerpropertiesbase.ui +++ b/src/ui/qgsvectorlayerpropertiesbase.ui @@ -1294,7 +1294,7 @@ - :/images/themes/default/symbologyAdd.png:/images/themes/default/symbologyAdd.png + :/images/themes/default/symbologyAdd.svg:/images/themes/default/symbologyAdd.svg @@ -1305,7 +1305,7 @@ - :/images/themes/default/symbologyRemove.png:/images/themes/default/symbologyRemove.png + :/images/themes/default/symbologyRemove.svg:/images/themes/default/symbologyRemove.svg