[PluginManager] Code cleanup: keep one class per file also in Python

python/pyplugin_installer/CMakeLists.txt

@@ -5,7 +5,10 @@ SET(PY_PLUGININSTALLER_FILES
     __init__.py
     installer.py
     installer_data.py
-    installer_gui.py
+    qgsplugininstallerinstallingdialog.py
+    qgsplugininstallerpluginerrordialog.py
+    qgsplugininstallerfetchingdialog.py
+    qgsplugininstallerrepositorydialog.py
     unzip.py
     version_compare.py
 )

python/pyplugin_installer/installer.py

@@ -26,12 +26,12 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from qgis.core import *
-from qgis.utils import iface
-from installer_gui import QgsPluginInstallerInstallingDialog, QgsPluginInstallerPluginErrorDialog
-from installer_gui import QgsPluginInstallerFetchingDialog, QgsPluginInstallerRepositoryDialog
-from installer_gui import removeDir
+from qgis.utils import iface, startPlugin, unloadPlugin, loadPlugin, reloadPlugin, updateAvailablePlugins
 from installer_data import *
-from qgis.utils import startPlugin, unloadPlugin, loadPlugin, reloadPlugin, updateAvailablePlugins
+from qgsplugininstallerinstallingdialog import QgsPluginInstallerInstallingDialog
+from qgsplugininstallerpluginerrordialog import QgsPluginInstallerPluginErrorDialog
+from qgsplugininstallerfetchingdialog import QgsPluginInstallerFetchingDialog
+from qgsplugininstallerrepositorydialog import QgsPluginInstallerRepositoryDialog
 
 
 # public instances:

python/pyplugin_installer/qgsplugininstallerfetchingdialog.py

@@ -0,0 +1,82 @@
+# -*- coding:utf-8 -*-
+"""
+/***************************************************************************
+                           qgsplugininstallerfetchingdialog.py
+                           Plugin Installer module
+                             -------------------
+    Date                 : June 2013
+    Copyright            : (C) 2013 by Borys Jurgiel
+    Email                : info at borysjurgiel dot pl
+
+    This module is based on former plugin_installer plugin:
+      Copyright (C) 2007-2008 Matthew Perry
+      Copyright (C) 2008-2013 Borys Jurgiel
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+"""
+
+import sys
+import time
+
+from PyQt4.QtGui import *
+
+from ui_qgsplugininstallerfetchingbase import Ui_QgsPluginInstallerFetchingDialogBase
+from installer_data import *
+
+
+
+
+class QgsPluginInstallerFetchingDialog(QDialog, Ui_QgsPluginInstallerFetchingDialogBase):
+  # ----------------------------------------- #
+  def __init__(self, parent):
+    QDialog.__init__(self, parent)
+    self.setupUi(self)
+    self.progressBar.setRange(0,len(repositories.allEnabled())*100)
+    self.itemProgress = {}
+    self.item = {}
+    for key in repositories.allEnabled():
+      self.item[key] = QTreeWidgetItem(self.treeWidget)
+      self.item[key].setText(0,key)
+      if repositories.all()[key]["state"] > 1:
+        self.itemProgress[key] = 100
+        self.displayState(key,0)
+      else:
+        self.itemProgress[key] = 0
+        self.displayState(key,2)
+    self.treeWidget.resizeColumnToContents(0)
+    repositories.repositoryFetched.connect(self.repositoryFetched)
+    repositories.anythingChanged.connect(self.displayState)
+
+
+  # ----------------------------------------- #
+  def displayState(self,key,state,state2=None):
+    messages=[self.tr("Success"),self.tr("Resolving host name..."),self.tr("Connecting..."),self.tr("Host connected. Sending request..."),self.tr("Downloading data..."),self.tr("Idle"),self.tr("Closing connection..."),self.tr("Error")]
+    message = messages[state]
+    if state2:
+      message += " (%s%%)" % state2
+    self.item[key].setText(1,message)
+
+    if state == 4 and state2:
+      self.itemProgress[key] = state2
+    totalProgress = sum(self.itemProgress.values())
+    self.progressBar.setValue(totalProgress)
+
+
+  # ----------------------------------------- #
+  def repositoryFetched(self, repoName):
+    self.itemProgress[repoName] = 100
+    if repositories.all()[repoName]["state"] == 2:
+      self.displayState(repoName,0)
+    else:
+      self.displayState(repoName,7)
+    if not repositories.fetchingInProgress():
+      self.close()

