Skip to content

Commit f46113e

Browse files
author
borysiasty
committedNov 13, 2008
Plugin Installer update: Files and classes renamed to better meet the QGIS coding standard
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9631 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent ab393f3 commit f46113e

14 files changed

+281
-252
lines changed
 

‎python/plugins/plugin_installer/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#TODO: Need to configure cmake to run pyrcc4 and pyuic4 as required when the resource
22
# file or the ui change
33
SET(INSTALLER_FILES
4-
fetchingbase.py
5-
fetchingbase.ui
6-
guibase.py
7-
guibase.ui
84
__init__.py
95
installer_data.py
106
installer_gui.py
117
installer_plugin.py
12-
installingbase.py
13-
installingbase.ui
14-
pluginerrorbase.py
15-
pluginerrorbase.ui
168
plugin_installer.png
179
qgis-icon.png
10+
qgsplugininstallerbase.py
11+
qgsplugininstallerbase.ui
12+
qgsplugininstallerfetchingbase.py
13+
qgsplugininstallerfetchingbase.ui
14+
qgsplugininstallerinstallingbase.py
15+
qgsplugininstallerinstallingbase.ui
16+
qgsplugininstallerpluginerrorbase.py
17+
qgsplugininstallerpluginerrorbase.ui
18+
qgsplugininstallerrepositorybase.py
19+
qgsplugininstallerrepositorybase.ui
1820
repoConnected.png
1921
repoDisabled.png
20-
repositorybase.py
21-
repositorybase.ui
2222
repoUnavailable.png
2323
resources.qrc
2424
resources_rc.py

‎python/plugins/plugin_installer/i18n.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ file: installer_gui.py
6262
--------------------*/
6363

6464
// common functions
65-
translate("QgsPluginInstaller","Plugin directory doesn't exist:")
65+
translate("QgsPluginInstaller","Nothing to remove! Plugin directory doesn't exist:")
6666
translate("QgsPluginInstaller","Failed to remove the directory:")
6767
translate("QgsPluginInstaller","Check permissions or remove it manually")
6868

@@ -92,8 +92,7 @@ QgsPluginInstallerInstallingDialog::foo()
9292
tr("Error")
9393

9494
// def requestFinished
95-
tr("Failed to unzip file to the following directory:")
96-
tr("Check permissions")
95+
tr("Failed to unzip the plugin package. Probably it's broken or missing from the repository. You may also want to make sure that you have write permission to the plugin directory:")
9796

9897
// def abort
9998
tr("Aborted by user")
@@ -103,7 +102,7 @@ QgsPluginInstallerInstallingDialog::foo()
103102
QgsPluginInstallerPluginErrorDialog::foo()
104103
{
105104
// def __init__
106-
tr("No error message received. Try to restart Quantum GIS and ensure the plugin isn't installed under a different name. If it is, contact the plugin author and submit this issue, please.")
105+
tr("no error message received")
107106
}
108107

109108
QgsPluginInstallerDialog::foo()
@@ -174,7 +173,11 @@ QgsPluginInstallerDialog::foo()
174173
tr("Install/upgrade plugin")
175174

176175
// def installPlugin
176+
tr("QGIS Python Plugin Installer")
177+
tr("Are you sure you want to downgrade the plugin to the latest available version? The installed one is newer!")
177178
tr("Plugin installation failed")
179+
tr("Plugin has disappeared")
180+
tr("The plugin seems to have been installed but I don't know where. Probably the plugin package contained a wrong named directory.\nPlease search the list of installed plugins. I'm nearly sure you'll find the plugin there, but I just can't determine which of them it is. It also means that I won't be able to determine if this plugin is installed and inform you about available updates. However the plugin may work. Please contact the plugin author and submit this issue.")
178181
tr("Plugin installed successfully")
179182
tr("Python plugin installed.\nYou have to enable it in the Plugin Manager.")
180183
tr("Plugin installed successfully")

‎python/plugins/plugin_installer/installer_data.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ def updatePlugin(self, key, readOnly):
463463
# same same "installed"
464464
# less greater "upgradeable"
465465
# greater less "newer"
466-
467466
if not self.mPlugins[key]["version_avail"]:
468467
self.mPlugins[key]["status"] = "orphan"
469468
elif self.mPlugins[key]["error"] == "broken":

‎python/plugins/plugin_installer/installer_gui.py

Lines changed: 68 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
from PyQt4.QtGui import *
1919
from qgis.core import QgsApplication, QgsContextHelp
2020
import sys, time
21-
from fetchingbase import Ui_QgsPluginInstallerFetchingDialog
22-
from installingbase import Ui_QgsPluginInstallerInstallingDialog
23-
from repositorybase import Ui_QgsPluginInstallerRepositoryDetailsDialog
24-
from pluginerrorbase import Ui_QgsPluginInstallerPluginErrorDialog
25-
from guibase import Ui_QgsPluginInstallerDialog
21+
from qgsplugininstallerfetchingbase import Ui_QgsPluginInstallerFetchingDialogBase
22+
from qgsplugininstallerinstallingbase import Ui_QgsPluginInstallerInstallingDialogBase
23+
from qgsplugininstallerrepositorybase import Ui_QgsPluginInstallerRepositoryDetailsDialogBase
24+
from qgsplugininstallerpluginerrorbase import Ui_QgsPluginInstallerPluginErrorDialogBase
25+
from qgsplugininstallerbase import Ui_QgsPluginInstallerDialogBase
2626
from installer_data import *
2727

2828

@@ -31,7 +31,7 @@
3131
def removeDir(path):
3232
result = QString()
3333
if not QFile(path).exists():
34-
result = QCoreApplication.translate("QgsPluginInstaller","Plugin directory doesn't exist:")+"\n"+path
34+
result = QCoreApplication.translate("QgsPluginInstaller","Nothing to remove! Plugin directory doesn't exist:")+"\n"+path
3535
elif QFile(path).remove(): # if it is only link, just remove it without resolving.
3636
#print " Link removing successfull: %s" % path
3737
pass
@@ -51,7 +51,7 @@ def removeDir(path):
5151
#print " Directory removing successfull: %s" % item
5252
pass
5353
if QFile(path).exists():
54-
result = QCoreApplication.translate("QgsPluginInstaller","Failed to remove the directory:")+" "+path+"\n"+QCoreApplication.translate("QgsPluginInstaller","Check permissions or remove it manually")
54+
result = QCoreApplication.translate("QgsPluginInstaller","Failed to remove the directory:")+"\n"+path+"\n"+QCoreApplication.translate("QgsPluginInstaller","Check permissions or remove it manually")
5555
# restore plugin directory if removed by QDir().rmpath()
5656
pluginDir = unicode(QFileInfo(QgsApplication.qgisUserDbFilePath()).path()+"/python/plugins")
5757
if not QDir(pluginDir).exists():
@@ -64,7 +64,7 @@ def removeDir(path):
6464

6565

6666
# --- class QgsPluginInstallerFetchingDialog --------------------------------------------------------------- #
67-
class QgsPluginInstallerFetchingDialog(QDialog, Ui_QgsPluginInstallerFetchingDialog):
67+
class QgsPluginInstallerFetchingDialog(QDialog, Ui_QgsPluginInstallerFetchingDialogBase):
6868
# ----------------------------------------- #
6969
def __init__(self, parent):
7070
QDialog.__init__(self, parent)
@@ -116,7 +116,7 @@ def repositoryFetched(self, repoName):
116116

117117

118118
# --- class QgsPluginInstallerRepositoryDialog ------------------------------------------------------------- #
119-
class QgsPluginInstallerRepositoryDialog(QDialog, Ui_QgsPluginInstallerRepositoryDetailsDialog):
119+
class QgsPluginInstallerRepositoryDialog(QDialog, Ui_QgsPluginInstallerRepositoryDetailsDialogBase):
120120
# ----------------------------------------- #
121121
def __init__(self, parent=None):
122122
QDialog.__init__(self, parent)
@@ -137,7 +137,7 @@ def textChanged(self, string):
137137

138138

139139
# --- class QgsPluginInstallerInstallingDialog --------------------------------------------------------------- #
140-
class QgsPluginInstallerInstallingDialog(QDialog, Ui_QgsPluginInstallerInstallingDialog):
140+
class QgsPluginInstallerInstallingDialog(QDialog, Ui_QgsPluginInstallerInstallingDialogBase):
141141
# ----------------------------------------- #
142142
def __init__(self, parent, plugin):
143143
QDialog.__init__(self, parent)
@@ -209,7 +209,7 @@ def requestFinished(self, requestId, state):
209209
removeDir(QDir.cleanPath(pluginDir+"/"+self.plugin["localdir"])) # remove old plugin if exists
210210
un.extract(tmpPath, pluginDir) # final extract.
211211
except:
212-
self.mResult = self.tr("Failed to unzip file to the following directory:") + "\n" + pluginDir + "\n" + self.tr("Check permissions")
212+
self.mResult = self.tr("Failed to unzip the plugin package. Probably it's broken or missing from the repository. You may also want to make sure that you have write permission to the plugin directory:") + "\n" + pluginDir
213213
self.reject()
214214
return
215215

@@ -234,13 +234,13 @@ def abort(self):
234234

235235

236236
# --- class QgsPluginInstallerPluginErrorDialog -------------------------------------------------------------- #
237-
class QgsPluginInstallerPluginErrorDialog(QDialog, Ui_QgsPluginInstallerPluginErrorDialog):
237+
class QgsPluginInstallerPluginErrorDialog(QDialog, Ui_QgsPluginInstallerPluginErrorDialogBase):
238238
# ----------------------------------------- #
239239
def __init__(self, parent, errorMessage):
240240
QDialog.__init__(self, parent)
241241
self.setupUi(self)
242242
if not errorMessage:
243-
errorMessage = self.tr("No error message received. Try to restart Quantum GIS and ensure the plugin isn't installed under a different name. If it is, contact the plugin author and submit this issue, please.")
243+
errorMessage = self.tr("no error message received")
244244
self.textBrowser.setText(errorMessage)
245245
# --- /class QgsPluginInstallerPluginErrorDialog ------------------------------------------------------------- #
246246

@@ -250,7 +250,7 @@ def __init__(self, parent, errorMessage):
250250

251251

252252
# --- class QgsPluginInstallerDialog ------------------------------------------------------------------------- #
253-
class QgsPluginInstallerDialog(QDialog, Ui_QgsPluginInstallerDialog):
253+
class QgsPluginInstallerDialog(QDialog, Ui_QgsPluginInstallerDialogBase):
254254
# ----------------------------------------- #
255255
def __init__(self, parent, fl):
256256
QDialog.__init__(self, parent, fl)
@@ -260,8 +260,9 @@ def __init__(self, parent, fl):
260260
self.connect(self.lineFilter, SIGNAL("textChanged (QString)"), self.filterChanged)
261261
self.connect(self.comboFilter1, SIGNAL("currentIndexChanged (int)"), self.filterChanged)
262262
self.connect(self.comboFilter2, SIGNAL("currentIndexChanged (int)"), self.filterChanged)
263-
# grab the click on the treePlugins
264-
self.connect(self.treePlugins, SIGNAL("itemSelectionChanged()"), self.treeClicked)
263+
# grab clicks on trees
264+
self.connect(self.treePlugins, SIGNAL("itemSelectionChanged()"), self.pluginTreeClicked)
265+
self.connect(self.treeRepositories, SIGNAL("itemSelectionChanged()"), self.repositoryTreeClicked)
265266
# buttons
266267
self.connect(self.buttonInstall, SIGNAL("clicked()"), self.installPlugin)
267268
self.connect(self.buttonUninstall, SIGNAL("clicked()"), self.uninstallPlugin)
@@ -279,6 +280,8 @@ def __init__(self, parent, fl):
279280
self.checkUpdates.setCheckState(Qt.Checked)
280281
else:
281282
self.checkUpdates.setCheckState(Qt.Unchecked)
283+
self.buttonEditRep.setEnabled(False)
284+
self.buttonDeleteRep.setEnabled(False)
282285

283286
self.populateMostWidgets()
284287

@@ -498,17 +501,19 @@ def addItem(p):
498501

499502

500503
# ----------------------------------------- #
501-
def treeClicked(self):
504+
def pluginTreeClicked(self):
502505
""" the pluginsTree has been clicked """
503506
buttons={"not installed":(True,False,self.tr("Install plugin")),
504507
"installed":(True,True,self.tr("Reinstall plugin")),
505508
"upgradeable":(True,True,self.tr("Upgrade plugin")),
506509
"orphan":(False,True,self.tr("Install/upgrade plugin")),
507-
"new":(True, False,self.tr("Install plugin")),
510+
"new":(True,False,self.tr("Install plugin")),
508511
"newer":(True,True,self.tr("Downgrade plugin"))}
509512
self.buttonInstall.setEnabled(False)
510513
self.buttonInstall.setText(self.tr("Install/upgrade plugin"))
511514
self.buttonUninstall.setEnabled(False)
515+
if not self.treePlugins.selectedItems():
516+
return
512517
item = self.treePlugins.currentItem()
513518
if not item:
514519
return
@@ -535,36 +540,47 @@ def installPlugin(self):
535540
if not plugin:
536541
return
537542

543+
if plugin["status"] == "newer":
544+
if QMessageBox.warning(self, self.tr("QGIS Python Plugin Installer"), self.tr("Are you sure you want to downgrade the plugin to the latest available version? The installed one is newer!"), QMessageBox.Yes, QMessageBox.No) == QMessageBox.No:
545+
return
546+
538547
dlg = QgsPluginInstallerInstallingDialog(self,plugin)
539548
dlg.exec_()
540549

541550
if dlg.result():
542551
infoString = (self.tr("Plugin installation failed"), dlg.result())
543552
else:
544-
try:
545-
exec ("sys.path_importer_cache.clear()")
546-
exec ("del sys.modules[%s]" % plugin["localdir"]) # remove old version if exist
547-
except:
548-
pass
549-
try:
550-
exec ("import %s" % plugin["localdir"])
551-
exec ("reload (%s)" % plugin["localdir"])
552-
if plugin["status"] == "not installed" or plugin["status"] == "new":
553-
infoString = (self.tr("Plugin installed successfully"), self.tr("Python plugin installed.\nYou have to enable it in the Plugin Manager."))
554-
else:
555-
infoString = (self.tr("Plugin installed successfully"),self.tr("Python plugin reinstalled.\nYou have to restart Quantum GIS to reload it."))
556-
except Exception, error:
557-
dlg = QgsPluginInstallerPluginErrorDialog(self,error.message)
558-
dlg.exec_()
559-
if dlg.result():
560-
pluginDir = unicode(QFileInfo(QgsApplication.qgisUserDbFilePath()).path()+"/python/plugins/"+ str(plugin["localdir"]))
561-
result = removeDir(pluginDir)
562-
if result:
563-
QMessageBox.warning(self, self.tr("Plugin uninstall failed"), result)
553+
path = QDir.cleanPath(QgsApplication.qgisSettingsDirPath() + "/python/plugins/" + key)
554+
if not QDir(path).exists():
555+
infoString = (self.tr("Plugin has disappeared"), self.tr("The plugin seems to have been installed but I don't know where. Probably the plugin package contained a wrong named directory.\nPlease search the list of installed plugins. I'm nearly sure you'll find the plugin there, but I just can't determine which of them it is. It also means that I won't be able to determine if this plugin is installed and inform you about available updates. However the plugin may work. Please contact the plugin author and submit this issue."))
556+
QApplication.setOverrideCursor(Qt.WaitCursor)
557+
self.getAllAvailablePlugins()
558+
QApplication.restoreOverrideCursor()
559+
else:
560+
try:
561+
exec ("sys.path_importer_cache.clear()")
562+
exec ("del sys.modules[%s]" % plugin["localdir"]) # remove old version if exist
563+
except:
564+
pass
565+
try:
566+
exec ("import %s" % plugin["localdir"])
567+
exec ("reload (%s)" % plugin["localdir"])
568+
if plugin["status"] == "not installed" or plugin["status"] == "new":
569+
infoString = (self.tr("Plugin installed successfully"), self.tr("Python plugin installed.\nYou have to enable it in the Plugin Manager."))
570+
else:
571+
infoString = (self.tr("Plugin installed successfully"),self.tr("Python plugin reinstalled.\nYou have to restart Quantum GIS to reload it."))
572+
except Exception, error:
573+
dlg = QgsPluginInstallerPluginErrorDialog(self,error.message)
574+
dlg.exec_()
575+
if dlg.result():
576+
pluginDir = unicode(QFileInfo(QgsApplication.qgisUserDbFilePath()).path()+"/python/plugins/"+ str(plugin["localdir"]))
577+
result = removeDir(pluginDir)
578+
if result:
579+
QMessageBox.warning(self, self.tr("Plugin uninstall failed"), result)
580+
plugins.updatePlugin(key, False)
581+
self.populatePluginTree()
582+
return
564583
plugins.updatePlugin(key, False)
565-
self.populatePluginTree()
566-
return
567-
plugins.updatePlugin(key, False)
568584
self.populatePluginTree()
569585
QMessageBox.information(self, infoString[0], infoString[1])
570586

@@ -605,6 +621,17 @@ def uninstallPlugin(self):
605621
QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin uninstalled successfully"))
606622

607623

624+
# ----------------------------------------- #
625+
def repositoryTreeClicked(self):
626+
""" the repositoryTree has been clicked """
627+
if self.treeRepositories.selectedItems():
628+
self.buttonEditRep.setEnabled(True)
629+
self.buttonDeleteRep.setEnabled(True)
630+
else:
631+
self.buttonEditRep.setEnabled(False)
632+
self.buttonDeleteRep.setEnabled(False)
633+
634+
608635
# ----------------------------------------- #
609636
def ChangeCheckingPolicy(self,policy):
610637
if policy == Qt.Checked:

‎python/plugins/plugin_installer/guibase.py renamed to ‎python/plugins/plugin_installer/qgsplugininstallerbase.py

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

‎python/plugins/plugin_installer/guibase.ui renamed to ‎python/plugins/plugin_installer/qgsplugininstallerbase.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ui version="4.0" >
22
<author>Matthew Perry, Borys Jurgiel</author>
3-
<class>QgsPluginInstallerDialog</class>
4-
<widget class="QDialog" name="QgsPluginInstallerDialog" >
3+
<class>QgsPluginInstallerDialogBase</class>
4+
<widget class="QDialog" name="QgsPluginInstallerDialogBase" >
55
<property name="geometry" >
66
<rect>
77
<x>0</x>
@@ -416,7 +416,7 @@
416416
<connection>
417417
<sender>buttonClose</sender>
418418
<signal>released()</signal>
419-
<receiver>QgsPluginInstallerDialog</receiver>
419+
<receiver>QgsPluginInstallerDialogBase</receiver>
420420
<slot>close()</slot>
421421
<hints>
422422
<hint type="sourcelabel" >

‎python/plugins/plugin_installer/fetchingbase.py renamed to ‎python/plugins/plugin_installer/qgsplugininstallerfetchingbase.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'fetchingbase.ui'
3+
# Form implementation generated from reading ui file 'qgsplugininstallerfetchingbase.ui'
44
#
5-
# Created: Fri Sep 12 19:21:37 2008
6-
# by: PyQt4 UI code generator 4.3
5+
# Created: Wed Nov 12 23:21:49 2008
6+
# by: PyQt4 UI code generator 4.3.3
77
#
88
# WARNING! All changes made in this file will be lost!
99

1010
from PyQt4 import QtCore, QtGui
1111

12-
class Ui_QgsPluginInstallerFetchingDialog(object):
13-
def setupUi(self, QgsPluginInstallerFetchingDialog):
14-
QgsPluginInstallerFetchingDialog.setObjectName("QgsPluginInstallerFetchingDialog")
15-
QgsPluginInstallerFetchingDialog.resize(QtCore.QSize(QtCore.QRect(0,0,521,332).size()).expandedTo(QgsPluginInstallerFetchingDialog.minimumSizeHint()))
16-
QgsPluginInstallerFetchingDialog.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
12+
class Ui_QgsPluginInstallerFetchingDialogBase(object):
13+
def setupUi(self, QgsPluginInstallerFetchingDialogBase):
14+
QgsPluginInstallerFetchingDialogBase.setObjectName("QgsPluginInstallerFetchingDialogBase")
15+
QgsPluginInstallerFetchingDialogBase.resize(QtCore.QSize(QtCore.QRect(0,0,521,332).size()).expandedTo(QgsPluginInstallerFetchingDialogBase.minimumSizeHint()))
16+
QgsPluginInstallerFetchingDialogBase.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
1717

18-
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerFetchingDialog)
18+
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerFetchingDialogBase)
1919
self.gridlayout.setObjectName("gridlayout")
2020

