[QGIS Commit] r10363 - branches/Version-1_0/python/plugins/plugin_installer

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Mar 21 12:11:29 EDT 2009


Author: borysiasty
Date: 2009-03-21 12:11:29 -0400 (Sat, 21 Mar 2009)
New Revision: 10363

Modified:
   branches/Version-1_0/python/plugins/plugin_installer/__init__.py
   branches/Version-1_0/python/plugins/plugin_installer/i18n.cpp
   branches/Version-1_0/python/plugins/plugin_installer/installer_data.py
   branches/Version-1_0/python/plugins/plugin_installer/installer_gui.py
   branches/Version-1_0/python/plugins/plugin_installer/installer_plugin.py
   branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.py
   branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.ui
Log:
Plugin Installer - revert last changes in order to keep the stable gui

Modified: branches/Version-1_0/python/plugins/plugin_installer/__init__.py
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/__init__.py	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/__init__.py	2009-03-21 16:11:29 UTC (rev 10363)
@@ -14,7 +14,7 @@
   return "Plugin Installer"
 
 def version():
-  return "Version 0.9.11"
+  return "Version 0.9.8"
 
 def description():
   return "Downloads and installs QGIS python plugins"
@@ -23,7 +23,7 @@
   return "0.9"
 
 def authorName():
-  return "Matthew Perry, Borys Jurgiel"
+  return "perrygeo, borysiasty"
 
 def homepage():
   return "http://bwj.aster.net.pl/qgis/"

Modified: branches/Version-1_0/python/plugins/plugin_installer/i18n.cpp
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/i18n.cpp	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/i18n.cpp	2009-03-21 16:11:29 UTC (rev 10363)
@@ -200,7 +200,7 @@
 // def ChangeCheckingPolicy
 
 // def addKnownRepositories
-  tr( "You are about to add several plugin repositories that are neither authorized nor supported by the Quantum GIS team. Plugin authors generally make efforts to ensure that their work is useful and safe, however, we can assume no responsibility for them." )
+  tr( "You are going to add some plugin repositories neither authorized nor supported by the Quantum GIS team, however provided by folks associated with us. Plugin authors generally make efforts to make their works useful and safe, but we can't assume any responsibility for them. FEEL WARNED!" )
   tr( "QGIS Python Plugin Installer" )
 
 // def addRepository

Modified: branches/Version-1_0/python/plugins/plugin_installer/installer_data.py
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/installer_data.py	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/installer_data.py	2009-03-21 16:11:29 UTC (rev 10363)
@@ -43,7 +43,6 @@
                                 "error_details" QString,
                                 "homepage" QString,
                                 "url" QString,
-                                "experimental" bool
                                 "filename" QString,
                                 "repository" QString,
                                 "localdir" QString,
@@ -84,7 +83,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", ""),
-                ("GIS-Lab Repository", 		"http://gis-lab.info/programs/qgis/qgis-repo.xml", "")]
+                ("GIS-Lab Repository",         "http://gis-lab.info/programs/qgis/qgis-repo.xml", "")]
 
 
 # --- class QPHttp  ----------------------------------------------------------------------- #
@@ -97,8 +96,6 @@
     if settings.value("/proxyEnabled").toBool():
       self.proxy=QNetworkProxy()
       proxyType = settings.value( "/proxyType", QVariant(0)).toString()
-      if len(args)>0 and settings.value("/proxyExcludedUrls").toString().contains(args[0]):
-        proxyType = "NoProxy"
       if proxyType in ["1","Socks5Proxy"]: self.proxy.setType(QNetworkProxy.Socks5Proxy)
       elif proxyType in ["2","NoProxy"]: self.proxy.setType(QNetworkProxy.NoProxy)
       elif proxyType in ["3","HttpProxy"]: self.proxy.setType(QNetworkProxy.HttpProxy)
@@ -239,48 +236,6 @@
 
 
   # ----------------------------------------- #
-  def checkingOnStartInterval(self):
-    """ return checking for news and updates interval """
-    settings = QSettings()
-    (i, ok) = settings.value(settingsGroup+"/checkOnStartInterval").toInt()
-    if i < 0 or not ok:
-      i = 1
-    # allowed values: 0,1,3,7,14,30 days
-    interval = 0
-    for j in [1,3,7,14,30]:
-      if i >= j:
-	interval = j
-    return interval
-
-
-  # ----------------------------------------- #
-  def setCheckingOnStartInterval(self, interval):
-    """ set checking for news and updates interval """
-    settings = QSettings()
-    settings.setValue(settingsGroup+"/checkOnStartInterval", QVariant(interval))
-
-
-  # ----------------------------------------- #
-  def saveCheckingOnStartLastDate(self):
-    """ set today's date as the day of last checking  """
-    settings = QSettings()
-    settings.setValue(settingsGroup+"/checkOnStartLastDate", QVariant(QDate.currentDate()))
-
-
-  # ----------------------------------------- #
-  def timeForChecking(self):
-    """ determine whether it's the time for checking for news and updates now """
-    if self.checkingOnStartInterval() == 0:
-      return True
-    settings = QSettings()
-    interval = settings.value(settingsGroup+"/checkOnStartLastDate").toDate().daysTo(QDate.currentDate())
-    if interval >= self.checkingOnStartInterval():
-      return True
-    else:
-      return False
-
-
-  # ----------------------------------------- #
   def load(self):
     """ populate the mRepositories dict"""
     self.mRepositories = {}
@@ -376,19 +331,15 @@
           fileName = QFileInfo(pluginNodes.item(i).firstChildElement("download_url").text().trimmed()).fileName()
           name = fileName.section(".", 0, 0)
           name = str(name)
-          experimental = False
-          if pluginNodes.item(i).firstChildElement("experimental").text().simplified().toUpper() in ["TRUE","YES"]:
-            experimental = True
           plugin = {}
           plugin[name] = {
             "name"          : pluginNodes.item(i).toElement().attribute("name"),
             "version_avail" : pluginNodes.item(i).toElement().attribute("version"),
-            "desc_repo"     : pluginNodes.item(i).firstChildElement("description").text().simplified(),
+            "desc_repo"     : pluginNodes.item(i).firstChildElement("description").text().trimmed(),
             "desc_local"    : "",
-            "author"        : pluginNodes.item(i).firstChildElement("author_name").text().simplified(),
-            "homepage"      : pluginNodes.item(i).firstChildElement("homepage").text().simplified(),
-            "url"           : pluginNodes.item(i).firstChildElement("download_url").text().simplified(),
-            "experimental"  : experimental,
+            "author"        : pluginNodes.item(i).firstChildElement("author_name").text().trimmed(),
+            "homepage"      : pluginNodes.item(i).firstChildElement("homepage").text().trimmed(),
+            "url"           : pluginNodes.item(i).firstChildElement("download_url").text().trimmed(),
             "filename"      : fileName,
             "status"        : "not installed",
             "error"         : "",
@@ -397,14 +348,14 @@
             "repository"    : reposName,
             "localdir"      : name,
             "read-only"     : False}
