diff --git a/images/images.qrc b/images/images.qrc index 9555f2be2e54..4b578913ac93 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -198,8 +198,11 @@ themes/default/mActionDuplicateLayer.svg themes/default/mActionDuplicateComposer.svg themes/default/mActionEditCopy.png + themes/default/mActionEditCopy.svg themes/default/mActionEditCut.png + themes/default/mActionEditCut.svg themes/default/mActionEditPaste.png + themes/default/mActionEditPaste.svg themes/default/mActionExpandNewTree.png themes/default/mActionExpandNewTree.svg themes/default/mActionExpandTree.png @@ -257,6 +260,7 @@ themes/default/mActionMergeFeatureAttributes.png themes/default/mActionMergeFeatures.png themes/default/mActionMoveFeature.png + themes/default/mActionMoveFeature.svg themes/default/mActionMoveItemContent.png themes/default/mActionMoveItemContent.svg themes/default/mActionMoveItemsToBottom.png @@ -272,6 +276,7 @@ themes/default/mActionNewGeoPackageLayer.svg themes/default/mActionNewVectorLayer.svg themes/default/mActionNodeTool.png + themes/default/mActionNodeTool.svg themes/default/mActionOffsetCurve.png themes/default/mActionOpenTable.png themes/default/mActionOpenTable.svg diff --git a/images/themes/default/mActionDeleteSelected.svg b/images/themes/default/mActionDeleteSelected.svg index d9019b81a0c7..badea1200ea5 100644 --- a/images/themes/default/mActionDeleteSelected.svg +++ b/images/themes/default/mActionDeleteSelected.svg @@ -7,14 +7,15 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" - width="512" - height="512" - viewBox="0 0 512 512" + width="24" + height="24" + viewBox="0 0 24 24" id="svg2" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92pre1 unknown" sodipodi:docname="mActionDeleteSelected.svg"> @@ -24,11 +25,2132 @@ image/svg+xml + + id="defs133"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + inkscape:current-layer="svg2"> + + + style="fill:none;fill-rule:evenodd;stroke:#d00000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 6,22 5,9 h 14 l -1,13 z" + id="path4230" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + + + + + diff --git a/images/themes/default/mActionEditCopy.svg b/images/themes/default/mActionEditCopy.svg new file mode 100644 index 000000000000..23ccb2a57eb1 --- /dev/null +++ b/images/themes/default/mActionEditCopy.svg @@ -0,0 +1,2513 @@ + + + + + ring fill + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + ring fill + 2014-02-04 + + + Robert Szczepanek + + + + + + + + + + ring fill + + + GIS icons 0.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/themes/default/mActionEditCut.svg b/images/themes/default/mActionEditCut.svg new file mode 100644 index 000000000000..51c771ca7607 --- /dev/null +++ b/images/themes/default/mActionEditCut.svg @@ -0,0 +1,2459 @@ + + + + + ring fill + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + ring fill + 2014-02-04 + + + Robert Szczepanek + + + + + + + + + + ring fill + + + GIS icons 0.2 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/themes/default/mActionEditPaste.svg b/images/themes/default/mActionEditPaste.svg new file mode 100644 index 000000000000..f588926e819d --- /dev/null +++ b/images/themes/default/mActionEditPaste.svg @@ -0,0 +1,2481 @@ + + + + + ring fill + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + ring fill + 2014-02-04 + + + Robert Szczepanek + + + + + + + + + + ring fill + + + GIS icons 0.2 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/themes/default/mActionMoveFeature.svg b/images/themes/default/mActionMoveFeature.svg new file mode 100644 index 000000000000..f273419f411e --- /dev/null +++ b/images/themes/default/mActionMoveFeature.svg @@ -0,0 +1,1153 @@ + + + + + ring fill + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + ring fill + 2014-02-04 + + + Robert Szczepanek + + + + + + + + + + ring fill + + + GIS icons 0.2 + + + + + + + + + + + + + + + + + + + + + diff --git a/images/themes/default/mActionNodeTool.svg b/images/themes/default/mActionNodeTool.svg new file mode 100644 index 000000000000..1b4bdc7a642b --- /dev/null +++ b/images/themes/default/mActionNodeTool.svg @@ -0,0 +1,2487 @@ + + + + + ring fill + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + ring fill + 2014-02-04 + + + Robert Szczepanek + + + + + + + + + + ring fill + + + GIS icons 0.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index 69cac8f482ad..2c57a073eee9 100644 --- a/src/app/composer/qgscomposer.cpp +++ b/src/app/composer/qgscomposer.cpp @@ -258,19 +258,19 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ) mActionCut = new QAction( tr( "Cu&t" ), this ); mActionCut->setShortcuts( QKeySequence::Cut ); mActionCut->setStatusTip( tr( "Cut" ) ); - mActionCut->setIcon( QgsApplication::getThemeIcon( "/mActionEditCut.png" ) ); + mActionCut->setIcon( QgsApplication::getThemeIcon( "/mActionEditCut.svg" ) ); connect( mActionCut, SIGNAL( triggered() ), this, SLOT( actionCutTriggered() ) ); mActionCopy = new QAction( tr( "&Copy" ), this ); mActionCopy->setShortcuts( QKeySequence::Copy ); mActionCopy->setStatusTip( tr( "Copy" ) ); - mActionCopy->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.png" ) ); + mActionCopy->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.svg" ) ); connect( mActionCopy, SIGNAL( triggered() ), this, SLOT( actionCopyTriggered() ) ); mActionPaste = new QAction( tr( "&Paste" ), this ); mActionPaste->setShortcuts( QKeySequence::Paste ); mActionPaste->setStatusTip( tr( "Paste" ) ); - mActionPaste->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.png" ) ); + mActionPaste->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.svg" ) ); connect( mActionPaste, SIGNAL( triggered() ), this, SLOT( actionPasteTriggered() ) ); QMenu *editMenu = menuBar()->addMenu( tr( "&Edit" ) ); diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index d9eaad07a014..844571364e61 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -2507,17 +2507,17 @@ void QgisApp::setTheme( const QString& theThemeName ) mActionRollbackAllEdits->setIcon( QgsApplication::getThemeIcon( "/mActionRollbackAllEdits.svg" ) ); mActionCancelEdits->setIcon( QgsApplication::getThemeIcon( "/mActionCancelEdits.svg" ) ); mActionCancelAllEdits->setIcon( QgsApplication::getThemeIcon( "/mActionCancelAllEdits.svg" ) ); - mActionCutFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCut.png" ) ); - mActionCopyFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.png" ) ); - mActionPasteFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.png" ) ); - mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePoint.png" ) ); - mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeature.png" ) ); + mActionCutFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCut.svg" ) ); + mActionCopyFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.svg" ) ); + mActionPasteFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.svg" ) ); + mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionCapturePoint.svg" ) ); + mActionMoveFeature->setIcon( QgsApplication::getThemeIcon( "/mActionMoveFeature.svg" ) ); mActionRotateFeature->setIcon( QgsApplication::getThemeIcon( "/mActionRotateFeature.png" ) ); mActionReshapeFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionReshape.png" ) ); mActionSplitFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionSplitFeatures.svg" ) ); mActionSplitParts->setIcon( QgsApplication::getThemeIcon( "/mActionSplitParts.svg" ) ); mActionDeleteSelected->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteSelected.svg" ) ); - mActionNodeTool->setIcon( QgsApplication::getThemeIcon( "/mActionNodeTool.png" ) ); + mActionNodeTool->setIcon( QgsApplication::getThemeIcon( "/mActionNodeTool.svg" ) ); mActionSimplifyFeature->setIcon( QgsApplication::getThemeIcon( "/mActionSimplify.png" ) ); mActionUndo->setIcon( QgsApplication::getThemeIcon( "/mActionUndo.svg" ) ); mActionRedo->setIcon( QgsApplication::getThemeIcon( "/mActionRedo.svg" ) ); diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index 5c632fd5874f..0fb3f8911b3c 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -1825,7 +1825,7 @@ void QgsGeorefPluginGui::showGDALScript( const QStringList& commands ) // create window to show gdal script QDialogButtonBox *bbxGdalScript = new QDialogButtonBox( QDialogButtonBox::Cancel, Qt::Horizontal, this ); - QPushButton *pbnCopyInClipBoard = new QPushButton( getThemeIcon( "/mActionEditPaste.png" ), + QPushButton *pbnCopyInClipBoard = new QPushButton( getThemeIcon( "/mActionEditPaste.svg" ), tr( "Copy to Clipboard" ), bbxGdalScript ); bbxGdalScript->addButton( pbnCopyInClipBoard, QDialogButtonBox::AcceptRole ); diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui index 4a8cbd8a80b3..dd30d3c7c45e 100644 --- a/src/ui/qgisapp.ui +++ b/src/ui/qgisapp.ui @@ -688,7 +688,7 @@ - :/images/themes/default/mActionEditCut.png:/images/themes/default/mActionEditCut.png + :/images/themes/default/mActionEditCut.svg:/images/themes/default/mActionEditCut.svg Cut Features @@ -700,7 +700,7 @@ - :/images/themes/default/mActionEditCopy.png:/images/themes/default/mActionEditCopy.png + :/images/themes/default/mActionEditCopy.svg:/images/themes/default/mActionEditCopy.svg Copy Features @@ -712,7 +712,7 @@ - :/images/themes/default/mActionEditPaste.png:/images/themes/default/mActionEditPaste.png + :/images/themes/default/mActionEditPaste.svg:/images/themes/default/mActionEditPaste.svg Paste Features @@ -727,7 +727,7 @@ - :/images/themes/default/mActionCapturePolygon.png:/images/themes/default/mActionCapturePolygon.png + :/images/themes/default/mActionCapturePolygon.svg:/images/themes/default/mActionCapturePolygon.svg Add Feature @@ -742,7 +742,7 @@ - :/images/themes/default/mActionMoveFeature.png:/images/themes/default/mActionMoveFeature.png + :/images/themes/default/mActionMoveFeature.svg:/images/themes/default/mActionMoveFeature.svg Move Feature(s) @@ -877,7 +877,7 @@ - :/images/themes/default/mActionNodeTool.png:/images/themes/default/mActionNodeTool.png + :/images/themes/default/mActionNodeTool.svg:/images/themes/default/mActionNodeTool.svg Node Tool @@ -1881,7 +1881,7 @@ Ctl (Cmd) increments by 15 deg. - :/images/themes/default/mActionEditCopy.png:/images/themes/default/mActionEditCopy.png + :/images/themes/default/mActionEditCopy.svg:/images/themes/default/mActionEditCopy.svg Copy style @@ -1890,7 +1890,7 @@ Ctl (Cmd) increments by 15 deg. - :/images/themes/default/mActionEditPaste.png:/images/themes/default/mActionEditPaste.png + :/images/themes/default/mActionEditPaste.svg:/images/themes/default/mActionEditPaste.svg Paste style diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui index 859d92d0bcac..b378db6f8c96 100644 --- a/src/ui/qgsattributetabledialog.ui +++ b/src/ui/qgsattributetabledialog.ui @@ -451,7 +451,7 @@ - :/images/themes/default/mActionEditCopy.png:/images/themes/default/mActionEditCopy.png + :/images/themes/default/mActionEditCopy.svg:/images/themes/default/mActionEditCopy.svg @@ -480,7 +480,7 @@ - :/images/themes/default/mActionEditPaste.png:/images/themes/default/mActionEditPaste.png + :/images/themes/default/mActionEditPaste.svg:/images/themes/default/mActionEditPaste.svg diff --git a/src/ui/qgsidentifyresultsbase.ui b/src/ui/qgsidentifyresultsbase.ui index 6f0d14adcabe..b9e4b8a288c1 100644 --- a/src/ui/qgsidentifyresultsbase.ui +++ b/src/ui/qgsidentifyresultsbase.ui @@ -315,7 +315,7 @@ - :/images/themes/default/mActionEditCopy.png:/images/themes/default/mActionEditCopy.png + :/images/themes/default/mActionEditCopy.svg:/images/themes/default/mActionEditCopy.svg Copy Feature diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui index 7a811dfe1a37..2c1097d108e1 100644 --- a/src/ui/qgsoptionsbase.ui +++ b/src/ui/qgsoptionsbase.ui @@ -2644,7 +2644,7 @@ - :/images/themes/default/mActionEditPaste.png:/images/themes/default/mActionEditPaste.png + :/images/themes/default/mActionEditPaste.svg:/images/themes/default/mActionEditPaste.svg diff --git a/src/ui/qgsprojectpropertiesbase.ui b/src/ui/qgsprojectpropertiesbase.ui index d0ba0c884aa1..9b98bf019779 100644 --- a/src/ui/qgsprojectpropertiesbase.ui +++ b/src/ui/qgsprojectpropertiesbase.ui @@ -1285,7 +1285,7 @@ - :/images/themes/default/mActionEditPaste.png:/images/themes/default/mActionEditPaste.png + :/images/themes/default/mActionEditPaste.svg:/images/themes/default/mActionEditPaste.svg