2121
spacerItem = QtGui.QSpacerItem(249,10,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
2222
self.gridlayout.addItem(spacerItem,1,0,1,1)
2323

24-
self.label1 = QtGui.QLabel(QgsPluginInstallerFetchingDialog)
24+
self.label1 = QtGui.QLabel(QgsPluginInstallerFetchingDialogBase)
2525
self.label1.setObjectName("label1")
2626
self.gridlayout.addWidget(self.label1,2,0,1,1)
2727

28-
self.progressBar = QtGui.QProgressBar(QgsPluginInstallerFetchingDialog)
28+
self.progressBar = QtGui.QProgressBar(QgsPluginInstallerFetchingDialogBase)
2929
self.progressBar.setProperty("value",QtCore.QVariant(24))
3030
self.progressBar.setAlignment(QtCore.Qt.AlignHCenter)
3131
self.progressBar.setTextDirection(QtGui.QProgressBar.TopToBottom)
@@ -41,7 +41,7 @@ def setupUi(self, QgsPluginInstallerFetchingDialog):
4141
spacerItem2 = QtGui.QSpacerItem(140,27,QtGui.QSizePolicy.MinimumExpanding,QtGui.QSizePolicy.Minimum)
4242
self.hboxlayout.addItem(spacerItem2)
4343

44-
self.buttonSkip = QtGui.QPushButton(QgsPluginInstallerFetchingDialog)
44+
self.buttonSkip = QtGui.QPushButton(QgsPluginInstallerFetchingDialogBase)
4545

4646
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
4747
sizePolicy.setHorizontalStretch(0)
@@ -60,7 +60,7 @@ def setupUi(self, QgsPluginInstallerFetchingDialog):
6060
self.hboxlayout.addItem(spacerItem3)
6161
self.gridlayout.addLayout(self.hboxlayout,5,0,1,1)
6262

63-
self.treeWidget = QtGui.QTreeWidget(QgsPluginInstallerFetchingDialog)
63+
self.treeWidget = QtGui.QTreeWidget(QgsPluginInstallerFetchingDialogBase)
6464
self.treeWidget.setEnabled(True)
6565
self.treeWidget.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
6666
self.treeWidget.setProperty("showDropIndicator",QtCore.QVariant(False))
@@ -71,15 +71,15 @@ def setupUi(self, QgsPluginInstallerFetchingDialog):
7171
self.treeWidget.setObjectName("treeWidget")
7272
self.gridlayout.addWidget(self.treeWidget,0,0,1,1)
7373

74-
self.retranslateUi(QgsPluginInstallerFetchingDialog)
75-
QtCore.QObject.connect(self.buttonSkip,QtCore.SIGNAL("clicked()"),QgsPluginInstallerFetchingDialog.reject)
76-
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerFetchingDialog)
74+
self.retranslateUi(QgsPluginInstallerFetchingDialogBase)
75+
QtCore.QObject.connect(self.buttonSkip,QtCore.SIGNAL("clicked()"),QgsPluginInstallerFetchingDialogBase.reject)
76+
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerFetchingDialogBase)
7777