-          qgisMinimumVersion = pluginNodes.item(i).firstChildElement("qgis_minimum_version").text().simplified()
+          qgisMinimumVersion = pluginNodes.item(i).firstChildElement("qgis_minimum_version").text().trimmed()
           if not qgisMinimumVersion: qgisMinimumVersion = "0"
           # please use the tag below only if really needed! (for example if plugin development is abandoned)
-          qgisMaximumVersion = pluginNodes.item(i).firstChildElement("qgis_maximum_version").text().simplified()
+          qgisMaximumVersion = pluginNodes.item(i).firstChildElement("qgis_maximum_version").text().trimmed()
           if not qgisMaximumVersion: qgisMaximumVersion = "2"
           #if compatible, add the plugin to the list
           if compareVersions(QGIS_VER, qgisMinimumVersion) < 2 and compareVersions(qgisMaximumVersion, QGIS_VER) < 2:
-            if QGIS_VER[0]==qgisMinimumVersion[0] or name=="plugin_installer" or (qgisMinimumVersion!="0" and qgisMaximumVersion!="2"):
+            if QGIS_VER[0]=="0" or qgisMinimumVersion[0]=="1" or name=="plugin_installer":
               plugins.addPlugin(plugin)
         plugins.workarounds()
         self.mRepositories[reposName]["state"] = 2
@@ -418,7 +369,6 @@
     # is the checking done?
     if not self.fetchingInProgress():
       plugins.getAllInstalled()
-      self.saveCheckingOnStartLastDate()
       self.emit(SIGNAL("checkingDone()"))
 # --- /class Repositories ---------------------------------------------------------------- #
 
@@ -552,7 +502,6 @@
         "author"        : auth,
         "homepage"      : homepage,
         "url"           : path,
-        "experimental"  : False,
         "filename"      : "",
         "status"        : "",
         "error"         : error,
@@ -572,7 +521,6 @@
         self.mPlugins[key]["name"] = plugin["name"] # local name has higher priority
       self.mPlugins[key]["version_inst"] = plugin["version_inst"]
       self.mPlugins[key]["desc_local"] = plugin["desc_local"]
-      self.mPlugins[key]["experimental"] = False
     # set status
     #
     # installed   available   status

Modified: branches/Version-1_0/python/plugins/plugin_installer/installer_gui.py
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/installer_gui.py	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/installer_gui.py	2009-03-21 16:11:29 UTC (rev 10363)
@@ -262,27 +262,15 @@
     self.connect(self.buttonAddRep, SIGNAL("clicked()"), self.addRepository)
     self.connect(self.buttonEditRep, SIGNAL("clicked()"), self.editRepository)
     self.connect(self.buttonDeleteRep, SIGNAL("clicked()"), self.deleteRepository)
-    self.buttonEditRep.setEnabled(False)
-    self.buttonDeleteRep.setEnabled(False)
-    # configuration widgets
-    self.connect(self.checkUpdates, SIGNAL("toggled (bool)"), self.changeCheckingPolicy)
-    self.connect(self.comboInterval, SIGNAL("currentIndexChanged (int)"), self.changeCheckingInterval)
-    self.connect(self.radioPluginType0, SIGNAL("toggled (bool)"), self.changePluginPolicy)
-    self.connect(self.radioPluginType1, SIGNAL("toggled (bool)"), self.changePluginPolicy)
-    self.connect(self.radioPluginType2, SIGNAL("toggled (bool)"), self.changePluginPolicy)
+    # checkingOnStart checkbox
+    self.connect(self.checkUpdates, SIGNAL("stateChanged (int)"), self.ChangeCheckingPolicy)
     if repositories.checkingOnStart():
-      self.checkUpdates.setChecked(Qt.Checked)
+      self.checkUpdates.setCheckState(Qt.Checked)
     else:
-      self.checkUpdates.setChecked(Qt.Unchecked)
-    interval = repositories.checkingOnStartInterval()
-    intervals = [0,1,3,7,14,30] # days
-    if intervals.count(interval):
-      index = intervals.index(interval)
-    else:
-      index = 1
-    if QGIS_VER[0] == "0":
-      self.label_2.setText("<b>Note: This functionality requires QGIS 1.0</b>")
-    self.comboInterval.setCurrentIndex(index)
+      self.checkUpdates.setCheckState(Qt.Unchecked)
+    self.buttonEditRep.setEnabled(False)
+    self.buttonDeleteRep.setEnabled(False)
+
     self.populateMostWidgets()
 
 
@@ -340,32 +328,13 @@
     for i in [0,1,2]:
       self.treeRepositories.resizeColumnToContents(i)
     self.comboFilter1.addItem(self.tr("orphans"))
-    # fill the status filter comboBox
+    # filling the status filter comboBox
     self.comboFilter2.clear()
     self.comboFilter2.addItem(self.tr("any status"))
     self.comboFilter2.addItem(self.tr("not installed", "plural"))
     self.comboFilter2.addItem(self.tr("installed", "plural"))
     if plugins.isThereAnythingNew():
       self.comboFilter2.addItem(self.tr("upgradeable and news"))
-    #set configuration widgets (dependent on the repository list)
-    if len(repositories.all()) == 1 or QGIS_VER[0] == "0":
-      self.radioPluginType0.setEnabled(False)
-      self.radioPluginType1.setEnabled(False)
-      self.radioPluginType2.setEnabled(False)
-    else:
-      self.radioPluginType0.setEnabled(True)
-      self.radioPluginType1.setEnabled(True)
-      self.radioPluginType2.setEnabled(True)
-    settings = QSettings()
-    (i, ok) = settings.value(settingsGroup+"/allowedPluginType", QVariant(2)).toInt()
-    if QGIS_VER[0] == "0":
-      self.radioPluginType1.setChecked(Qt.Checked)
-    elif i == 1 or len(repositories.all()) == 1:
-      self.radioPluginType0.setChecked(Qt.Checked)
-    elif i == 3:
-      self.radioPluginType2.setChecked(Qt.Checked)
-    else:
-      self.radioPluginType1.setChecked(Qt.Checked)
 
 
   # ----------------------------------------- #
