Mercurial Repositories > eric / changeset

--- a/DataViews/CodeMetricsDialog.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/DataViews/CodeMetricsDialog.py	Wed Oct 03 15:36:41 2012 +0200
@@ -10,7 +10,7 @@
 import os
 import fnmatch
 
-from PyQt4.QtCore import pyqtSlot, Qt, QLocale
+from PyQt4.QtCore import pyqtSlot, Qt, QLocale, qVersion
 from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, \
     QApplication
 
@@ -225,8 +225,12 @@
         self.buttonBox.button(QDialogButtonBox.Cancel).setEnabled(False)
         self.buttonBox.button(QDialogButtonBox.Close).setDefault(True)
         
-        self.resultList.header().setResizeMode(QHeaderView.Interactive)
-        self.summaryList.header().setResizeMode(QHeaderView.Interactive)
+        if qVersion() >= "5.0.0":
+            self.resultList.header().setSectionResizeMode(QHeaderView.Interactive)
+            self.summaryList.header().setSectionResizeMode(QHeaderView.Interactive)
+        else:
+            self.resultList.header().setResizeMode(QHeaderView.Interactive)
+            self.summaryList.header().setResizeMode(QHeaderView.Interactive)
         
     def on_buttonBox_clicked(self, button):
         """

--- a/Debugger/BreakPointViewer.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Debugger/BreakPointViewer.py	Wed Oct 03 15:36:41 2012 +0200
@@ -7,7 +7,7 @@
 Module implementing the Breakpoint viewer widget.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt
+from PyQt4.QtCore import pyqtSignal, Qt, qVersion
 from PyQt4.QtGui import QTreeView, QAbstractItemView, QSortFilterProxyModel, \
     QHeaderView, QItemSelectionModel, QMenu, QDialog
 
@@ -72,7 +72,10 @@
         header = self.header()
         header.setSortIndicator(0, Qt.AscendingOrder)
         header.setSortIndicatorShown(True)
-        header.setClickable(True)
+        if qVersion() >= "5.0.0":
+            header.setSectionsClickable(True)
+        else:
+            header.setClickable(True)
         
         self.setSortingEnabled(True)
         

--- a/Debugger/VariablesViewer.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Debugger/VariablesViewer.py	Wed Oct 03 15:36:41 2012 +0200
@@ -7,7 +7,7 @@
 Module implementing the variables viewer widget.
 """
 
-from PyQt4.QtCore import Qt, QRegExp
+from PyQt4.QtCore import Qt, QRegExp, qVersion
 from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QApplication, QAbstractItemView, \
     QMenu
 
@@ -307,7 +307,10 @@
         header = self.header()
         header.setSortIndicator(0, Qt.AscendingOrder)
         header.setSortIndicatorShown(True)
-        header.setClickable(True)
+        if qVersion() >= "5.0.0":
+            header.setSectionsClickable(True)
+        else:
+            header.setClickable(True)
         header.resizeSection(0, 120)    # variable column
         header.resizeSection(1, 150)    # value column
         

--- a/Debugger/WatchPointViewer.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Debugger/WatchPointViewer.py	Wed Oct 03 15:36:41 2012 +0200
@@ -7,7 +7,7 @@
 Module implementing the watch expression viewer widget.
 """
 
-from PyQt4.QtCore import Qt, QModelIndex
+from PyQt4.QtCore import Qt, QModelIndex, qVersion
 from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, QSortFilterProxyModel, \
     QHeaderView, QItemSelectionModel, QDialog
 
@@ -67,7 +67,10 @@
         header = self.header()
         header.setSortIndicator(0, Qt.AscendingOrder)
         header.setSortIndicatorShown(True)
-        header.setClickable(True)
+        if qVersion() >= "5.0.0":
+            header.setSectionsClickable(True)
+        else:
+            header.setClickable(True)
         
         self.setSortingEnabled(True)
         

--- a/Graphics/ImportsDiagramBuilder.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Graphics/ImportsDiagramBuilder.py	Wed Oct 03 15:36:41 2012 +0200
@@ -112,10 +112,11 @@
         """
         initlist = glob.glob(os.path.join(self.packagePath, '__init__.*'))
         if len(initlist) == 0:
-            ct = QGraphicsTextItem(None, self.scene)
+            ct = QGraphicsTextItem(None)
             ct.setHtml(
                 self.trUtf8("The directory <b>'{0}'</b> is not a Python package.")\
                     .format(self.package))
+            self.scene.addItem(ct)
             return
         
         shapes = {}

