Separate icons for mActionShowComposerManager and mActionFilePrint

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12479 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 15, 2009 · 5257ae3 · 5257ae3
1 parent f05e72f
commit 5257ae3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -17,6 +17,7 @@
     <file>themes/newgis/mActionCaptureLine.png</file>
     <file>themes/newgis/mActionCapturePoint.png</file>
     <file>themes/newgis/mActionCapturePolygon.png</file>
+    <file>themes/newgis/mActionComposerManager.png</file>
     <file>themes/newgis/mActionDeletePart.png</file>
     <file>themes/newgis/mActionDeleteRing.png</file>
     <file>themes/newgis/mActionDeleteSelected.png</file>
@@ -119,6 +120,7 @@
     <file>themes/default/mActionCapturePolygon.png</file>
     <file>themes/default/mActionCheckQgisVersion.png</file>
     <file>themes/default/mActionCollapseTree.png</file>
+    <file>themes/default/mActionComposerManager.png</file>
     <file>themes/default/mActionContextHelp.png</file>
     <file>themes/default/mActionCopySelected.png</file>
     <file>themes/default/mActionCustomProjection.png</file>
@@ -274,6 +276,7 @@
     <file>themes/gis/mActionCaptureLine.png</file>
     <file>themes/gis/mActionCapturePoint.png</file>
     <file>themes/gis/mActionCapturePolygon.png</file>
+    <file>themes/gis/mActionComposerManager.png</file>
     <file>themes/gis/mActionDeletePart.png</file>
     <file>themes/gis/mActionDeleteRing.png</file>
     <file>themes/gis/mActionDeleteSelected.png</file>

diff --git a/images/themes/default/mActionComposerManager.png b/images/themes/default/mActionComposerManager.png
diff --git a/images/themes/gis/mActionComposerManager.png b/images/themes/gis/mActionComposerManager.png
diff --git a/images/themes/newgis/mActionComposerManager.png b/images/themes/newgis/mActionComposerManager.png
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -596,7 +596,7 @@ void QgisApp::createActions()
   mActionNewPrintComposer->setStatusTip( tr( "New Print Composer" ) );
   connect( mActionNewPrintComposer, SIGNAL( triggered() ), this, SLOT( newPrintComposer() ) );
 
-  mActionShowComposerManager = new QAction( getThemeIcon( "mActionFilePrint.png" ), tr( "Composer manager..." ), this );
+  mActionShowComposerManager = new QAction( getThemeIcon( "mActionComposerManager.png" ), tr( "Composer manager..." ), this );
   mActionShowComposerManager->setStatusTip( tr( "Composer manager" ) );
   connect( mActionShowComposerManager, SIGNAL( triggered() ), this, SLOT( showComposerManager() ) );
 
@@ -1672,7 +1672,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionSaveProject->setIcon( getThemeIcon( "/mActionFileSave.png" ) );
   mActionSaveProjectAs->setIcon( getThemeIcon( "/mActionFileSaveAs.png" ) );
   mActionNewPrintComposer->setIcon( getThemeIcon( "/mActionNewComposer.png" ) );
-  mActionShowComposerManager->setIcon( getThemeIcon( "/mActionFilePrint.png" ) );
+  mActionShowComposerManager->setIcon( getThemeIcon( "/mActionComposerManager.png" ) );
   mActionSaveMapAsImage->setIcon( getThemeIcon( "/mActionSaveMapAsImage.png" ) );
   mActionExit->setIcon( getThemeIcon( "/mActionFileExit.png" ) );
   mActionAddOgrLayer->setIcon( getThemeIcon( "/mActionAddOgrLayer.png" ) );