@@ -389,10 +358,6 @@
       return False
     if self.comboFilter2.currentIndex() == 3 and not plugin["status"] in ["upgradeable","new"]:
       return False
-    if self.radioPluginType0.isChecked() and plugin["repository"] != officialRepo[0] and plugin["status"] in ["not installed","new"]:
-      return False
-    if self.radioPluginType1.isChecked() and plugin["experimental"] and plugin["status"] in ["not installed","new"]:
-      return False
     if self.lineFilter.text() == "":
       return True
     else:
@@ -400,6 +365,7 @@
         item = QString(plugin[i]) #.toUpper()
         if item != None:
           if item.contains(self.lineFilter.text(), Qt.CaseInsensitive):
+          #if item.find(self.lineFilter.text().toUpper()) > -1:
             return True
     return False
 
@@ -692,41 +658,17 @@
 
 
   # ----------------------------------------- #
-  def changeCheckingPolicy(self,policy):
-    """ the Checking On Start checkbox has been clicked """
-    if policy:
+  def ChangeCheckingPolicy(self,policy):
+    if policy == Qt.Checked:
       repositories.setCheckingOnStart(True)
     else:
       repositories.setCheckingOnStart(False)
 
 
   # ----------------------------------------- #
-  def changeCheckingInterval(self,interval):
-    """ the Checking on start interval combobox has been clicked """
-    intervals = [0,1,3,7,14,30]
-    repositories.setCheckingOnStartInterval(intervals[interval])
-
-
-  # ----------------------------------------- #
-  def changePluginPolicy(self, state):
-    """ one of the plugin type radiobuttons has been clicked """
-    if not state: # radio button released
-      return
-    if self.radioPluginType0.isChecked():
-      i = 1
-    elif self.radioPluginType1.isChecked():
-      i = 2
-    else:
-      i = 3
-    settings = QSettings()
-    settings.setValue(settingsGroup+"/allowedPluginType", QVariant(i))
-    self.populatePluginTree()
-
-
-  # ----------------------------------------- #
   def addKnownRepositories(self):
     """ update list of known repositories - in the future it will be replaced with an online fetching """
-    message = self.tr("You are about to add several plugin repositories that are neither authorized nor supported by the Quantum GIS team. Plugin authors generally make efforts to ensure that their work is useful and safe, however, we can assume no responsibility for them.")
+    message = self.tr("You are going to add some plugin repositories neither authorized nor supported by the Quantum GIS team, however provided by folks associated with us. Plugin authors generally make efforts to make their works useful and safe, but we can't assume any responsibility for them. FEEL WARNED!")
     if QMessageBox.question(self, self.tr("QGIS Python Plugin Installer"), message, QMessageBox.Ok, QMessageBox.Abort) == QMessageBox.Ok:
       repositories.addKnownRepos()
       # refresh lists and populate widgets
@@ -745,13 +687,13 @@
     if not dlg.exec_():
       return
     for i in repositories.all().values():
-      if dlg.editURL.text().trimmed() == i["url"]:
+      if dlg.editURL.text() == i["url"]:
         QMessageBox.warning(self, self.tr("QGIS Python Plugin Installer"), self.tr("Unable to add another repository with the same URL!"))
         return
     settings = QSettings()
     settings.beginGroup(self.reposGroup)
     reposName = dlg.editName.text()
-    reposURL = dlg.editURL.text().trimmed()
+    reposURL = dlg.editURL.text()
     if repositories.all().has_key(reposName):
       reposName = reposName + "(2)"
     # add to settings
@@ -787,7 +729,7 @@
     if not dlg.exec_():
       return # nothing to do if cancelled
     for i in repositories.all().values():
-      if dlg.editURL.text().trimmed() == i["url"] and dlg.editURL.text().trimmed() != repositories.all()[reposName]["url"]:
+      if dlg.editURL.text() == i["url"] and dlg.editURL.text() != repositories.all()[reposName]["url"]:
         QMessageBox.warning(self, self.tr("QGIS Python Plugin Installer"), self.tr("Unable to add another repository with the same URL!"))
         return
     # delete old repo from QSettings and create new one
@@ -797,9 +739,9 @@
     newName = dlg.editName.text()
     if repositories.all().has_key(newName) and newName != reposName:
       newName = newName + "(2)"
-    settings.setValue(newName+"/url", QVariant(dlg.editURL.text().trimmed()))
+    settings.setValue(newName+"/url", QVariant(dlg.editURL.text()))
     settings.setValue(newName+"/enabled", QVariant(bool(dlg.checkBoxEnabled.checkState())))
-    if dlg.editURL.text().trimmed() == repositories.all()[reposName]["url"] and dlg.checkBoxEnabled.checkState() == checkState[repositories.all()[reposName]["enabled"]]:
+    if dlg.editURL.text() == repositories.all()[reposName]["url"] and dlg.checkBoxEnabled.checkState() == checkState[repositories.all()[reposName]["enabled"]]:
       repositories.rename(reposName, newName)
       self.populateMostWidgets()
       return # nothing else to do if only repository name was changed

Modified: branches/Version-1_0/python/plugins/plugin_installer/installer_plugin.py
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/installer_plugin.py	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/installer_plugin.py	2009-03-21 16:11:29 UTC (rev 10363)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Copyright (C) 2007-2008 Matthew Perry
 Copyright (C) 2008 Borys Jurgiel
@@ -31,26 +32,10 @@
     else: # old plugin API
       self.mainWindow = self.iface.getMainWindow
 
-
   # ----------------------------------------- #
-  def getThemeIcon(self, theName):
-    myCurThemePath = QgsApplication.activeThemePath() + "/plugins/" + theName;
-    myDefThemePath = QgsApplication.defaultThemePath() + "/plugins/" + theName;
-    myQrcPath = ":/plugins/installer/" + theName;
-    if QFile.exists(myCurThemePath):
-      return QIcon(myCurThemePath)
-    elif QFile.exists(myDefThemePath):
-      return QIcon(myDefThemePath)
-    elif QFile.exists(myQrcPath):
-      return QIcon(myQrcPath)
-    else:
-      return QIcon()
-
-
-  # ----------------------------------------- #
   def initGui(self):
     """ create action that will start plugin window and then add it to menu """
-    self.action = QAction(self.getThemeIcon("plugin_installer.png"), QCoreApplication.translate("QgsPluginInstaller","Fetch Python Plugins..."), self.mainWindow())
+    self.action = QAction(QIcon(":/plugins/installer/plugin_installer.png"), QCoreApplication.translate("QgsPluginInstaller","Fetch Python Plugins..."), self.mainWindow())
     self.action.setWhatsThis(QCoreApplication.translate("QgsPluginInstaller","Install more plugins from remote repositories"))
     self.action.setStatusTip(QCoreApplication.translate("QgsPluginInstaller","Install more plugins from remote repositories"))
     if QGIS_MAJOR_VER: # new plugin API