python/pyplugin_installer/installer_gui.py → python/pyplugin_installer/qgsplugininstallerinstallingdialog.py

@@ -1,9 +1,10 @@
 # -*- coding:utf-8 -*-
 """
 /***************************************************************************
-                            Plugin Installer module
+                           qgsplugininstallerinstallingdialog.py
+                           Plugin Installer module
                              -------------------
-    Date                 : May 2013
+    Date                 : June 2013
     Copyright            : (C) 2013 by Borys Jurgiel
     Email                : info at borysjurgiel dot pl
 
@@ -23,99 +24,18 @@
  ***************************************************************************/
 """
 
-import sys
-import time
-
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from qgis.core import QgsApplication, QgsContextHelp
+from qgis.core import QgsApplication
 
-from ui_qgsplugininstallerfetchingbase import Ui_QgsPluginInstallerFetchingDialogBase
 from ui_qgsplugininstallerinstallingbase import Ui_QgsPluginInstallerInstallingDialogBase
-from ui_qgsplugininstallerrepositorybase import Ui_QgsPluginInstallerRepositoryDetailsDialogBase
-from ui_qgsplugininstallerpluginerrorbase import Ui_QgsPluginInstallerPluginErrorDialogBase
-
 from installer_data import *
 from unzip import unzip
 
 
 
 
-# --- class QgsPluginInstallerFetchingDialog --------------------------------------------------------------- #
-class QgsPluginInstallerFetchingDialog(QDialog, Ui_QgsPluginInstallerFetchingDialogBase):
-  # ----------------------------------------- #
-  def __init__(self, parent):
-    QDialog.__init__(self, parent)
-    self.setupUi(self)
-    self.progressBar.setRange(0,len(repositories.allEnabled())*100)
-    self.itemProgress = {}
-    self.item = {}
-    for key in repositories.allEnabled():
-      self.item[key] = QTreeWidgetItem(self.treeWidget)
-      self.item[key].setText(0,key)
-      if repositories.all()[key]["state"] > 1:
-        self.itemProgress[key] = 100
-        self.displayState(key,0)
-      else:
-        self.itemProgress[key] = 0
-        self.displayState(key,2)
-    self.treeWidget.resizeColumnToContents(0)
-    repositories.repositoryFetched.connect(self.repositoryFetched)
-    repositories.anythingChanged.connect(self.displayState)
-
-
-  # ----------------------------------------- #
-  def displayState(self,key,state,state2=None):
-    messages=[self.tr("Success"),self.tr("Resolving host name..."),self.tr("Connecting..."),self.tr("Host connected. Sending request..."),self.tr("Downloading data..."),self.tr("Idle"),self.tr("Closing connection..."),self.tr("Error")]
-    message = messages[state]
-    if state2:
-      message += " (%s%%)" % state2
-    self.item[key].setText(1,message)
-
-    if state == 4 and state2:
-      self.itemProgress[key] = state2
-    totalProgress = sum(self.itemProgress.values())
-    self.progressBar.setValue(totalProgress)
-
-
-  # ----------------------------------------- #
-  def repositoryFetched(self, repoName):
-    self.itemProgress[repoName] = 100
-    if repositories.all()[repoName]["state"] == 2:
-      self.displayState(repoName,0)
-    else:
-      self.displayState(repoName,7)
-    if not repositories.fetchingInProgress():
-      self.close()
-# --- /class QgsPluginInstallerFetchingDialog -------------------------------------------------------------- #
-
-
-
-
-
-# --- class QgsPluginInstallerRepositoryDialog ------------------------------------------------------------- #
-class QgsPluginInstallerRepositoryDialog(QDialog, Ui_QgsPluginInstallerRepositoryDetailsDialogBase):
-  # ----------------------------------------- #
-  def __init__(self, parent=None):
-    QDialog.__init__(self, parent)
-    self.setupUi(self)
-    self.editURL.setText("http://")
-    self.editName.textChanged.connect(self.textChanged)
-    self.editURL.textChanged.connect(self.textChanged)
-    self.textChanged(None)
-
-  # ----------------------------------------- #
-  def textChanged(self, string):
-    enable = (len(self.editName.text()) > 0 and len(self.editURL.text()) > 0)
-    self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)
-# --- /class QgsPluginInstallerRepositoryDialog ------------------------------------------------------------ #
-
-
-
-
-
-# --- class QgsPluginInstallerInstallingDialog --------------------------------------------------------------- #
 class QgsPluginInstallerInstallingDialog(QDialog, Ui_QgsPluginInstallerInstallingDialogBase):
   # ----------------------------------------- #
   def __init__(self, parent, plugin):