78-
def retranslateUi(self, QgsPluginInstallerFetchingDialog):
79-
QgsPluginInstallerFetchingDialog.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Fetching repositories", None, QtGui.QApplication.UnicodeUTF8))
80-
self.label1.setText(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Overall progress:", None, QtGui.QApplication.UnicodeUTF8))
81-
self.buttonSkip.setText(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Abort fetching", None, QtGui.QApplication.UnicodeUTF8))
82-
self.treeWidget.headerItem().setText(0,QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "Repository", None, QtGui.QApplication.UnicodeUTF8))
83-
self.treeWidget.headerItem().setText(1,QtGui.QApplication.translate("QgsPluginInstallerFetchingDialog", "State", None, QtGui.QApplication.UnicodeUTF8))
78+
def retranslateUi(self, QgsPluginInstallerFetchingDialogBase):
79+
QgsPluginInstallerFetchingDialogBase.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialogBase", "Fetching repositories", None, QtGui.QApplication.UnicodeUTF8))
80+
self.label1.setText(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialogBase", "Overall progress:", None, QtGui.QApplication.UnicodeUTF8))
81+
self.buttonSkip.setText(QtGui.QApplication.translate("QgsPluginInstallerFetchingDialogBase", "Abort fetching", None, QtGui.QApplication.UnicodeUTF8))
82+
self.treeWidget.headerItem().setText(0,QtGui.QApplication.translate("QgsPluginInstallerFetchingDialogBase", "Repository", None, QtGui.QApplication.UnicodeUTF8))
83+
self.treeWidget.headerItem().setText(1,QtGui.QApplication.translate("QgsPluginInstallerFetchingDialogBase", "State", None, QtGui.QApplication.UnicodeUTF8))
8484

8585
import resources_rc

‎python/plugins/plugin_installer/fetchingbase.ui renamed to ‎python/plugins/plugin_installer/qgsplugininstallerfetchingbase.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ui version="4.0" >
2-
<author>Matthew Perry, Borys Jurgiel</author>
3-
<class>QgsPluginInstallerFetchingDialog</class>
4-
<widget class="QDialog" name="QgsPluginInstallerFetchingDialog" >
2+
<author>Borys Jurgiel</author>
3+
<class>QgsPluginInstallerFetchingDialogBase</class>
4+
<widget class="QDialog" name="QgsPluginInstallerFetchingDialogBase" >
55
<property name="geometry" >
66
<rect>
77
<x>0</x>
@@ -183,7 +183,7 @@
183183
<connection>
184184
<sender>buttonSkip</sender>
185185
<signal>clicked()</signal>
186-
<receiver>QgsPluginInstallerFetchingDialog</receiver>
186+
<receiver>QgsPluginInstallerFetchingDialogBase</receiver>
187187
<slot>reject()</slot>
188188
<hints>
189189
<hint type="sourcelabel" >

‎python/plugins/plugin_installer/installingbase.py renamed to ‎python/plugins/plugin_installer/qgsplugininstallerinstallingbase.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'installingbase.ui'
3+
# Form implementation generated from reading ui file 'qgsplugininstallerinstallingbase.ui'
44
#
5-
# Created: Fri Sep 12 19:21:37 2008
6-
# by: PyQt4 UI code generator 4.3
5+
# Created: Wed Nov 12 23:21:49 2008
6+
# by: PyQt4 UI code generator 4.3.3
77
#
88
# WARNING! All changes made in this file will be lost!
99

1010
from PyQt4 import QtCore, QtGui
1111

12-
class Ui_QgsPluginInstallerInstallingDialog(object):
13-
def setupUi(self, QgsPluginInstallerInstallingDialog):
14-
QgsPluginInstallerInstallingDialog.setObjectName("QgsPluginInstallerInstallingDialog")
15-
QgsPluginInstallerInstallingDialog.resize(QtCore.QSize(QtCore.QRect(0,0,520,175).size()).expandedTo(QgsPluginInstallerInstallingDialog.minimumSizeHint()))
16-
QgsPluginInstallerInstallingDialog.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
12+
class Ui_QgsPluginInstallerInstallingDialogBase(object):
13+
def setupUi(self, QgsPluginInstallerInstallingDialogBase):
14+
QgsPluginInstallerInstallingDialogBase.setObjectName("QgsPluginInstallerInstallingDialogBase")
15+
QgsPluginInstallerInstallingDialogBase.resize(QtCore.QSize(QtCore.QRect(0,0,520,175).size()).expandedTo(QgsPluginInstallerInstallingDialogBase.minimumSizeHint()))
16+
QgsPluginInstallerInstallingDialogBase.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
1717

18-
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerInstallingDialog)
18+
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerInstallingDialogBase)
1919
self.gridlayout.setObjectName("gridlayout")
2020