@@ -65,12 +50,10 @@
     repositories.load()
     plugins.clear()
 
-    if repositories.checkingOnStart() and repositories.timeForChecking() and repositories.allEnabled():
+    if repositories.checkingOnStart() and repositories.allEnabled():
       self.statusLabel = QLabel(QCoreApplication.translate("QgsPluginInstaller","Looking for new plugins..."), self.mainWindow().statusBar())
       self.mainWindow().statusBar().insertPermanentWidget(0,self.statusLabel)
-      QObject.connect(self.statusLabel, SIGNAL("linkActivated (QString)"), self.preRun)
-
-
+      QObject.connect(self.statusLabel, SIGNAL("linkActivated (QString)"), self.run)
       QObject.connect(repositories, SIGNAL("checkingDone()"), self.checkingDone)
       for key in repositories.allEnabled():
         repositories.requestFetching(key)
@@ -106,37 +89,25 @@
   # ----------------------------------------- #
   def unload(self):
     """ remove the menu item and notify label """
-    if QGIS_MAJOR_VER: # new plugin API
-      self.iface.pluginMenu().removeAction(self.action)
-    else: # old plugin API
-      self.mainWindow().menuBar().actions()[4].menu().removeAction(self.action)
+    self.mainWindow().menuBar().actions()[4].menu().removeAction(self.action)
     if self.statusLabel:
       self.mainWindow().statusBar().removeWidget(self.statusLabel)
 
 
   # ----------------------------------------- #
-  def preRun(self, * params):
-    """ stupid method to get rid of the string value """
-    self.run()
-
-
-  # ----------------------------------------- #
-  def run(self, parent = None):
+  def run(self, * params):
     """ create and show a configuration dialog """
     QApplication.setOverrideCursor(Qt.WaitCursor)
     if self.statusLabel:
       self.mainWindow().statusBar().removeWidget(self.statusLabel)
       self.statusLabel = None
 
-    if not parent:
-      parent = self.mainWindow()
-  
     for key in repositories.all():
       if repositories.all()[key]["state"] == 3: # if state = 3 (error), try to fetch once again
         repositories.requestFetching(key)
 
     if repositories.fetchingInProgress():
-      self.fetchDlg = QgsPluginInstallerFetchingDialog(parent)
+      self.fetchDlg = QgsPluginInstallerFetchingDialog(self.mainWindow())
       self.fetchDlg.exec_()
       del self.fetchDlg
       for key in repositories.all():
@@ -147,10 +118,10 @@
     # 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(self.mainWindow(), QCoreApplication.translate("QgsPluginInstaller","QGIS Python Plugin Installer"), QCoreApplication.translate("QgsPluginInstaller","Error reading repository:") + u' %s\n%s' % (key,repositories.all()[key]["error"]))
 
     plugins.getAllInstalled()
 
     flags = Qt.WindowTitleHint | Qt.WindowSystemMenuHint | Qt.WindowMaximizeButtonHint 
-    self.guiDlg = QgsPluginInstallerDialog(parent,flags)
+    self.guiDlg = QgsPluginInstallerDialog(self.mainWindow(),flags)
     self.guiDlg.show()

Modified: branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.py
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.py	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.py	2009-03-21 16:11:29 UTC (rev 10363)
@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'qgsplugininstallerbase.ui'
 #
-# Created: Thu Mar 12 17:09:35 2009
-#      by: PyQt4 UI code generator 4.4.4
+# Created: Wed Nov 12 23:21:49 2008
+#      by: PyQt4 UI code generator 4.3.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,235 +12,184 @@
 class Ui_QgsPluginInstallerDialogBase(object):
     def setupUi(self, QgsPluginInstallerDialogBase):
         QgsPluginInstallerDialogBase.setObjectName("QgsPluginInstallerDialogBase")
-        QgsPluginInstallerDialogBase.resize(799, 382)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/plugins/installer/qgis-icon.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        QgsPluginInstallerDialogBase.setWindowIcon(icon)
+        QgsPluginInstallerDialogBase.resize(QtCore.QSize(QtCore.QRect(0,0,769,395).size()).expandedTo(QgsPluginInstallerDialogBase.minimumSizeHint()))
+        QgsPluginInstallerDialogBase.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
+
         self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerDialogBase)
         self.gridlayout.setObjectName("gridlayout")
-        self.hboxlayout = QtGui.QHBoxLayout()
-        self.hboxlayout.setObjectName("hboxlayout")
-        self.label_3 = QtGui.QLabel(QgsPluginInstallerDialogBase)
-        self.label_3.setObjectName("label_3")
-        self.hboxlayout.addWidget(self.label_3)
-        self.buttonClose = QtGui.QPushButton(QgsPluginInstallerDialogBase)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.buttonClose.sizePolicy().hasHeightForWidth())
-        self.buttonClose.setSizePolicy(sizePolicy)
-        self.buttonClose.setObjectName("buttonClose")
-        self.hboxlayout.addWidget(self.buttonClose)
-        self.gridlayout.addLayout(self.hboxlayout, 1, 0, 1, 1)
+
         self.tabWidget = QtGui.QTabWidget(QgsPluginInstallerDialogBase)
         self.tabWidget.setObjectName("tabWidget")
+
         self.tab = QtGui.QWidget()
         self.tab.setObjectName("tab")
+
         self.vboxlayout = QtGui.QVBoxLayout(self.tab)
         self.vboxlayout.setObjectName("vboxlayout")
-        self.hboxlayout1 = QtGui.QHBoxLayout()
-        self.hboxlayout1.setObjectName("hboxlayout1")
+
+        self.hboxlayout = QtGui.QHBoxLayout()
+        self.hboxlayout.setObjectName("hboxlayout")
+
         self.label_5 = QtGui.QLabel(self.tab)
         self.label_5.setEnabled(True)
         self.label_5.setObjectName("label_5")
-        self.hboxlayout1.addWidget(self.label_5)
+        self.hboxlayout.addWidget(self.label_5)
+
         self.lineFilter = QtGui.QLineEdit(self.tab)
         self.lineFilter.setEnabled(True)
         self.lineFilter.setObjectName("lineFilter")
-        self.hboxlayout1.addWidget(self.lineFilter)
+        self.hboxlayout.addWidget(self.lineFilter)
+
         self.comboFilter1 = QtGui.QComboBox(self.tab)
         self.comboFilter1.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.comboFilter1.sizePolicy().hasHeightForWidth())
         self.comboFilter1.setSizePolicy(sizePolicy)
         self.comboFilter1.setObjectName("comboFilter1")