--- a/Graphics/UMLClassDiagramBuilder.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Graphics/UMLClassDiagramBuilder.py	Wed Oct 03 15:36:41 2012 +0200
@@ -77,10 +77,11 @@
             module = Utilities.ModuleParser.readModule(self.file, extensions=extensions,
                                                        caching=False)
         except ImportError:
-            ct = QGraphicsTextItem(None, self.scene)
+            ct = QGraphicsTextItem(None)
             ct.setHtml(
                 self.trUtf8("The module <b>'{0}'</b> could not be found.")
                     .format(self.file))
+            self.scene.addItem(ct)
             return
         
         if self.file not in self.allModules:
@@ -139,10 +140,11 @@
             self.__createAssociations(routes)
             self.umlView.autoAdjustSceneSize(limit=True)
         else:
-            ct = QGraphicsTextItem(None, self.scene)
+            ct = QGraphicsTextItem(None)
             ct.setHtml(
                 self.trUtf8("The module <b>'{0}'</b> does not contain any classes.")\
                 .format(self.file))
+            self.scene.addItem(ct)
         
     def __arrangeClasses(self, nodes, routes, whiteSpaceFactor=1.2):
         """

--- a/Helpviewer/HelpBrowserWV.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Wed Oct 03 15:36:41 2012 +0200
@@ -1859,7 +1859,7 @@
                 .format(self.__dataString(securityOrigin.databaseQuota()), databaseName),
             yesDefault=True)
         if res:
-            newQuota, ok = QInputDialog.getInteger(
+            newQuota, ok = QInputDialog.getInt(
                 self,
                 self.trUtf8("New Web Database Quota"),
                 self.trUtf8("Enter the new quota in MB (current = {0}, used = {1}; "

--- a/Helpviewer/Network/NetworkAccessManager.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py	Wed Oct 03 15:36:41 2012 +0200
@@ -242,16 +242,17 @@
         server = url.host()
         if url.port() != -1:
             server += ":{0:d}".format(url.port())
-        for err in errors:
-            if err.error() == QSslError.NoError:
-                continue
-            if server in caMerge and err.certificate() in caMerge[server]:
-                continue
-            errorStrings.append(err.errorString())
-            if not err.certificate().isNull():
-                cert = err.certificate()
-                if cert not in caNew:
-                    caNew.append(cert)
+        if errors:
+            for err in errors:
+                if err.error() == QSslError.NoError:
+                    continue
+                if server in caMerge and err.certificate() in caMerge[server]:
+                    continue
+                errorStrings.append(err.errorString())
+                if not err.certificate().isNull():
+                    cert = err.certificate()
+                    if cert not in caNew:
+                        caNew.append(cert)
         if not errorStrings:
             reply.ignoreSslErrors()
             return

--- a/PluginManager/PluginRepositoryDialog.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/PluginManager/PluginRepositoryDialog.py	Wed Oct 03 15:36:41 2012 +0200
@@ -491,16 +491,19 @@
         @param errors list of SSL errors (list of QSslError)
         """
         errorStrings = []