2121
spacerItem = QtGui.QSpacerItem(502,16,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.MinimumExpanding)
@@ -24,11 +24,11 @@ def setupUi(self, QgsPluginInstallerInstallingDialog):
2424
self.hboxlayout = QtGui.QHBoxLayout()
2525
self.hboxlayout.setObjectName("hboxlayout")
2626

27-
self.label = QtGui.QLabel(QgsPluginInstallerInstallingDialog)
27+
self.label = QtGui.QLabel(QgsPluginInstallerInstallingDialogBase)
2828
self.label.setObjectName("label")
2929
self.hboxlayout.addWidget(self.label)
3030

31-
self.labelName = QtGui.QLabel(QgsPluginInstallerInstallingDialog)
31+
self.labelName = QtGui.QLabel(QgsPluginInstallerInstallingDialogBase)
3232

3333
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Preferred)
3434
sizePolicy.setHorizontalStretch(0)
@@ -39,11 +39,11 @@ def setupUi(self, QgsPluginInstallerInstallingDialog):
3939
self.hboxlayout.addWidget(self.labelName)
4040
self.gridlayout.addLayout(self.hboxlayout,1,0,1,1)
4141

42-
self.labelState = QtGui.QLabel(QgsPluginInstallerInstallingDialog)
42+
self.labelState = QtGui.QLabel(QgsPluginInstallerInstallingDialogBase)
4343
self.labelState.setObjectName("labelState")
4444
self.gridlayout.addWidget(self.labelState,2,0,1,1)
4545