-        self.comboFilter1.addItem(QtCore.QString())
-        self.hboxlayout1.addWidget(self.comboFilter1)
+        self.hboxlayout.addWidget(self.comboFilter1)
+
         self.comboFilter2 = QtGui.QComboBox(self.tab)
         self.comboFilter2.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.comboFilter2.sizePolicy().hasHeightForWidth())
         self.comboFilter2.setSizePolicy(sizePolicy)
         self.comboFilter2.setObjectName("comboFilter2")
-        self.hboxlayout1.addWidget(self.comboFilter2)
-        self.vboxlayout.addLayout(self.hboxlayout1)
+        self.hboxlayout.addWidget(self.comboFilter2)
+        self.vboxlayout.addLayout(self.hboxlayout)
+
         self.treePlugins = QtGui.QTreeWidget(self.tab)
         self.treePlugins.setAlternatingRowColors(True)
         self.treePlugins.setRootIsDecorated(False)
         self.treePlugins.setItemsExpandable(False)
+        self.treePlugins.setSortingEnabled(True)
         self.treePlugins.setAllColumnsShowFocus(True)
         self.treePlugins.setObjectName("treePlugins")
         self.vboxlayout.addWidget(self.treePlugins)
-        self.hboxlayout2 = QtGui.QHBoxLayout()
-        self.hboxlayout2.setObjectName("hboxlayout2")
-        spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.hboxlayout2.addItem(spacerItem)
+
+        self.hboxlayout1 = QtGui.QHBoxLayout()
+        self.hboxlayout1.setObjectName("hboxlayout1")
+
+        spacerItem = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        self.hboxlayout1.addItem(spacerItem)
+
         self.buttonInstall = QtGui.QPushButton(self.tab)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.buttonInstall.sizePolicy().hasHeightForWidth())
         self.buttonInstall.setSizePolicy(sizePolicy)
-        self.buttonInstall.setMinimumSize(QtCore.QSize(160, 0))
+        self.buttonInstall.setMinimumSize(QtCore.QSize(160,0))
         self.buttonInstall.setObjectName("buttonInstall")
-        self.hboxlayout2.addWidget(self.buttonInstall)
+        self.hboxlayout1.addWidget(self.buttonInstall)
+
         self.buttonUninstall = QtGui.QPushButton(self.tab)
         self.buttonUninstall.setEnabled(True)
         self.buttonUninstall.setObjectName("buttonUninstall")
-        self.hboxlayout2.addWidget(self.buttonUninstall)
-        self.vboxlayout.addLayout(self.hboxlayout2)
-        self.tabWidget.addTab(self.tab, "")
+        self.hboxlayout1.addWidget(self.buttonUninstall)
+        self.vboxlayout.addLayout(self.hboxlayout1)
+        self.tabWidget.addTab(self.tab,"")
+
         self.tab_2 = QtGui.QWidget()
         self.tab_2.setObjectName("tab_2")
+
         self.gridlayout1 = QtGui.QGridLayout(self.tab_2)
         self.gridlayout1.setObjectName("gridlayout1")
+
         self.treeRepositories = QtGui.QTreeWidget(self.tab_2)
         self.treeRepositories.setRootIsDecorated(False)
         self.treeRepositories.setItemsExpandable(False)
         self.treeRepositories.setObjectName("treeRepositories")
-        self.gridlayout1.addWidget(self.treeRepositories, 0, 0, 1, 7)
-        spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum)
-        self.gridlayout1.addItem(spacerItem1, 1, 1, 1, 1)
+        self.gridlayout1.addWidget(self.treeRepositories,0,0,1,7)
+
+        self.checkUpdates = QtGui.QCheckBox(self.tab_2)
+        self.checkUpdates.setObjectName("checkUpdates")
+        self.gridlayout1.addWidget(self.checkUpdates,1,0,1,1)
+
+        spacerItem1 = QtGui.QSpacerItem(30,20,QtGui.QSizePolicy.Preferred,QtGui.QSizePolicy.Minimum)
+        self.gridlayout1.addItem(spacerItem1,1,1,1,1)
+
         self.buttonFetchRepositories = QtGui.QPushButton(self.tab_2)
         self.buttonFetchRepositories.setEnabled(True)
         self.buttonFetchRepositories.setObjectName("buttonFetchRepositories")
-        self.gridlayout1.addWidget(self.buttonFetchRepositories, 1, 2, 1, 1)
-        spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridlayout1.addItem(spacerItem2, 1, 3, 1, 1)
+        self.gridlayout1.addWidget(self.buttonFetchRepositories,1,2,1,1)
+
+        spacerItem2 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+        self.gridlayout1.addItem(spacerItem2,1,3,1,1)
+
         self.buttonAddRep = QtGui.QPushButton(self.tab_2)
         self.buttonAddRep.setObjectName("buttonAddRep")
-        self.gridlayout1.addWidget(self.buttonAddRep, 1, 4, 1, 1)
+        self.gridlayout1.addWidget(self.buttonAddRep,1,4,1,1)
+
         self.buttonEditRep = QtGui.QPushButton(self.tab_2)
         self.buttonEditRep.setObjectName("buttonEditRep")
-        self.gridlayout1.addWidget(self.buttonEditRep, 1, 5, 1, 1)
+        self.gridlayout1.addWidget(self.buttonEditRep,1,5,1,1)
+
         self.buttonDeleteRep = QtGui.QPushButton(self.tab_2)
         self.buttonDeleteRep.setObjectName("buttonDeleteRep")
