diff --git a/images/images.qrc b/images/images.qrc
index 011c73b0cc2..77eca88466a 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -184,12 +184,14 @@
themes/default/mActionCapturePolygon.png
themes/default/mActionCapturePolygon.svg
themes/default/mActionNewTableRow.png
+ themes/default/mActionNewTableRow.svg
themes/default/mActionChangeLabelProperties.png
themes/default/mActionChangeLabelProperties.svg
themes/default/mActionCheckQgisVersion.png
themes/default/mActionCollapseTree.png
themes/default/mActionCollapseTree.svg
themes/default/mActionComposerManager.svg
+ themes/default/mActionConditionalFormatting.svg
themes/default/mActionContextHelp.png
themes/default/mActionCopySelected.png
themes/default/mActionCreateMemory.png
@@ -198,6 +200,7 @@
themes/default/mActionDecreaseBrightness.svg
themes/default/mActionDecreaseContrast.svg
themes/default/mActionDeleteAttribute.png
+ themes/default/mActionDeleteAttribute.svg
themes/default/mActionDeletePart.png
themes/default/mActionDeletePart.svg
themes/default/mActionDeleteRing.png
@@ -293,6 +296,7 @@
themes/default/mActionMoveLabel.svg
themes/default/mActionMoveVertex.png
themes/default/mActionNewAttribute.png
+ themes/default/mActionNewAttribute.svg
themes/default/mActionNewBookmark.png
themes/default/mActionNewBookmark.svg
themes/default/mActionNewComposer.svg
@@ -351,6 +355,7 @@
themes/default/mActionSelectAll.png
themes/default/mActionSelectAll.svg
themes/default/mActionSelectedToTop.png
+ themes/default/mActionSelectedToTop.svg
themes/default/mActionSelectFreehand.svg
themes/default/mActionSelectPan.png
themes/default/mActionSelectPolygon.svg
diff --git a/images/themes/default/mActionConditionalFormatting.svg b/images/themes/default/mActionConditionalFormatting.svg
new file mode 100644
index 00000000000..799ffa9e8f4
--- /dev/null
+++ b/images/themes/default/mActionConditionalFormatting.svg
@@ -0,0 +1,2104 @@
+
+
+
+
\ No newline at end of file
diff --git a/images/themes/default/mActionDeleteAttribute.svg b/images/themes/default/mActionDeleteAttribute.svg
new file mode 100644
index 00000000000..0fea9760fb5
--- /dev/null
+++ b/images/themes/default/mActionDeleteAttribute.svg
@@ -0,0 +1,1023 @@
+
+
+
+
diff --git a/images/themes/default/mActionNewAttribute.svg b/images/themes/default/mActionNewAttribute.svg
new file mode 100644
index 00000000000..40869409c3b
--- /dev/null
+++ b/images/themes/default/mActionNewAttribute.svg
@@ -0,0 +1,1317 @@
+
+
+
+
diff --git a/images/themes/default/mActionNewTableRow.svg b/images/themes/default/mActionNewTableRow.svg
new file mode 100644
index 00000000000..e8eb39c2953
--- /dev/null
+++ b/images/themes/default/mActionNewTableRow.svg
@@ -0,0 +1,1312 @@
+
+
+
+
diff --git a/images/themes/default/mActionSelectedToTop.svg b/images/themes/default/mActionSelectedToTop.svg
new file mode 100644
index 00000000000..08aa38b6d5b
--- /dev/null
+++ b/images/themes/default/mActionSelectedToTop.svg
@@ -0,0 +1,1281 @@
+
+
+
+
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 01777301b04..f87cf5149a1 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -10609,7 +10609,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
}
else if ( vlayer->geometryType() == QGis::NoGeometry )
{
- mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );
+ mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.svg" ) );
}
mActionOpenFieldCalc->setEnabled( true );
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
index 33842e0bc66..762a0c49941 100644
--- a/src/app/qgsattributetabledialog.cpp
+++ b/src/app/qgsattributetabledialog.cpp
@@ -206,7 +206,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
mActionRemoveSelection->setIcon( QgsApplication::getThemeIcon( "/mActionDeselectAll.svg" ) );
mActionSelectAll->setIcon( QgsApplication::getThemeIcon( "/mActionSelectAll.svg" ) );
- mActionSelectedToTop->setIcon( QgsApplication::getThemeIcon( "/mActionSelectedToTop.png" ) );
+ mActionSelectedToTop->setIcon( QgsApplication::getThemeIcon( "/mActionSelectedToTop.svg" ) );
mActionCopySelectedRows->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.svg" ) );
mActionPasteFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.svg" ) );
mActionZoomMapToSelectedRows->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.svg" ) );
@@ -216,12 +216,12 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
mActionSaveEdits->setIcon( QgsApplication::getThemeIcon( "/mActionSaveEdits.svg" ) );
mActionDeleteSelected->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteSelected.svg" ) );
mActionOpenFieldCalculator->setIcon( QgsApplication::getThemeIcon( "/mActionCalculateField.svg" ) );
- mActionAddAttribute->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
- mActionRemoveAttribute->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+ mActionAddAttribute->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.svg" ) );
+ mActionRemoveAttribute->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.svg" ) );
mTableViewButton->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTable.svg" ) );
mAttributeViewButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ) );
mActionExpressionSelect->setIcon( QgsApplication::getThemeIcon( "/mIconExpressionSelect.svg" ) );
- mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );
+ mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.svg" ) );
// toggle editing
bool canChangeAttributes = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues;
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
index 4f36dcf7f6d..f308328e4f1 100644
--- a/src/app/qgsfieldsproperties.cpp
+++ b/src/app/qgsfieldsproperties.cpp
@@ -59,8 +59,8 @@ QgsFieldsProperties::QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent
// Init as hidden by default, it will be enabled if project is set to
mAttributeEditorOptionsWidget->setVisible( false );
- mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
- mDeleteAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+ mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.svg" ) );
+ mDeleteAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.svg" ) );
mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
mCalculateFieldButton->setIcon( QgsApplication::getThemeIcon( "/mActionCalculateField.svg" ) );
diff --git a/src/app/qgsnewspatialitelayerdialog.cpp b/src/app/qgsnewspatialitelayerdialog.cpp
index cf7db3b126b..add7ef5aed0 100644
--- a/src/app/qgsnewspatialitelayerdialog.cpp
+++ b/src/app/qgsnewspatialitelayerdialog.cpp
@@ -50,8 +50,8 @@ QgsNewSpatialiteLayerDialog::QgsNewSpatialiteLayerDialog( QWidget *parent, Qt::W
QSettings settings;
restoreGeometry( settings.value( "/Windows/NewSpatiaLiteLayer/geometry" ).toByteArray() );
- mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
- mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+ mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.svg" ) );
+ mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.svg" ) );
mTypeBox->addItem( tr( "Text data" ), "text" );
mTypeBox->addItem( tr( "Whole number" ), "integer" );
mTypeBox->addItem( tr( "Decimal number" ), "real" );
diff --git a/src/gui/qgsnewgeopackagelayerdialog.cpp b/src/gui/qgsnewgeopackagelayerdialog.cpp
index 388d29018cd..034a2921241 100644
--- a/src/gui/qgsnewgeopackagelayerdialog.cpp
+++ b/src/gui/qgsnewgeopackagelayerdialog.cpp
@@ -63,8 +63,8 @@ QgsNewGeoPackageLayerDialog::QgsNewGeoPackageLayerDialog( QWidget *parent, Qt::W
QSettings settings;
restoreGeometry( settings.value( "/Windows/NewGeoPackageLayer/geometry" ).toByteArray() );
- mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
- mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+ mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.svg" ) );
+ mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.svg" ) );
#ifdef SUPPORT_GEOMETRY_LESS
mGeometryTypeBox->addItem( tr( "Non spatial" ), wkbNone );
diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
index 7de63bc1c95..d544f16a6f2 100644
--- a/src/gui/qgsnewvectorlayerdialog.cpp
+++ b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -40,8 +40,8 @@ QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, const Qt::Win
QSettings settings;
restoreGeometry( settings.value( "/Windows/NewVectorLayer/geometry" ).toByteArray() );
- mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
- mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+ mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.svg" ) );
+ mRemoveAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.svg" ) );
mTypeBox->addItem( tr( "Text data" ), "String" );
mTypeBox->addItem( tr( "Whole number" ), "Integer" );
mTypeBox->addItem( tr( "Decimal number" ), "Real" );
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
index 7da63cf0b61..b819e594d62 100644
--- a/src/gui/qgsrasterlayersaveasdialog.cpp
+++ b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -40,9 +40,9 @@ QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterLayer* rasterLa
, mResolutionState( OriginalResolution )
{
setupUi( this );
- mAddNoDataManuallyToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
+ mAddNoDataManuallyToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.svg" ) );
mLoadTransparentNoDataToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionCopySelected.png" ) );
- mRemoveSelectedNoDataToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+ mRemoveSelectedNoDataToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.svg" ) );
mRemoveAllNoDataToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionRemove.png" ) );
mNoDataTableWidget->setColumnCount( 2 );
diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
index b94713cd225..acfd0caf5ce 100644
--- a/src/gui/qgsrelationeditorwidget.cpp
+++ b/src/gui/qgsrelationeditorwidget.cpp
@@ -58,7 +58,7 @@ QgsRelationEditorWidget::QgsRelationEditorWidget( QWidget* parent )
buttonLayout->addWidget( mSaveEditsButton );
// add feature
mAddFeatureButton = new QToolButton( this );
- mAddFeatureButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );
+ mAddFeatureButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.svg" ) );
mAddFeatureButton->setText( tr( "Add child feature" ) );
mAddFeatureButton->setToolTip( tr( "Add child feature" ) );
mAddFeatureButton->setObjectName( "mAddFeatureButton" );
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
index 0a35b9af08c..b54337eddde 100644
--- a/src/ui/qgsattributetabledialog.ui
+++ b/src/ui/qgsattributetabledialog.ui
@@ -400,7 +400,7 @@
- :/images/themes/default/mActionNewTableRow.png:/images/themes/default/mActionNewTableRow.png
+ :/images/themes/default/mActionNewTableRow.svg:/images/themes/default/mActionNewTableRow.svg
Add feature
@@ -484,7 +484,7 @@
- :/images/themes/default/mActionSelectedToTop.png:/images/themes/default/mActionSelectedToTop.png
+ :/images/themes/default/mActionSelectedToTop.svg:/images/themes/default/mActionSelectedToTop.svg
Move selection to top
@@ -556,7 +556,7 @@
- :/images/themes/default/mActionDeleteAttribute.png:/images/themes/default/mActionDeleteAttribute.png
+ :/images/themes/default/mActionDeleteAttribute.svg:/images/themes/default/mActionDeleteAttribute.svg
Delete field
@@ -571,7 +571,7 @@
- :/images/themes/default/mActionNewAttribute.png:/images/themes/default/mActionNewAttribute.png
+ :/images/themes/default/mActionNewAttribute.svg:/images/themes/default/mActionNewAttribute.svg
New field
@@ -604,7 +604,7 @@
- :/images/themes/default/rendererCategorizedSymbol.svg:/images/themes/default/rendererCategorizedSymbol.svg
+ :/images/themes/default/mActionConditionalFormatting.svg:/images/themes/default/mActionConditionalFormatting.svg
Conditional formatting
diff --git a/src/ui/qgsnewgeopackagelayerdialogbase.ui b/src/ui/qgsnewgeopackagelayerdialogbase.ui
index d68bfeafec1..8ea992ae735 100644
--- a/src/ui/qgsnewgeopackagelayerdialogbase.ui
+++ b/src/ui/qgsnewgeopackagelayerdialogbase.ui
@@ -127,7 +127,7 @@
- ../../images/themes/default/mActionNewAttribute.png../../images/themes/default/mActionNewAttribute.png
+ ../../images/themes/default/mActionNewAttribute.svg../../images/themes/default/mActionNewAttribute.svg
Qt::ToolButtonTextBesideIcon
@@ -377,7 +377,7 @@
- ../../images/themes/default/mActionDeleteAttribute.png../../images/themes/default/mActionDeleteAttribute.png
+ ../../images/themes/default/mActionDeleteAttribute.svg../../images/themes/default/mActionDeleteAttribute.svg
Qt::ToolButtonTextBesideIcon
diff --git a/src/ui/qgsnewspatialitelayerdialogbase.ui b/src/ui/qgsnewspatialitelayerdialogbase.ui
index 84733e913d3..a78a654e9fb 100644
--- a/src/ui/qgsnewspatialitelayerdialogbase.ui
+++ b/src/ui/qgsnewspatialitelayerdialogbase.ui
@@ -333,7 +333,7 @@
- ../../images/themes/default/mActionNewAttribute.png../../images/themes/default/mActionNewAttribute.png
+ ../../images/themes/default/mActionNewAttribute.svg../../images/themes/default/mActionNewAttribute.svg
Qt::ToolButtonTextBesideIcon
@@ -407,7 +407,7 @@
- ../../images/themes/default/mActionDeleteAttribute.png../../images/themes/default/mActionDeleteAttribute.png
+ ../../images/themes/default/mActionDeleteAttribute.svg../../images/themes/default/mActionDeleteAttribute.svg
Qt::ToolButtonTextBesideIcon
diff --git a/src/ui/qgsnewvectorlayerdialogbase.ui b/src/ui/qgsnewvectorlayerdialogbase.ui
index 6de33e3a3ce..ee3b4f9d247 100644
--- a/src/ui/qgsnewvectorlayerdialogbase.ui
+++ b/src/ui/qgsnewvectorlayerdialogbase.ui
@@ -181,7 +181,7 @@
- ../../images/themes/default/mActionNewAttribute.png../../images/themes/default/mActionNewAttribute.png
+ ../../images/themes/default/mActionNewAttribute.svg../../images/themes/default/mActionNewAttribute.svg
Qt::ToolButtonTextBesideIcon
@@ -265,7 +265,7 @@
- ../../images/themes/default/mActionDeleteAttribute.png../../images/themes/default/mActionDeleteAttribute.png
+ ../../images/themes/default/mActionDeleteAttribute.svg../../images/themes/default/mActionDeleteAttribute.svg
Qt::ToolButtonTextBesideIcon
diff --git a/src/ui/qgsrasterlayersaveasdialogbase.ui b/src/ui/qgsrasterlayersaveasdialogbase.ui
index 507a36be01d..b9959056fca 100644
--- a/src/ui/qgsrasterlayersaveasdialogbase.ui
+++ b/src/ui/qgsrasterlayersaveasdialogbase.ui
@@ -565,7 +565,7 @@ datasets with maximum width and height specified below.
- ../../images/themes/default/mActionNewAttribute.png../../images/themes/default/mActionNewAttribute.png
+ ../../images/themes/default/mActionNewAttribute.svg../../images/themes/default/mActionNewAttribute.svg
@@ -596,7 +596,7 @@ datasets with maximum width and height specified below.
- ../../images/themes/default/mActionDeleteAttribute.png../../images/themes/default/mActionDeleteAttribute.png
+ ../../images/themes/default/mActionDeleteAttribute.svg../../images/themes/default/mActionDeleteAttribute.svg