46-
self.progressBar = QtGui.QProgressBar(QgsPluginInstallerInstallingDialog)
46+
self.progressBar = QtGui.QProgressBar(QgsPluginInstallerInstallingDialogBase)
4747
self.progressBar.setMaximum(100)
4848
self.progressBar.setProperty("value",QtCore.QVariant(0))
4949
self.progressBar.setAlignment(QtCore.Qt.AlignHCenter)
@@ -54,20 +54,20 @@ def setupUi(self, QgsPluginInstallerInstallingDialog):
5454
spacerItem1 = QtGui.QSpacerItem(502,16,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
5555
self.gridlayout.addItem(spacerItem1,4,0,1,1)
5656

57-
self.buttonBox = QtGui.QDialogButtonBox(QgsPluginInstallerInstallingDialog)
57+
self.buttonBox = QtGui.QDialogButtonBox(QgsPluginInstallerInstallingDialogBase)
5858
self.buttonBox.setFocusPolicy(QtCore.Qt.NoFocus)
5959
self.buttonBox.setContextMenuPolicy(QtCore.Qt.NoContextMenu)
6060
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Abort)
6161
self.buttonBox.setCenterButtons(True)
6262
self.buttonBox.setObjectName("buttonBox")
6363
self.gridlayout.addWidget(self.buttonBox,5,0,1,1)
6464

65-
self.retranslateUi(QgsPluginInstallerInstallingDialog)
66-
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerInstallingDialog)
65+
self.retranslateUi(QgsPluginInstallerInstallingDialogBase)
66+
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerInstallingDialogBase)
6767

68-
def retranslateUi(self, QgsPluginInstallerInstallingDialog):
69-
QgsPluginInstallerInstallingDialog.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerInstallingDialog", "QGIS Python Plugin Installer", None, QtGui.QApplication.UnicodeUTF8))
70-
self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerInstallingDialog", "Installing plugin:", None, QtGui.QApplication.UnicodeUTF8))
71-
self.labelState.setText(QtGui.QApplication.translate("QgsPluginInstallerInstallingDialog", "Connecting...", None, QtGui.QApplication.UnicodeUTF8))
68+
def retranslateUi(self, QgsPluginInstallerInstallingDialogBase):
69+
QgsPluginInstallerInstallingDialogBase.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerInstallingDialogBase", "QGIS Python Plugin Installer", None, QtGui.QApplication.UnicodeUTF8))
70+
self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerInstallingDialogBase", "Installing plugin:", None, QtGui.QApplication.UnicodeUTF8))
71+
self.labelState.setText(QtGui.QApplication.translate("QgsPluginInstallerInstallingDialogBase", "Connecting...", None, QtGui.QApplication.UnicodeUTF8))
7272

7373
import resources_rc

‎python/plugins/plugin_installer/installingbase.ui renamed to ‎python/plugins/plugin_installer/qgsplugininstallerinstallingbase.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ui version="4.0" >
2-
<author>Matthew Perry, Borys Jurgiel</author>
3-
<class>QgsPluginInstallerInstallingDialog</class>
4-
<widget class="QDialog" name="QgsPluginInstallerInstallingDialog" >
2+
<author>Borys Jurgiel</author>
3+
<class>QgsPluginInstallerInstallingDialogBase</class>
4+
<widget class="QDialog" name="QgsPluginInstallerInstallingDialogBase" >
55
<property name="geometry" >
66
<rect>
77
<x>0</x>

‎python/plugins/plugin_installer/pluginerrorbase.py renamed to ‎python/plugins/plugin_installer/qgsplugininstallerpluginerrorbase.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'pluginerrorbase.ui'
3+
# Form implementation generated from reading ui file 'qgsplugininstallerpluginerrorbase.ui'
44
#
5-
# Created: Fri Sep 12 19:21:37 2008
6-
# by: PyQt4 UI code generator 4.3
5+
# Created: Wed Nov 12 23:21:49 2008
6+
# by: PyQt4 UI code generator 4.3.3
77
#
88
# WARNING! All changes made in this file will be lost!
99

1010
from PyQt4 import QtCore, QtGui
1111

12-
class Ui_QgsPluginInstallerPluginErrorDialog(object):
13-
def setupUi(self, QgsPluginInstallerPluginErrorDialog):
14-
QgsPluginInstallerPluginErrorDialog.setObjectName("QgsPluginInstallerPluginErrorDialog")
15-
QgsPluginInstallerPluginErrorDialog.resize(QtCore.QSize(QtCore.QRect(0,0,521,383).size()).expandedTo(QgsPluginInstallerPluginErrorDialog.minimumSizeHint()))
16-
QgsPluginInstallerPluginErrorDialog.setMinimumSize(QtCore.QSize(480,300))
17-
QgsPluginInstallerPluginErrorDialog.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
12+
class Ui_QgsPluginInstallerPluginErrorDialogBase(object):
13+
def setupUi(self, QgsPluginInstallerPluginErrorDialogBase):
14+
QgsPluginInstallerPluginErrorDialogBase.setObjectName("QgsPluginInstallerPluginErrorDialogBase")
15+
QgsPluginInstallerPluginErrorDialogBase.resize(QtCore.QSize(QtCore.QRect(0,0,521,383).size()).expandedTo(QgsPluginInstallerPluginErrorDialogBase.minimumSizeHint()))
16+
QgsPluginInstallerPluginErrorDialogBase.setMinimumSize(QtCore.QSize(480,300))
17+
QgsPluginInstallerPluginErrorDialogBase.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
1818

19-
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerPluginErrorDialog)
19+
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerPluginErrorDialogBase)
2020
self.gridlayout.setObjectName("gridlayout")
2121

22-
self.label = QtGui.QLabel(QgsPluginInstallerPluginErrorDialog)
22+
self.label = QtGui.QLabel(QgsPluginInstallerPluginErrorDialogBase)
2323

2424
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Preferred)
2525
sizePolicy.setHorizontalStretch(0)
@@ -31,7 +31,7 @@ def setupUi(self, QgsPluginInstallerPluginErrorDialog):
3131
self.label.setObjectName("label")
3232
self.gridlayout.addWidget(self.label,1,0,1,1)
3333

34-
self.textBrowser = QtGui.QTextBrowser(QgsPluginInstallerPluginErrorDialog)
34+
self.textBrowser = QtGui.QTextBrowser(QgsPluginInstallerPluginErrorDialogBase)
3535
self.textBrowser.setMinimumSize(QtCore.QSize(0,0))
3636
self.textBrowser.setFocusPolicy(QtCore.Qt.NoFocus)
3737
self.textBrowser.setObjectName("textBrowser")
@@ -40,29 +40,29 @@ def setupUi(self, QgsPluginInstallerPluginErrorDialog):
4040
spacerItem = QtGui.QSpacerItem(503,10,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
4141
self.gridlayout.addItem(spacerItem,3,0,1,1)
4242

43-
self.label1 = QtGui.QLabel(QgsPluginInstallerPluginErrorDialog)
43+
self.label1 = QtGui.QLabel(QgsPluginInstallerPluginErrorDialogBase)
4444
self.label1.setFrameShape(QtGui.QFrame.NoFrame)
4545
self.label1.setFrameShadow(QtGui.QFrame.Plain)
4646
self.label1.setWordWrap(True)
4747
self.label1.setObjectName("label1")
4848
self.gridlayout.addWidget(self.label1,4,0,1,1)
4949

50-
self.buttonBox = QtGui.QDialogButtonBox(QgsPluginInstallerPluginErrorDialog)
50+
self.buttonBox = QtGui.QDialogButtonBox(QgsPluginInstallerPluginErrorDialogBase)
5151
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.No|QtGui.QDialogButtonBox.NoButton|QtGui.QDialogButtonBox.Yes)
5252
self.buttonBox.setObjectName("buttonBox")
5353
self.gridlayout.addWidget(self.buttonBox,6,0,1,1)
5454

5555
spacerItem1 = QtGui.QSpacerItem(10,10,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Fixed)
5656
self.gridlayout.addItem(spacerItem1,0,0,1,1)
5757

58-
self.retranslateUi(QgsPluginInstallerPluginErrorDialog)
59-
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("rejected()"),QgsPluginInstallerPluginErrorDialog.reject)
60-
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("accepted()"),QgsPluginInstallerPluginErrorDialog.accept)
61-
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerPluginErrorDialog)
58+
self.retranslateUi(QgsPluginInstallerPluginErrorDialogBase)
59+
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("rejected()"),QgsPluginInstallerPluginErrorDialogBase.reject)
60+
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("accepted()"),QgsPluginInstallerPluginErrorDialogBase.accept)
61+
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerPluginErrorDialogBase)
6262

63-
def retranslateUi(self, QgsPluginInstallerPluginErrorDialog):
64-
QgsPluginInstallerPluginErrorDialog.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerPluginErrorDialog", "Error loading plugin", None, QtGui.QApplication.UnicodeUTF8))
65-
self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerPluginErrorDialog", "The plugin seems to be invalid or have unfulfilled dependencies. It has been installed, but can\'t be loaded. If you really need this plugin, you can contact its author or <a href=\"http://lists.osgeo.org/mailman/listinfo/qgis-user\">QGIS users group</a> and try to solve the problem. If not, you can just uninstall it. Here is the error message below:", None, QtGui.QApplication.UnicodeUTF8))
66-
self.label1.setText(QtGui.QApplication.translate("QgsPluginInstallerPluginErrorDialog", "Do you want to uninstall this plugin now? If you\'re unsure, probably you would like to do this.", None, QtGui.QApplication.UnicodeUTF8))
63+
def retranslateUi(self, QgsPluginInstallerPluginErrorDialogBase):
64+
QgsPluginInstallerPluginErrorDialogBase.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerPluginErrorDialogBase", "Error loading plugin", None, QtGui.QApplication.UnicodeUTF8))
65+
self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerPluginErrorDialogBase", "The plugin seems to be invalid or have unfulfilled dependencies. It has been installed, but can\'t be loaded. If you really need this plugin, you can contact its author or <a href=\"http://lists.osgeo.org/mailman/listinfo/qgis-user\">QGIS users group</a> and try to solve the problem. If not, you can just uninstall it. Here is the error message below:", None, QtGui.QApplication.UnicodeUTF8))
66+
self.label1.setText(QtGui.QApplication.translate("QgsPluginInstallerPluginErrorDialogBase", "Do you want to uninstall this plugin now? If you\'re unsure, probably you would like to do this.", None, QtGui.QApplication.UnicodeUTF8))
6767

6868
import resources_rc

‎python/plugins/plugin_installer/pluginerrorbase.ui renamed to ‎python/plugins/plugin_installer/qgsplugininstallerpluginerrorbase.ui

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ui version="4.0" >
2-
<author>Matthew Perry, Borys Jurgiel</author>
3-
<class>QgsPluginInstallerPluginErrorDialog</class>
4-
<widget class="QDialog" name="QgsPluginInstallerPluginErrorDialog" >
2+
<author>Borys Jurgiel</author>
3+
<class>QgsPluginInstallerPluginErrorDialogBase</class>
4+
<widget class="QDialog" name="QgsPluginInstallerPluginErrorDialogBase" >
55
<property name="geometry" >
66
<rect>
77
<x>0</x>
@@ -122,7 +122,7 @@
122122
<connection>
123123
<sender>buttonBox</sender>
124124
<signal>rejected()</signal>
125-
<receiver>QgsPluginInstallerPluginErrorDialog</receiver>
125+
<receiver>QgsPluginInstallerPluginErrorDialogBase</receiver>
126126
<slot>reject()</slot>
127127
<hints>
128128
<hint type="sourcelabel" >
@@ -138,7 +138,7 @@
138138
<connection>
139139
<sender>buttonBox</sender>
140140
<signal>accepted()</signal>
141-
<receiver>QgsPluginInstallerPluginErrorDialog</receiver>
141+
<receiver>QgsPluginInstallerPluginErrorDialogBase</receiver>
142142
<slot>accept()</slot>
143143
<hints>
144144
<hint type="sourcelabel" >

‎python/plugins/plugin_installer/repositorybase.py renamed to ‎python/plugins/plugin_installer/qgsplugininstallerrepositorybase.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'repositorybase.ui'
3+
# Form implementation generated from reading ui file 'qgsplugininstallerrepositorybase.ui'
44
#
5-
# Created: Wed Sep 17 14:22:09 2008
6-
# by: PyQt4 UI code generator 4.3
5+
# Created: Wed Nov 12 23:21:49 2008
6+
# by: PyQt4 UI code generator 4.3.3
77
#
88
# WARNING! All changes made in this file will be lost!
99

1010
from PyQt4 import QtCore, QtGui
1111

12-
class Ui_QgsPluginInstallerRepositoryDetailsDialog(object):
13-
def setupUi(self, QgsPluginInstallerRepositoryDetailsDialog):
14-
QgsPluginInstallerRepositoryDetailsDialog.setObjectName("QgsPluginInstallerRepositoryDetailsDialog")
15-
QgsPluginInstallerRepositoryDetailsDialog.resize(QtCore.QSize(QtCore.QRect(0,0,522,191).size()).expandedTo(QgsPluginInstallerRepositoryDetailsDialog.minimumSizeHint()))
12+
class Ui_QgsPluginInstallerRepositoryDetailsDialogBase(object):
13+
def setupUi(self, QgsPluginInstallerRepositoryDetailsDialogBase):
14+
QgsPluginInstallerRepositoryDetailsDialogBase.setObjectName("QgsPluginInstallerRepositoryDetailsDialogBase")
15+
QgsPluginInstallerRepositoryDetailsDialogBase.resize(QtCore.QSize(QtCore.QRect(0,0,522,191).size()).expandedTo(QgsPluginInstallerRepositoryDetailsDialogBase.minimumSizeHint()))
1616

1717
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred,QtGui.QSizePolicy.Preferred)
1818
sizePolicy.setHorizontalStretch(0)
1919
sizePolicy.setVerticalStretch(0)
20-
sizePolicy.setHeightForWidth(QgsPluginInstallerRepositoryDetailsDialog.sizePolicy().hasHeightForWidth())
21-
QgsPluginInstallerRepositoryDetailsDialog.setSizePolicy(sizePolicy)
22-
QgsPluginInstallerRepositoryDetailsDialog.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
20+
sizePolicy.setHeightForWidth(QgsPluginInstallerRepositoryDetailsDialogBase.sizePolicy().hasHeightForWidth())
21+
QgsPluginInstallerRepositoryDetailsDialogBase.setSizePolicy(sizePolicy)
22+
QgsPluginInstallerRepositoryDetailsDialogBase.setWindowIcon(QtGui.QIcon(":/plugins/installer/qgis-icon.png"))
2323

24-
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerRepositoryDetailsDialog)
24+
self.gridlayout = QtGui.QGridLayout(QgsPluginInstallerRepositoryDetailsDialogBase)
2525
self.gridlayout.setObjectName("gridlayout")
2626

27-
self.label = QtGui.QLabel(QgsPluginInstallerRepositoryDetailsDialog)
27+
self.label = QtGui.QLabel(QgsPluginInstallerRepositoryDetailsDialogBase)
2828

2929
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Preferred)
3030
sizePolicy.setHorizontalStretch(0)
@@ -37,19 +37,19 @@ def setupUi(self, QgsPluginInstallerRepositoryDetailsDialog):
3737
spacerItem = QtGui.QSpacerItem(16,27,QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Minimum)
3838
self.gridlayout.addItem(spacerItem,0,1,1,1)
3939

40-
self.editName = QtGui.QLineEdit(QgsPluginInstallerRepositoryDetailsDialog)
40+
self.editName = QtGui.QLineEdit(QgsPluginInstallerRepositoryDetailsDialogBase)
4141
self.editName.setObjectName("editName")
4242
self.gridlayout.addWidget(self.editName,0,2,1,2)
4343

44-
self.label_2 = QtGui.QLabel(QgsPluginInstallerRepositoryDetailsDialog)
44+
self.label_2 = QtGui.QLabel(QgsPluginInstallerRepositoryDetailsDialogBase)
4545
self.label_2.setObjectName("label_2")
4646
self.gridlayout.addWidget(self.label_2,1,0,1,1)
4747

48-
self.editURL = QtGui.QLineEdit(QgsPluginInstallerRepositoryDetailsDialog)
48+
self.editURL = QtGui.QLineEdit(QgsPluginInstallerRepositoryDetailsDialogBase)
4949
self.editURL.setObjectName("editURL")
5050
self.gridlayout.addWidget(self.editURL,1,2,1,2)
5151

52-
self.checkBoxEnabled = QtGui.QCheckBox(QgsPluginInstallerRepositoryDetailsDialog)
52+
self.checkBoxEnabled = QtGui.QCheckBox(QgsPluginInstallerRepositoryDetailsDialogBase)
5353
self.checkBoxEnabled.setEnabled(True)
5454