-        self.gridlayout1.addWidget(self.buttonDeleteRep, 1, 6, 1, 1)
-        self.tabWidget.addTab(self.tab_2, "")
-        self.tab_3 = QtGui.QWidget()
-        self.tab_3.setObjectName("tab_3")
-        self.verticalLayout = QtGui.QVBoxLayout(self.tab_3)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.checkUpdates = QtGui.QGroupBox(self.tab_3)
-        self.checkUpdates.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        self.gridlayout1.addWidget(self.buttonDeleteRep,1,6,1,1)
+        self.tabWidget.addTab(self.tab_2,"")
+        self.gridlayout.addWidget(self.tabWidget,0,0,1,1)
+
+        self.hboxlayout2 = QtGui.QHBoxLayout()
+        self.hboxlayout2.setObjectName("hboxlayout2")
+
+        self.label_3 = QtGui.QLabel(QgsPluginInstallerDialogBase)
+        self.label_3.setObjectName("label_3")
+        self.hboxlayout2.addWidget(self.label_3)
+
+        self.buttonClose = QtGui.QPushButton(QgsPluginInstallerDialogBase)
+
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.checkUpdates.sizePolicy().hasHeightForWidth())
-        self.checkUpdates.setSizePolicy(sizePolicy)
-        self.checkUpdates.setCheckable(True)
-        self.checkUpdates.setChecked(False)
-        self.checkUpdates.setObjectName("checkUpdates")
-        self.gridLayout = QtGui.QGridLayout(self.checkUpdates)
-        self.gridLayout.setObjectName("gridLayout")
-        self.comboInterval = QtGui.QComboBox(self.checkUpdates)
-        self.comboInterval.setObjectName("comboInterval")
-        self.comboInterval.addItem(QtCore.QString())
-        self.comboInterval.addItem(QtCore.QString())
-        self.comboInterval.addItem(QtCore.QString())
-        self.comboInterval.addItem(QtCore.QString())
-        self.comboInterval.addItem(QtCore.QString())
-        self.comboInterval.addItem(QtCore.QString())
-        self.gridLayout.addWidget(self.comboInterval, 0, 0, 1, 1)
-        spacerItem3 = QtGui.QSpacerItem(20, 10, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
-        self.gridLayout.addItem(spacerItem3, 2, 0, 1, 1)
-        self.label = QtGui.QLabel(self.checkUpdates)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
-        self.label.setSizePolicy(sizePolicy)
-        self.label.setWordWrap(True)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 1, 0, 1, 1)
-        self.verticalLayout.addWidget(self.checkUpdates)
-        self.groupBox_2 = QtGui.QGroupBox(self.tab_3)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(1)
-        sizePolicy.setHeightForWidth(self.groupBox_2.sizePolicy().hasHeightForWidth())
-        self.groupBox_2.setSizePolicy(sizePolicy)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.gridLayout_2 = QtGui.QGridLayout(self.groupBox_2)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.radioPluginType0 = QtGui.QRadioButton(self.groupBox_2)
-        self.radioPluginType0.setEnabled(False)
-        self.radioPluginType0.setChecked(True)
-        self.radioPluginType0.setObjectName("radioPluginType0")
-        self.gridLayout_2.addWidget(self.radioPluginType0, 0, 0, 1, 1)
-        self.radioPluginType1 = QtGui.QRadioButton(self.groupBox_2)
-        self.radioPluginType1.setEnabled(False)
-        self.radioPluginType1.setChecked(False)
-        self.radioPluginType1.setObjectName("radioPluginType1")
-        self.gridLayout_2.addWidget(self.radioPluginType1, 1, 0, 1, 1)
-        self.radioPluginType2 = QtGui.QRadioButton(self.groupBox_2)
-        self.radioPluginType2.setEnabled(False)
-        self.radioPluginType2.setObjectName("radioPluginType2")
-        self.gridLayout_2.addWidget(self.radioPluginType2, 2, 0, 1, 1)
-        self.label_2 = QtGui.QLabel(self.groupBox_2)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
-        self.label_2.setSizePolicy(sizePolicy)
-        self.label_2.setMinimumSize(QtCore.QSize(0, 75))
-        self.label_2.setTextFormat(QtCore.Qt.RichText)
-        self.label_2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
-        self.label_2.setWordWrap(True)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout_2.addWidget(self.label_2, 3, 0, 1, 1)
-        self.verticalLayout.addWidget(self.groupBox_2)
-        self.tabWidget.addTab(self.tab_3, "")
-        self.gridlayout.addWidget(self.tabWidget, 0, 0, 1, 1)
+        sizePolicy.setHeightForWidth(self.buttonClose.sizePolicy().hasHeightForWidth())
+        self.buttonClose.setSizePolicy(sizePolicy)
+        self.buttonClose.setObjectName("buttonClose")
+        self.hboxlayout2.addWidget(self.buttonClose)
+        self.gridlayout.addLayout(self.hboxlayout2,1,0,1,1)
 
         self.retranslateUi(QgsPluginInstallerDialogBase)
         self.tabWidget.setCurrentIndex(0)
-        QtCore.QObject.connect(self.buttonClose, QtCore.SIGNAL("released()"), QgsPluginInstallerDialogBase.close)
+        QtCore.QObject.connect(self.buttonClose,QtCore.SIGNAL("released()"),QgsPluginInstallerDialogBase.close)
         QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerDialogBase)
-        QgsPluginInstallerDialogBase.setTabOrder(self.tabWidget, self.lineFilter)
-        QgsPluginInstallerDialogBase.setTabOrder(self.lineFilter, self.comboFilter1)
-        QgsPluginInstallerDialogBase.setTabOrder(self.comboFilter1, self.comboFilter2)
-        QgsPluginInstallerDialogBase.setTabOrder(self.comboFilter2, self.treePlugins)
-        QgsPluginInstallerDialogBase.setTabOrder(self.treePlugins, self.buttonInstall)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonInstall, self.buttonUninstall)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonUninstall, self.buttonClose)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonClose, self.treeRepositories)
-        QgsPluginInstallerDialogBase.setTabOrder(self.treeRepositories, self.buttonFetchRepositories)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonFetchRepositories, self.buttonAddRep)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonAddRep, self.buttonEditRep)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonEditRep, self.buttonDeleteRep)
-        QgsPluginInstallerDialogBase.setTabOrder(self.buttonDeleteRep, self.checkUpdates)
-        QgsPluginInstallerDialogBase.setTabOrder(self.checkUpdates, self.comboInterval)
-        QgsPluginInstallerDialogBase.setTabOrder(self.comboInterval, self.radioPluginType0)
-        QgsPluginInstallerDialogBase.setTabOrder(self.radioPluginType0, self.radioPluginType1)
-        QgsPluginInstallerDialogBase.setTabOrder(self.radioPluginType1, self.radioPluginType2)
+        QgsPluginInstallerDialogBase.setTabOrder(self.tabWidget,self.lineFilter)
+        QgsPluginInstallerDialogBase.setTabOrder(self.lineFilter,self.comboFilter1)
+        QgsPluginInstallerDialogBase.setTabOrder(self.comboFilter1,self.comboFilter2)
+        QgsPluginInstallerDialogBase.setTabOrder(self.comboFilter2,self.treePlugins)
+        QgsPluginInstallerDialogBase.setTabOrder(self.treePlugins,self.buttonInstall)
+        QgsPluginInstallerDialogBase.setTabOrder(self.buttonInstall,self.buttonUninstall)
+        QgsPluginInstallerDialogBase.setTabOrder(self.buttonUninstall,self.buttonClose)
+        QgsPluginInstallerDialogBase.setTabOrder(self.buttonClose,self.treeRepositories)
+        QgsPluginInstallerDialogBase.setTabOrder(self.treeRepositories,self.buttonFetchRepositories)
+        QgsPluginInstallerDialogBase.setTabOrder(self.buttonFetchRepositories,self.checkUpdates)
+        QgsPluginInstallerDialogBase.setTabOrder(self.checkUpdates,self.buttonAddRep)
+        QgsPluginInstallerDialogBase.setTabOrder(self.buttonAddRep,self.buttonEditRep)
+        QgsPluginInstallerDialogBase.setTabOrder(self.buttonEditRep,self.buttonDeleteRep)
 
     def retranslateUi(self, QgsPluginInstallerDialogBase):
         QgsPluginInstallerDialogBase.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "QGIS Python Plugin Installer", None, QtGui.QApplication.UnicodeUTF8))
         QgsPluginInstallerDialogBase.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "QGIS Python Plugin Installer", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_3.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "The plugins will be installed to ~/.qgis/python/plugins", None, QtGui.QApplication.UnicodeUTF8))
