Merge pull request #698 from 3nids/svgpan

SVG for pan icons
qgis · Aug 15, 2013 · 69d80b9 · 69d80b9
2 parents 25e79f9 + 66a7afa
commit 69d80b9
Show file tree

Hide file tree

Showing 12 changed files with 127 additions and 48 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -230,8 +230,7 @@
         <file>themes/default/mActionOffsetCurve.png</file>
         <file>themes/default/mActionOpenTable.png</file>
         <file>themes/default/mActionOptions.svg</file>
-        <file>themes/default/mActionPan.png</file>
-        <file>themes/default/mActionPanToSelected.png</file>
+        <file>themes/default/mActionPan.svg</file>
         <file>themes/default/mActionPanToSelected.svg</file>
         <file>themes/default/mActionPinLabels.svg</file>
         <file>themes/default/mActionProjectProperties.png</file>

diff --git a/images/themes/default/mActionPan.png b/images/themes/default/mActionPan.png
diff --git a/images/themes/default/mActionPan.svg b/images/themes/default/mActionPan.svg
diff --git a/images/themes/default/mActionPanToSelected.png b/images/themes/default/mActionPanToSelected.png
diff --git a/images/themes/default/mActionPanToSelected.svg b/images/themes/default/mActionPanToSelected.svg
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1767,7 +1767,7 @@ void QgisApp::setTheme( QString theThemeName )
 #ifdef HAVE_TOUCH
   mActionTouch->setIcon( QgsApplication::getThemeIcon( "/mActionTouch.png" ) );
 #endif
-  mActionPan->setIcon( QgsApplication::getThemeIcon( "/mActionPan.png" ) );
+  mActionPan->setIcon( QgsApplication::getThemeIcon( "/mActionPan.svg" ) );
   mActionPanToSelected->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.svg" ) );
   mActionZoomLast->setIcon( QgsApplication::getThemeIcon( "/mActionZoomLast.svg" ) );
   mActionZoomNext->setIcon( QgsApplication::getThemeIcon( "/mActionZoomNext.svg" ) );

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -136,7 +136,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mSelectedToTopButton->setIcon( QgsApplication::getThemeIcon( "/mActionSelectedToTop.png" ) );
   mCopySelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionCopySelected.png" ) );
   mZoomMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToSelected.svg" ) );
-  mPanMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.png" ) );
+  mPanMapToSelectedRowsButton->setIcon( QgsApplication::getThemeIcon( "/mActionPanToSelected.svg" ) );
   mInvertSelectionButton->setIcon( QgsApplication::getThemeIcon( "/mActionInvertSelection.png" ) );
   mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
   mSaveEditsButton->setIcon( QgsApplication::getThemeIcon( "/mActionSaveEdits.svg" ) );

diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -829,7 +829,7 @@ void QgsGeorefPluginGui::createActions()
   connect( mActionMoveGCPPoint, SIGNAL( triggered() ), this, SLOT( setMovePointTool() ) );
 
   // View actions
-  mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
+  mActionPan->setIcon( getThemeIcon( "/mActionPan.svg" ) );
   connect( mActionPan, SIGNAL( triggered() ), this, SLOT( setPanTool() ) );
 
   mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.svg" ) );
@@ -1089,7 +1089,7 @@ void QgsGeorefPluginGui::updateIconTheme( QString theme )
   mActionMoveGCPPoint->setIcon( getThemeIcon( "/mActionMoveGCPPoint.png" ) );
 
   // View actions
-  mActionPan->setIcon( getThemeIcon( "/mActionPan.png" ) );
+  mActionPan->setIcon( getThemeIcon( "/mActionPan.svg" ) );
   mActionZoomIn->setIcon( getThemeIcon( "/mActionZoomIn.svg" ) );
   mActionZoomOut->setIcon( getThemeIcon( "/mActionZoomOut.svg" ) );
   mActionZoomToLayer->setIcon( getThemeIcon( "/mActionZoomToLayer.svg" ) );

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -799,7 +799,7 @@
    </property>
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
+     <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
    </property>
    <property name="text">
     <string>Pan Map</string>
@@ -1688,7 +1688,7 @@ Ctl (Cmd) increments by 15 deg.</string>
   <action name="mActionPanToSelected">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionPanToSelected.png</normaloff>:/images/themes/default/mActionPanToSelected.png</iconset>
+     <normaloff>:/images/themes/default/mActionPanToSelected.svg</normaloff>:/images/themes/default/mActionPanToSelected.svg</iconset>
    </property>
    <property name="text">
     <string>Pan Map to Selection</string>

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -244,7 +244,7 @@
        </property>
        <property name="icon">
         <iconset>
-         <normaloff>:/images/themes/default/mActionPanToSelected.png</normaloff>:/images/themes/default/mActionPanToSelected.png</iconset>
+         <normaloff>:/images/themes/default/mActionPanToSelected.svg</normaloff>../../images/themes/default/mActionPanToSelected.svg</iconset>
        </property>
        <property name="iconSize">
         <size>

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -210,7 +210,7 @@
   <action name="mActionSelectMoveItem">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
+     <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
    </property>
    <property name="text">
     <string>Move Item</string>

diff --git a/src/ui/qgslabelingguibase.ui b/src/ui/qgslabelingguibase.ui
@@ -550,7 +550,7 @@
                  </property>
                  <property name="icon">
                   <iconset resource="../../images/images.qrc">
-                   <normaloff>:/images/themes/default/mActionPan.png</normaloff>:/images/themes/default/mActionPan.png</iconset>
+                   <normaloff>:/images/themes/default/mActionPan.svg</normaloff>:/images/themes/default/mActionPan.svg</iconset>
                  </property>
                 </item>
                 <item>