Fix wrong icons in the Map Composer

git-svn-id: http://svn.osgeo.org/qgis/trunk@11472 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 21, 2009 · dd37133 · dd37133
1 parent 779c1a0
commit dd37133
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/images/themes/default/mActionAddImage.png b/images/themes/default/mActionAddImage.png
diff --git a/images/themes/default/mActionAddMap.png b/images/themes/default/mActionAddMap.png
diff --git a/images/themes/default/mActionSaveMapAsImage.png b/images/themes/default/mActionSaveMapAsImage.png
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -241,16 +241,16 @@ void QgsComposer::setupTheme()
   //missing from active theme
   mActionLoadFromTemplate->setIcon( QgisApp::getThemeIcon( "/mActionFileOpen.png" ) );
   mActionSaveAsTemplate->setIcon( QgisApp::getThemeIcon( "/mActionFileSaveAs.png" ) );
-  mActionExportAsImage->setIcon( QgisApp::getThemeIcon( "/mActionExportMapServer.png" ) );
+  mActionExportAsImage->setIcon( QgisApp::getThemeIcon( "/mActionSaveMapAsImage.png" ) );
   mActionExportAsSVG->setIcon( QgisApp::getThemeIcon( "/mActionSaveAsSVG.png" ) );
   mActionExportAsPDF->setIcon( QgisApp::getThemeIcon( "/mActionSaveAsPDF.png" ) );
   mActionPrint->setIcon( QgisApp::getThemeIcon( "/mActionFilePrint.png" ) );
   mActionZoomAll->setIcon( QgisApp::getThemeIcon( "/mActionZoomFullExtent.png" ) );
   mActionZoomIn->setIcon( QgisApp::getThemeIcon( "/mActionZoomIn.png" ) );
   mActionZoomOut->setIcon( QgisApp::getThemeIcon( "/mActionZoomOut.png" ) );
   mActionRefreshView->setIcon( QgisApp::getThemeIcon( "/mActionDraw.png" ) );
-  mActionAddImage->setIcon( QgisApp::getThemeIcon( "/mActionSaveMapAsImage.png" ) );
-  mActionAddNewMap->setIcon( QgisApp::getThemeIcon( "/mActionAddRasterLayer.png" ) );
+  mActionAddImage->setIcon( QgisApp::getThemeIcon( "/mActionAddImage.png" ) );
+  mActionAddNewMap->setIcon( QgisApp::getThemeIcon( "/mActionAddMap.png" ) );
   mActionAddNewLabel->setIcon( QgisApp::getThemeIcon( "/mActionLabel.png" ) );
   mActionAddNewLegend->setIcon( QgisApp::getThemeIcon( "/mActionAddLegend.png" ) );
   mActionAddNewScalebar->setIcon( QgisApp::getThemeIcon( "/mActionScaleBar.png" ) );

diff --git a/src/ui/qgscomposerbase.ui b/src/ui/qgscomposerbase.ui
@@ -285,7 +285,7 @@
   </action>
   <action name="mActionAddNewMap" >
    <property name="icon" >
-    <iconset>../themes/default/mActionAddRasterLayer.png</iconset>
+    <iconset>../themes/default/mActionAddMap.png</iconset>
    </property>
    <property name="text" >
     <string>Add Map</string>
@@ -329,7 +329,7 @@
   </action>
   <action name="mActionExportAsImage" >
    <property name="icon" >
-    <iconset>../themes/default/mActionExportMapServer.png</iconset>
+    <iconset>../themes/default/mActionSaveMapAsImage.png</iconset>
    </property>
    <property name="text" >
     <string>Export as Image...</string>
@@ -375,7 +375,7 @@
   </action>
   <action name="mActionAddImage" >
    <property name="icon" >
-    <iconset>../themes/default/mActionSaveMapAsImage.png</iconset>
+    <iconset>../themes/default/mActionAddImage.png</iconset>
    </property>
    <property name="text" >
     <string>Add Image</string>