-        self.buttonClose.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Close the Installer window", None, QtGui.QApplication.UnicodeUTF8))
-        self.buttonClose.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Close the Installer window", None, QtGui.QApplication.UnicodeUTF8))
-        self.buttonClose.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Close", None, QtGui.QApplication.UnicodeUTF8))
         self.label_5.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Filter:", None, QtGui.QApplication.UnicodeUTF8))
         self.lineFilter.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Display only plugins containing this word in their metadata", None, QtGui.QApplication.UnicodeUTF8))
         self.lineFilter.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Display only plugins containing this word in their metadata", None, QtGui.QApplication.UnicodeUTF8))
         self.comboFilter1.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Display only plugins from given repository", None, QtGui.QApplication.UnicodeUTF8))
         self.comboFilter1.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Display only plugins from given repository", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboFilter1.setItemText(0, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "all repositories", None, QtGui.QApplication.UnicodeUTF8))
+        self.comboFilter1.addItem(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "all repositories", None, QtGui.QApplication.UnicodeUTF8))
         self.comboFilter2.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Display only plugins with matching status", None, QtGui.QApplication.UnicodeUTF8))
         self.comboFilter2.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Display only plugins with matching status", None, QtGui.QApplication.UnicodeUTF8))
-        self.treePlugins.setSortingEnabled(True)
-        self.treePlugins.headerItem().setText(0, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Status", None, QtGui.QApplication.UnicodeUTF8))
-        self.treePlugins.headerItem().setText(1, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Name", None, QtGui.QApplication.UnicodeUTF8))
-        self.treePlugins.headerItem().setText(2, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Version", None, QtGui.QApplication.UnicodeUTF8))
-        self.treePlugins.headerItem().setText(3, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Description", None, QtGui.QApplication.UnicodeUTF8))
-        self.treePlugins.headerItem().setText(4, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Author", None, QtGui.QApplication.UnicodeUTF8))
-        self.treePlugins.headerItem().setText(5, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Repository", None, QtGui.QApplication.UnicodeUTF8))
+        self.treePlugins.headerItem().setText(0,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Status", None, QtGui.QApplication.UnicodeUTF8))
+        self.treePlugins.headerItem().setText(1,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Name", None, QtGui.QApplication.UnicodeUTF8))
+        self.treePlugins.headerItem().setText(2,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Version", None, QtGui.QApplication.UnicodeUTF8))
+        self.treePlugins.headerItem().setText(3,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Description", None, QtGui.QApplication.UnicodeUTF8))
+        self.treePlugins.headerItem().setText(4,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Author", None, QtGui.QApplication.UnicodeUTF8))
+        self.treePlugins.headerItem().setText(5,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Repository", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonInstall.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Install, reinstall or upgrade the selected plugin", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonInstall.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Install, reinstall or upgrade the selected plugin", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonInstall.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Install/upgrade plugin", None, QtGui.QApplication.UnicodeUTF8))
@@ -248,10 +197,13 @@
         self.buttonUninstall.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Uninstall the selected plugin", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonUninstall.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Uninstall plugin", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Plugins", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "List of available and installed plugins", None, QtGui.QApplication.UnicodeUTF8))
-        self.treeRepositories.headerItem().setText(0, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Status", None, QtGui.QApplication.UnicodeUTF8))
-        self.treeRepositories.headerItem().setText(1, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Name", None, QtGui.QApplication.UnicodeUTF8))
-        self.treeRepositories.headerItem().setText(2, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "URL", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.tab),QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "List of available and installed plugins", None, QtGui.QApplication.UnicodeUTF8))
+        self.treeRepositories.headerItem().setText(0,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Status", None, QtGui.QApplication.UnicodeUTF8))
+        self.treeRepositories.headerItem().setText(1,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Name", None, QtGui.QApplication.UnicodeUTF8))
+        self.treeRepositories.headerItem().setText(2,QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "URL", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkUpdates.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Allow the Installer to look for updates and news in enabled repositories on QGIS startup", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkUpdates.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Allow the Installer to look for updates and news in enabled repositories on QGIS startup", None, QtGui.QApplication.UnicodeUTF8))
+        self.checkUpdates.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Check for updates on startup", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonFetchRepositories.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Add third party plugin repositories to the list", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonFetchRepositories.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Add third party plugin repositories to the list", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonFetchRepositories.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Add 3rd party repositories", None, QtGui.QApplication.UnicodeUTF8))
@@ -265,29 +217,10 @@
         self.buttonDeleteRep.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Remove the selected repository", None, QtGui.QApplication.UnicodeUTF8))
         self.buttonDeleteRep.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Delete", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Repositories", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.tab_2), QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "List of plugin repositories", None, QtGui.QApplication.UnicodeUTF8))
-        self.checkUpdates.setTitle(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Check for updates on startup", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboInterval.setItemText(0, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "every time QGIS starts", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboInterval.setItemText(1, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "once a day", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboInterval.setItemText(2, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "every 3 days", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboInterval.setItemText(3, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "every week", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboInterval.setItemText(4, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "every 2 weeks", None, QtGui.QApplication.UnicodeUTF8))
-        self.comboInterval.setItemText(5, QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "every month", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'DejaVu Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Note:</span> If this function is enabled, Quantum GIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
-        self.groupBox_2.setTitle(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Allowed plugins", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioPluginType0.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Only show plugins from the official repository", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioPluginType1.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Show all plugins except those marked as experimental", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioPluginType2.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Show all plugins, even those marked as experimental", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:\'DejaVu Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Note:</span> Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered \'incomplete\' or \'proof of concept\' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.</p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Options", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.tab_3), QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Configuration of the plugin installer", None, QtGui.QApplication.UnicodeUTF8))
+        self.tabWidget.setTabToolTip(self.tabWidget.indexOf(self.tab_2),QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "List of plugin repositories", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "The plugins will be installed to ~/.qgis/python/plugins", None, QtGui.QApplication.UnicodeUTF8))
+        self.buttonClose.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Close the Installer window", None, QtGui.QApplication.UnicodeUTF8))
+        self.buttonClose.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Close the Installer window", None, QtGui.QApplication.UnicodeUTF8))
+        self.buttonClose.setText(QtGui.QApplication.translate("QgsPluginInstallerDialogBase", "Close", None, QtGui.QApplication.UnicodeUTF8))
 
 import resources_rc

Modified: branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.ui
===================================================================
--- branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.ui	2009-03-21 16:10:00 UTC (rev 10362)
+++ branches/Version-1_0/python/plugins/plugin_installer/qgsplugininstallerbase.ui	2009-03-21 16:11:29 UTC (rev 10363)
@@ -6,54 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>799</width>
-    <height>382</height>
+    <width>769</width>
+    <height>395</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>QGIS Python Plugin Installer</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="resources.qrc" >
-    <normaloff>:/plugins/installer/qgis-icon.png</normaloff>:/plugins/installer/qgis-icon.png</iconset>
+   <iconset resource="resources.qrc" >:/plugins/installer/qgis-icon.png</iconset>
   </property>
   <property name="whatsThis" >
    <string>QGIS Python Plugin Installer</string>
   </property>
   <layout class="QGridLayout" >
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="whatsThis" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>The plugins will be installed to ~/.qgis/python/plugins</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonClose" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip" >
-        <string>Close the Installer window</string>
-       </property>
-       <property name="whatsThis" >
-        <string>Close the Installer window</string>
-       </property>
-       <property name="text" >
-        <string>Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="toolTip" >
@@ -202,7 +168,7 @@
            <property name="orientation" >
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" stdset="0" >
+           <property name="sizeHint" >
             <size>
              <width>40</width>
              <height>20</height>
@@ -288,6 +254,22 @@
          </column>
         </widget>
        </item>
+       <item row="1" column="0" >
+        <widget class="QCheckBox" name="checkUpdates" >
+         <property name="toolTip" >
+          <string>Allow the Installer to look for updates and news in enabled repositories on QGIS startup</string>
+         </property>
+         <property name="statusTip" >
+          <string/>
+         </property>
+         <property name="whatsThis" >
+          <string>Allow the Installer to look for updates and news in enabled repositories on QGIS startup</string>
+         </property>
+         <property name="text" >
+          <string>Check for updates on startup</string>
+         </property>
+        </widget>
+       </item>
        <item row="1" column="1" >
         <spacer>
          <property name="orientation" >
@@ -296,9 +278,9 @@
          <property name="sizeType" >
           <enum>QSizePolicy::Preferred</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" >
           <size>
-           <width>20</width>
+           <width>30</width>
            <height>20</height>
           </size>
          </property>
@@ -325,7 +307,7 @@
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" >
           <size>
            <width>40</width>
            <height>20</height>
@@ -374,195 +356,41 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_3" >
-      <attribute name="title" >
-       <string>Options</string>
-      </attribute>
-      <attribute name="toolTip" >
-       <string>Configuration of the plugin installer</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout" >
-       <item>
-        <widget class="QGroupBox" name="checkUpdates" >
-         <property name="enabled" >
-          <bool>true</bool>
-         </property>
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title" >
-          <string>Check for updates on startup</string>
-         </property>
-         <property name="checkable" >
-          <bool>true</bool>
-         </property>
-         <property name="checked" >
-          <bool>false</bool>
-         </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" >
-           <widget class="QComboBox" name="comboInterval" >
-            <item>
-             <property name="text" >
-              <string>every time QGIS starts</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>once a day</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>every 3 days</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>every week</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>every 2 weeks</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>every month</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="2" column="0" >
-           <spacer name="verticalSpacer_3" >
-            <property name="orientation" >
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeType" >
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>20</width>
-              <height>10</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text" >
-             <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Note:&lt;/span> If this function is enabled, Quantum GIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.&lt;/p>&lt;/body>&lt;/html></string>
-            </property>
-            <property name="wordWrap" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_2" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-           <horstretch>0</horstretch>
-           <verstretch>1</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title" >
-          <string>Allowed plugins</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_2" >
-          <item row="0" column="0" >
-           <widget class="QRadioButton" name="radioPluginType0" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string>Only show plugins from the official repository</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QRadioButton" name="radioPluginType1" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string>Show all plugins except those marked as experimental</string>
-            </property>
-            <property name="checked" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" >
-           <widget class="QRadioButton" name="radioPluginType2" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="text" >
-             <string>Show all plugins, even those marked as experimental</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" >
-           <widget class="QLabel" name="label_2" >
-            <property name="sizePolicy" >
-             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize" >
-             <size>
-              <width>0</width>
-              <height>75</height>
-             </size>
-            </property>
-            <property name="text" >
-             <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Note:&lt;/span> Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered 'incomplete' or 'proof of concept' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.&lt;/p>&lt;/body>&lt;/html></string>
-            </property>
-            <property name="textFormat" >
-             <enum>Qt::RichText</enum>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-            </property>
-            <property name="wordWrap" >
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="label_3" >
+       <property name="whatsThis" >
+        <string/>
+       </property>
+       <property name="text" >
+        <string>The plugins will be installed to ~/.qgis/python/plugins</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="buttonClose" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip" >
+        <string>Close the Installer window</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Close the Installer window</string>
+       </property>
+       <property name="text" >
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -576,14 +404,10 @@
   <tabstop>buttonClose</tabstop>
   <tabstop>treeRepositories</tabstop>
   <tabstop>buttonFetchRepositories</tabstop>
+  <tabstop>checkUpdates</tabstop>
   <tabstop>buttonAddRep</tabstop>
   <tabstop>buttonEditRep</tabstop>
   <tabstop>buttonDeleteRep</tabstop>
-  <tabstop>checkUpdates</tabstop>
-  <tabstop>comboInterval</tabstop>
-  <tabstop>radioPluginType0</tabstop>
-  <tabstop>radioPluginType1</tabstop>
-  <tabstop>radioPluginType2</tabstop>
  </tabstops>
  <resources>
   <include location="resources.qrc" />



More information about the QGIS-commit mailing list