@@ -200,21 +120,3 @@ def abort(self):
     self.http.abort()
     self.mResult = self.tr("Aborted by user")
     self.reject()
-# --- /class QgsPluginInstallerInstallingDialog ------------------------------------------------------------- #
-
-
-
-
-
-# --- class QgsPluginInstallerPluginErrorDialog -------------------------------------------------------------- #
-class QgsPluginInstallerPluginErrorDialog(QDialog, Ui_QgsPluginInstallerPluginErrorDialogBase):
-  # ----------------------------------------- #
-  def __init__(self, parent, errorMessage):
-    QDialog.__init__(self, parent)
-    self.setupUi(self)
-    if not errorMessage:
-      errorMessage = self.tr("no error message received")
-    self.textBrowser.setText(errorMessage)
-# --- /class QgsPluginInstallerPluginErrorDialog ------------------------------------------------------------- #
-
-

python/pyplugin_installer/qgsplugininstallerpluginerrordialog.py

@@ -0,0 +1,41 @@
+# -*- coding:utf-8 -*-
+"""
+/***************************************************************************
+                           qgsplugininstallerpluginerrordialog.py
+                           Plugin Installer module
+                             -------------------
+    Date                 : June 2013
+    Copyright            : (C) 2013 by Borys Jurgiel
+    Email                : info at borysjurgiel dot pl
+
+    This module is based on former plugin_installer plugin:
+      Copyright (C) 2007-2008 Matthew Perry
+      Copyright (C) 2008-2013 Borys Jurgiel
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+"""
+
+from PyQt4.QtGui import *
+
+from ui_qgsplugininstallerpluginerrorbase import Ui_QgsPluginInstallerPluginErrorDialogBase
+
+
+
+
+class QgsPluginInstallerPluginErrorDialog(QDialog, Ui_QgsPluginInstallerPluginErrorDialogBase):
+  # ----------------------------------------- #
+  def __init__(self, parent, errorMessage):
+    QDialog.__init__(self, parent)
+    self.setupUi(self)
+    if not errorMessage:
+      errorMessage = self.tr("no error message received")
+    self.textBrowser.setText(errorMessage)

python/pyplugin_installer/qgsplugininstallerrepositorydialog.py

@@ -0,0 +1,47 @@
+# -*- coding:utf-8 -*-
+"""
+/***************************************************************************
+                           qgsplugininstallerrepositorydialog.py
+                           Plugin Installer module
+                             -------------------
+    Date                 : June 2013
+    Copyright            : (C) 2013 by Borys Jurgiel
+    Email                : info at borysjurgiel dot pl
+
+    This module is based on former plugin_installer plugin:
+      Copyright (C) 2007-2008 Matthew Perry
+      Copyright (C) 2008-2013 Borys Jurgiel
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+"""
+
+from PyQt4.QtGui import *
+
+from ui_qgsplugininstallerrepositorybase import Ui_QgsPluginInstallerRepositoryDetailsDialogBase
+
+
+
+
+class QgsPluginInstallerRepositoryDialog(QDialog, Ui_QgsPluginInstallerRepositoryDetailsDialogBase):
+  # ----------------------------------------- #
+  def __init__(self, parent=None):
+    QDialog.__init__(self, parent)
+    self.setupUi(self)
+    self.editURL.setText("http://")
+    self.editName.textChanged.connect(self.textChanged)
+    self.editURL.textChanged.connect(self.textChanged)
+    self.textChanged(None)
+
+  # ----------------------------------------- #
+  def textChanged(self, string):
+    enable = (len(self.editName.text()) > 0 and len(self.editURL.text()) > 0)
+    self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable)