Merged in Borys's new plugin installer

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9293 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 10, 2008 · 62d16ae · 62d16ae
1 parent 45d0c09
commit 62d16ae
Show file tree

Hide file tree

Showing 22 changed files with 3,616 additions and 23 deletions.
diff --git a/python/plugins/plugin_installer/CMakeLists.txt b/python/plugins/plugin_installer/CMakeLists.txt
@@ -10,5 +10,22 @@ qgis_plugins.py
 resources.py
 repository_ui.py
 repository_dialog.py
+qgis-icon.png 
+installingbase.ui 
+fetchingbase.py 
+guibase.py 
+repositorybase.py 
+plugin_installer.png 
+unzip.py 
+installer_gui.py 
+installingbase.py 
+pluginerrorbase.ui 
+installer_data.py 
+repoConnected.png 
+guibase.ui 
+pluginerrorbase.py 
+repositorybase.ui 
+resources_rc.py 
+repoDisabled.png
 )
 INSTALL(FILES ${INSTALLER_FILES} DESTINATION ${QGIS_DATA_DIR}/python/plugins/plugin_installer)
diff --git a/python/plugins/plugin_installer/LICENSE b/python/plugins/plugin_installer/LICENSE
@@ -1,4 +1,6 @@
 Copyright (c) 2007 Matthew T. Perry
+Copyright (c) 2008 Borys Jurgiel
+
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

diff --git a/python/plugins/plugin_installer/__init__.py b/python/plugins/plugin_installer/__init__.py
@@ -1,5 +1,6 @@
 """
 Copyright (C) 2008 Matthew Perry
+Copyright (C) 2008 Borys Jurgiel
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -10,15 +11,17 @@
  ***************************************************************************/
 """
 def name():
-  return "Plugin installer"
+  return "Plugin Installer"
 
 def description():
   return "Downloads and installs QGIS python plugins"
 
+def author_name():
+  return "perrygeo, borysiasty"
+
 def version():
-  return "Version 0.02"
+  return "Version 0.05.6"
 
 def classFactory(iface):
-  # load TestPlugin class from file testplugin.py
   from installer_plugin import InstallerPlugin
-  return InstallerPlugin(iface)
+  return InstallerPlugin(iface)
diff --git a/python/plugins/plugin_installer/fetchingbase.py b/python/plugins/plugin_installer/fetchingbase.py
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'fetchingbase.ui'
+#
+# Created: Sun Sep  7 16:22:19 2008
+#      by: PyQt4 UI code generator 4.3
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt4 import QtCore, QtGui
+
+class Ui_QgsPluginInstallerFetchingDialog(object):
+    def setupUi(self, QgsPluginInstallerFetchingDialog):
+        QgsPluginInstallerFetchingDialog.setObjectName("QgsPluginInstallerFetchingDialog")
+        QgsPluginInstallerFetchingDialog.resize(QtCore.QSize(QtCore.QRect(0,0,521,332).size()).expandedTo(QgsPluginInstallerFetchingDialog.minimumSizeHint()))
+        QgsPluginInstallerFetchingDialog.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
+
+        self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerFetchingDialog)
+        self.gridlayout.setObjectName("gridlayout")
+
+        spacerItem = QtGui.QSpacerItem(249,10,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
+        self.gridlayout.addItem(spacerItem,1,0,1,1)
+
+        self.label1 = QtGui.QLabel(QgsPluginInstallerFetchingDialog)
+        self.label1.setObjectName("label1")
+        self.gridlayout.addWidget(self.label1,2,0,1,1)
+
+        self.progressBar = QtGui.QProgressBar(QgsPluginInstallerFetchingDialog)
+        self.progressBar.setProperty("value",QtCore.QVariant(24))
+        self.progressBar.setAlignment(QtCore.Qt.AlignHCenter)
+        self.progressBar.setTextDirection(QtGui.QProgressBar.TopToBottom)
+        self.progressBar.setObjectName("progressBar")
+        self.gridlayout.addWidget(self.progressBar,3,0,1,1)
+
+        spacerItem1 = QtGui.QSpacerItem(248,10,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
+        self.gridlayout.addItem(spacerItem1,4,0,1,1)
+
+        self.hboxlayout = QtGui.QHBoxLayout()
+        self.hboxlayout.setObjectName("hboxlayout")
+
+        spacerItem2 = QtGui.QSpacerItem(140,27,QtGui.QSizePolicy.MinimumExpanding,QtGui.QSizePolicy.Minimum)
+        self.hboxlayout.addItem(spacerItem2)
+
+        self.buttonSkip = QtGui.QPushButton(QgsPluginInstallerFetchingDialog)
+
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.buttonSkip.sizePolicy().hasHeightForWidth())
+        self.buttonSkip.setSizePolicy(sizePolicy)
+        self.buttonSkip.setMinimumSize(QtCore.QSize(180,0))
+        self.buttonSkip.setFocusPolicy(QtCore.Qt.NoFocus)
+        self.buttonSkip.setAutoDefault(False)
+        self.buttonSkip.setDefault(False)
+        self.buttonSkip.setFlat(False)
+        self.buttonSkip.setObjectName("buttonSkip")
+        self.hboxlayout.addWidget(self.buttonSkip)
+
+        spacerItem3 = QtGui.QSpacerItem(140,27,QtGui.QSizePolicy.MinimumExpanding,QtGui.QSizePolicy.Minimum)
+        self.hboxlayout.addItem(spacerItem3)
+        self.gridlayout.addLayout(self.hboxlayout,5,0,1,1)
+
+        self.treeWidget = QtGui.QTreeWidget(QgsPluginInstallerFetchingDialog)
+        self.treeWidget.setEnabled(True)
+        self.treeWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+        self.treeWidget.setProperty("showDropIndicator",QtCore.QVariant(False))
+        self.treeWidget.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.treeWidget.setHorizontalScrollMode(QtGui.QAbstractItemView.ScrollPerItem)
+        self.treeWidget.setRootIsDecorated(False)
+        self.treeWidget.setItemsExpandable(False)
+        self.treeWidget.setObjectName("treeWidget")
+        self.gridlayout.addWidget(self.treeWidget,0,0,1,1)
+
+        self.retranslateUi(QgsPluginInstallerFetchingDialog)
+        QtCore.QObject.connect(self.buttonSkip,QtCore.SIGNAL("clicked()"),QgsPluginInstallerFetchingDialog.reject)
+        QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerFetchingDialog)
+
+    def retranslateUi(self, QgsPluginInstallerFetchingDialog):
+        QgsPluginInstallerFetchingDialog.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Fetching repositories", None, QtGui.QApplication.UnicodeUTF8))
+        self.label1.setText(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Overall progress:", None, QtGui.QApplication.UnicodeUTF8))
+        self.buttonSkip.setText(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Abort fetching", None, QtGui.QApplication.UnicodeUTF8))
+        self.treeWidget.headerItem().setText(0,QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Repository", None, QtGui.QApplication.UnicodeUTF8))
+        self.treeWidget.headerItem().setText(1,QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "State", None, QtGui.QApplication.UnicodeUTF8))
+
+import resources_rc