[QGIS Commit] r11472 - in trunk/qgis: images/themes/default src/app/composer src/ui

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2009-08-21 17:41:33 -0400 (Fri, 21 Aug 2009)
New Revision: 11472

Added:
   trunk/qgis/images/themes/default/mActionAddImage.png
   trunk/qgis/images/themes/default/mActionAddMap.png
Modified:
   trunk/qgis/images/themes/default/mActionSaveMapAsImage.png
   trunk/qgis/src/app/composer/qgscomposer.cpp
   trunk/qgis/src/ui/qgscomposerbase.ui
Log:
Fix wrong icons in the Map Composer 

Added: trunk/qgis/images/themes/default/mActionAddImage.png
===================================================================
(Binary files differ)


Property changes on: trunk/qgis/images/themes/default/mActionAddImage.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/qgis/images/themes/default/mActionAddMap.png
===================================================================
(Binary files differ)


Property changes on: trunk/qgis/images/themes/default/mActionAddMap.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/qgis/images/themes/default/mActionSaveMapAsImage.png
===================================================================
(Binary files differ)

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2009-08-21 20:58:26 UTC (rev 11471)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2009-08-21 21:41:33 UTC (rev 11472)
@@ -241,7 +241,7 @@
   //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" ) );
@@ -249,8 +249,8 @@
   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" ) );

Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui	2009-08-21 20:58:26 UTC (rev 11471)
+++ trunk/qgis/src/ui/qgscomposerbase.ui	2009-08-21 21:41:33 UTC (rev 11472)
@@ -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>