-        for err in errors:
-            errorStrings.append(err.errorString())
-        errorString = '.<br />'.join(errorStrings)
-        ret = E5MessageBox.yesNo(self,
-            self.trUtf8("SSL Errors"),
-            self.trUtf8("""<p>SSL Errors:</p>"""
-                        """<p>{0}</p>"""
-                        """<p>Do you want to ignore these errors?</p>""")\
-                .format(errorString),
+        if errors:
+            for err in errors:
+                errorStrings.append(err.errorString())
+            errorString = '.<br />'.join(errorStrings)
+            ret = E5MessageBox.yesNo(self,
+                self.trUtf8("SSL Errors"),
+                self.trUtf8("""<p>SSL Errors:</p>"""
+                            """<p>{0}</p>"""
+                            """<p>Do you want to ignore these errors?</p>""")\
+                    .format(errorString),
             icon=E5MessageBox.Warning)
+        else:
+            ret = True
         if ret:
             reply.ignoreSslErrors()
         else:

--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Wed Oct 03 15:36:41 2012 +0200
@@ -921,7 +921,7 @@
         
         @param name file/directory name to show the log of (string)
         """
-        noEntries, ok = QInputDialog.getInteger(
+        noEntries, ok = QInputDialog.getInt(
             None,
             self.trUtf8("Subversion Log"),
             self.trUtf8("Select number of entries to show."),

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Wed Oct 03 15:36:41 2012 +0200
@@ -823,7 +823,7 @@
         
         @param name file/directory name to show the log of (string)
         """
-        noEntries, ok = QInputDialog.getInteger(
+        noEntries, ok = QInputDialog.getInt(
             None,
             self.trUtf8("Subversion Log"),
             self.trUtf8("Select number of entries to show."),

--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Wed Oct 03 15:36:41 2012 +0200
@@ -80,7 +80,7 @@
                 echomode,
                 self.eTextDefault.text())
         elif self.rInteger.isChecked():
-            QInputDialog.getInteger(
+            QInputDialog.getInt(
                 None,
                 self.eCaption.text(),
                 self.eLabel.text(),
@@ -143,7 +143,7 @@
                     os.linesep, istring, self.eTextDefault.text())
             code += '){0}'.format(estring)
         elif self.rInteger.isChecked():
-            code += 'getInteger({0}{1}'.format(os.linesep, istring)
+            code += 'getInt({0}{1}'.format(os.linesep, istring)
             code += 'None,{0}{1}'.format(os.linesep, istring)
             code += 'self.trUtf8("{0}"),{1}{2}'.format(
                 self.eCaption.text(), os.linesep, istring)

--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py	Wed Oct 03 15:36:41 2012 +0200
@@ -11,7 +11,7 @@
 
 from pygments.lexers import get_all_lexers
 
-from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtCore import Qt, pyqtSlot, qVersion
 from PyQt4.QtGui import QHeaderView, QTreeWidgetItem
 
 from .ConfigurationPageBase import ConfigurationPageBase
@@ -36,7 +36,10 @@
         
         self.editorLexerList.headerItem().setText(self.editorLexerList.columnCount(), "")
         header = self.editorLexerList.header()
-        header.setResizeMode(QHeaderView.ResizeToContents)
+        if qVersion() >= "5.0.0":
+            header.setSectionResizeMode(QHeaderView.ResizeToContents)
+        else:
+            header.setResizeMode(QHeaderView.ResizeToContents)
         header.setSortIndicator(0, Qt.AscendingOrder)
         
         try:

--- a/Project/CreateDialogCodeDialog.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Project/CreateDialogCodeDialog.py	Wed Oct 03 15:36:41 2012 +0200
@@ -9,7 +9,8 @@
 
 import os
 
-from PyQt4.QtCore import QMetaObject, QByteArray, QRegExp, Qt, pyqtSlot, QMetaMethod
+from PyQt4.QtCore import QMetaObject, QByteArray, QRegExp, Qt, pyqtSlot, QMetaMethod, \
+    qVersion
 from PyQt4.QtGui import QWidget, QSortFilterProxyModel, QStandardItemModel, QDialog, \
     QBrush, QStandardItem, QDialogButtonBox, QAction
 from PyQt4 import uic
@@ -234,12 +235,21 @@
                 for index in range(metaObject.methodCount()):
                     metaMethod = metaObject.method(index)
                     if metaMethod.methodType() == QMetaMethod.Signal:
-                        itm2 = QStandardItem("on_{0}_{1}".format(
-                            name, metaMethod.signature()))
+                        if qVersion() >= "5.0.0":
+                            itm2 = QStandardItem("on_{0}_{1}".format(
+                                name, bytes(metaMethod.methodSignature()).decode()))
+                        else:
+                            itm2 = QStandardItem("on_{0}_{1}".format(
+                                name, metaMethod.signature()))
                         itm.appendRow(itm2)
                         if self.__module is not None:
-                            method = "on_{0}_{1}".format(
-                                name, metaMethod.signature().split("(")[0])
+                            if qVersion() >= "5.0.0":
+                                method = "on_{0}_{1}".format(
+                                    name, bytes(metaMethod.methodSignature()).decode()\
+                                        .split("(")[0])
+                            else:
+                                method = "on_{0}_{1}".format(
+                                    name, metaMethod.signature().split("(")[0])
                             method2 = "{0}({1})".format(method,
                                 ", ".join([self.__mapType(t)
                                            for t in metaMethod.parameterTypes()]))
@@ -264,14 +274,27 @@
                             ", ".join([bytes(n).decode() for n in parameterNames])
                         
                         if methNamesSig:
-                            pythonSignature = "on_{0}_{1}(self, {2})".format(
-                                name,
-                                metaMethod.signature().split("(")[0],
-                                methNamesSig)
+                            if qVersion() >= "5.0.0":
+                                pythonSignature = "on_{0}_{1}(self, {2})".format(
+                                    name,
+                                    bytes(metaMethod.methodSignature()).decode()\
+                                        .split("(")[0],
+                                    methNamesSig)
+                            else:
+                                pythonSignature = "on_{0}_{1}(self, {2})".format(
+                                    name,
+                                    metaMethod.signature().split("(")[0],
+                                    methNamesSig)
                         else:
-                            pythonSignature = "on_{0}_{1}(self)".format(
-                                name,
-                                metaMethod.signature().split("(")[0])
+                            if qVersion() >= "5.0.0":
+                                pythonSignature = "on_{0}_{1}(self)".format(
+                                    name,
+                                    bytes(metaMethod.methodSignature()).decode()\
+                                        .split("(")[0])
+                            else:
+                                pythonSignature = "on_{0}_{1}(self)".format(
+                                    name,
+                                    metaMethod.signature().split("(")[0])
                         itm2.setData(pyqtSignature, pyqtSignatureRole)
                         itm2.setData(pythonSignature, pythonSignatureRole)
                         

--- a/Project/LexerAssociationDialog.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/Project/LexerAssociationDialog.py	Wed Oct 03 15:36:41 2012 +0200
@@ -11,7 +11,7 @@
 
 from pygments.lexers import get_all_lexers
 
-from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtCore import Qt, pyqtSlot, qVersion
 from PyQt4.QtGui import QHeaderView, QTreeWidgetItem, QDialog
 
 import QScintilla.Lexers
@@ -35,7 +35,10 @@
 
         self.editorLexerList.headerItem().setText(self.editorLexerList.columnCount(), "")
         header = self.editorLexerList.header()
-        header.setResizeMode(QHeaderView.ResizeToContents)
+        if qVersion() >= "5.0.0":
+            header.setSectionResizeMode(QHeaderView.ResizeToContents)
+        else:
+            header.setResizeMode(QHeaderView.ResizeToContents)
         header.setSortIndicator(0, Qt.AscendingOrder)
         
         try:

--- a/SqlBrowser/SqlConnectionWidget.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/SqlBrowser/SqlConnectionWidget.py	Wed Oct 03 15:36:41 2012 +0200
@@ -7,7 +7,7 @@
 Module implementing a widget showing the SQL connections.
 """
 
-from PyQt4.QtCore import pyqtSignal, Qt
+from PyQt4.QtCore import pyqtSignal, Qt, qVersion
 from PyQt4.QtGui import QWidget, QHeaderView, QTreeWidget, QVBoxLayout, \
     QTreeWidgetItem, QAction
 from PyQt4.QtSql import QSqlDatabase
@@ -39,7 +39,10 @@
         self.__connectionTree = QTreeWidget(self)
         self.__connectionTree.setObjectName("connectionTree")
         self.__connectionTree.setHeaderLabels([self.trUtf8("Database")])
-        self.__connectionTree.header().setResizeMode(QHeaderView.Stretch)
+        if qVersion() >= "5.0.0":
+            self.__connectionTree.header().setSectionResizeMode(QHeaderView.Stretch)
+        else:
+            self.__connectionTree.header().setResizeMode(QHeaderView.Stretch)
         refreshAction = QAction(self.trUtf8("Refresh"), self.__connectionTree)
         self.__schemaAction = QAction(self.trUtf8("Show Schema"), self.__connectionTree)
         

--- a/UI/Browser.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/UI/Browser.py	Wed Oct 03 15:36:41 2012 +0200
@@ -10,7 +10,7 @@
 import os
 import mimetypes
 
-from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl, Qt
+from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl, Qt, qVersion
 from PyQt4.QtGui import QTreeView, QDesktopServices, QItemSelectionModel, QApplication, \
     QMenu, QAbstractItemView
 
@@ -133,7 +133,10 @@
         header = self.header()
         header.setSortIndicator(0, Qt.AscendingOrder)
         header.setSortIndicatorShown(True)
-        header.setClickable(True)
+        if qVersion() >= "5.0.0":
+            header.setSectionsClickable(True)
+        else:
+            header.setClickable(True)
         
         self.setSortingEnabled(True)
         

--- a/UI/EmailDialog.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/UI/EmailDialog.py	Wed Oct 03 15:36:41 2012 +0200
@@ -12,7 +12,7 @@
 import smtplib
 import socket
 
-from PyQt4.QtCore import Qt, pyqtSlot
+from PyQt4.QtCore import Qt, pyqtSlot, qVersion
 from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, QInputDialog, \
     QApplication, QDialogButtonBox, QTreeWidgetItem
 
@@ -93,7 +93,10 @@
         self.mainSplitter.setSizes([int(0.7 * height), int(0.3 * height)])
         
         self.attachments.headerItem().setText(self.attachments.columnCount(), "")
-        self.attachments.header().setResizeMode(QHeaderView.Interactive)
+        if qVersion() >= "5.0.0":
+            self.attachments.header().setSectionResizeMode(QHeaderView.Interactive)
+        else:
+            self.attachments.header().setResizeMode(QHeaderView.Interactive)
         
         sig = Preferences.getUser("Signature")
         if sig:

--- a/UI/NumbersWidget.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/UI/NumbersWidget.py	Wed Oct 03 15:36:41 2012 +0200
@@ -198,7 +198,11 @@
         
         self.__model = BinaryModel(self)
         self.binTable.setModel(self.__model)
-        self.binTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)
+        if qVersion() >= "5.0.0":
+            self.binTable.horizontalHeader().setSectionResizeMode(
+                QHeaderView.ResizeToContents)
+        else:
+            self.binTable.horizontalHeader().setResizeMode(QHeaderView.ResizeToContents)
         self.__model.setBitsAndValue(self.__bytes * 8, self.__input)
         self.__model.dataChanged.connect(self.__binModelDataChanged)
     

--- a/UI/SymbolsWidget.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/UI/SymbolsWidget.py	Wed Oct 03 15:36:41 2012 +0200
@@ -10,7 +10,8 @@
 import unicodedata
 import html.entities
 
-from PyQt4.QtCore import pyqtSlot, pyqtSignal, QAbstractTableModel, QModelIndex, Qt
+from PyQt4.QtCore import pyqtSlot, pyqtSignal, QAbstractTableModel, QModelIndex, Qt, \
+    qVersion
 from PyQt4.QtGui import QWidget, QHeaderView, QAbstractItemView, QColor, \
     QItemSelectionModel
 
@@ -354,7 +355,10 @@
         self.symbolsTable.selectionModel().currentRowChanged.connect(
             self.__currentRowChanged)
         
-        self.symbolsTable.horizontalHeader().setResizeMode(QHeaderView.Fixed)
+        if qVersion() >= "5.0.0":
+            self.symbolsTable.horizontalHeader().setSectionResizeMode(QHeaderView.Fixed)
+        else:
+            self.symbolsTable.horizontalHeader().setResizeMode(QHeaderView.Fixed)
         fm = self.fontMetrics()
         em = fm.width("M")
         self.symbolsTable.horizontalHeader().resizeSection(0, em * 5)

--- a/UI/UserInterface.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/UI/UserInterface.py	Wed Oct 03 15:36:41 2012 +0200
@@ -5500,16 +5500,19 @@
         @param errors list of SSL errors (list of QSslError)
         """
         errorStrings = []
-        for err in errors:
-            errorStrings.append(err.errorString())
-        errorString = '.<br />'.join(errorStrings)
-        ret = E5MessageBox.yesNo(self,
-            self.trUtf8("SSL Errors"),
-            self.trUtf8("""<p>SSL Errors:</p>"""
-                        """<p>{0}</p>"""
-                        """<p>Do you want to ignore these errors?</p>""")\
-                .format(errorString),
-            icon=E5MessageBox.Warning)
+        if errors:
+            for err in errors:
+                errorStrings.append(err.errorString())
+            errorString = '.<br />'.join(errorStrings)
+            ret = E5MessageBox.yesNo(self,
+                self.trUtf8("SSL Errors"),
+                self.trUtf8("""<p>SSL Errors:</p>"""
+                            """<p>{0}</p>"""
+                            """<p>Do you want to ignore these errors?</p>""")\
+                    .format(errorString),
+                icon=E5MessageBox.Warning)
+        else:
+            ret = True
         if ret:
             reply.ignoreSslErrors()
         else:

--- a/VCS/StatusMonitorLed.py	Wed Oct 03 13:20:57 2012 +0200
+++ b/VCS/StatusMonitorLed.py	Wed Oct 03 15:36:41 2012 +0200
@@ -117,7 +117,7 @@
         """
         Private slot to change the status check interval.
         """
-        interval,  ok = QInputDialog.getInteger(
+        interval,  ok = QInputDialog.getInt(
             None,
             self.trUtf8("VCS Status Monitor"),
             self.trUtf8("Enter monitor interval [s]"),