Fix launcher plugin load/unload

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6805 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 16, 2007 · 127dfab · 127dfab
1 parent c4e9933
commit 127dfab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/plugins/launcher/qgslauncherplugin.cpp b/src/plugins/launcher/qgslauncherplugin.cpp
@@ -82,7 +82,7 @@ void QgsLauncherPlugin::initGui()
   //menuId = pluginMenu->insertItem(QIconSet(icon),"&Run...", this, SLOT(run()));
 
   // Create the action for tool
-  QAction *myQActionPointer = new QAction(QIcon(icon), tr("Run..."), this);
+  myQActionPointer = new QAction(QIcon(icon), tr("Run..."), this);
   // Connect the action to the run
   connect(myQActionPointer, SIGNAL(activated()), this, SLOT(run()));
   // Add the toolbar
@@ -123,8 +123,9 @@ void QgsLauncherPlugin::drawVectorLayer(QString thePathNameQString, QString theB
 void QgsLauncherPlugin::unload()
 {
   // remove the GUI
-  qGisInterface->removePluginMenuItem("&Launcher", menuId);
-  delete toolBarPointer;
+  qGisInterface->removePluginMenu(tr("&Launcher"),myQActionPointer);
+  qGisInterface->removeToolBarIcon(myQActionPointer); 
+  delete myQActionPointer;
 }
 /** 
  * Required extern functions needed  for every plugin 

diff --git a/src/plugins/launcher/qgslauncherplugin.h b/src/plugins/launcher/qgslauncherplugin.h
@@ -65,6 +65,8 @@ class QgsLauncherPlugin:public QObject, public QgisPlugin
   QgisApp *qgisMainWindowPointer;
   //! Pointer to the QGIS interface object
   QgisIface *qGisInterface;
+  //! Pointer to the action
+  QAction *myQActionPointer;
 };
 
 #endif
diff --git a/src/plugins/launcher/qgslauncherpluginguibase.ui b/src/plugins/launcher/qgslauncherpluginguibase.ui
@@ -205,7 +205,7 @@ p, li { white-space: pre-wrap; }
         <string>Run the selected program/command and display the output</string>
        </property>
        <property name="text" >
-        <string/>
+         <string>Run</string>
        </property>
        <property name="icon" >
         <iconset>icon.xpm</iconset>