5555
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Fixed)
@@ -64,7 +64,7 @@ def setupUi(self, QgsPluginInstallerRepositoryDetailsDialog):
6464
spacerItem1 = QtGui.QSpacerItem(351,23,QtGui.QSizePolicy.Fixed,QtGui.QSizePolicy.Minimum)
6565
self.gridlayout.addItem(spacerItem1,2,3,1,1)
6666

67-
self.labelInfo = QtGui.QLabel(QgsPluginInstallerRepositoryDetailsDialog)
67+
self.labelInfo = QtGui.QLabel(QgsPluginInstallerRepositoryDetailsDialogBase)
6868
self.labelInfo.setEnabled(True)
6969

7070
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Fixed)
@@ -96,27 +96,27 @@ def setupUi(self, QgsPluginInstallerRepositoryDetailsDialog):
9696
self.labelInfo.setObjectName("labelInfo")
9797
self.gridlayout.addWidget(self.labelInfo,3,2,1,2)
9898

99-
self.buttonBox = QtGui.QDialogButtonBox(QgsPluginInstallerRepositoryDetailsDialog)
99+
self.buttonBox = QtGui.QDialogButtonBox(QgsPluginInstallerRepositoryDetailsDialogBase)
100100
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
101101
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.NoButton|QtGui.QDialogButtonBox.Ok)
102102
self.buttonBox.setObjectName("buttonBox")
103103
self.gridlayout.addWidget(self.buttonBox,5,0,1,4)
104104

105-
self.retranslateUi(QgsPluginInstallerRepositoryDetailsDialog)
106-
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("accepted()"),QgsPluginInstallerRepositoryDetailsDialog.accept)
107-
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("rejected()"),QgsPluginInstallerRepositoryDetailsDialog.reject)
108-
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerRepositoryDetailsDialog)
109-
110-
def retranslateUi(self, QgsPluginInstallerRepositoryDetailsDialog):
111-
QgsPluginInstallerRepositoryDetailsDialog.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Repository details", None, QtGui.QApplication.UnicodeUTF8))
112-
self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Name:", None, QtGui.QApplication.UnicodeUTF8))
113-
self.editName.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enter a name for the repository", None, QtGui.QApplication.UnicodeUTF8))
114-
self.editName.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enter a name for the repository", None, QtGui.QApplication.UnicodeUTF8))
115-
self.label_2.setText(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "URL:", None, QtGui.QApplication.UnicodeUTF8))
116-
self.editURL.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enter the repository URL, beginning with \"http://\"", None, QtGui.QApplication.UnicodeUTF8))
117-
self.editURL.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enter the repository URL, beginning with \"http://\"", None, QtGui.QApplication.UnicodeUTF8))
118-
self.checkBoxEnabled.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enable or disable the repository (disabled repositories will be omitted)", None, QtGui.QApplication.UnicodeUTF8))
119-
self.checkBoxEnabled.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enable or disable the repository (disabled repositories will be omitted)", None, QtGui.QApplication.UnicodeUTF8))
120-
self.checkBoxEnabled.setText(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialog", "Enabled", None, QtGui.QApplication.UnicodeUTF8))
105+
self.retranslateUi(QgsPluginInstallerRepositoryDetailsDialogBase)
106+
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("accepted()"),QgsPluginInstallerRepositoryDetailsDialogBase.accept)
107+
QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("rejected()"),QgsPluginInstallerRepositoryDetailsDialogBase.reject)
108+
QtCore.QMetaObject.connectSlotsByName(QgsPluginInstallerRepositoryDetailsDialogBase)
109+
110+
def retranslateUi(self, QgsPluginInstallerRepositoryDetailsDialogBase):
111+
QgsPluginInstallerRepositoryDetailsDialogBase.setWindowTitle(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Repository details", None, QtGui.QApplication.UnicodeUTF8))
112+
self.label.setText(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Name:", None, QtGui.QApplication.UnicodeUTF8))
113+
self.editName.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enter a name for the repository", None, QtGui.QApplication.UnicodeUTF8))
114+
self.editName.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enter a name for the repository", None, QtGui.QApplication.UnicodeUTF8))
115+
self.label_2.setText(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "URL:", None, QtGui.QApplication.UnicodeUTF8))
116+
self.editURL.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enter the repository URL, beginning with \"http://\"", None, QtGui.QApplication.UnicodeUTF8))
117+
self.editURL.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enter the repository URL, beginning with \"http://\"", None, QtGui.QApplication.UnicodeUTF8))
118+
self.checkBoxEnabled.setToolTip(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enable or disable the repository (disabled repositories will be omitted)", None, QtGui.QApplication.UnicodeUTF8))
119+
self.checkBoxEnabled.setWhatsThis(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enable or disable the repository (disabled repositories will be omitted)", None, QtGui.QApplication.UnicodeUTF8))
120+
self.checkBoxEnabled.setText(QtGui.QApplication.translate("QgsPluginInstallerRepositoryDetailsDialogBase", "Enabled", None, QtGui.QApplication.UnicodeUTF8))
121121

122122
import resources_rc

‎python/plugins/plugin_installer/repositorybase.ui renamed to ‎python/plugins/plugin_installer/qgsplugininstallerrepositorybase.ui

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ui version="4.0" >
2-
<author>Matthew Perry, Borys Jurgiel</author>
3-
<class>QgsPluginInstallerRepositoryDetailsDialog</class>
4-
<widget class="QDialog" name="QgsPluginInstallerRepositoryDetailsDialog" >
2+
<author>Borys Jurgiel</author>
3+
<class>QgsPluginInstallerRepositoryDetailsDialogBase</class>
4+
<widget class="QDialog" name="QgsPluginInstallerRepositoryDetailsDialogBase" >
55
<property name="geometry" >
66
<rect>
77
<x>0</x>
@@ -210,7 +210,7 @@
210210
<connection>
211211
<sender>buttonBox</sender>
212212
<signal>accepted()</signal>
213-
<receiver>QgsPluginInstallerRepositoryDetailsDialog</receiver>
213+
<receiver>QgsPluginInstallerRepositoryDetailsDialogBase</receiver>
214214
<slot>accept()</slot>
215215
<hints>
216216
<hint type="sourcelabel" >
@@ -226,7 +226,7 @@
226226
<connection>
227227
<sender>buttonBox</sender>
228228
<signal>rejected()</signal>
229-
<receiver>QgsPluginInstallerRepositoryDetailsDialog</receiver>
229+
<receiver>QgsPluginInstallerRepositoryDetailsDialogBase</receiver>
230230
<slot>reject()</slot>
231231
<hints>
232232
<hint type="sourcelabel" >

0 commit comments

Comments
 (0)
Please sign in to comment.