[QGIS Commit] r13832 - trunk/qgis/python/plugins/plugin_installer

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2010-06-28 19:49:28 +0000 (Mon, 28 Jun 2010)
New Revision: 13832

Modified:
   trunk/qgis/python/plugins/plugin_installer/installer_gui.py
   trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
Log:
Plugin installer update: r13830 follow-up

Modified: trunk/qgis/python/plugins/plugin_installer/installer_gui.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2010-06-28 19:37:17 UTC (rev 13831)
+++ trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2010-06-28 19:49:28 UTC (rev 13832)
@@ -690,6 +690,7 @@
       # if the uninstalled plugin is the installer itself, reload it and quit
       if key == "plugin_installer":
         try:
+          QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation."))
           reloadPlugin(key)
           return
         except:

Modified: trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2010-06-28 19:37:17 UTC (rev 13831)
+++ trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2010-06-28 19:49:28 UTC (rev 13832)
@@ -31,6 +31,7 @@
       self.mainWindow = self.iface.mainWindow
     else: # old plugin API
       self.mainWindow = self.iface.getMainWindow
+    self.guiDlg = None
 
 
   # ----------------------------------------- #
@@ -128,7 +129,8 @@
       self.mainWindow().menuBar().actions()[4].menu().removeAction(self.action)
     if self.statusLabel:
       self.mainWindow().statusBar().removeWidget(self.statusLabel)
-    self.guiDlg.close()
+    if self.guiDlg:
+      self.guiDlg.close()
 
 
   # ----------------------------------------- #