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

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2009-08-04 16:22:25 -0400 (Tue, 04 Aug 2009)
New Revision: 11270

Modified:
   trunk/qgis/python/plugins/plugin_installer/__init__.py
   trunk/qgis/python/plugins/plugin_installer/installer_data.py
   trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
Log:
Plugin Installer small fixes

Modified: trunk/qgis/python/plugins/plugin_installer/__init__.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/__init__.py	2009-08-04 17:59:34 UTC (rev 11269)
+++ trunk/qgis/python/plugins/plugin_installer/__init__.py	2009-08-04 20:22:25 UTC (rev 11270)
@@ -14,7 +14,7 @@
   return "Plugin Installer"
 
 def version():
-  return "Version 1.0.1"
+  return "Version 1.0.2"
 
 def description():
   return "Downloads and installs QGIS python plugins"

Modified: trunk/qgis/python/plugins/plugin_installer/installer_data.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_data.py	2009-08-04 17:59:34 UTC (rev 11269)
+++ trunk/qgis/python/plugins/plugin_installer/installer_data.py	2009-08-04 20:22:25 UTC (rev 11270)
@@ -84,6 +84,7 @@
                 ("Martin Dobias' Sandbox",     "http://mapserver.sk/~wonder/qgis/plugins-sandbox.xml", ""),
                 ("Aaron Racicot's Repository", "http://qgisplugins.z-pulley.com", ""),
                 ("Barry Rowlingson's Repository", "http://www.maths.lancs.ac.uk/~rowlings/Qgis/Plugins/plugins.xml", ""),
+                ("Volkan Kepoglu's Repository","http://ggit.metu.edu.tr/~volkan/plugins.xml", ""),
                 ("GIS-Lab Repository",         "http://gis-lab.info/programs/qgis/qgis-repo.xml", "")]
 
 
@@ -414,9 +415,11 @@
       pluginNodes = reposXML.elementsByTagName("pyqgis_plugin")
       if pluginNodes.size():
         for i in range(pluginNodes.size()):
-          fileName = QFileInfo(pluginNodes.item(i).firstChildElement("download_url").text().trimmed()).fileName()
+          fileName = pluginNodes.item(i).firstChildElement("file_name").text().simplified()
+          if not fileName:
+              fileName = QFileInfo(pluginNodes.item(i).firstChildElement("download_url").text().trimmed().split("?")[0]).fileName()
           name = fileName.section(".", 0, 0)
-          name = str(name)
+          name = unicode(name)
           experimental = False
           if pluginNodes.item(i).firstChildElement("experimental").text().simplified().toUpper() in ["TRUE","YES"]:
             experimental = True

Modified: trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2009-08-04 17:59:34 UTC (rev 11269)
+++ trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2009-08-04 20:22:25 UTC (rev 11270)
@@ -159,7 +159,7 @@
     # display an error message for every unavailable reposioty, except the case if all repositories are unavailable!
     if repositories.allUnavailable() and repositories.allUnavailable() != repositories.allEnabled():
       for key in repositories.allUnavailable():
-        QMessageBox.warning(parent, QCoreApplication.translate("QgsPluginInstaller","QGIS Python Plugin Installer"), QCoreApplication.translate("QgsPluginInstaller","Error reading repository:") + u' %s\n%s' % (key,repositories.all()[key]["error"]))
+        QMessageBox.warning(parent, QCoreApplication.translate("QgsPluginInstaller","QGIS Python Plugin Installer"), QCoreApplication.translate("QgsPluginInstaller","Error reading repository:") + QString(' %s\n%s' % (key,repositories.all()[key]["error"])))
 
     flags = Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMaximizeButtonHint 
     self.guiDlg = QgsPluginInstallerDialog(parent,flags)