For all plugins use icon name based on <plugin_dir>.png

git-svn-id: http://svn.osgeo.org/qgis/trunk@8952 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 30, 2008 · 5ea7430 · 5ea7430
1 parent a7bbe62
commit 5ea7430
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 225 deletions.
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -1,7 +1,7 @@
 SUBDIRS (copyright_label delimited_text grid_maker north_arrow scale_bar)
 
 IF (POSTGRES_FOUND)
-  SUBDIRS (geoprocessing spit)
+  SUBDIRS (spit)
 ENDIF (POSTGRES_FOUND)
 
 IF (EXPAT_FOUND)

diff --git a/src/plugins/copyright_label/copyright.png → ...ugins/copyright_label/copyright_label.png b/src/plugins/copyright_label/copyright.png → ...ugins/copyright_label/copyright_label.png
diff --git a/src/plugins/copyright_label/copyright_plugin.qrc b/src/plugins/copyright_label/copyright_plugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/" >
-        <file>copyright.png</file>
+        <file>copyright_label.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/copyright_label/plugin.cpp b/src/plugins/copyright_label/plugin.cpp
@@ -74,7 +74,7 @@ QgsCopyrightLabelPlugin::~QgsCopyrightLabelPlugin()
 void QgsCopyrightLabelPlugin::initGui()
 {
     // Create the action for tool
-    myQActionPointer = new QAction(QIcon(":/copyright.png"), tr("&Copyright Label"), this);
+    myQActionPointer = new QAction(QIcon(":/copyright_label.png"), tr("&Copyright Label"), this);
     myQActionPointer->setWhatsThis(tr("Creates a copyright label that is displayed on the map canvas."));
     // Connect the action to the run
     connect(myQActionPointer, SIGNAL(activated()), this, SLOT(run()));

diff --git a/src/plugins/georeferencer/icon.png → src/plugins/georeferencer/georeferencer.png b/src/plugins/georeferencer/icon.png → src/plugins/georeferencer/georeferencer.png
diff --git a/src/plugins/georeferencer/georeferencer.qrc b/src/plugins/georeferencer/georeferencer.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/" >
         <file>georef.png</file>
-        <file>icon.png</file>
+        <file>georeferencer.png</file>
         <file>pencil.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/georeferencer/plugin.cpp b/src/plugins/georeferencer/plugin.cpp
@@ -88,7 +88,7 @@ QgsGeorefPlugin::~QgsGeorefPlugin()
 void QgsGeorefPlugin::initGui()
 {
   // Create the action for tool
-  mQActionPointer = new QAction(QIcon(":/icon.png"), tr("&Georeferencer"), this);
+  mQActionPointer = new QAction(QIcon(":/georeferencer.png"), tr("&Georeferencer"), this);
 
   // Connect the action to the run
   connect(mQActionPointer, SIGNAL(triggered()), this, SLOT(run()));

diff --git a/src/plugins/gps_importer/gps_importer.png b/src/plugins/gps_importer/gps_importer.png
diff --git a/src/plugins/gps_importer/icon.xpm b/src/plugins/gps_importer/icon.xpm
diff --git a/src/plugins/gps_importer/qgsgps_plugin.qrc b/src/plugins/gps_importer/qgsgps_plugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/" >
-        <file>gps.xpm</file>
+        <file>gps_importer.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp
@@ -46,9 +46,6 @@
 //the gui subclass
 #include "qgsgpsplugingui.h"
 
-// xpm for creating the toolbar icon
-#include "icon.xpm"
-
 
 static const char * const ident_ = 
   "$Id$";
@@ -90,8 +87,8 @@ QgsGPSPlugin::~QgsGPSPlugin()
 void QgsGPSPlugin::initGui()
 {
   // add an action to the toolbar
-  mQActionPointer = new QAction(QIcon(icon), tr("&Gps Tools"), this);
-  mCreateGPXAction = new QAction(QIcon(icon), tr("&Create new GPX layer"), this);
+  mQActionPointer = new QAction(QIcon(":/gps_importer.png"), tr("&Gps Tools"), this);
+  mCreateGPXAction = new QAction(QIcon(":/gps_importer.png"), tr("&Create new GPX layer"), this);
 
   mQActionPointer->setWhatsThis(tr("Creates a new GPX layer and displays it on the map canvas"));
   mCreateGPXAction->setWhatsThis(tr("Creates a new GPX layer and displays it on the map canvas"));

diff --git a/src/plugins/grid_maker/graticule.png → src/plugins/grid_maker/grid_maker.png b/src/plugins/grid_maker/graticule.png → src/plugins/grid_maker/grid_maker.png
diff --git a/src/plugins/grid_maker/gridmaker_plugin.qrc b/src/plugins/grid_maker/gridmaker_plugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/" >
-        <file>graticule.png</file>
+        <file>grid_maker.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/grid_maker/plugin.cpp b/src/plugins/grid_maker/plugin.cpp
@@ -88,7 +88,7 @@ int QgsGridMakerPlugin::type()
 void QgsGridMakerPlugin::initGui()
 {
   // Create the action for tool
-  myQActionPointer = new QAction(QIcon(":/graticule.png"), tr("&Graticule Creator"), this);
+  myQActionPointer = new QAction(QIcon(":/grid_maker.png"), tr("&Graticule Creator"), this);
   myQActionPointer->setWhatsThis(tr("Creates a graticule (grid) and stores the result as a shapefile"));
   // Connect the action to the run
   connect(myQActionPointer, SIGNAL(activated()), this, SLOT(run()));

diff --git a/src/plugins/north_arrow/northarrow.png → src/plugins/north_arrow/north_arrow.png b/src/plugins/north_arrow/northarrow.png → src/plugins/north_arrow/north_arrow.png
diff --git a/src/plugins/north_arrow/northArrow.svg → src/plugins/north_arrow/north_arrow.svg b/src/plugins/north_arrow/northArrow.svg → src/plugins/north_arrow/north_arrow.svg
diff --git a/src/plugins/north_arrow/northarrow_plugin.qrc b/src/plugins/north_arrow/northarrow_plugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/" >
-        <file>northarrow.png</file>
+        <file>north_arrow.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/north_arrow/plugin.cpp b/src/plugins/north_arrow/plugin.cpp
@@ -91,7 +91,7 @@ QgsNorthArrowPlugin::~QgsNorthArrowPlugin()
 void QgsNorthArrowPlugin::initGui()
 {
   // Create the action for tool
-  myQActionPointer = new QAction(QIcon(":/northarrow.png"), tr("&North Arrow"), this);
+  myQActionPointer = new QAction(QIcon(":/north_arrow.png"), tr("&North Arrow"), this);
   myQActionPointer->setWhatsThis(tr("Creates a north arrow that is displayed on the map canvas"));
   // Connect the action to the run
   connect(myQActionPointer, SIGNAL(activated()), this, SLOT(run()));

diff --git a/src/plugins/quick_print/quickprint.png → src/plugins/quick_print/quick_print.png b/src/plugins/quick_print/quickprint.png → src/plugins/quick_print/quick_print.png
diff --git a/src/plugins/quick_print/quickprint.qrc b/src/plugins/quick_print/quickprint.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/quickprint/" >
-        <file>quickprint.png</file>
+        <file>quick_print.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/quick_print/quickprintplugin.cpp b/src/plugins/quick_print/quickprintplugin.cpp
@@ -72,9 +72,9 @@ void QuickPrintPlugin::initGui()
 {
 
   // Create the action for tool
-  mQActionPointer = new QAction(QIcon(":/quickprint/quickprint.png"),tr("Quick Print"), this);
+  mQActionPointer = new QAction(QIcon(":/quickprint/quick_print.png"),tr("Quick Print"), this);
   // Set the what's this text
-  mQActionPointer->setWhatsThis(tr("Replace this with a short description of the what the plugin does"));
+  mQActionPointer->setWhatsThis(tr("Provides a qay to quickly produce a map with minimal user input."));
   // Connect the action to the run
   connect(mQActionPointer, SIGNAL(activated()), this, SLOT(run()));
   // Add the icon to the toolbar

diff --git a/src/plugins/scale_bar/plugin.cpp b/src/plugins/scale_bar/plugin.cpp
@@ -97,7 +97,7 @@ QgsScaleBarPlugin::~QgsScaleBarPlugin()
 void QgsScaleBarPlugin::initGui()
 {
   // Create the action for tool
-  myQActionPointer = new QAction(QIcon(":/scalebar.png"), tr("&Scale Bar"), this);
+  myQActionPointer = new QAction(QIcon(":/scale_bar.png"), tr("&Scale Bar"), this);
   myQActionPointer->setWhatsThis(tr("Creates a scale bar that is displayed on the map canvas"));
   // Connect the action to the run
   connect(myQActionPointer, SIGNAL(activated()), this, SLOT(run()));

diff --git a/src/plugins/scale_bar/scalebar.png → src/plugins/scale_bar/scale_bar.png b/src/plugins/scale_bar/scalebar.png → src/plugins/scale_bar/scale_bar.png
diff --git a/src/plugins/scale_bar/scalebar.svg → src/plugins/scale_bar/scale_bar.svg b/src/plugins/scale_bar/scalebar.svg → src/plugins/scale_bar/scale_bar.svg
diff --git a/src/plugins/scale_bar/scalebar_plugin.qrc b/src/plugins/scale_bar/scalebar_plugin.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/" >
-        <file>scalebar.png</file>
+        <file>scale_bar.png</file>
     </qresource>
 </RCC>