Mercurial Repositories > eric / changeset
changeset
Started porting eric5 to PyQt5.
Sun, 29 Jun 2014 20:13:56 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 29 Jun 2014 20:13:56 +0200
- changeset 3656
- 441956d8fce5
- parent 3654
- ffeb85cdc72d
- child 3657
- ae833e7fcd6c
Started porting eric5 to PyQt5.
--- a/Cooperation/ChatWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Cooperation/ChatWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo -from PyQt4.QtGui import QWidget, QColor, QListWidgetItem, QMenu, QApplication +from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog
--- a/Cooperation/Connection.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Cooperation/Connection.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ except NameError: pass -from PyQt4.QtCore import pyqtSignal, QTimer, QTime, QByteArray -from PyQt4.QtNetwork import QTcpSocket, QHostInfo +from PyQt5.QtCore import pyqtSignal, QTimer, QTime, QByteArray +from PyQt5.QtNetwork import QTcpSocket, QHostInfo from E5Gui import E5MessageBox from E5Gui.E5Application import e5App
--- a/Cooperation/CooperationClient.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Cooperation/CooperationClient.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import collections -from PyQt4.QtCore import QObject, pyqtSignal, QProcess, QRegExp -from PyQt4.QtNetwork import QHostInfo, QHostAddress, QAbstractSocket, \ +from PyQt5.QtCore import QObject, pyqtSignal, QProcess, QRegExp +from PyQt5.QtNetwork import QHostInfo, QHostAddress, QAbstractSocket, \ QNetworkInterface from .CooperationServer import CooperationServer
--- a/Cooperation/CooperationServer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Cooperation/CooperationServer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal -from PyQt4.QtNetwork import QTcpServer +from PyQt5.QtCore import pyqtSignal +from PyQt5.QtNetwork import QTcpServer from .Connection import Connection
--- a/DataViews/CodeMetricsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/DataViews/CodeMetricsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os import fnmatch -from PyQt4.QtCore import pyqtSlot, Qt, QLocale, qVersion -from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, Qt, QLocale, qVersion +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMenu, QHeaderView, \ QTreeWidgetItem, QApplication from .Ui_CodeMetricsDialog import Ui_CodeMetricsDialog
--- a/DataViews/PyCoverageDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/DataViews/PyCoverageDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMenu, QHeaderView, \ QTreeWidgetItem, QApplication from E5Gui import E5MessageBox
--- a/DataViews/PyCoverageDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/DataViews/PyCoverageDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -60,9 +60,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/DataViews/PyProfileDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/DataViews/PyProfileDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os import pickle -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QMenu, QHeaderView, \ +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QMenu, QHeaderView, \ QTreeWidgetItem, QApplication from E5Gui import E5MessageBox
--- a/Debugger/BreakPointModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/BreakPointModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex +from PyQt5.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex class BreakPointModel(QAbstractItemModel):
--- a/Debugger/BreakPointViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/BreakPointViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, qVersion -from PyQt4.QtGui import QTreeView, QAbstractItemView, QSortFilterProxyModel, \ - QHeaderView, QItemSelectionModel, QMenu, QDialog +from PyQt5.QtCore import pyqtSignal, Qt, qVersion, QItemSelectionModel, \ + QSortFilterProxyModel +from PyQt5.QtWidgets import QTreeView, QAbstractItemView, QHeaderView, QMenu, \ + QDialog from E5Gui.E5Application import e5App
--- a/Debugger/CallStackViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/CallStackViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QFileInfo -from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QMenu +from PyQt5.QtCore import pyqtSignal, Qt, QFileInfo +from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QMenu from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox
--- a/Debugger/CallTraceViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/CallTraceViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QRegExp, QFileInfo -from PyQt4.QtGui import QWidget, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QRegExp, QFileInfo +from PyQt5.QtWidgets import QWidget, QTreeWidgetItem from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox
--- a/Debugger/Config.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/Config.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals try: - from PyQt4.QtCore import QT_TRANSLATE_NOOP + from PyQt5.QtCore import QT_TRANSLATE_NOOP # Variables type definition ConfigVarTypeDispStrings = [
--- a/Debugger/DebugServer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebugServer.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSignal, QModelIndex -from PyQt4.QtNetwork import QTcpServer, QHostAddress, QHostInfo, \ +from PyQt5.QtCore import pyqtSignal, QModelIndex +from PyQt5.QtNetwork import QTcpServer, QHostAddress, QHostInfo, \ QNetworkInterface from E5Gui.E5Application import e5App
--- a/Debugger/DebugUI.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebugUI.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, Qt -from PyQt4.QtGui import QKeySequence, QMenu, QToolBar, QApplication, QDialog, \ +from PyQt5.QtCore import pyqtSignal, QObject, Qt +from PyQt5.QtGui import QKeySequence +from PyQt5.QtWidgets import QMenu, QToolBar, QApplication, QDialog, \ QInputDialog from UI.Info import Program
--- a/Debugger/DebugViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebugViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -24,8 +24,8 @@ import os -from PyQt4.QtCore import pyqtSignal -from PyQt4.QtGui import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, \ +from PyQt5.QtCore import pyqtSignal +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, \ QSizePolicy, QPushButton, QComboBox, QLabel, QTreeWidget, \ QTreeWidgetItem, QHeaderView
--- a/Debugger/DebuggerInterfaceNone.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebuggerInterfaceNone.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject ClientDefaultCapabilities = 0
--- a/Debugger/DebuggerInterfacePython.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebuggerInterfacePython.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,9 @@ import os import re -from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer -from PyQt4.QtGui import QInputDialog +from PyQt5.QtCore import QObject, QTextCodec, QProcess, QProcessEnvironment, \ + QTimer +from PyQt5.QtWidgets import QInputDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -132,10 +133,10 @@ """ proc = QProcess() if environment is not None: - env = [] + env = QProcessEnvironment() for key, value in list(environment.items()): - env.append("{0}={1}".format(key, value)) - proc.setEnvironment(env) + env.insert(key, value) + proc.setProcessEnvironment(env) args = [] for arg in arguments: args.append(arg)
--- a/Debugger/DebuggerInterfacePython3.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,9 @@ import sys import os -from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer -from PyQt4.QtGui import QInputDialog +from PyQt5.QtCore import QObject, QTextCodec, QProcess, QProcessEnvironment, \ + QTimer +from PyQt5.QtWidgets import QInputDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -129,10 +130,10 @@ """ proc = QProcess() if environment is not None: - env = [] + env = QProcessEnvironment() for key, value in list(environment.items()): - env.append("{0}={1}".format(key, value)) - proc.setEnvironment(env) + env.insert(key, value) + proc.setProcessEnvironment(env) args = [] for arg in arguments: args.append(arg)
--- a/Debugger/DebuggerInterfaceRuby.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/DebuggerInterfaceRuby.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,8 @@ import os -from PyQt4.QtCore import QObject, QTextCodec, QProcess, QTimer +from PyQt5.QtCore import QObject, QTextCodec, QProcess, QProcessEnvironment, \ + QTimer from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -123,10 +124,10 @@ """ proc = QProcess() if environment is not None: - env = [] + env = QProcessEnvironment() for key, value in list(environment.items()): - env.append("{0}={1}".format(key, value)) - proc.setEnvironment(env) + env.insert(key, value) + proc.setProcessEnvironment(env) args = [] for arg in arguments: args.append(arg)
--- a/Debugger/EditBreakpointDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/EditBreakpointDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os.path -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Debugger/EditBreakpointDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/EditBreakpointDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -58,9 +58,6 @@ <property name="editable"> <bool>true</bool> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> </widget> </item> <item row="2" column="1" colspan="3"> @@ -77,9 +74,6 @@ <property name="editable"> <bool>true</bool> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> </widget> </item> <item row="3" column="1">
--- a/Debugger/EditWatchpointDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/EditWatchpointDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_EditWatchpointDialog import Ui_EditWatchpointDialog
--- a/Debugger/ExceptionLogger.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/ExceptionLogger.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt -from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QMenu +from PyQt5.QtCore import pyqtSignal, Qt +from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QMenu from E5Gui.E5Application import e5App
--- a/Debugger/ExceptionsFilterDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/ExceptionsFilterDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_ExceptionsFilterDialog import Ui_ExceptionsFilterDialog
--- a/Debugger/StartCoverageDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/StartCoverageDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -51,9 +51,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -93,9 +90,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -136,9 +130,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Debugger/StartDebugDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/StartDebugDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -51,9 +51,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -93,9 +90,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -136,9 +130,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Debugger/StartDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/StartDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Debugger/StartProfileDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/StartProfileDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -51,9 +51,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -93,9 +90,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -136,9 +130,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Debugger/StartRunDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/StartRunDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -51,9 +51,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -93,9 +90,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -136,9 +130,6 @@ <property name="sizeAdjustPolicy"> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Debugger/VariableDetailDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/VariableDetailDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_VariableDetailDialog import Ui_VariableDetailDialog
--- a/Debugger/VariablesFilterDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/VariablesFilterDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from Debugger.Config import ConfigVarTypeDispStrings import Preferences
--- a/Debugger/VariablesViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/VariablesViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,10 +13,10 @@ except NameError: pass -from PyQt4.QtCore import Qt, QRegExp, qVersion -from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QApplication, \ - QAbstractItemView, QMenu -from PyQt4.QtGui import QTextDocument # __IGNORE_WARNING__ +from PyQt5.QtCore import Qt, QRegExp, qVersion, QCoreApplication +from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView, \ + QMenu +from PyQt5.QtGui import QTextDocument # __IGNORE_WARNING__ from E5Gui.E5Application import e5App @@ -43,8 +43,8 @@ """ self.__value = dvalue if len(dvalue) > 2048: # 1024 * 2 - dvalue = QApplication.translate("VariableItem", - "<double click to show value>") + dvalue = QCoreApplication.translate( + "VariableItem", "<double click to show value>") self.__tooltip = dvalue else: if Qt.mightBeRichText(dvalue):
--- a/Debugger/WatchPointModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/WatchPointModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex +from PyQt5.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex class WatchPointModel(QAbstractItemModel):
--- a/Debugger/WatchPointViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Debugger/WatchPointViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QModelIndex, qVersion -from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, \ - QSortFilterProxyModel, QHeaderView, QItemSelectionModel, QDialog +from PyQt5.QtCore import Qt, QModelIndex, qVersion, QItemSelectionModel, \ + QSortFilterProxyModel +from PyQt5.QtWidgets import QTreeView, QAbstractItemView, QMenu, QHeaderView, \ + QDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/E5Graphics/E5ArrowItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Graphics/E5ArrowItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ import math -from PyQt4.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt -from PyQt4.QtGui import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle, \ - QPen, QPolygonF +from PyQt5.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt +from PyQt5.QtGui import QPen, QPolygonF +from PyQt5.QtWidgets import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle NormalArrow = 1 WideArrow = 2
--- a/E5Graphics/E5GraphicsView.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Graphics/E5GraphicsView.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import sys -from PyQt4.QtCore import pyqtSignal, QRectF, QSize, QSizeF, Qt -from PyQt4.QtGui import QGraphicsView, QBrush, QPainter, QPixmap, QFont, QColor +from PyQt5.QtCore import pyqtSignal, QRectF, QSize, QSizeF, Qt +from PyQt5.QtGui import QBrush, QPainter, QPixmap, QFont, QColor +from PyQt5.QtWidgets import QGraphicsView import Preferences @@ -260,7 +261,7 @@ paintDevice = QPixmap(int(rect.width()), int(rect.height())) paintDevice.fill(self.backgroundBrush().color()) else: - from PyQt4.QtSvg import QSvgGenerator + from PyQt5.QtSvg import QSvgGenerator paintDevice = QSvgGenerator() paintDevice.setResolution(100) # 100 dpi paintDevice.setSize(QSize(int(rect.width()), int(rect.height())))
--- a/E5Gui/E5Action.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5Action.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QAction, QActionGroup, QIcon, QKeySequence, qApp +from PyQt5.QtGui import QIcon, QKeySequence +from PyQt5.QtWidgets import QAction, QActionGroup, qApp class ArgumentsError(RuntimeError):
--- a/E5Gui/E5Application.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5Application.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QCoreApplication -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QCoreApplication +from PyQt5.QtWidgets import QApplication class E5Application(QApplication):
--- a/E5Gui/E5ClickableLabel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ClickableLabel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QPoint -from PyQt4.QtGui import QLabel +from PyQt5.QtCore import pyqtSignal, Qt, QPoint +from PyQt5.QtWidgets import QLabel class E5ClickableLabel(QLabel):
--- a/E5Gui/E5ComboBox.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ComboBox.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QComboBox +from PyQt5.QtWidgets import QComboBox class E5ComboBox(QComboBox):
--- a/E5Gui/E5Completers.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5Completers.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDir, Qt -from PyQt4.QtGui import QCompleter, QFileSystemModel, QStringListModel +from PyQt5.QtCore import QDir, Qt, QStringListModel +from PyQt5.QtWidgets import QCompleter, QFileSystemModel from Globals import isWindowsPlatform
--- a/E5Gui/E5ErrorMessage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ErrorMessage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import qInstallMsgHandler, QCoreApplication, QtDebugMsg, \ - QtWarningMsg, QtCriticalMsg, QtFatalMsg, QThread, QMetaObject, Qt, Q_ARG, \ - QSettings -from PyQt4.QtGui import QErrorMessage, qApp, QDialog +from PyQt5.QtCore import qInstallMessageHandler, QCoreApplication, \ + QtDebugMsg, QtWarningMsg, QtCriticalMsg, QtFatalMsg, QThread, \ + QMetaObject, Qt, Q_ARG, QSettings +from PyQt5.QtWidgets import QErrorMessage, qApp, QDialog import Globals import Utilities @@ -87,7 +87,7 @@ self.settings.setValue("MessageFilters", filters) -def messageHandler(msgType, message): +def messageHandler(msgType, context, message): """ Module function handling messages. @@ -113,8 +113,10 @@ message = message.replace("\r\n", "<br/>")\ .replace("\n", "<br/>")\ .replace("\r", "<br/>") - msg = "<p><b>{0}</b></p><p>{1}</p>".format( - messageType, Utilities.html_uencode(message)) + msg = "<p><b>{0}</b></p><p>{1}</p><p>File: {2}</p>" \ + "<p>Line: {3}</p><p>Function: {4}</p>".format( + messageType, Utilities.html_uencode(message), + context.file, context.line, context.function) if QThread.currentThread() == qApp.thread(): __msgHandlerDialog.showMessage(msg) else: @@ -144,7 +146,8 @@ "E5ErrorMessage", "Fatal Error") if isinstance(message, bytes): message = message.decode() - print("{0}: {1}".format(messageType, message)) + print("{0}: {1} in {2} at line {3} ({4})".format( + messageType, message, context.file, context.line, context.function)) def qtHandler(): @@ -159,7 +162,7 @@ if __msgHandlerDialog is None: # Install an E5ErrorMessage dialog as the global message handler. __msgHandlerDialog = E5ErrorMessage() - __origMsgHandler = qInstallMsgHandler(messageHandler) + __origMsgHandler = qInstallMessageHandler(messageHandler) return __msgHandlerDialog
--- a/E5Gui/E5ErrorMessageFilterDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ErrorMessageFilterDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \ - QInputDialog, QLineEdit +from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel +from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit from .Ui_E5ErrorMessageFilterDialog import Ui_E5ErrorMessageFilterDialog
--- a/E5Gui/E5FileDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5FileDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QFileDialog +from PyQt5.QtWidgets import QFileDialog import Globals @@ -60,7 +60,7 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog return QFileDialog.getOpenFileName(parent, caption, directory, - filter, options) + filter, "", options)[0] def getOpenFileNameAndFilter(parent=None, caption="", directory="", @@ -81,9 +81,8 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog newfilter = __reorderFilter(filter, initialFilter) - return QFileDialog.getOpenFileNameAndFilter(parent, caption, directory, - newfilter, initialFilter, - options) + return QFileDialog.getOpenFileName(parent, caption, directory, newfilter, + initialFilter, options) def getOpenFileNames(parent=None, caption="", directory="", @@ -101,7 +100,7 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog return QFileDialog.getOpenFileNames(parent, caption, directory, - filter, options) + filter, "", options)[0] def getOpenFileNamesAndFilter(parent=None, caption="", directory="", @@ -123,9 +122,8 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog newfilter = __reorderFilter(filter, initialFilter) - return QFileDialog.getOpenFileNamesAndFilter(parent, caption, directory, - newfilter, initialFilter, - options) + return QFileDialog.getOpenFileNames(parent, caption, directory, newfilter, + initialFilter, options) def getSaveFileName(parent=None, caption="", directory="", @@ -143,7 +141,7 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog return QFileDialog.getSaveFileName(parent, caption, directory, - filter, options) + filter, "", options)[0] def getSaveFileNameAndFilter(parent=None, caption="", directory="", @@ -164,9 +162,8 @@ if Globals.isLinuxPlatform(): options |= QFileDialog.DontUseNativeDialog newfilter = __reorderFilter(filter, initialFilter) - return QFileDialog.getSaveFileNameAndFilter(parent, caption, directory, - newfilter, initialFilter, - options) + return QFileDialog.getSaveFileName(parent, caption, directory, newfilter, + initialFilter, options) def getExistingDirectory(parent=None, caption="",
--- a/E5Gui/E5Led.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5Led.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QSize, QPoint -from PyQt4.QtGui import QWidget, QColor, QRadialGradient, QPalette, QPainter, \ - QBrush +from PyQt5.QtCore import pyqtSignal, Qt, QSize, QPoint +from PyQt5.QtGui import QColor, QRadialGradient, QPalette, QPainter, QBrush +from PyQt5.QtWidgets import QWidget E5LedRectangular = 0 E5LedCircular = 1 @@ -40,7 +40,7 @@ self.__led_on = True self.__dark_factor = 300 - self.__offcolor = color.dark(self.__dark_factor) + self.__offcolor = color.darker(self.__dark_factor) self.__led_color = color self.__framedLed = True self.__shape = shape @@ -83,13 +83,13 @@ wh = width / 2 color = self.__led_on and self.__led_color or self.__offcolor gradient = QRadialGradient(wh, wh, wh, 0.8 * wh, 0.8 * wh) - gradient.setColorAt(0.0, color.light(200)) + gradient.setColorAt(0.0, color.lighter(200)) gradient.setColorAt(0.6, color) if self.__framedLed: - gradient.setColorAt(0.9, color.dark()) + gradient.setColorAt(0.9, color.darker()) gradient.setColorAt(1.0, self.palette().color(QPalette.Dark)) else: - gradient.setColorAt(1.0, color.dark()) + gradient.setColorAt(1.0, color.darker()) # now do the drawing paint = QPainter(self) @@ -114,13 +114,13 @@ painter.setRenderHint(QPainter.Antialiasing, True) color = self.__led_on and self.__led_color or self.__offcolor - painter.setPen(color.light(200)) + painter.setPen(color.lighter(200)) painter.drawLine(left, 0, left, height - 1) painter.drawLine(left + 1, 0, right - 1, 0) if self.__framedLed: painter.setPen(self.palette().color(QPalette.Dark)) else: - painter.setPen(color.dark()) + painter.setPen(color.darker()) painter.drawLine(left + 1, height - 1, right - 1, height - 1) painter.drawLine(right - 1, 1, right - 1, height - 1) painter.fillRect(left + 1, 1, right - 2, height - 2, QBrush(color)) @@ -196,7 +196,7 @@ """ if self.__led_color != color: self.__led_color = color - self.__offcolor = color.dark(self.__dark_factor) + self.__offcolor = color.darker(self.__dark_factor) self.update() def setDarkFactor(self, darkfactor): @@ -207,7 +207,7 @@ """ if self.__dark_factor != darkfactor: self.__dark_factor = darkfactor - self.__offcolor = self.__led_color.dark(darkfactor) + self.__offcolor = self.__led_color.darker(darkfactor) self.update() def darkFactor(self):
--- a/E5Gui/E5LineEdit.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5LineEdit.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QEvent, qVersion -from PyQt4.QtGui import QLineEdit, QStyle, QPainter, QPalette, \ - QStyleOptionFrameV2, QWidget, QHBoxLayout, QBoxLayout, QLayout, \ - QApplication, QSpacerItem, QSizePolicy +from PyQt5.QtCore import pyqtSignal, Qt, QEvent, qVersion +from PyQt5.QtGui import QPainter, QPalette +from PyQt5.QtWidgets import QLineEdit, QStyle, QWidget, QHBoxLayout, \ + QBoxLayout, QLayout, QApplication, QSpacerItem, QSizePolicy, \ + QStyleOptionFrame import UI.PixmapCache @@ -152,7 +153,7 @@ if not self.text() and \ self.__inactiveText and \ not self.hasFocus(): - panel = QStyleOptionFrameV2() + panel = QStyleOptionFrame() self.initStyleOption(panel) textRect = self.style().subElementRect( QStyle.SE_LineEditContents, panel, self)
--- a/E5Gui/E5LineEditButton.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5LineEditButton.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QPoint, QPointF -from PyQt4.QtGui import QAbstractButton, QPainter, QPainterPath +from PyQt5.QtCore import Qt, QPoint, QPointF +from PyQt5.QtGui import QPainter, QPainterPath +from PyQt5.QtWidgets import QAbstractButton class E5LineEditButton(QAbstractButton):
--- a/E5Gui/E5ListView.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ListView.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QListView, QItemSelectionModel +from PyQt5.QtCore import Qt, QItemSelectionModel +from PyQt5.QtWidgets import QListView class E5ListView(QListView):
--- a/E5Gui/E5MainWindow.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5MainWindow.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMainWindow, QStyleFactory, QApplication +from PyQt5.QtWidgets import QMainWindow, QStyleFactory, QApplication from .E5Application import e5App from . import E5MessageBox
--- a/E5Gui/E5MapWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5MapWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QSize, QRect, QCoreApplication -from PyQt4.QtGui import QWidget, QAbstractScrollArea, QColor, QBrush, QPainter +from PyQt5.QtCore import Qt, QSize, QRect, QCoreApplication +from PyQt5.QtGui import QColor, QBrush, QPainter +from PyQt5.QtWidgets import QWidget, QAbstractScrollArea class E5MapWidget(QWidget):
--- a/E5Gui/E5MessageBox.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5MessageBox.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QMessageBox, QApplication +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QMessageBox, QApplication ############################################################################### ## Mappings to standard QMessageBox ##
--- a/E5Gui/E5ModelMenu.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ModelMenu.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint -from PyQt4.QtGui import QMenu, QFontMetrics, QAction, QApplication, QDrag, \ - QPixmap +from PyQt5.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint +from PyQt5.QtGui import QFontMetrics, QDrag, QPixmap +from PyQt5.QtWidgets import QMenu, QAction, QApplication import UI.PixmapCache
--- a/E5Gui/E5ModelToolBar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ModelToolBar.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint, QEvent -from PyQt4.QtGui import QApplication, QDrag, QPixmap, QToolBar, QIcon, \ - QToolButton +from PyQt5.QtCore import pyqtSignal, qVersion, Qt, QModelIndex, QPoint, QEvent +from PyQt5.QtGui import QDrag, QPixmap, QIcon +from PyQt5.QtWidgets import QApplication, QToolBar, QToolButton class E5ModelToolBar(QToolBar):
--- a/E5Gui/E5PassivePopup.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5PassivePopup.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect -from PyQt4.QtGui import QFrame, QVBoxLayout, QApplication +from PyQt5.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect +from PyQt5.QtWidgets import QFrame, QVBoxLayout, QApplication class E5PassivePopup(QFrame):
--- a/E5Gui/E5PasswordMeter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5PasswordMeter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QProgressBar +from PyQt5.QtWidgets import QProgressBar from Utilities.PasswordChecker import PasswordChecker @@ -94,7 +94,7 @@ if __name__ == "__main__": import sys - from PyQt4.QtGui import QApplication + from PyQt5.QtWidgets import QApplication app = QApplication(sys.argv) meter = E5PasswordMeter()
--- a/E5Gui/E5ProgressDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ProgressDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QProgressBar, QProgressDialog +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QProgressBar, QProgressDialog class E5ProgressDialog(QProgressDialog):
--- a/E5Gui/E5SideBar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5SideBar.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QEvent, QSize, Qt, QByteArray, QDataStream, \ +from PyQt5.QtCore import QEvent, QSize, Qt, QByteArray, QDataStream, \ QIODevice, QTimer -from PyQt4.QtGui import QTabBar, QWidget, QStackedWidget, QBoxLayout, \ +from PyQt5.QtWidgets import QTabBar, QWidget, QStackedWidget, QBoxLayout, \ QToolButton, QSizePolicy from E5Gui.E5Application import e5App
--- a/E5Gui/E5SqueezeLabels.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5SqueezeLabels.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QLabel +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QLabel from Utilities import compactPath
--- a/E5Gui/E5TabWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5TabWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal -from PyQt4.QtGui import QTabWidget, QTabBar, QApplication, QDrag, QStyle, \ - QLabel, QMovie +from PyQt5.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal +from PyQt5.QtGui import QDrag, QMovie +from PyQt5.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle, QLabel class E5WheelTabBar(QTabBar): @@ -35,7 +35,7 @@ @param event reference to the wheel event (QWheelEvent) """ try: - if event.delta() > 0: + if event.angleDelta().y() > 0: self._tabWidget.prevTab() else: self._tabWidget.nextTab()
--- a/E5Gui/E5TableView.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5TableView.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QTableView, QItemSelectionModel +from PyQt5.QtCore import Qt, QItemSelectionModel +from PyQt5.QtWidgets import QTableView class E5TableView(QTableView):
--- a/E5Gui/E5TextSpinBox.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5TextSpinBox.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QSpinBox +from PyQt5.QtWidgets import QSpinBox class E5TextSpinBox(QSpinBox):
--- a/E5Gui/E5ToolBarDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ToolBarDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, QColor, \ +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ QInputDialog, QLineEdit, QListWidgetItem, QAbstractButton from E5Gui import E5MessageBox
--- a/E5Gui/E5ToolBarManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ToolBarManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, QByteArray, QDataStream, QIODevice -from PyQt4.QtGui import QToolBar +from PyQt5.QtCore import QObject, QByteArray, QDataStream, QIODevice +from PyQt5.QtWidgets import QToolBar import Utilities
--- a/E5Gui/E5ToolBox.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ToolBox.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QToolBox, QTabWidget +from PyQt5.QtWidgets import QToolBox, QTabWidget from .E5TabWidget import E5TabWidget
--- a/E5Gui/E5TreeSortFilterProxyModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5TreeSortFilterProxyModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QModelIndex -from PyQt4.QtGui import QSortFilterProxyModel +from PyQt5.QtCore import Qt, QModelIndex, QSortFilterProxyModel class E5TreeSortFilterProxyModel(QSortFilterProxyModel):
--- a/E5Gui/E5TreeView.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5TreeView.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QTreeView +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QTreeView class E5TreeView(QTreeView):
--- a/E5Gui/E5TreeWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5TreeWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt -from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QAbstractItemView +from PyQt5.QtCore import pyqtSignal, Qt +from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView class E5TreeWidget(QTreeWidget):
--- a/E5Gui/E5ZoomWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Gui/E5ZoomWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, pyqtSignal -from PyQt4.QtGui import QWidget +from PyQt5.QtCore import pyqtSlot, pyqtSignal +from PyQt5.QtWidgets import QWidget from .Ui_E5ZoomWidget import Ui_E5ZoomWidget
--- a/E5Network/E5NetworkHeaderDetailsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5NetworkHeaderDetailsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_E5NetworkHeaderDetailsDialog import Ui_E5NetworkHeaderDetailsDialog
--- a/E5Network/E5NetworkMonitor.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5NetworkMonitor.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl -from PyQt4.QtGui import QDialog, QStandardItemModel, QSortFilterProxyModel -from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager +from PyQt5.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl, \ + QSortFilterProxyModel +from PyQt5.QtGui import QStandardItemModel +from PyQt5.QtWidgets import QDialog +from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager from .Ui_E5NetworkMonitor import Ui_E5NetworkMonitor
--- a/E5Network/E5NetworkProxyFactory.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5NetworkProxyFactory.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ import os -from PyQt4.QtCore import QUrl, QCoreApplication -from PyQt4.QtGui import QDialog -from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkProxy, \ +from PyQt5.QtCore import QUrl, QCoreApplication +from PyQt5.QtWidgets import QDialog +from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkProxy, \ QNetworkProxyQuery from E5Gui import E5MessageBox
--- a/E5Network/E5SslCertificatesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5SslCertificatesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,11 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt, QByteArray, QFile, QFileInfo, \ +from PyQt5.QtCore import pyqtSlot, Qt, QByteArray, QFile, QFileInfo, \ QIODevice, qVersion -from PyQt4.QtGui import QDialog, QTreeWidgetItem +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem try: - from PyQt4.QtNetwork import QSslCertificate, QSslSocket, \ + from PyQt5.QtNetwork import QSslCertificate, QSslSocket, \ QSslConfiguration, QSsl except ImportError: pass
--- a/E5Network/E5SslCertificatesInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5SslCertificatesInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_E5SslCertificatesInfoDialog import Ui_E5SslCertificatesInfoDialog
--- a/E5Network/E5SslCertificatesInfoWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5SslCertificatesInfoWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,9 @@ except NameError: pass -from PyQt4.QtCore import pyqtSlot, QCryptographicHash, QDateTime, qVersion -from PyQt4.QtGui import QWidget -from PyQt4.QtNetwork import QSslCertificate +from PyQt5.QtCore import pyqtSlot, QCryptographicHash, QDateTime, qVersion +from PyQt5.QtWidgets import QWidget +from PyQt5.QtNetwork import QSslCertificate from .Ui_E5SslCertificatesInfoWidget import Ui_E5SslCertificatesInfoWidget
--- a/E5Network/E5SslErrorHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5SslErrorHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import qVersion, QObject, QByteArray -from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \ +from PyQt5.QtCore import qVersion, QObject, QByteArray +from PyQt5.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \ QSslError, QSsl from E5Gui import E5MessageBox
--- a/E5Network/E5SslInfoWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5SslInfoWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import qVersion, Qt, QUrl, QPoint -from PyQt4.QtGui import QMenu, QGridLayout, QLabel, QSizePolicy -from PyQt4.QtNetwork import QSsl, QSslConfiguration, QSslCertificate +from PyQt5.QtCore import qVersion, Qt, QUrl, QPoint +from PyQt5.QtWidgets import QMenu, QGridLayout, QLabel, QSizePolicy +from PyQt5.QtNetwork import QSsl, QSslConfiguration, QSslCertificate import UI.PixmapCache import Utilities
--- a/E5Network/E5UrlInfo.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5Network/E5UrlInfo.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDateTime +from PyQt5.QtCore import QDateTime class E5UrlInfo(object):
--- a/E5XML/HighlightingStylesReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5XML/HighlightingStylesReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QColor, QFont +from PyQt5.QtGui import QColor, QFont from .Config import highlightingStylesFileFormatVersion from .XMLStreamReaderBase import XMLStreamReaderBase
--- a/E5XML/MultiProjectReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5XML/MultiProjectReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -84,7 +84,7 @@ project["uid"] = uid else: # upgrade from pre 5.1 format - from PyQt4.QtCore import QUuid + from PyQt5.QtCore import QUuid project["uid"] = QUuid.createUuid().toString() while not self.atEnd():
--- a/E5XML/XMLStreamReaderBase.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5XML/XMLStreamReaderBase.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import pickle import base64 -from PyQt4.QtCore import QXmlStreamReader, QCoreApplication +from PyQt5.QtCore import QXmlStreamReader, QCoreApplication from E5Gui import E5MessageBox
--- a/E5XML/XMLStreamWriterBase.py Sun Jun 29 14:00:30 2014 +0200 +++ b/E5XML/XMLStreamWriterBase.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,7 +17,7 @@ import pickle import base64 -from PyQt4.QtCore import QXmlStreamWriter +from PyQt5.QtCore import QXmlStreamWriter class XMLStreamWriterBase(QXmlStreamWriter):
--- a/Globals/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Globals/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import sys import os -from PyQt4.QtCore import QDir, QLibraryInfo +from PyQt5.QtCore import QDir, QLibraryInfo # names of the various settings objects settingsNameOrganization = "Eric5" @@ -89,20 +89,20 @@ pass # check version of PyQt - from PyQt4.QtCore import PYQT_VERSION_STR + from PyQt5.QtCore import PYQT_VERSION_STR pyqtVersion = PYQT_VERSION_STR # always assume, that snapshots are good if "snapshot" not in pyqtVersion: # check for blacklisted versions - for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]: + for vers in BlackLists["PyQt5"] + PlatformBlackLists["PyQt5"]: if vers == pyqtVersion: - print('Sorry, PyQt4 version {0} is not compatible with eric5.' + print('Sorry, PyQt5 version {0} is not compatible with eric5.' .format(vers)) print('Please install another version.') return False # check version of QScintilla - from PyQt4.Qsci import QSCINTILLA_VERSION_STR + from PyQt5.Qsci import QSCINTILLA_VERSION_STR scintillaVersion = QSCINTILLA_VERSION_STR # always assume, that snapshots are new enough if "snapshot" not in scintillaVersion: @@ -160,14 +160,14 @@ return distutils.sysconfig.get_python_lib(True) -def getPyQt4ModulesDirectory(): +def getPyQt5ModulesDirectory(): """ - Function to determine the path to PyQt4's modules directory. + Function to determine the path to PyQt5's modules directory. - @return path to the PyQt4 modules directory (string) + @return path to the PyQt5 modules directory (string) """ import distutils.sysconfig - return os.path.join(distutils.sysconfig.get_python_lib(True), "PyQt4") + return os.path.join(distutils.sysconfig.get_python_lib(True), "PyQt5") def getQtBinariesPath(): @@ -178,8 +178,8 @@ """ path = "" if isWindowsPlatform(): - # check for PyQt4 installer first (designer is test object) - modDir = getPyQt4ModulesDirectory() + # check for PyQt5 installer first (designer is test object) + modDir = getPyQt5ModulesDirectory() if os.path.exists(os.path.join(modDir, "bin", "designer.exe")): path = os.path.join(modDir, "bin") elif os.path.exists(os.path.join(modDir, "designer.exe")):
--- a/Graphics/ApplicationDiagramBuilder.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/ApplicationDiagramBuilder.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import os import glob -from PyQt4.QtGui import QApplication +from PyQt5.QtWidgets import QApplication from E5Gui import E5MessageBox from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/Graphics/AssociationItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/AssociationItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QPointF, QRectF, QLineF -from PyQt4.QtGui import QGraphicsItem +from PyQt5.QtCore import QPointF, QRectF, QLineF +from PyQt5.QtWidgets import QGraphicsItem from E5Graphics.E5ArrowItem import E5ArrowItem, NormalArrow, WideArrow
--- a/Graphics/ClassItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/ClassItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle +from PyQt5.QtGui import QFont +from PyQt5.QtWidgets import QGraphicsSimpleTextItem, QStyle from .UMLItem import UMLModel, UMLItem
--- a/Graphics/ImportsDiagramBuilder.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/ImportsDiagramBuilder.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import glob import os -from PyQt4.QtGui import QApplication, QGraphicsTextItem +from PyQt5.QtWidgets import QApplication, QGraphicsTextItem from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/Graphics/ModuleItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/ModuleItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle +from PyQt5.QtGui import QFont +from PyQt5.QtWidgets import QGraphicsSimpleTextItem, QStyle from .UMLItem import UMLModel, UMLItem
--- a/Graphics/PackageDiagramBuilder.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/PackageDiagramBuilder.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,7 +16,7 @@ except ImportError: from itertools import izip_longest as zip_longest # __IGNORE_WARNING__ -from PyQt4.QtGui import QApplication, QGraphicsTextItem +from PyQt5.QtWidgets import QApplication, QGraphicsTextItem from E5Gui.E5ProgressDialog import E5ProgressDialog @@ -202,7 +202,8 @@ initlist = glob.glob(os.path.join(self.package, '__init__.*')) if len(initlist) == 0: - ct = QGraphicsTextItem(None, self.scene) + ct = QGraphicsTextItem(None) + self.scene.addItem(ct) ct.setHtml( self.tr("The directory <b>'{0}'</b> is not a package.") .format(self.package)) @@ -210,7 +211,8 @@ modules = self.__buildModulesDict() if not modules: - ct = QGraphicsTextItem(None, self.scene) + ct = QGraphicsTextItem(None) + self.scene.addItem(ct) ct.setHtml( self.tr( "The package <b>'{0}'</b> does not contain any modules.") @@ -226,7 +228,8 @@ classesFound = True self.__addLocalClass(cls, module.classes[cls], 0, 0) if not classesFound: - ct = QGraphicsTextItem(None, self.scene) + ct = QGraphicsTextItem(None) + self.scene.addItem(ct) ct.setHtml( self.tr( "The package <b>'{0}'</b> does not contain any classes.")
--- a/Graphics/PackageItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/PackageItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QFont, QGraphicsSimpleTextItem, QStyle +from PyQt5.QtGui import QFont +from PyQt5.QtWidgets import QGraphicsSimpleTextItem, QStyle from .UMLItem import UMLModel, UMLItem
--- a/Graphics/PixmapDiagram.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/PixmapDiagram.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QSize, QEvent -from PyQt4.QtGui import QLabel, QPalette, QSizePolicy, QScrollArea, QAction, \ - QMenu, QToolBar, QImage, QPixmap, QPrinter, QPrintDialog, QPainter, \ - QFont, QColor +from PyQt5.QtCore import Qt, QSize, QEvent +from PyQt5.QtGui import QPalette, QImage, QPixmap, QPainter, QFont, QColor +from PyQt5.QtWidgets import QLabel, QSizePolicy, QScrollArea, QAction, QMenu, \ + QToolBar +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog from E5Gui import E5MessageBox from E5Gui.E5MainWindow import E5MainWindow @@ -186,7 +187,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.__zoomOut() else: self.__zoomIn() @@ -325,7 +326,7 @@ """ Private slot called to show a print preview of the diagram. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True)
--- a/Graphics/SvgDiagram.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/SvgDiagram.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QSize, QEvent -from PyQt4.QtGui import QPalette, QSizePolicy, QScrollArea, QAction, QMenu, \ - QToolBar, QPrinter, QPrintDialog, QPainter, QFont, QColor -from PyQt4.QtSvg import QSvgWidget +from PyQt5.QtCore import Qt, QSize, QEvent +from PyQt5.QtGui import QPalette, QPainter, QFont, QColor +from PyQt5.QtWidgets import QSizePolicy, QScrollArea, QAction, QMenu, QToolBar +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog +from PyQt5.QtSvg import QSvgWidget from E5Gui.E5MainWindow import E5MainWindow from E5Gui.E5ZoomWidget import E5ZoomWidget @@ -156,7 +157,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.__zoomOut() else: self.__zoomIn() @@ -295,7 +296,7 @@ """ Private slot called to show a print preview of the diagram. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True)
--- a/Graphics/UMLClassDiagramBuilder.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/UMLClassDiagramBuilder.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,7 +13,7 @@ except ImportError: from itertools import izip_longest as zip_longest # __IGNORE_WARNING__ -from PyQt4.QtGui import QGraphicsTextItem +from PyQt5.QtWidgets import QGraphicsTextItem import Utilities import Preferences
--- a/Graphics/UMLDiagramBuilder.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/UMLDiagramBuilder.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class UMLDiagramBuilder(QObject):
--- a/Graphics/UMLDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/UMLDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt, QFileInfo -from PyQt4.QtGui import QAction, QToolBar, QGraphicsScene +from PyQt5.QtCore import pyqtSlot, Qt, QFileInfo +from PyQt5.QtWidgets import QAction, QToolBar, QGraphicsScene from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5MainWindow import E5MainWindow
--- a/Graphics/UMLGraphicsView.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/UMLGraphicsView.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, \ +from PyQt5.QtCore import pyqtSignal, Qt, QSignalMapper, QFileInfo, QEvent, \ QRectF -from PyQt4.QtGui import QGraphicsView, QAction, QToolBar, QDialog, QPrinter, \ - QPrintDialog +from PyQt5.QtWidgets import QGraphicsView, QAction, QToolBar, QDialog +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog from E5Graphics.E5GraphicsView import E5GraphicsView @@ -431,7 +431,7 @@ """ Public slot called to show a print preview of the diagram. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog printer = QPrinter(mode=QPrinter.ScreenResolution) printer.setFullPage(True) @@ -601,7 +601,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.zoomOut() else: self.zoomIn()
--- a/Graphics/UMLItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/UMLItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QSizeF -from PyQt4.QtGui import QGraphicsItem, QGraphicsRectItem, QStyle +from PyQt5.QtCore import Qt, QSizeF +from PyQt5.QtWidgets import QGraphicsItem, QGraphicsRectItem, QStyle import Preferences
--- a/Graphics/UMLSceneSizeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Graphics/UMLSceneSizeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_UMLSceneSizeDialog import Ui_UMLSceneSizeDialog
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QUrl -from PyQt4.QtNetwork import QNetworkAccessManager +from PyQt5.QtCore import QUrl +from PyQt5.QtNetwork import QNetworkAccessManager from E5Gui import E5MessageBox
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTimer -from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager +from PyQt5.QtCore import QTimer +from PyQt5.QtNetwork import QNetworkReply, QNetworkAccessManager class AdBlockBlockedNetworkReply(QNetworkReply):
--- a/Helpviewer/AdBlock/AdBlockDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QMenu, QToolButton +from PyQt5.QtCore import pyqtSlot, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QMenu, QToolButton from E5Gui import E5MessageBox
--- a/Helpviewer/AdBlock/AdBlockExceptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockExceptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_AdBlockExceptionsDialog import Ui_AdBlockExceptionsDialog
--- a/Helpviewer/AdBlock/AdBlockIcon.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockIcon.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QAction, QMenu +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QAction, QMenu from E5Gui.E5ClickableLabel import E5ClickableLabel
--- a/Helpviewer/AdBlock/AdBlockManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile +from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QFile from .AdBlockSubscription import AdBlockSubscription
--- a/Helpviewer/AdBlock/AdBlockNetwork.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockNetwork.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, QUrl -from PyQt4.QtNetwork import QNetworkRequest +from PyQt5.QtCore import QObject, QUrl +from PyQt5.QtNetwork import QNetworkRequest from .AdBlockBlockedNetworkReply import AdBlockBlockedNetworkReply
--- a/Helpviewer/AdBlock/AdBlockPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, QUrl +from PyQt5.QtCore import QObject, QUrl class AdBlockPage(QObject):
--- a/Helpviewer/AdBlock/AdBlockRule.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockRule.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import re -from PyQt4.QtCore import Qt, QRegExp, QUrl, qVersion -from PyQt4.QtNetwork import QNetworkRequest +from PyQt5.QtCore import Qt, QRegExp, QUrl, qVersion +from PyQt5.QtNetwork import QNetworkRequest # Qt version < 4.8 has an issue; it will wrongly
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,9 @@ import hashlib import base64 -from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, \ +from PyQt5.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, \ QUrl, QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime -from PyQt4.QtNetwork import QNetworkReply +from PyQt5.QtNetwork import QNetworkReply from E5Gui import E5MessageBox
--- a/Helpviewer/AdBlock/AdBlockTreeWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockTreeWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QAbstractItemView, QFont, QTreeWidgetItem, \ - QInputDialog, QLineEdit, QMenu, QApplication, QColor +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QFont, QColor +from PyQt5.QtWidgets import QAbstractItemView, QTreeWidgetItem, QInputDialog, \ + QLineEdit, QMenu, QApplication from E5Gui.E5TreeWidget import E5TreeWidget
--- a/Helpviewer/Bookmarks/AddBookmarkDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/AddBookmarkDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QModelIndex -from PyQt4.QtGui import QSortFilterProxyModel, QDialog, QTreeView +from PyQt5.QtCore import QModelIndex, QSortFilterProxyModel +from PyQt5.QtWidgets import QDialog, QTreeView from .Ui_AddBookmarkDialog import Ui_AddBookmarkDialog
--- a/Helpviewer/Bookmarks/BookmarkNode.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarkNode.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDateTime +from PyQt5.QtCore import QDateTime class BookmarkNode(object):
--- a/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarkPropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_BookmarkPropertiesDialog import Ui_BookmarkPropertiesDialog
--- a/Helpviewer/Bookmarks/BookmarksDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QModelIndex -from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication +from PyQt5.QtCore import pyqtSignal, Qt, QUrl, QModelIndex +from PyQt5.QtGui import QFontMetrics, QCursor +from PyQt5.QtWidgets import QDialog, QMenu, QApplication from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/Helpviewer/Bookmarks/BookmarksImportDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImportDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt, QSize -from PyQt4.QtGui import QDialog, QListWidgetItem +from PyQt5.QtCore import pyqtSlot, Qt, QSize +from PyQt5.QtWidgets import QDialog, QListWidgetItem from E5Gui import E5FileDialog, E5MessageBox
--- a/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/BookmarksImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class BookmarksImporter(QObject):
--- a/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/ChromeImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import os import json -from PyQt4.QtCore import QCoreApplication, QDate, Qt +from PyQt5.QtCore import QCoreApplication, QDate, Qt from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/FirefoxImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import os import sqlite3 -from PyQt4.QtCore import QCoreApplication, QDate, Qt, QUrl +from PyQt5.QtCore import QCoreApplication, QDate, Qt, QUrl from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/HtmlImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QCoreApplication, QDate, Qt +from PyQt5.QtCore import QCoreApplication, QDate, Qt from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/IExplorerImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QCoreApplication, QDate, Qt +from PyQt5.QtCore import QCoreApplication, QDate, Qt from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/OperaImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QCoreApplication, QDate, Qt +from PyQt5.QtCore import QCoreApplication, QDate, Qt from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/SafariImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QCoreApplication, QDate, Qt +from PyQt5.QtCore import QCoreApplication, QDate, Qt from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt +from PyQt5.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt from .BookmarksImporter import BookmarksImporter
--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QCoreApplication +from PyQt5.QtCore import QCoreApplication import UI.PixmapCache import Globals
--- a/Helpviewer/Bookmarks/BookmarksManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,10 @@ import os -from PyQt4.QtCore import pyqtSignal, Qt, QT_TRANSLATE_NOOP, QObject, QFile, \ - QIODevice, QXmlStreamReader, QDate, QDateTime, QFileInfo, QUrl -from PyQt4.QtGui import QUndoStack, QUndoCommand, QApplication, QDialog +from PyQt5.QtCore import pyqtSignal, Qt, QT_TRANSLATE_NOOP, QObject, QFile, \ + QIODevice, QXmlStreamReader, QDate, QDateTime, QFileInfo, QUrl, \ + QCoreApplication +from PyQt5.QtWidgets import QUndoStack, QUndoCommand, QDialog from E5Gui import E5MessageBox, E5FileDialog @@ -531,7 +532,7 @@ @param row row number of bookmark (integer) """ super(RemoveBookmarksCommand, self).__init__( - QApplication.translate("BookmarksManager", "Remove Bookmark")) + QCoreApplication.translate("BookmarksManager", "Remove Bookmark")) self._row = row self._bookmarksManager = bookmarksManager @@ -572,7 +573,7 @@ @param row row number of bookmark (integer) """ RemoveBookmarksCommand.__init__(self, bookmarksManager, parent, row) - self.setText(QApplication.translate( + self.setText(QCoreApplication.translate( "BookmarksManager", "Insert Bookmark")) self._node = node @@ -613,11 +614,11 @@ if self._title: self._oldValue = self._node.title - self.setText(QApplication.translate( + self.setText(QCoreApplication.translate( "BookmarksManager", "Name Change")) else: self._oldValue = self._node.url - self.setText(QApplication.translate( + self.setText(QCoreApplication.translate( "BookmarksManager", "Address Change")) def undo(self):
--- a/Helpviewer/Bookmarks/BookmarksMenu.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QUrl -from PyQt4.QtGui import QMenu, QCursor +from PyQt5.QtCore import pyqtSignal, Qt, QUrl +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QMenu from E5Gui.E5ModelMenu import E5ModelMenu
--- a/Helpviewer/Bookmarks/BookmarksModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QAbstractItemModel, QModelIndex, QUrl, \ +from PyQt5.QtCore import Qt, QAbstractItemModel, QModelIndex, QUrl, \ QByteArray, QDataStream, QIODevice, QBuffer, QMimeData import UI.PixmapCache
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksToolBar.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QUrl -from PyQt4.QtGui import QMenu, QApplication, QCursor -from PyQt4.QtWebKit import QWebPage +from PyQt5.QtCore import pyqtSignal, Qt, QUrl, QCoreApplication +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QMenu +from PyQt5.QtWebKitWidgets import QWebPage from E5Gui.E5ModelToolBar import E5ModelToolBar @@ -39,7 +40,7 @@ @param parent reference to the parent widget (QWidget) """ E5ModelToolBar.__init__( - self, QApplication.translate("BookmarksToolBar", "Bookmarks"), + self, QCoreApplication.translate("BookmarksToolBar", "Bookmarks"), parent) self.__mw = mainWindow
--- a/Helpviewer/Bookmarks/DefaultBookmarks_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/DefaultBookmarks_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,14 +2,12 @@ # Resource object code # -# Created: So. Okt 13 16:21:52 2013 -# by: The Resource Compiler for PyQt (Qt v4.8.5) +# Created: So. Juni 29 18:58:07 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from __future__ import unicode_literals - -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ \x00\x00\x01\xf3\
--- a/Helpviewer/Bookmarks/NsHtmlReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/NsHtmlReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,7 +13,7 @@ except NameError: pass -from PyQt4.QtCore import QObject, QIODevice, QFile, QRegExp, Qt, QDateTime +from PyQt5.QtCore import QObject, QIODevice, QFile, QRegExp, Qt, QDateTime from .BookmarkNode import BookmarkNode
--- a/Helpviewer/Bookmarks/NsHtmlWriter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/NsHtmlWriter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, QIODevice, QFile +from PyQt5.QtCore import QObject, QIODevice, QFile from .BookmarkNode import BookmarkNode
--- a/Helpviewer/Bookmarks/XbelReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/XbelReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamReader, QXmlStreamEntityResolver, \ +from PyQt5.QtCore import QXmlStreamReader, QXmlStreamEntityResolver, \ QIODevice, QFile, QCoreApplication, QXmlStreamNamespaceDeclaration, \ QDateTime, Qt
--- a/Helpviewer/Bookmarks/XbelWriter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Bookmarks/XbelWriter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt +from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt from .BookmarkNode import BookmarkNode
--- a/Helpviewer/ClosedTabsManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/ClosedTabsManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QUrl, QObject -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import pyqtSignal, QUrl, QObject +from PyQt5.QtWebKit import QWebSettings class ClosedTab(object):
--- a/Helpviewer/CookieJar/CookieDetailsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookieDetailsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_CookieDetailsDialog import Ui_CookieDetailsDialog
--- a/Helpviewer/CookieJar/CookieExceptionsModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookieExceptionsModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex -from PyQt4.QtGui import QFont, QFontMetrics +from PyQt5.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex +from PyQt5.QtGui import QFont, QFontMetrics class CookieExceptionsModel(QAbstractTableModel): @@ -227,4 +227,5 @@ if otherRule in removeList2: removeList2.remove(otherRule) - self.reset() + self.beginResetModel() + self.endResetModel()
--- a/Helpviewer/CookieJar/CookieJar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookieJar.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,10 @@ import os -from PyQt4.QtCore import pyqtSignal, QByteArray, QDataStream, QIODevice, \ +from PyQt5.QtCore import pyqtSignal, QByteArray, QDataStream, QIODevice, \ QSettings, QDateTime -from PyQt4.QtNetwork import QNetworkCookieJar, QNetworkCookie -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtNetwork import QNetworkCookieJar, QNetworkCookie +from PyQt5.QtWebKit import QWebSettings from Utilities.AutoSaver import AutoSaver import Utilities
--- a/Helpviewer/CookieJar/CookieModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookieModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex -from PyQt4.QtGui import QFont, QFontMetrics +from PyQt5.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex +from PyQt5.QtGui import QFont, QFontMetrics class CookieModel(QAbstractTableModel): @@ -148,4 +148,5 @@ """ Private slot handling changes of the cookies list in the cookie jar. """ - self.reset() + self.beginResetModel() + self.endResetModel()
--- a/Helpviewer/CookieJar/CookiesConfigurationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookiesConfigurationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .CookieJar import CookieJar
--- a/Helpviewer/CookieJar/CookiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt, QDateTime, QByteArray -from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel +from PyQt5.QtCore import pyqtSlot, Qt, QDateTime, QByteArray, \ + QSortFilterProxyModel +from PyQt5.QtGui import QFont, QFontMetrics +from PyQt5.QtWidgets import QDialog from .CookieModel import CookieModel
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QSortFilterProxyModel, QCompleter, QFont, \ - QFontMetrics +from PyQt5.QtCore import pyqtSlot, QSortFilterProxyModel +from PyQt5.QtGui import QFont, QFontMetrics +from PyQt5.QtWidgets import QDialog, QCompleter from .CookieExceptionsModel import CookieExceptionsModel from .CookieModel import CookieModel
--- a/Helpviewer/Download/DownloadAskActionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Download/DownloadAskActionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_DownloadAskActionDialog import Ui_DownloadAskActionDialog
--- a/Helpviewer/Download/DownloadItem.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Download/DownloadItem.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,10 +13,11 @@ except NameError: pass -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, \ +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, \ QUrl, QIODevice, QCryptographicHash -from PyQt4.QtGui import QWidget, QPalette, QStyle, QDesktopServices, QDialog -from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply +from PyQt5.QtGui import QPalette, QDesktopServices +from PyQt5.QtWidgets import QWidget, QStyle, QDialog +from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply from E5Gui import E5FileDialog
--- a/Helpviewer/Download/DownloadManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Download/DownloadManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -6,11 +6,12 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt, QModelIndex, QFileInfo -from PyQt4.QtGui import QDialog, QStyle, QFileIconProvider, QMenu, QCursor, \ +from PyQt5.QtCore import pyqtSlot, Qt, QModelIndex, QFileInfo +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QDialog, QStyle, QFileIconProvider, QMenu, \ QApplication -from PyQt4.QtNetwork import QNetworkRequest -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtNetwork import QNetworkRequest +from PyQt5.QtWebKit import QWebSettings from E5Gui import E5MessageBox
--- a/Helpviewer/Download/DownloadModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Download/DownloadModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl +from PyQt5.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl class DownloadModel(QAbstractListModel):
--- a/Helpviewer/Download/DownloadUtilities.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Download/DownloadUtilities.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QCoreApplication +from PyQt5.QtCore import QCoreApplication def timeString(timeRemaining): @@ -25,12 +25,12 @@ remaining = QCoreApplication.translate( "DownloadUtilities", "%n:{0:02} minutes remaining""", "", - QCoreApplication.UnicodeUTF8, minutes).format(seconds) + QCoreApplication, minutes).format(seconds) else: seconds = int(timeRemaining) remaining = QCoreApplication.translate( "DownloadUtilities", - "%n seconds remaining", "", QCoreApplication.UnicodeUTF8, seconds) + "%n seconds remaining", "", QCoreApplication, seconds) return remaining
--- a/Helpviewer/Feeds/FeedEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Feeds/FeedEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QUrl -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QUrl +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_FeedEditDialog import Ui_FeedEditDialog
--- a/Helpviewer/Feeds/FeedsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Feeds/FeedsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QUrl -from PyQt4.QtGui import QDialog, QPushButton, QLabel +from PyQt5.QtCore import QUrl +from PyQt5.QtWidgets import QDialog, QPushButton, QLabel from E5Gui import E5MessageBox
--- a/Helpviewer/Feeds/FeedsManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Feeds/FeedsManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,11 +13,11 @@ except NameError: pass -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader -from PyQt4.QtGui import QDialog, QIcon, QTreeWidgetItem, QMenu, QCursor, \ - QApplication -from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader +from PyQt5.QtGui import QIcon, QCursor +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QMenu, QApplication +from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply +from PyQt5.QtWebKit import QWebSettings from E5Gui import E5MessageBox
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QDir, QFile -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot, QDir, QFile +from PyQt5.QtWidgets import QDialog from E5Gui import E5MessageBox
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt, QUrl -from PyQt4.QtGui import QDialog, QListWidgetItem, QDesktopServices +from PyQt5.QtCore import pyqtSlot, Qt, QUrl +from PyQt5.QtGui import QDesktopServices +from PyQt5.QtWidgets import QDialog, QListWidgetItem from E5Gui import E5MessageBox
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,9 +10,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QSize, QRect -from PyQt4.QtGui import QStyle, QStyledItemDelegate, QApplication, \ - QFontMetrics, QPalette, QFont, QStyleOptionViewItemV4 +from PyQt5.QtCore import Qt, QSize, QRect +from PyQt5.QtGui import QFontMetrics, QPalette, QFont, QStyleOptionViewItemV4 +from PyQt5.QtWidgets import QStyle, QStyledItemDelegate, QApplication import UI.PixmapCache import Globals
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QRect -from PyQt4.QtGui import QListWidget, QListWidgetItem +from PyQt5.QtCore import pyqtSignal, QRect +from PyQt5.QtWidgets import QListWidget, QListWidgetItem from .GreaseMonkeyConfigurationListDelegate import \ GreaseMonkeyConfigurationListDelegate
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_GreaseMonkeyConfigurationScriptInfoDialog import \ Ui_GreaseMonkeyConfigurationScriptInfoDialog
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QSettings, QRegExp, QUrl -from PyQt4.QtGui import QDialog -from PyQt4.QtNetwork import QNetworkReply +from PyQt5.QtCore import pyqtSignal, QObject, QSettings, QRegExp, QUrl +from PyQt5.QtWidgets import QDialog +from PyQt5.QtNetwork import QNetworkReply from E5Gui import E5MessageBox
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QTimer, QFile, QDir, QSettings, \ +from PyQt5.QtCore import pyqtSignal, QObject, QTimer, QFile, QDir, QSettings, \ QUrl, QByteArray -from PyQt4.QtNetwork import QNetworkAccessManager +from PyQt5.QtNetwork import QNetworkAccessManager import Utilities import Preferences
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyScript.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QUrl, QRegExp +from PyQt5.QtCore import QUrl, QRegExp from .GreaseMonkeyUrlMatcher import GreaseMonkeyUrlMatcher
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyUrlMatcher.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import re -from PyQt4.QtCore import Qt, QRegExp +from PyQt5.QtCore import Qt, QRegExp def wildcardMatch(string, pattern):
--- a/Helpviewer/HelpBrowserWV.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,18 +14,21 @@ except NameError: pass -from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, \ +from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, \ QUrl, QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile, \ QPoint, QByteArray, qVersion -from PyQt4.QtGui import qApp, QDesktopServices, QStyle, QMenu, QApplication, \ - QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, \ - QColor, QPalette, QFrame, QPrinter, QPrintDialog, QDialog -from PyQt4.QtWebKit import QWebView, QWebPage, QWebSettings +from PyQt5.QtGui import QDesktopServices, QClipboard, QMouseEvent, QColor, \ + QPalette +from PyQt5.QtWidgets import qApp, QStyle, QMenu, QApplication, QInputDialog, \ + QLineEdit, QLabel, QToolTip, QFrame, QDialog +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog +from PyQt5.QtWebKit import QWebSettings +from PyQt5.QtWebKitWidgets import QWebView, QWebPage try: - from PyQt4.QtWebKit import QWebElement + from PyQt5.QtWebKit import QWebElement except ImportError: pass -from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest +from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest import sip from E5Gui import E5MessageBox, E5FileDialog @@ -34,7 +37,7 @@ import UI.PixmapCache try: - from PyQt4.QtNetwork import QSslCertificate + from PyQt5.QtNetwork import QSslCertificate SSL_AVAILABLE = True except ImportError: SSL_AVAILABLE = False @@ -1703,7 +1706,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.zoomOut() else: self.zoomIn() @@ -1711,7 +1714,7 @@ return if evt.modifiers() & Qt.ShiftModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.backward() else: self.forward() @@ -2330,13 +2333,13 @@ self.tr("eric5 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" - """ PyQt4. Please upgrade.</p>""")) + """ PyQt5. Please upgrade.</p>""")) def __printPreviewClickedFrame(self): """ Private slot to show a print preview of the clicked frame. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog printer = QPrinter(mode=QPrinter.HighResolution) if Preferences.getPrinter("ColorMode"): @@ -2375,7 +2378,7 @@ self, self.tr("eric5 Web Browser"), self.tr( - """<p>Printing is not available due to a bug in PyQt4.""" + """<p>Printing is not available due to a bug in PyQt5.""" """Please upgrade.</p>""")) return @@ -2408,7 +2411,7 @@ self.tr("eric5 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" - """ PyQt4. Please upgrade.</p>""")) + """ PyQt5. Please upgrade.</p>""")) return def __zoomInClickedFrame(self):
--- a/Helpviewer/HelpClearPrivateDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpClearPrivateDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_HelpClearPrivateDataDialog import Ui_HelpClearPrivateDataDialog
--- a/Helpviewer/HelpDocsInstaller.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpDocsInstaller.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,9 +10,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QThread, Qt, QMutex, QDateTime, QDir, \ +from PyQt5.QtCore import pyqtSignal, QThread, Qt, QMutex, QDateTime, QDir, \ QLibraryInfo, QFileInfo -from PyQt4.QtHelp import QHelpEngineCore +from PyQt5.QtHelp import QHelpEngineCore from eric5config import getConfig
--- a/Helpviewer/HelpIndexWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpIndexWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QUrl, QEvent -from PyQt4.QtGui import QWidget, QVBoxLayout, QLabel, QLineEdit, QMenu, QDialog +from PyQt5.QtCore import pyqtSignal, Qt, QUrl, QEvent +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QLineEdit, QMenu, \ + QDialog class HelpIndexWidget(QWidget):
--- a/Helpviewer/HelpLanguagesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpLanguagesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QByteArray, QLocale -from PyQt4.QtGui import QDialog, QStringListModel +from PyQt5.QtCore import pyqtSlot, QByteArray, QLocale, QStringListModel +from PyQt5.QtWidgets import QDialog from .Ui_HelpLanguagesDialog import Ui_HelpLanguagesDialog
--- a/Helpviewer/HelpSearchWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpSearchWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl -from PyQt4.QtGui import QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu +from PyQt5.QtCore import pyqtSignal, Qt, QEvent, QUrl +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QTextBrowser, QApplication, \ + QMenu class HelpSearchWidget(QWidget):
--- a/Helpviewer/HelpSnap.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpSnap.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QSize, Qt -from PyQt4.QtGui import QPixmap, QPainter -from PyQt4.QtWebKit import QWebFrame +from PyQt5.QtCore import QSize, Qt +from PyQt5.QtGui import QPixmap, QPainter +from PyQt5.QtWebKitWidgets import QWebFrame def renderTabPreview(page, w, h):
--- a/Helpviewer/HelpTabBar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpTabBar.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QPoint, QTimer, QEvent -from PyQt4.QtGui import QFrame, QLabel +from PyQt5.QtCore import Qt, QPoint, QTimer, QEvent +from PyQt5.QtWidgets import QFrame, QLabel from E5Gui.E5TabWidget import E5WheelTabBar from E5Gui.E5PassivePopup import E5PassivePopup
--- a/Helpviewer/HelpTabWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpTabWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,11 @@ import os -from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl -from PyQt4.QtGui import QWidget, QHBoxLayout, QMenu, QToolButton, QPrinter, \ - QPrintDialog, QDialog, QIcon -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest +from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl +from PyQt5.QtGui import QIcon +from PyQt5.QtWidgets import QWidget, QHBoxLayout, QMenu, QToolButton, QDialog +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest from E5Gui.E5TabWidget import E5TabWidget from E5Gui import E5MessageBox @@ -545,7 +546,7 @@ self.tr("eric5 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" - """ PyQt4. Please upgrade.</p>""")) + """ PyQt5. Please upgrade.</p>""")) return @pyqtSlot() @@ -591,7 +592,7 @@ self.tr("eric5 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" - """ PyQt4. Please upgrade.</p>""")) + """ PyQt5. Please upgrade.</p>""")) return @pyqtSlot() @@ -601,7 +602,7 @@ @param browser reference to the browser to be printed (HelpBrowserWV) """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog if browser is None: browser = self.currentBrowser() @@ -644,7 +645,7 @@ self, self.tr("eric5 Web Browser"), self.tr( - """<p>Printing is not available due to a bug in PyQt4.""" + """<p>Printing is not available due to a bug in PyQt5.""" """Please upgrade.</p>""")) return
--- a/Helpviewer/HelpTocWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpTocWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QEvent, QUrl -from PyQt4.QtGui import QWidget, QVBoxLayout, QMenu +from PyQt5.QtCore import pyqtSignal, Qt, QEvent, QUrl +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QMenu class HelpTocWidget(QWidget):
--- a/Helpviewer/HelpTopicDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpTopicDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog -from PyQt4.QtCore import QUrl +from PyQt5.QtWidgets import QDialog +from PyQt5.QtCore import QUrl from .Ui_HelpTopicDialog import Ui_HelpTopicDialog
--- a/Helpviewer/HelpUtilities.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpUtilities.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QUrl +from PyQt5.QtCore import QUrl def getFileNameFromUrl(url):
--- a/Helpviewer/HelpWebSearchWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,12 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt -from PyQt4.QtGui import QMenu, QStandardItem, QStandardItemModel, \ - QCompleter, QFont, QIcon, QPixmap -from PyQt4.QtWebKit import QWebSettings, QWebPage +from PyQt5.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt +from PyQt5.QtGui import QStandardItem, QStandardItemModel, QFont, QIcon, \ + QPixmap +from PyQt5.QtWidgets import QMenu, QCompleter +from PyQt5.QtWebKit import QWebSettings +from PyQt5.QtWebKitWidgets import QWebPage import UI.PixmapCache
--- a/Helpviewer/HelpWindow.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/HelpWindow.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,17 +15,18 @@ import os -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \ +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \ QUrl, QThread, QTextCodec -from PyQt4.QtGui import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \ - QDesktopServices, QKeySequence, QComboBox, QFont, QFontMetrics, QLabel, \ - QSplitter, QMenu, QToolButton, QLineEdit, QApplication, QWhatsThis, \ - QDialog, QHBoxLayout, QProgressBar, QAction, QIcon -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest -from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin, \ - QWebPage +from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics, \ + QIcon +from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \ + QComboBox, QLabel, QSplitter, QMenu, QToolButton, QLineEdit, \ + QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar, QAction +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest +from PyQt5.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin +from PyQt5.QtWebKitWidgets import QWebPage try: - from PyQt4.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery + from PyQt5.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery QTHELP_AVAILABLE = True except ImportError: QTHELP_AVAILABLE = False
--- a/Helpviewer/History/HistoryCompleter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryCompleter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QRegExp, QTimer -from PyQt4.QtGui import QTableView, QAbstractItemView, QSortFilterProxyModel, \ - QCompleter +from PyQt5.QtCore import Qt, QRegExp, QTimer, QSortFilterProxyModel +from PyQt5.QtWidgets import QTableView, QAbstractItemView, QCompleter from .HistoryModel import HistoryModel from .HistoryFilterModel import HistoryFilterModel
--- a/Helpviewer/History/HistoryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QUrl -from PyQt4.QtGui import QDialog, QFontMetrics, QMenu, QCursor, QApplication +from PyQt5.QtCore import pyqtSignal, Qt, QUrl +from PyQt5.QtGui import QFontMetrics, QCursor +from PyQt5.QtWidgets import QDialog, QMenu, QApplication from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/Helpviewer/History/HistoryFilterModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryFilterModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QDateTime, QModelIndex -from PyQt4.QtGui import QAbstractProxyModel +from PyQt5.QtCore import Qt, QDateTime, QModelIndex, QAbstractProxyModel from .HistoryModel import HistoryModel @@ -166,8 +165,9 @@ """ Private slot to handle a reset of the source model. """ + self.beginResetModel() self.__loaded = False - self.reset() + self.endResetModel() def rowCount(self, parent=QModelIndex()): """ @@ -346,7 +346,8 @@ self.sourceModel().rowsRemoved.connect(self.__sourceRowsRemoved) self.__loaded = False if oldCount - count != self.rowCount(): - self.reset() + self.beginResetModel() + self.endResetModel() return True def __frequencyScore(self, sourceIndex):
--- a/Helpviewer/History/HistoryManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,10 @@ import os -from PyQt4.QtCore import pyqtSignal, pyqtSlot, QFileInfo, QDateTime, QDate, \ +from PyQt5.QtCore import pyqtSignal, pyqtSlot, QFileInfo, QDateTime, QDate, \ QTime, QUrl, QTimer, QFile, QIODevice, QByteArray, QDataStream, \ QTemporaryFile -from PyQt4.QtWebKit import QWebHistoryInterface, QWebSettings +from PyQt5.QtWebKit import QWebHistoryInterface, QWebSettings from E5Gui import E5MessageBox
--- a/Helpviewer/History/HistoryMenu.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryMenu.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import sys -from PyQt4.QtCore import pyqtSignal, Qt, QMimeData, QUrl, QModelIndex -from PyQt4.QtGui import QAbstractProxyModel, QSortFilterProxyModel, QMenu +from PyQt5.QtCore import pyqtSignal, Qt, QMimeData, QUrl, QModelIndex, \ + QSortFilterProxyModel, QAbstractProxyModel +from PyQt5.QtWidgets import QMenu from E5Gui.E5ModelMenu import E5ModelMenu from E5Gui import E5MessageBox
--- a/Helpviewer/History/HistoryModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl +from PyQt5.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl import Helpviewer.HelpWindow @@ -51,7 +51,8 @@ """ Public slot to reset the model. """ - self.reset() + self.beginResetModel() + self.endResetModel() def entryAdded(self): """
--- a/Helpviewer/History/HistoryTreeModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/History/HistoryTreeModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,7 @@ import bisect -from PyQt4.QtCore import Qt, QModelIndex, QDate -from PyQt4.QtGui import QAbstractProxyModel +from PyQt5.QtCore import Qt, QModelIndex, QDate, QAbstractProxyModel from .HistoryModel import HistoryModel @@ -239,14 +238,16 @@ self.sourceModel().rowsInserted.connect(self.__sourceRowsInserted) self.sourceModel().rowsRemoved.connect(self.__sourceRowsRemoved) - self.reset() + self.beginResetModel() + self.endResetModel() def __sourceReset(self): """ Private slot to handle a reset of the source model. """ + self.beginResetModel() self.__sourceRowCache = [] - self.reset() + self.endResetModel() def __sourceRowsInserted(self, parent, start, end): """ @@ -258,8 +259,9 @@ """ if not parent.isValid(): if start != 0 or start != end: + self.beginResetModel() self.__sourceRowCache = [] - self.reset() + self.endResetModel() return self.__sourceRowCache = [] @@ -339,8 +341,9 @@ @param end end row (integer) """ if not self.__removingDown: + self.beginResetModel() self.__sourceRowCache = [] - self.reset() + self.endResetModel() return if not parent.isValid():
--- a/Helpviewer/Network/EmptyNetworkReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/EmptyNetworkReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTimer -from PyQt4.QtNetwork import QNetworkReply, QNetworkAccessManager +from PyQt5.QtCore import QTimer +from PyQt5.QtNetwork import QNetworkReply, QNetworkAccessManager class EmptyNetworkReply(QNetworkReply):
--- a/Helpviewer/Network/EricAccessHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/EricAccessHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QFile, QByteArray +from PyQt5.QtCore import QFile, QByteArray from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/FileAccessHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/FileAccessHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QFileInfo -from PyQt4.QtNetwork import QNetworkAccessManager +from PyQt5.QtCore import QFileInfo +from PyQt5.QtNetwork import QNetworkAccessManager from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/FileReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/FileReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,10 +13,10 @@ except NameError: pass -from PyQt4.QtCore import Qt, QByteArray, QTimer, QDir, QIODevice, QUrl, QBuffer -from PyQt4.QtGui import QPixmap -from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import Qt, QByteArray, QTimer, QDir, QIODevice, QUrl, QBuffer +from PyQt5.QtGui import QPixmap +from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest +from PyQt5.QtWebKit import QWebSettings import UI.PixmapCache
--- a/Helpviewer/Network/FollowRedirectReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/FollowRedirectReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QObject -from PyQt4.QtNetwork import QNetworkRequest +from PyQt5.QtCore import pyqtSignal, QObject +from PyQt5.QtNetwork import QNetworkRequest class FollowRedirectReply(QObject):
--- a/Helpviewer/Network/FtpAccessHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/FtpAccessHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtNetwork import QNetworkAccessManager +from PyQt5.QtNetwork import QNetworkAccessManager from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/FtpReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/FtpReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -18,11 +18,12 @@ import errno import mimetypes -from PyQt4.QtCore import QByteArray, QIODevice, Qt, QUrl, QTimer, QBuffer, \ +from PyQt5.QtCore import QByteArray, QIODevice, Qt, QUrl, QTimer, QBuffer, \ QCoreApplication -from PyQt4.QtGui import QPixmap, QDialog -from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest, QAuthenticator -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtGui import QPixmap +from PyQt5.QtWidgets import QDialog +from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest, QAuthenticator +from PyQt5.QtWebKit import QWebSettings from E5Network.E5Ftp import E5Ftp, E5FtpProxyError, E5FtpProxyType
--- a/Helpviewer/Network/NetworkAccessManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,15 +11,15 @@ import os -from PyQt4.QtCore import pyqtSignal, QByteArray, qVersion -from PyQt4.QtGui import QDialog -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ +from PyQt5.QtCore import pyqtSignal, QByteArray, qVersion +from PyQt5.QtWidgets import QDialog +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ QNetworkReply from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory, \ proxyAuthenticationRequired try: - from PyQt4.QtNetwork import QSslSocket + from PyQt5.QtNetwork import QSslSocket from E5Network.E5SslErrorHandler import E5SslErrorHandler SSL_AVAILABLE = True except ImportError: @@ -261,7 +261,7 @@ Private method to set the disk cache. """ if Preferences.getHelp("DiskCacheEnabled"): - from PyQt4.QtWebKit import qWebKitVersion + from PyQt5.QtWebKit import qWebKitVersion from .NetworkDiskCache import NetworkDiskCache diskCache = NetworkDiskCache(self) location = os.path.join(
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/NetworkAccessManagerProxy.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest try: - from PyQt4.QtNetwork import QSslError # __IGNORE_EXCEPTION__ __IGNORE_WARNING__ + from PyQt5.QtNetwork import QSslError # __IGNORE_EXCEPTION__ __IGNORE_WARNING__ SSL_AVAILABLE = True except ImportError: SSL_AVAILABLE = False
--- a/Helpviewer/Network/NetworkDiskCache.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/NetworkDiskCache.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtWebKit import QWebSettings -from PyQt4.QtNetwork import QNetworkDiskCache +from PyQt5.QtWebKit import QWebSettings +from PyQt5.QtNetwork import QNetworkDiskCache class NetworkDiskCache(QNetworkDiskCache):
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTimer -from PyQt4.QtNetwork import QNetworkReply +from PyQt5.QtCore import QTimer +from PyQt5.QtNetwork import QNetworkReply class NetworkProtocolUnknownErrorReply(QNetworkReply):
--- a/Helpviewer/Network/NetworkReply.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/NetworkReply.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTimer, QIODevice, QByteArray -from PyQt4.QtNetwork import QNetworkReply, QNetworkRequest +from PyQt5.QtCore import QTimer, QIODevice, QByteArray +from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest class NetworkReply(QNetworkReply):
--- a/Helpviewer/Network/NoCacheHostsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/NoCacheHostsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \ - QInputDialog, QLineEdit +from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel +from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit from .Ui_NoCacheHostsDialog import Ui_NoCacheHostsDialog
--- a/Helpviewer/Network/QtHelpAccessHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/QtHelpAccessHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import mimetypes import os -from PyQt4.QtCore import QByteArray +from PyQt5.QtCore import QByteArray from .SchemeAccessHandler import SchemeAccessHandler
--- a/Helpviewer/Network/SchemeAccessHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/SchemeAccessHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class SchemeAccessHandler(QObject):
--- a/Helpviewer/Network/SendRefererWhitelistDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Network/SendRefererWhitelistDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \ - QInputDialog, QLineEdit +from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel +from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit from .Ui_SendRefererWhitelistDialog import Ui_SendRefererWhitelistDialog
--- a/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OfflineStorage/OfflineStorageConfigDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog +from PyQt5.QtWebKit import QWebSettings from .Ui_OfflineStorageConfigDialog import Ui_OfflineStorageConfigDialog
--- a/Helpviewer/OfflineStorage/WebDatabasesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OfflineStorage/WebDatabasesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QDialog, QFontMetrics +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QFontMetrics +from PyQt5.QtWidgets import QDialog from E5Gui.E5TreeSortFilterProxyModel import E5TreeSortFilterProxyModel
--- a/Helpviewer/OfflineStorage/WebDatabasesModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OfflineStorage/WebDatabasesModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import sys -from PyQt4.QtCore import QAbstractItemModel, QModelIndex, Qt -from PyQt4.QtWebKit import QWebSecurityOrigin, QWebDatabase +from PyQt5.QtCore import QAbstractItemModel, QModelIndex, Qt +from PyQt5.QtWebKit import QWebSecurityOrigin, QWebDatabase class WebDatabasesModel(QAbstractItemModel):
--- a/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,14 +2,54 @@ # Resource object code # -# Created: Mo. Apr. 21 16:34:12 2014 -# by: The Resource Compiler for PyQt (Qt v5.2.1) +# Created: So. Juni 29 18:58:07 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ +\x00\x00\x02\x5b\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x70\x65\ +\x64\x69\x61\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\ +\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x46\x75\x6c\x6c\x20\x74\x65\x78\x74\x20\x73\x65\x61\x72\x63\ +\x68\x20\x69\x6e\x20\x57\x69\x6b\x69\x70\x65\x64\x69\x61\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ +\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x77\x69\x6b\ +\x69\x2f\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\ +\x3f\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ +\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x66\x75\x6c\x6c\x74\x65\ +\x78\x74\x3d\x53\x65\x61\x72\x63\x68\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\ +\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\ +\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\ +\x72\x79\x7d\x2e\x77\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\ +\x67\x2f\x77\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\x69\ +\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\x6d\ +\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\ +\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\x73\ +\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ +\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\ +\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x01\xc9\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -41,7 +81,35 @@ \x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ \x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ \x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x79\ +\x00\x00\x01\x9b\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ +\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ +\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ +\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ +\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ +\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ +\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ +\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ +\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ +\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ +\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x7e\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -50,24 +118,24 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ -\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ -\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ -\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ -\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x95\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ +\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ +\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ +\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ +\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ +\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ +\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ +\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ +\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ +\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x45\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -76,22 +144,33 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x41\x6d\x61\x7a\x6f\x6e\ -\x2e\x63\x6f\x6d\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x41\x6d\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x20\x53\x65\x61\ -\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\ -\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x2f\x65\x78\x65\x63\x2f\x6f\x62\ -\x69\x64\x6f\x73\x2f\x65\x78\x74\x65\x72\x6e\x61\x6c\x2d\x73\x65\ -\x61\x72\x63\x68\x2f\x3f\x66\x69\x65\x6c\x64\x2d\x6b\x65\x79\x77\ -\x6f\x72\x64\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ -\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\x61\x7a\ -\x6f\x6e\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ +\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ +\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ +\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ +\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ +\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ +\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ +\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ +\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ +\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ +\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ +\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ +\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\ +\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\x69\x65\x73\ +\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\x6f\x6d\x70\ +\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x64\x73\x3d\x79\ +\x74\x26\x61\x6d\x70\x3b\x6a\x73\x6f\x6e\x3d\x74\x26\x61\x6d\x70\ +\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\ +\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x6f\x6c\x61\x62\x65\x6c\x73\x3d\ +\x74\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ +\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ \x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ \x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ \x6f\x6e\x3e\x0a\ @@ -131,7 +210,87 @@ \x2d\x64\x65\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ \x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ \x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x9b\ +\x00\x00\x02\x6b\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x47\x6f\x6f\x67\x6c\x65\ +\x20\x28\x49\x27\x6d\x20\x46\x65\x65\x6c\x69\x6e\x67\x20\x4c\x75\ +\x63\x6b\x79\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x47\x6f\x6f\x67\x6c\x65\x20\x57\x65\x62\x20\x53\x65\x61\ +\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\ +\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\ +\x62\x74\x6e\x49\x3d\x26\x61\x6d\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\ +\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x6c\x72\x3d\x6c\ +\x61\x6e\x67\x5f\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\ +\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ +\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ +\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\ +\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\x69\x65\ +\x73\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\x6f\x6d\ +\x70\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x6a\x73\x6f\ +\x6e\x3d\x74\x26\x61\x6d\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\ +\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x6f\ +\x6c\x61\x62\x65\x6c\x73\x3d\x74\x22\x2f\x3e\x0a\x20\x20\x20\x20\ +\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ +\x77\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x46\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x20\ +\x28\x65\x6e\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x57\x69\x6b\x69\x61\x20\x28\x65\x6e\x29\x3c\x2f\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ +\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ +\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\ +\x2f\x69\x6e\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\ +\x3d\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\ +\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\ +\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\ +\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\ +\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\ +\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\ +\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\ +\x69\x61\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\ +\x63\x74\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\ +\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\ +\x6d\x65\x73\x70\x61\x63\x65\x3d\x31\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\ +\x6d\x61\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\ +\x77\x69\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\ +\x65\x73\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\ +\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ +\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x95\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -140,25 +299,144 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ -\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x41\x6d\x61\x7a\x6f\x6e\ +\x2e\x63\x6f\x6d\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ \x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ -\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ -\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ -\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ -\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ -\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ -\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ -\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ -\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ -\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x6e\x3e\x41\x6d\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x20\x53\x65\x61\ +\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\ +\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x2f\x65\x78\x65\x63\x2f\x6f\x62\ +\x69\x64\x6f\x73\x2f\x65\x78\x74\x65\x72\x6e\x61\x6c\x2d\x73\x65\ +\x61\x72\x63\x68\x2f\x3f\x66\x69\x65\x6c\x64\x2d\x6b\x65\x79\x77\ +\x6f\x72\x64\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ +\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\x61\x7a\ +\x6f\x6e\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ +\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x54\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ +\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ +\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ +\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ +\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ +\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ +\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ +\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ +\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ +\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ +\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ +\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ +\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ +\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ +\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ +\x00\x00\x02\x7a\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x45\x4f\x20\x44\x65\ +\x75\x2d\x45\x6e\x67\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\ +\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x44\x65\x75\x74\x73\x63\x68\x2d\x45\x6e\x67\x6c\x69\ +\x73\x63\x68\x20\x57\xc3\xb6\x72\x74\x65\x72\x62\x75\x63\x68\x20\ +\x76\x6f\x6e\x20\x4c\x45\x4f\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ +\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ +\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ +\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\ +\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x65\x6e\x64\x65\x3f\ +\x6c\x61\x6e\x67\x3d\x64\x65\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ +\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x64\x69\ +\x63\x74\x51\x75\x65\x72\x79\x2f\x6d\x2d\x71\x75\x65\x72\x79\x2f\ +\x63\x6f\x6e\x66\x2f\x65\x6e\x64\x65\x2f\x71\x75\x65\x72\x79\x2e\ +\x63\x6f\x6e\x66\x2f\x73\x74\x72\x6c\x69\x73\x74\x2e\x6a\x73\x6f\ +\x6e\x3f\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\ +\x7d\x26\x61\x6d\x70\x3b\x73\x6f\x72\x74\x3d\x50\x4c\x61\x26\x61\ +\x6d\x70\x3b\x73\x68\x6f\x72\x74\x51\x75\x65\x72\x79\x26\x61\x6d\ +\x70\x3b\x6e\x6f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x26\ +\x61\x6d\x70\x3b\x6e\x6f\x51\x75\x65\x72\x79\x55\x52\x4c\x73\x22\ +\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ +\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\ +\x67\x2f\x69\x6d\x67\x2f\x66\x61\x76\x69\x63\x6f\x6e\x73\x2f\x65\ +\x6e\x64\x65\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ +\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ +\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x27\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ +\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ +\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ +\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ +\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ +\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ +\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ +\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ +\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ +\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ +\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ +\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ +\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x4d\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -223,152 +501,7 @@ \x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ \x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ \x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x7e\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ -\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ -\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ -\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ -\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ -\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ -\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ -\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ -\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ -\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x46\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x20\ -\x28\x65\x6e\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x57\x69\x6b\x69\x61\x20\x28\x65\x6e\x29\x3c\x2f\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ -\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ -\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\ -\x2f\x69\x6e\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\ -\x3d\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\ -\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\ -\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\ -\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\ -\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\ -\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\ -\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\ -\x69\x61\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\ -\x63\x74\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\ -\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\ -\x6d\x65\x73\x70\x61\x63\x65\x3d\x31\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\ -\x6d\x61\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\ -\x77\x69\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\ -\x65\x73\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\ -\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ -\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x6b\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x47\x6f\x6f\x67\x6c\x65\ -\x20\x28\x49\x27\x6d\x20\x46\x65\x65\x6c\x69\x6e\x67\x20\x4c\x75\ -\x63\x6b\x79\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x47\x6f\x6f\x67\x6c\x65\x20\x57\x65\x62\x20\x53\x65\x61\ -\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\ -\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\ -\x62\x74\x6e\x49\x3d\x26\x61\x6d\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\ -\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x6c\x72\x3d\x6c\ -\x61\x6e\x67\x5f\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\ -\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ -\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ -\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\ -\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\x69\x65\ -\x73\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\x6f\x6d\ -\x70\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x6a\x73\x6f\ -\x6e\x3d\x74\x26\x61\x6d\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\ -\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x6f\ -\x6c\x61\x62\x65\x6c\x73\x3d\x74\x22\x2f\x3e\x0a\x20\x20\x20\x20\ -\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\ -\x77\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x45\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ -\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ -\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ -\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ -\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ -\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ -\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ -\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ -\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ -\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ -\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ -\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ -\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\ -\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\x69\x65\x73\ -\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\x6f\x6d\x70\ -\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x64\x73\x3d\x79\ -\x74\x26\x61\x6d\x70\x3b\x6a\x73\x6f\x6e\x3d\x74\x26\x61\x6d\x70\ -\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\ -\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x6f\x6c\x61\x62\x65\x6c\x73\x3d\ -\x74\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ -\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ -\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ -\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x7a\ +\x00\x00\x01\x79\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -377,180 +510,76 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x45\x4f\x20\x44\x65\ -\x75\x2d\x45\x6e\x67\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\ -\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x44\x65\x75\x74\x73\x63\x68\x2d\x45\x6e\x67\x6c\x69\ -\x73\x63\x68\x20\x57\xc3\xb6\x72\x74\x65\x72\x62\x75\x63\x68\x20\ -\x76\x6f\x6e\x20\x4c\x45\x4f\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ -\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ -\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ -\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\ -\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x65\x6e\x64\x65\x3f\ -\x6c\x61\x6e\x67\x3d\x64\x65\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ -\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\x67\x2f\x64\x69\ -\x63\x74\x51\x75\x65\x72\x79\x2f\x6d\x2d\x71\x75\x65\x72\x79\x2f\ -\x63\x6f\x6e\x66\x2f\x65\x6e\x64\x65\x2f\x71\x75\x65\x72\x79\x2e\ -\x63\x6f\x6e\x66\x2f\x73\x74\x72\x6c\x69\x73\x74\x2e\x6a\x73\x6f\ -\x6e\x3f\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\ -\x7d\x26\x61\x6d\x70\x3b\x73\x6f\x72\x74\x3d\x50\x4c\x61\x26\x61\ -\x6d\x70\x3b\x73\x68\x6f\x72\x74\x51\x75\x65\x72\x79\x26\x61\x6d\ -\x70\x3b\x6e\x6f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x26\ -\x61\x6d\x70\x3b\x6e\x6f\x51\x75\x65\x72\x79\x55\x52\x4c\x73\x22\ -\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ -\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x6c\x65\x6f\x2e\x6f\x72\ -\x67\x2f\x69\x6d\x67\x2f\x66\x61\x76\x69\x63\x6f\x6e\x73\x2f\x65\ -\x6e\x64\x65\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ -\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ -\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x5b\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x70\x65\ -\x64\x69\x61\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\ -\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x46\x75\x6c\x6c\x20\x74\x65\x78\x74\x20\x73\x65\x61\x72\x63\ -\x68\x20\x69\x6e\x20\x57\x69\x6b\x69\x70\x65\x64\x69\x61\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ -\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x77\x69\x6b\ -\x69\x2f\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\ -\x3f\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ -\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x66\x75\x6c\x6c\x74\x65\ -\x78\x74\x3d\x53\x65\x61\x72\x63\x68\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\ -\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\ -\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\ -\x72\x79\x7d\x2e\x77\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\ -\x67\x2f\x77\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\x69\ -\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\x6d\ -\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\ -\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\x73\ -\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ -\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\ -\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x54\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ -\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ -\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ -\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ -\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ -\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ -\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ -\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ -\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ -\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ -\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ -\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ -\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ -\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ -\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ -\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ -\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x0a\ -\x00\x00\x02\x27\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ -\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ -\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ -\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ -\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ -\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ -\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ -\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ -\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ -\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ -\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ -\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ -\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ +\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ +\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ +\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ +\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ " qt_resource_name = b"\ +\x00\x0d\ +\x06\xf8\x53\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x70\x00\x65\x00\x64\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x10\ \x09\x73\x65\x7c\ \x00\x4c\ \x00\x69\x00\x6e\x00\x75\x00\x78\x00\x4d\x00\x61\x00\x67\x00\x61\x00\x7a\x00\x69\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x08\ -\x00\x4a\x56\x1c\ -\x00\x42\ -\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0d\ -\x0a\x2e\x72\x9c\ -\x00\x41\ -\x00\x6d\x00\x61\x00\x7a\x00\x6f\x00\x6e\x00\x63\x00\x6f\x00\x6d\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0e\ +\x08\xce\x7c\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x72\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0c\ +\x0f\xd5\x68\x1c\ +\x00\x46\ +\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0b\ +\x0b\x48\x8a\x5c\ +\x00\x59\ +\x00\x6f\x00\x75\x00\x54\x00\x75\x00\x62\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x12\ \x0a\xf9\x0f\x7c\ \x00\x44\ \x00\x65\x00\x45\x00\x6e\x00\x5f\x00\x42\x00\x65\x00\x6f\x00\x6c\x00\x69\x00\x6e\x00\x67\x00\x75\x00\x73\x00\x2e\x00\x78\x00\x6d\ \x00\x6c\ +\x00\x1b\ +\x0d\x52\x43\x5c\ +\x00\x47\ +\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ +\x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0c\ +\x0e\x81\x61\xdc\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0d\ +\x0a\x2e\x72\x9c\ +\x00\x41\ +\x00\x6d\x00\x61\x00\x7a\x00\x6f\x00\x6e\x00\x63\x00\x6f\x00\x6d\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x01\xf4\xe3\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0e\ -\x08\xce\x7c\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x72\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\xf1\x12\x1c\ +\x00\x4c\ +\x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x0f\x62\xe1\xdc\ +\x00\x59\ +\x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0a\ \x0e\x31\x93\x9c\ \x00\x47\ @@ -559,58 +588,29 @@ \x0b\x0c\x48\x7c\ \x00\x52\ \x00\x65\x00\x64\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0c\ -\x0f\xd5\x68\x1c\ -\x00\x46\ -\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0c\ -\x0e\x81\x61\xdc\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x1b\ -\x0d\x52\x43\x5c\ -\x00\x47\ -\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ -\x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0b\ -\x0b\x48\x8a\x5c\ -\x00\x59\ -\x00\x6f\x00\x75\x00\x54\x00\x75\x00\x62\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x00\xf1\x12\x1c\ -\x00\x4c\ -\x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0d\ -\x06\xf8\x53\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x70\x00\x65\x00\x64\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x09\ -\x01\xf4\xe3\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x09\ -\x0f\x62\xe1\xdc\ -\x00\x59\ -\x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x08\ +\x00\x4a\x56\x1c\ +\x00\x42\ +\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ " qt_resource_struct = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x0f\x00\x00\x00\x01\ -\x00\x00\x00\x26\x00\x00\x00\x00\x00\x01\x00\x00\x01\xcd\ -\x00\x00\x01\x70\x00\x00\x00\x00\x00\x01\x00\x00\x14\xe8\ -\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x19\xc5\ -\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x17\x66\ -\x00\x00\x00\x86\x00\x00\x00\x00\x00\x01\x00\x00\x07\x01\ +\x00\x00\x01\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x1c\xcb\ +\x00\x00\x01\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x14\x5e\ +\x00\x00\x01\x46\x00\x00\x00\x00\x00\x01\x00\x00\x12\x06\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x03\x4a\ -\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x04\xe3\ -\x00\x00\x00\xc2\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xf1\ -\x00\x00\x01\x54\x00\x00\x00\x00\x00\x01\x00\x00\x12\x9f\ -\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x10\x30\ -\x00\x00\x00\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x08\xa0\ -\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x0d\xe6\ -\x00\x00\x01\xca\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x1d\ -\x00\x00\x00\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x64\ +\x00\x00\x00\x46\x00\x00\x00\x00\x00\x01\x00\x00\x04\x2c\ +\x00\x00\x00\x20\x00\x00\x00\x00\x00\x01\x00\x00\x02\x5f\ +\x00\x00\x01\x26\x00\x00\x00\x00\x00\x01\x00\x00\x10\x6d\ +\x00\x00\x00\xa2\x00\x00\x00\x00\x00\x01\x00\x00\x09\x96\ +\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x58\ +\x00\x00\x00\x86\x00\x00\x00\x00\x00\x01\x00\x00\x07\x4d\ +\x00\x00\x00\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xb4\ +\x00\x00\x01\x98\x00\x00\x00\x00\x00\x01\x00\x00\x19\x07\ +\x00\x00\x01\x08\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x23\ +\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x16\xdc\ +\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x05\xcb\ " def qInitResources():
--- a/Helpviewer/OpenSearch/OpenSearchDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog +from PyQt5.QtCore import pyqtSlot from E5Gui import E5MessageBox, E5FileDialog
--- a/Helpviewer/OpenSearch/OpenSearchEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_OpenSearchEditDialog import Ui_OpenSearchEditDialog
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,10 +12,10 @@ import re import json -from PyQt4.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \ +from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \ QBuffer, QIODevice, QObject -from PyQt4.QtGui import QImage -from PyQt4.QtNetwork import QNetworkRequest, QNetworkAccessManager +from PyQt5.QtGui import QImage +from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager from UI.Info import Program
--- a/Helpviewer/OpenSearch/OpenSearchEngineAction.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngineAction.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QUrl -from PyQt4.QtGui import QPixmap, QIcon, QAction +from PyQt5.QtCore import QUrl +from PyQt5.QtGui import QPixmap, QIcon +from PyQt5.QtWidgets import QAction class OpenSearchEngineAction(QAction):
--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import re -from PyQt4.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex -from PyQt4.QtGui import QPixmap, QIcon +from PyQt5.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex +from PyQt5.QtGui import QPixmap, QIcon class OpenSearchEngineModel(QAbstractTableModel): @@ -197,4 +197,5 @@ """ Private slot handling a change of the registered engines. """ - super(OpenSearchEngineModel, self).reset() + self.beginResetModel() + self.endResetModel()
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice -from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply +from PyQt5.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice +from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Helpviewer/OpenSearch/OpenSearchReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamReader, QIODevice, QCoreApplication +from PyQt5.QtCore import QXmlStreamReader, QIODevice, QCoreApplication class OpenSearchReader(QXmlStreamReader):
--- a/Helpviewer/OpenSearch/OpenSearchWriter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchWriter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamWriter, QIODevice +from PyQt5.QtCore import QXmlStreamWriter, QIODevice class OpenSearchWriter(QXmlStreamWriter):
--- a/Helpviewer/PageScreenDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/PageScreenDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, QImage, \ - QPainter, QPixmap +from PyQt5.QtCore import pyqtSlot, QFile, QFileInfo +from PyQt5.QtGui import QImage, QPainter, QPixmap +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton from E5Gui import E5FileDialog, E5MessageBox
--- a/Helpviewer/Passwords/LoginForm.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Passwords/LoginForm.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QUrl +from PyQt5.QtCore import QUrl class LoginForm(object):
--- a/Helpviewer/Passwords/PasswordManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Passwords/PasswordManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,11 +11,12 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QByteArray, QUrl, \ +from PyQt5.QtCore import pyqtSignal, QObject, QByteArray, QUrl, \ QCoreApplication, QXmlStreamReader -from PyQt4.QtGui import QApplication -from PyQt4.QtNetwork import QNetworkRequest -from PyQt4.QtWebKit import QWebSettings, QWebPage +from PyQt5.QtWidgets import QApplication +from PyQt5.QtNetwork import QNetworkRequest +from PyQt5.QtWebKit import QWebSettings +from PyQt5.QtWebKitWidgets import QWebPage from E5Gui import E5MessageBox from E5Gui.E5ProgressDialog import E5ProgressDialog
--- a/Helpviewer/Passwords/PasswordModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Passwords/PasswordModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel +from PyQt5.QtCore import Qt, QModelIndex, QAbstractTableModel class PasswordModel(QAbstractTableModel): @@ -43,7 +43,8 @@ @param on flag indicating if passwords shall be shown (boolean) """ self.__showPasswords = on - self.reset() + self.beginResetModel() + self.endResetModel() def showPasswords(self): """ @@ -57,7 +58,8 @@ """ Private slot handling a change of the registered passwords. """ - self.reset() + self.beginResetModel() + self.endResetModel() def removeRows(self, row, count, parent=QModelIndex()): """
--- a/Helpviewer/Passwords/PasswordReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Passwords/PasswordReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, \ +from PyQt5.QtCore import QXmlStreamReader, QIODevice, QFile, \ QCoreApplication, QUrl
--- a/Helpviewer/Passwords/PasswordWriter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Passwords/PasswordWriter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile +from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile class PasswordWriter(QXmlStreamWriter):
--- a/Helpviewer/Passwords/PasswordsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Passwords/PasswordsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel +from PyQt5.QtCore import pyqtSlot, QSortFilterProxyModel +from PyQt5.QtGui import QFont, QFontMetrics +from PyQt5.QtWidgets import QDialog from E5Gui import E5MessageBox
--- a/Helpviewer/PersonalInformationManager/PersonalDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/PersonalInformationManager/PersonalDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_PersonalDataDialog import Ui_PersonalDataDialog
--- a/Helpviewer/PersonalInformationManager/PersonalInformationManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/PersonalInformationManager/PersonalInformationManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QObject -from PyQt4.QtGui import QDialog, QMenu +from PyQt5.QtCore import Qt, QObject +from PyQt5.QtWidgets import QDialog, QMenu import Preferences import UI.PixmapCache
--- a/Helpviewer/QtHelpDocumentationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/QtHelpDocumentationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QItemSelectionModel -from PyQt4.QtHelp import QHelpEngineCore +from PyQt5.QtCore import pyqtSlot, Qt, QItemSelectionModel +from PyQt5.QtWidgets import QDialog +from PyQt5.QtHelp import QHelpEngineCore from E5Gui import E5MessageBox, E5FileDialog
--- a/Helpviewer/QtHelpFiltersDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/QtHelpFiltersDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,10 @@ import sqlite3 -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QTreeWidgetItem, QListWidgetItem, \ - QInputDialog, QLineEdit, QItemSelectionModel -from PyQt4.QtHelp import QHelpEngineCore +from PyQt5.QtCore import pyqtSlot, Qt, QItemSelectionModel +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QListWidgetItem, \ + QInputDialog, QLineEdit +from PyQt5.QtHelp import QHelpEngineCore from E5Gui import E5MessageBox
--- a/Helpviewer/SearchWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SearchWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QWidget, QPalette, QBrush, QColor -from PyQt4.QtWebKit import QWebPage +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtGui import QPalette, QBrush, QColor +from PyQt5.QtWidgets import QWidget +from PyQt5.QtWebKitWidgets import QWebPage from .Ui_SearchWidget import Ui_SearchWidget
--- a/Helpviewer/SearchWidget.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SearchWidget.ui Sun Jun 29 20:13:56 2014 +0200 @@ -48,9 +48,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Helpviewer/SiteInfo/SiteInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SiteInfo/SiteInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,11 @@ import os -from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QFile, qVersion -from PyQt4.QtGui import QDialog, QTreeWidgetItem, QPixmap, QGraphicsScene, \ - QMenu, QCursor, QApplication, QListWidgetItem -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import pyqtSlot, QUrl, Qt, QFile, qVersion +from PyQt5.QtGui import QPixmap, QCursor +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QGraphicsScene, QMenu, \ + QApplication, QListWidgetItem +from PyQt5.QtWebKit import QWebSettings from E5Gui import E5MessageBox, E5FileDialog
--- a/Helpviewer/SpeedDial/PageThumbnailer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SpeedDial/PageThumbnailer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl -from PyQt4.QtGui import QPixmap, QImage, QPainter -from PyQt4.QtWebKit import QWebPage +from PyQt5.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl +from PyQt5.QtGui import QPixmap, QImage, QPainter +from PyQt5.QtWebKitWidgets import QWebPage from ..Network.NetworkAccessManagerProxy import NetworkAccessManagerProxy
--- a/Helpviewer/SpeedDial/SpeedDial.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SpeedDial/SpeedDial.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import os -from PyQt4.QtCore import pyqtSignal, pyqtSlot, QObject, QCryptographicHash, \ +from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QCryptographicHash, \ QByteArray, QUrl, qWarning -from PyQt4.QtWebKit import QWebPage +from PyQt5.QtWebKitWidgets import QWebPage from E5Gui import E5MessageBox @@ -192,7 +192,7 @@ 'url:"http://eric-ide.python-projects.org/"|'\ 'title:"Eric Web Site";'\ 'url:"http://www.riverbankcomputing.com/"|'\ - 'title:"PyQt4 Web Site";'\ + 'title:"PyQt5 Web Site";'\ 'url:"http://qt.digia.com/"|title:"Qt Web Site";'\ 'url:"http://blog.qt.digia.com/"|title:"Qt Blog";'\ 'url:"http://www.python.org"|title:"Python Language Website";'\
--- a/Helpviewer/SpeedDial/SpeedDialReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SpeedDial/SpeedDialReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication +from PyQt5.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication class SpeedDialReader(QXmlStreamReader):
--- a/Helpviewer/SpeedDial/SpeedDialWriter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/SpeedDial/SpeedDialWriter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile +from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile class SpeedDialWriter(QXmlStreamWriter):
--- a/Helpviewer/Sync/DirectorySyncHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/DirectorySyncHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import pyqtSignal, QByteArray, QFileInfo, QCoreApplication +from PyQt5.QtCore import pyqtSignal, QByteArray, QFileInfo, QCoreApplication from .SyncHandler import SyncHandler
--- a/Helpviewer/Sync/FtpSyncHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/FtpSyncHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import ftplib import io -from PyQt4.QtCore import pyqtSignal, QTimer, QFileInfo, QCoreApplication, \ +from PyQt5.QtCore import pyqtSignal, QTimer, QFileInfo, QCoreApplication, \ QByteArray from E5Network.E5Ftp import E5Ftp, E5FtpProxyType, E5FtpProxyError
--- a/Helpviewer/Sync/SyncAssistantDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncAssistantDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QWizard +from PyQt5.QtWidgets import QWizard import UI.PixmapCache import Globals
--- a/Helpviewer/Sync/SyncCheckPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncCheckPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import os -from PyQt4.QtCore import QByteArray, QTimer -from PyQt4.QtGui import QWizardPage, QMovie +from PyQt5.QtCore import QByteArray, QTimer +from PyQt5.QtGui import QMovie +from PyQt5.QtWidgets import QWizardPage from . import SyncGlobals
--- a/Helpviewer/Sync/SyncDataPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncDataPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QWizardPage +from PyQt5.QtWidgets import QWizardPage from .Ui_SyncDataPage import Ui_SyncDataPage
--- a/Helpviewer/Sync/SyncDirectorySettingsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncDirectorySettingsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QWizardPage +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QWizardPage from E5Gui import E5FileDialog
--- a/Helpviewer/Sync/SyncEncryptionPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncEncryptionPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QWizardPage +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QWizardPage from .Ui_SyncEncryptionPage import Ui_SyncEncryptionPage
--- a/Helpviewer/Sync/SyncFtpSettingsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncFtpSettingsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QWizardPage +from PyQt5.QtWidgets import QWizardPage from .Ui_SyncFtpSettingsPage import Ui_SyncFtpSettingsPage
--- a/Helpviewer/Sync/SyncHandler.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncHandler.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QObject, pyqtSignal, QByteArray +from PyQt5.QtCore import QObject, pyqtSignal, QByteArray import Preferences
--- a/Helpviewer/Sync/SyncHostTypePage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncHostTypePage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QWizardPage +from PyQt5.QtWidgets import QWizardPage from . import SyncGlobals
--- a/Helpviewer/Sync/SyncManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/Sync/SyncManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, pyqtSignal +from PyQt5.QtCore import QObject, pyqtSignal import Preferences
--- a/Helpviewer/UrlBar/BookmarkActionSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UrlBar/BookmarkActionSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_BookmarkActionSelectionDialog import Ui_BookmarkActionSelectionDialog
--- a/Helpviewer/UrlBar/BookmarkInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UrlBar/BookmarkInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QFont +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QFont +from PyQt5.QtWidgets import QDialog from .Ui_BookmarkInfoDialog import Ui_BookmarkInfoDialog
--- a/Helpviewer/UrlBar/FavIconLabel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UrlBar/FavIconLabel.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,9 @@ except NameError: pass -from PyQt4.QtCore import Qt, QPoint, QUrl, QMimeData -from PyQt4.QtGui import QLabel, QApplication, QDrag, QPixmap +from PyQt5.QtCore import Qt, QPoint, QUrl, QMimeData +from PyQt5.QtGui import QDrag, QPixmap +from PyQt5.QtWidgets import QLabel, QApplication class FavIconLabel(QLabel):
--- a/Helpviewer/UrlBar/SslLabel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UrlBar/SslLabel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, pyqtSignal, QPoint -from PyQt4.QtGui import QLabel +from PyQt5.QtCore import Qt, pyqtSignal, QPoint +from PyQt5.QtWidgets import QLabel class SslLabel(QLabel):
--- a/Helpviewer/UrlBar/StackedUrlBar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UrlBar/StackedUrlBar.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QStackedWidget, QSizePolicy +from PyQt5.QtWidgets import QStackedWidget, QSizePolicy class StackedUrlBar(QStackedWidget):
--- a/Helpviewer/UrlBar/UrlBar.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UrlBar/UrlBar.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,14 +13,15 @@ except NameError: pass -from PyQt4.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, qVersion -from PyQt4.QtGui import QColor, QPalette, QLinearGradient, QIcon, QDialog, \ - QApplication +from PyQt5.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, qVersion +from PyQt5.QtGui import QColor, QPalette, QLinearGradient, QIcon +from PyQt5.QtWidgets import QDialog, QApplication try: - from PyQt4.QtNetwork import QSslCertificate # __IGNORE_EXCEPTION__ + from PyQt5.QtNetwork import QSslCertificate # __IGNORE_EXCEPTION__ except ImportError: QSslCertificate = None # __IGNORE_WARNING__ -from PyQt4.QtWebKit import QWebSettings, QWebPage +from PyQt5.QtWebKit import QWebSettings +from PyQt5.QtWebKitWidgets import QWebPage from E5Gui.E5LineEdit import E5LineEdit from E5Gui.E5LineEditButton import E5LineEditButton
--- a/Helpviewer/UserAgent/UserAgentDefaults_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentDefaults_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,14 +2,12 @@ # Resource object code # -# Created: So. Okt 13 17:05:33 2013 -# by: The Resource Compiler for PyQt (Qt v4.8.5) +# Created: So. Juni 29 18:58:08 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from __future__ import unicode_literals - -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ \x00\x00\x03\xd6\
--- a/Helpviewer/UserAgent/UserAgentManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import pyqtSignal, QObject, QXmlStreamReader +from PyQt5.QtCore import pyqtSignal, QObject, QXmlStreamReader from E5Gui import E5MessageBox
--- a/Helpviewer/UserAgent/UserAgentMenu.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentMenu.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamReader, QFile, QIODevice -from PyQt4.QtGui import QMenu, QAction, QActionGroup, QInputDialog, QLineEdit +from PyQt5.QtCore import QXmlStreamReader, QFile, QIODevice +from PyQt5.QtWidgets import QMenu, QAction, QActionGroup, QInputDialog, \ + QLineEdit from E5Gui import E5MessageBox
--- a/Helpviewer/UserAgent/UserAgentModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QModelIndex, QAbstractTableModel +from PyQt5.QtCore import Qt, QModelIndex, QAbstractTableModel class UserAgentModel(QAbstractTableModel): @@ -37,7 +37,8 @@ """ Private slot handling a change of the registered user agent strings. """ - self.reset() + self.beginResetModel() + self.endResetModel() def removeRows(self, row, count, parent=QModelIndex()): """
--- a/Helpviewer/UserAgent/UserAgentReader.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentReader.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication +from PyQt5.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication class UserAgentReader(QXmlStreamReader):
--- a/Helpviewer/UserAgent/UserAgentWriter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentWriter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QXmlStreamWriter, QIODevice, QFile +from PyQt5.QtCore import QXmlStreamWriter, QIODevice, QFile class UserAgentWriter(QXmlStreamWriter):
--- a/Helpviewer/UserAgent/UserAgentsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/UserAgent/UserAgentsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QFont, QFontMetrics, QSortFilterProxyModel +from PyQt5.QtCore import QSortFilterProxyModel +from PyQt5.QtGui import QFont, QFontMetrics +from PyQt5.QtWidgets import QDialog import Helpviewer.HelpWindow
--- a/Helpviewer/VirusTotalApi.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/VirusTotalApi.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,8 +16,8 @@ import json -from PyQt4.QtCore import QObject, QUrl, QByteArray, pyqtSignal -from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply, \ +from PyQt5.QtCore import QObject, QUrl, QByteArray, pyqtSignal +from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, \ QNetworkAccessManager import Preferences
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlash.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,11 +10,12 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QUrl, Qt, QByteArray, QTimer -from PyQt4.QtGui import QWidget, QMenu, QCursor, QDialog, QLabel, QFormLayout -from PyQt4.QtNetwork import QNetworkRequest -from PyQt4.QtWebKit import QWebHitTestResult, QWebElement, QWebView, \ - QWebElementCollection +from PyQt5.QtCore import pyqtSlot, QUrl, Qt, QByteArray, QTimer +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QMenu, QDialog, QLabel, QFormLayout +from PyQt5.QtNetwork import QNetworkRequest +from PyQt5.QtWebKit import QWebElement, QWebElementCollection +from PyQt5.QtWebKitWidgets import QWebHitTestResult, QWebView from .Ui_ClickToFlash import Ui_ClickToFlash
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashPlugin.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog -from PyQt4.QtWebKit import QWebPluginFactory +from PyQt5.QtWidgets import QDialog +from PyQt5.QtWebKit import QWebPluginFactory from ..WebPluginInterface import WebPluginInterface
--- a/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel, \ - QInputDialog, QLineEdit +from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel +from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit from .Ui_ClickToFlashWhitelistDialog import Ui_ClickToFlashWhitelistDialog
--- a/Helpviewer/WebPlugins/WebPluginFactory.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/WebPlugins/WebPluginFactory.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtWebKit import QWebPluginFactory +from PyQt5.QtWebKit import QWebPluginFactory class WebPluginFactory(QWebPluginFactory):
--- a/Helpviewer/data/html_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/data/html_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,17 +2,15 @@ # Resource object code # -# Created: Sat Feb 25 17:39:49 2012 -# by: The Resource Compiler for PyQt (Qt v4.8.0) +# Created: So. Juni 29 18:58:04 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from __future__ import unicode_literals - -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x03\x7c\ +\x00\x00\x04\xcf\ \x3c\ \x21\x44\x4f\x43\x54\x59\x50\x45\x20\x68\x74\x6d\x6c\x3e\x0a\x3c\ \x68\x74\x6d\x6c\x3e\x0a\x3c\x68\x65\x61\x64\x3e\x0a\x3c\x6d\x65\ @@ -24,52 +22,73 @@ \x3d\x75\x74\x66\x2d\x38\x22\x3e\x0a\x3c\x74\x69\x74\x6c\x65\x3e\ \x40\x54\x49\x54\x4c\x45\x40\x3c\x2f\x74\x69\x74\x6c\x65\x3e\x0a\ \x3c\x6c\x69\x6e\x6b\x20\x72\x65\x6c\x3d\x22\x69\x63\x6f\x6e\x22\ -\x20\x68\x72\x65\x66\x3d\x22\x40\x46\x41\x56\x49\x43\x4f\x4e\x40\ -\x22\x20\x74\x79\x70\x65\x3d\x22\x69\x6d\x61\x67\x65\x2f\x78\x2d\ -\x69\x63\x6f\x6e\x22\x20\x2f\x3e\x0a\x3c\x73\x74\x79\x6c\x65\x3e\ -\x0a\x62\x6f\x64\x79\x20\x7b\x0a\x20\x20\x70\x61\x64\x64\x69\x6e\ -\x67\x3a\x20\x33\x65\x6d\x20\x30\x65\x6d\x3b\x0a\x20\x20\x62\x61\ -\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x2d\x77\x65\x62\x6b\x69\ -\x74\x2d\x67\x72\x61\x64\x69\x65\x6e\x74\x28\x6c\x69\x6e\x65\x61\ -\x72\x2c\x20\x6c\x65\x66\x74\x20\x74\x6f\x70\x2c\x20\x6c\x65\x66\ -\x74\x20\x62\x6f\x74\x74\x6f\x6d\x2c\x20\x66\x72\x6f\x6d\x28\x23\ -\x38\x35\x37\x38\x34\x41\x29\x2c\x20\x74\x6f\x28\x23\x46\x44\x46\ -\x44\x46\x44\x29\x2c\x20\x63\x6f\x6c\x6f\x72\x2d\x73\x74\x6f\x70\ -\x28\x30\x2e\x35\x2c\x20\x23\x46\x44\x46\x44\x46\x44\x29\x29\x3b\ -\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x72\x65\ -\x70\x65\x61\x74\x3a\x20\x72\x65\x70\x65\x61\x74\x2d\x78\x3b\x0a\ -\x7d\x0a\x23\x62\x6f\x78\x20\x7b\x0a\x20\x20\x62\x61\x63\x6b\x67\ -\x72\x6f\x75\x6e\x64\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\ -\x62\x6f\x72\x64\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\ -\x64\x20\x23\x38\x35\x37\x38\x34\x41\x3b\x0a\x20\x20\x6d\x61\x78\ -\x2d\x77\x69\x64\x74\x68\x3a\x20\x36\x30\x30\x70\x78\x3b\x0a\x20\ -\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x35\x30\x25\x3b\x0a\x20\x20\ -\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x34\x30\x70\x78\x3b\x0a\x20\ -\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\ -\x20\x31\x30\x70\x78\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\ -\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\ -\x72\x61\x64\x69\x75\x73\x3a\x20\x30\x2e\x38\x65\x6d\x3b\x0a\x20\ -\x20\x74\x65\x78\x74\x2d\x61\x6c\x69\x67\x6e\x3a\x20\x63\x65\x6e\ -\x74\x65\x72\x3b\x0a\x20\x20\x76\x65\x72\x74\x69\x63\x61\x6c\x2d\ -\x61\x6c\x69\x67\x6e\x3a\x20\x6d\x69\x64\x64\x6c\x65\x3b\x0a\x20\ -\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x7d\ -\x0a\x68\x31\x20\x7b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\ -\x65\x3a\x20\x31\x33\x30\x25\x3b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\ -\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x20\x20\ -\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\ -\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x38\x35\x37\x38\x34\x41\ -\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x62\x6f\x74\x74\x6f\ -\x6d\x3a\x20\x30\x70\x78\x3b\x0a\x7d\x0a\x3c\x2f\x73\x74\x79\x6c\ -\x65\x3e\x0a\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\ -\x3e\x0a\x20\x20\x3c\x64\x69\x76\x20\x69\x64\x3d\x22\x62\x6f\x78\ -\x22\x3e\x0a\x20\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\ -\x22\x40\x49\x4d\x41\x47\x45\x40\x22\x20\x77\x69\x64\x74\x68\x3d\ -\x22\x36\x34\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x22\ -\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x68\x31\x3e\x41\x64\x42\x6c\x6f\ -\x63\x6b\x20\x50\x6c\x75\x73\x3c\x2f\x68\x31\x3e\x0a\x20\x20\x20\ -\x20\x3c\x70\x3e\x40\x4d\x45\x53\x53\x41\x47\x45\x40\x3c\x2f\x70\ -\x3e\x0a\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\x62\x6f\x64\ -\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\ +\x20\x68\x72\x65\x66\x3d\x22\x64\x61\x74\x61\x3a\x69\x6d\x61\x67\ +\x65\x2f\x70\x6e\x67\x3b\x62\x61\x73\x65\x36\x34\x2c\x40\x46\x41\ +\x56\x49\x43\x4f\x4e\x40\x22\x20\x74\x79\x70\x65\x3d\x22\x69\x6d\ +\x61\x67\x65\x2f\x78\x2d\x69\x63\x6f\x6e\x22\x20\x2f\x3e\x0a\x3c\ +\x73\x74\x79\x6c\x65\x3e\x0a\x62\x6f\x64\x79\x20\x7b\x0a\x20\x20\ +\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x33\x65\x6d\x20\x30\x65\x6d\ +\x3b\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\ +\x2d\x77\x65\x62\x6b\x69\x74\x2d\x67\x72\x61\x64\x69\x65\x6e\x74\ +\x28\x6c\x69\x6e\x65\x61\x72\x2c\x20\x6c\x65\x66\x74\x20\x74\x6f\ +\x70\x2c\x20\x6c\x65\x66\x74\x20\x62\x6f\x74\x74\x6f\x6d\x2c\x20\ +\x66\x72\x6f\x6d\x28\x23\x38\x35\x37\x38\x34\x41\x29\x2c\x20\x74\ +\x6f\x28\x23\x46\x44\x46\x44\x46\x44\x29\x2c\x20\x63\x6f\x6c\x6f\ +\x72\x2d\x73\x74\x6f\x70\x28\x30\x2e\x35\x2c\x20\x23\x46\x44\x46\ +\x44\x46\x44\x29\x29\x3b\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\ +\x75\x6e\x64\x2d\x72\x65\x70\x65\x61\x74\x3a\x20\x72\x65\x70\x65\ +\x61\x74\x2d\x78\x3b\x0a\x7d\x0a\x69\x6d\x67\x20\x7b\x0a\x20\x20\ +\x66\x6c\x6f\x61\x74\x3a\x20\x6c\x65\x66\x74\x3b\x0a\x20\x20\x6f\ +\x70\x61\x63\x69\x74\x79\x3a\x20\x2e\x38\x3b\x0a\x7d\x0a\x23\x62\ +\x6f\x78\x20\x7b\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ +\x64\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x62\x6f\x72\x64\ +\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x38\ +\x35\x37\x38\x34\x41\x3b\x0a\x20\x20\x77\x69\x64\x74\x68\x3a\x20\ +\x36\x30\x30\x70\x78\x3b\x0a\x20\x20\x70\x61\x64\x64\x69\x6e\x67\ +\x3a\x20\x36\x30\x70\x78\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\ +\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\x62\x6f\x72\x64\x65\x72\ +\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x30\x2e\x38\x65\x6d\x3b\x0a\ +\x7d\x0a\x68\x31\x20\x7b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\ +\x7a\x65\x3a\x20\x31\x33\x30\x25\x3b\x0a\x20\x20\x66\x6f\x6e\x74\ +\x2d\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x20\ +\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\ +\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x38\x35\x37\x38\x34\ +\x41\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\ +\x3a\x20\x36\x34\x70\x78\x3b\x0a\x7d\x0a\x68\x32\x20\x7b\x0a\x20\ +\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x30\x30\x25\ +\x3b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\x77\x65\x69\x67\x68\x74\x3a\ +\x20\x6e\x6f\x72\x6d\x61\x6c\x3b\x0a\x20\x20\x62\x6f\x72\x64\x65\ +\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\x70\x78\x20\x73\x6f\ +\x6c\x69\x64\x20\x23\x38\x35\x37\x38\x34\x41\x3b\x0a\x20\x20\x6d\ +\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\x3a\x20\x36\x34\x70\x78\ +\x3b\x0a\x7d\x0a\x75\x6c\x20\x7b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\ +\x73\x69\x7a\x65\x3a\x20\x31\x30\x30\x25\x3b\x0a\x20\x20\x70\x61\ +\x64\x64\x69\x6e\x67\x2d\x6c\x65\x66\x74\x3a\x20\x36\x34\x70\x78\ +\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x35\x70\x78\x20\ +\x30\x3b\x0a\x7d\x0a\x3c\x2f\x73\x74\x79\x6c\x65\x3e\x0a\x3c\x2f\ +\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\x0a\x20\x20\x3c\ +\x64\x69\x76\x20\x69\x64\x3d\x22\x62\x6f\x78\x22\x3e\x0a\x20\x20\ +\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x64\x61\x74\x61\ +\x3a\x69\x6d\x61\x67\x65\x2f\x70\x6e\x67\x3b\x62\x61\x73\x65\x36\ +\x34\x2c\x40\x49\x4d\x41\x47\x45\x40\x22\x20\x77\x69\x64\x74\x68\ +\x3d\x22\x34\x38\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x34\x38\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x68\x31\x3e\x40\x48\x31\x40\ +\x3c\x2f\x68\x31\x3e\x0a\x20\x20\x20\x20\x3c\x68\x32\x3e\x40\x48\ +\x32\x40\x3c\x2f\x68\x32\x3e\x0a\x20\x20\x20\x20\x3c\x75\x6c\x3e\ +\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\x3e\x40\x4c\x49\x2d\x31\ +\x40\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\ +\x3e\x40\x4c\x49\x2d\x32\x40\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\ +\x20\x20\x20\x3c\x6c\x69\x3e\x40\x4c\x49\x2d\x33\x40\x3c\x2f\x6c\ +\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\x3e\x40\x4c\x49\ +\x2d\x34\x40\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\ +\x69\x6e\x70\x75\x74\x20\x74\x79\x70\x65\x3d\x22\x73\x75\x62\x6d\ +\x69\x74\x22\x20\x69\x64\x3d\x22\x72\x65\x6c\x6f\x61\x64\x42\x75\ +\x74\x74\x6f\x6e\x22\x20\x76\x61\x6c\x75\x65\x3d\x22\x40\x42\x55\ +\x54\x54\x4f\x4e\x40\x22\x20\x6f\x6e\x63\x6c\x69\x63\x6b\x3d\x22\ +\x77\x69\x6e\x64\x6f\x77\x2e\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e\ +\x72\x65\x6c\x6f\x61\x64\x28\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x2f\x75\x6c\x3e\x0a\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\ +\x62\x6f\x64\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\ \x00\x00\x0c\xfe\ \x3c\ \x21\x44\x4f\x43\x54\x59\x50\x45\x20\x68\x74\x6d\x6c\x3e\x0a\x3c\ @@ -280,85 +299,6 @@ \x0a\x20\x20\x20\x20\x3c\x64\x69\x76\x20\x69\x64\x3d\x22\x66\x6f\ \x6f\x74\x65\x72\x22\x3e\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\x62\ \x6f\x64\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\ -\x00\x00\x04\xcf\ -\x3c\ -\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x68\x74\x6d\x6c\x3e\x0a\x3c\ -\x68\x74\x6d\x6c\x3e\x0a\x3c\x68\x65\x61\x64\x3e\x0a\x3c\x6d\x65\ -\x74\x61\x20\x63\x68\x61\x72\x73\x65\x74\x3d\x22\x75\x74\x66\x2d\ -\x38\x22\x3e\x20\x0a\x3c\x6d\x65\x74\x61\x20\x68\x74\x74\x70\x2d\ -\x65\x71\x75\x69\x76\x3d\x22\x63\x6f\x6e\x74\x65\x6e\x74\x2d\x74\ -\x79\x70\x65\x22\x20\x63\x6f\x6e\x74\x65\x6e\x74\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x3b\x20\x63\x68\x61\x72\x73\x65\x74\ -\x3d\x75\x74\x66\x2d\x38\x22\x3e\x0a\x3c\x74\x69\x74\x6c\x65\x3e\ -\x40\x54\x49\x54\x4c\x45\x40\x3c\x2f\x74\x69\x74\x6c\x65\x3e\x0a\ -\x3c\x6c\x69\x6e\x6b\x20\x72\x65\x6c\x3d\x22\x69\x63\x6f\x6e\x22\ -\x20\x68\x72\x65\x66\x3d\x22\x64\x61\x74\x61\x3a\x69\x6d\x61\x67\ -\x65\x2f\x70\x6e\x67\x3b\x62\x61\x73\x65\x36\x34\x2c\x40\x46\x41\ -\x56\x49\x43\x4f\x4e\x40\x22\x20\x74\x79\x70\x65\x3d\x22\x69\x6d\ -\x61\x67\x65\x2f\x78\x2d\x69\x63\x6f\x6e\x22\x20\x2f\x3e\x0a\x3c\ -\x73\x74\x79\x6c\x65\x3e\x0a\x62\x6f\x64\x79\x20\x7b\x0a\x20\x20\ -\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x33\x65\x6d\x20\x30\x65\x6d\ -\x3b\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\ -\x2d\x77\x65\x62\x6b\x69\x74\x2d\x67\x72\x61\x64\x69\x65\x6e\x74\ -\x28\x6c\x69\x6e\x65\x61\x72\x2c\x20\x6c\x65\x66\x74\x20\x74\x6f\ -\x70\x2c\x20\x6c\x65\x66\x74\x20\x62\x6f\x74\x74\x6f\x6d\x2c\x20\ -\x66\x72\x6f\x6d\x28\x23\x38\x35\x37\x38\x34\x41\x29\x2c\x20\x74\ -\x6f\x28\x23\x46\x44\x46\x44\x46\x44\x29\x2c\x20\x63\x6f\x6c\x6f\ -\x72\x2d\x73\x74\x6f\x70\x28\x30\x2e\x35\x2c\x20\x23\x46\x44\x46\ -\x44\x46\x44\x29\x29\x3b\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\ -\x75\x6e\x64\x2d\x72\x65\x70\x65\x61\x74\x3a\x20\x72\x65\x70\x65\ -\x61\x74\x2d\x78\x3b\x0a\x7d\x0a\x69\x6d\x67\x20\x7b\x0a\x20\x20\ -\x66\x6c\x6f\x61\x74\x3a\x20\x6c\x65\x66\x74\x3b\x0a\x20\x20\x6f\ -\x70\x61\x63\x69\x74\x79\x3a\x20\x2e\x38\x3b\x0a\x7d\x0a\x23\x62\ -\x6f\x78\x20\x7b\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\ -\x64\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\x62\x6f\x72\x64\ -\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x38\ -\x35\x37\x38\x34\x41\x3b\x0a\x20\x20\x77\x69\x64\x74\x68\x3a\x20\ -\x36\x30\x30\x70\x78\x3b\x0a\x20\x20\x70\x61\x64\x64\x69\x6e\x67\ -\x3a\x20\x36\x30\x70\x78\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\ -\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\x62\x6f\x72\x64\x65\x72\ -\x2d\x72\x61\x64\x69\x75\x73\x3a\x20\x30\x2e\x38\x65\x6d\x3b\x0a\ -\x7d\x0a\x68\x31\x20\x7b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\ -\x7a\x65\x3a\x20\x31\x33\x30\x25\x3b\x0a\x20\x20\x66\x6f\x6e\x74\ -\x2d\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x20\ -\x20\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\ -\x31\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x38\x35\x37\x38\x34\ -\x41\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\ -\x3a\x20\x36\x34\x70\x78\x3b\x0a\x7d\x0a\x68\x32\x20\x7b\x0a\x20\ -\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\x65\x3a\x20\x31\x30\x30\x25\ -\x3b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\x77\x65\x69\x67\x68\x74\x3a\ -\x20\x6e\x6f\x72\x6d\x61\x6c\x3b\x0a\x20\x20\x62\x6f\x72\x64\x65\ -\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\x70\x78\x20\x73\x6f\ -\x6c\x69\x64\x20\x23\x38\x35\x37\x38\x34\x41\x3b\x0a\x20\x20\x6d\ -\x61\x72\x67\x69\x6e\x2d\x6c\x65\x66\x74\x3a\x20\x36\x34\x70\x78\ -\x3b\x0a\x7d\x0a\x75\x6c\x20\x7b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\ -\x73\x69\x7a\x65\x3a\x20\x31\x30\x30\x25\x3b\x0a\x20\x20\x70\x61\ -\x64\x64\x69\x6e\x67\x2d\x6c\x65\x66\x74\x3a\x20\x36\x34\x70\x78\ -\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x35\x70\x78\x20\ -\x30\x3b\x0a\x7d\x0a\x3c\x2f\x73\x74\x79\x6c\x65\x3e\x0a\x3c\x2f\ -\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\x0a\x20\x20\x3c\ -\x64\x69\x76\x20\x69\x64\x3d\x22\x62\x6f\x78\x22\x3e\x0a\x20\x20\ -\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x64\x61\x74\x61\ -\x3a\x69\x6d\x61\x67\x65\x2f\x70\x6e\x67\x3b\x62\x61\x73\x65\x36\ -\x34\x2c\x40\x49\x4d\x41\x47\x45\x40\x22\x20\x77\x69\x64\x74\x68\ -\x3d\x22\x34\x38\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x34\x38\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x68\x31\x3e\x40\x48\x31\x40\ -\x3c\x2f\x68\x31\x3e\x0a\x20\x20\x20\x20\x3c\x68\x32\x3e\x40\x48\ -\x32\x40\x3c\x2f\x68\x32\x3e\x0a\x20\x20\x20\x20\x3c\x75\x6c\x3e\ -\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\x3e\x40\x4c\x49\x2d\x31\ -\x40\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\ -\x3e\x40\x4c\x49\x2d\x32\x40\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\ -\x20\x20\x20\x3c\x6c\x69\x3e\x40\x4c\x49\x2d\x33\x40\x3c\x2f\x6c\ -\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\x3e\x40\x4c\x49\ -\x2d\x34\x40\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\ -\x69\x6e\x70\x75\x74\x20\x74\x79\x70\x65\x3d\x22\x73\x75\x62\x6d\ -\x69\x74\x22\x20\x69\x64\x3d\x22\x72\x65\x6c\x6f\x61\x64\x42\x75\ -\x74\x74\x6f\x6e\x22\x20\x76\x61\x6c\x75\x65\x3d\x22\x40\x42\x55\ -\x54\x54\x4f\x4e\x40\x22\x20\x6f\x6e\x63\x6c\x69\x63\x6b\x3d\x22\ -\x77\x69\x6e\x64\x6f\x77\x2e\x6c\x6f\x63\x61\x74\x69\x6f\x6e\x2e\ -\x72\x65\x6c\x6f\x61\x64\x28\x29\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x2f\x75\x6c\x3e\x0a\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\ -\x62\x6f\x64\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\ \x00\x00\x10\xb6\ \x00\ \x00\x41\xa5\x78\x9c\xcd\x1c\xfd\x57\xdb\x46\xf2\x77\xfe\x8a\xad\ @@ -629,6 +569,64 @@ \xd2\xcd\xa7\x57\xd6\x65\xa9\x32\x9f\x0f\x35\xd6\x91\xf9\x70\x89\ \x24\x6a\x3e\xe7\x7f\xee\x35\x78\x05\xb0\xd7\xe0\xff\x37\x86\xff\ \x01\x62\x7f\x20\x9a\ +\x00\x00\x03\x7c\ +\x3c\ +\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x68\x74\x6d\x6c\x3e\x0a\x3c\ +\x68\x74\x6d\x6c\x3e\x0a\x3c\x68\x65\x61\x64\x3e\x0a\x3c\x6d\x65\ +\x74\x61\x20\x63\x68\x61\x72\x73\x65\x74\x3d\x22\x75\x74\x66\x2d\ +\x38\x22\x3e\x20\x0a\x3c\x6d\x65\x74\x61\x20\x68\x74\x74\x70\x2d\ +\x65\x71\x75\x69\x76\x3d\x22\x63\x6f\x6e\x74\x65\x6e\x74\x2d\x74\ +\x79\x70\x65\x22\x20\x63\x6f\x6e\x74\x65\x6e\x74\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x3b\x20\x63\x68\x61\x72\x73\x65\x74\ +\x3d\x75\x74\x66\x2d\x38\x22\x3e\x0a\x3c\x74\x69\x74\x6c\x65\x3e\ +\x40\x54\x49\x54\x4c\x45\x40\x3c\x2f\x74\x69\x74\x6c\x65\x3e\x0a\ +\x3c\x6c\x69\x6e\x6b\x20\x72\x65\x6c\x3d\x22\x69\x63\x6f\x6e\x22\ +\x20\x68\x72\x65\x66\x3d\x22\x40\x46\x41\x56\x49\x43\x4f\x4e\x40\ +\x22\x20\x74\x79\x70\x65\x3d\x22\x69\x6d\x61\x67\x65\x2f\x78\x2d\ +\x69\x63\x6f\x6e\x22\x20\x2f\x3e\x0a\x3c\x73\x74\x79\x6c\x65\x3e\ +\x0a\x62\x6f\x64\x79\x20\x7b\x0a\x20\x20\x70\x61\x64\x64\x69\x6e\ +\x67\x3a\x20\x33\x65\x6d\x20\x30\x65\x6d\x3b\x0a\x20\x20\x62\x61\ +\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3a\x20\x2d\x77\x65\x62\x6b\x69\ +\x74\x2d\x67\x72\x61\x64\x69\x65\x6e\x74\x28\x6c\x69\x6e\x65\x61\ +\x72\x2c\x20\x6c\x65\x66\x74\x20\x74\x6f\x70\x2c\x20\x6c\x65\x66\ +\x74\x20\x62\x6f\x74\x74\x6f\x6d\x2c\x20\x66\x72\x6f\x6d\x28\x23\ +\x38\x35\x37\x38\x34\x41\x29\x2c\x20\x74\x6f\x28\x23\x46\x44\x46\ +\x44\x46\x44\x29\x2c\x20\x63\x6f\x6c\x6f\x72\x2d\x73\x74\x6f\x70\ +\x28\x30\x2e\x35\x2c\x20\x23\x46\x44\x46\x44\x46\x44\x29\x29\x3b\ +\x0a\x20\x20\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x2d\x72\x65\ +\x70\x65\x61\x74\x3a\x20\x72\x65\x70\x65\x61\x74\x2d\x78\x3b\x0a\ +\x7d\x0a\x23\x62\x6f\x78\x20\x7b\x0a\x20\x20\x62\x61\x63\x6b\x67\ +\x72\x6f\x75\x6e\x64\x3a\x20\x77\x68\x69\x74\x65\x3b\x0a\x20\x20\ +\x62\x6f\x72\x64\x65\x72\x3a\x20\x31\x70\x78\x20\x73\x6f\x6c\x69\ +\x64\x20\x23\x38\x35\x37\x38\x34\x41\x3b\x0a\x20\x20\x6d\x61\x78\ +\x2d\x77\x69\x64\x74\x68\x3a\x20\x36\x30\x30\x70\x78\x3b\x0a\x20\ +\x20\x68\x65\x69\x67\x68\x74\x3a\x20\x35\x30\x25\x3b\x0a\x20\x20\ +\x70\x61\x64\x64\x69\x6e\x67\x3a\x20\x34\x30\x70\x78\x3b\x0a\x20\ +\x20\x70\x61\x64\x64\x69\x6e\x67\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\ +\x20\x31\x30\x70\x78\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x3a\ +\x20\x61\x75\x74\x6f\x3b\x0a\x20\x20\x62\x6f\x72\x64\x65\x72\x2d\ +\x72\x61\x64\x69\x75\x73\x3a\x20\x30\x2e\x38\x65\x6d\x3b\x0a\x20\ +\x20\x74\x65\x78\x74\x2d\x61\x6c\x69\x67\x6e\x3a\x20\x63\x65\x6e\ +\x74\x65\x72\x3b\x0a\x20\x20\x76\x65\x72\x74\x69\x63\x61\x6c\x2d\ +\x61\x6c\x69\x67\x6e\x3a\x20\x6d\x69\x64\x64\x6c\x65\x3b\x0a\x20\ +\x20\x6d\x61\x72\x67\x69\x6e\x3a\x20\x61\x75\x74\x6f\x3b\x0a\x7d\ +\x0a\x68\x31\x20\x7b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\x73\x69\x7a\ +\x65\x3a\x20\x31\x33\x30\x25\x3b\x0a\x20\x20\x66\x6f\x6e\x74\x2d\ +\x77\x65\x69\x67\x68\x74\x3a\x20\x62\x6f\x6c\x64\x3b\x0a\x20\x20\ +\x62\x6f\x72\x64\x65\x72\x2d\x62\x6f\x74\x74\x6f\x6d\x3a\x20\x31\ +\x70\x78\x20\x73\x6f\x6c\x69\x64\x20\x23\x38\x35\x37\x38\x34\x41\ +\x3b\x0a\x20\x20\x6d\x61\x72\x67\x69\x6e\x2d\x62\x6f\x74\x74\x6f\ +\x6d\x3a\x20\x30\x70\x78\x3b\x0a\x7d\x0a\x3c\x2f\x73\x74\x79\x6c\ +\x65\x3e\x0a\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\ +\x3e\x0a\x20\x20\x3c\x64\x69\x76\x20\x69\x64\x3d\x22\x62\x6f\x78\ +\x22\x3e\x0a\x20\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\ +\x22\x40\x49\x4d\x41\x47\x45\x40\x22\x20\x77\x69\x64\x74\x68\x3d\ +\x22\x36\x34\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x22\ +\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x68\x31\x3e\x41\x64\x42\x6c\x6f\ +\x63\x6b\x20\x50\x6c\x75\x73\x3c\x2f\x68\x31\x3e\x0a\x20\x20\x20\ +\x20\x3c\x70\x3e\x40\x4d\x45\x53\x53\x41\x47\x45\x40\x3c\x2f\x70\ +\x3e\x0a\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\x62\x6f\x64\ +\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\ " qt_resource_name = b"\ @@ -636,33 +634,33 @@ \x00\x06\xfb\x3c\ \x00\x68\ \x00\x74\x00\x6d\x00\x6c\ -\x00\x10\ -\x0b\xe9\x1d\x9c\ -\x00\x61\ -\x00\x64\x00\x62\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ -\x00\x0e\ -\x08\x97\xc9\x7c\ -\x00\x73\ -\x00\x74\x00\x61\x00\x72\x00\x74\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ \x00\x11\ \x01\xd8\x74\x9c\ \x00\x6e\ \x00\x6f\x00\x74\x00\x46\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ \ +\x00\x0e\ +\x08\x97\xc9\x7c\ +\x00\x73\ +\x00\x74\x00\x61\x00\x72\x00\x74\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ \x00\x12\ \x06\x3e\x39\x5c\ \x00\x73\ \x00\x70\x00\x65\x00\x65\x00\x64\x00\x64\x00\x69\x00\x61\x00\x6c\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x68\x00\x74\x00\x6d\ \x00\x6c\ +\x00\x10\ +\x0b\xe9\x1d\x9c\ +\x00\x61\ +\x00\x64\x00\x62\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\ " qt_resource_struct = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x02\ -\x00\x00\x00\x56\x00\x00\x00\x00\x00\x01\x00\x00\x10\x82\ -\x00\x00\x00\x7e\x00\x01\x00\x00\x00\x01\x00\x00\x15\x55\ -\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x03\x80\ \x00\x00\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ +\x00\x00\x00\x58\x00\x01\x00\x00\x00\x01\x00\x00\x11\xd5\ +\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x04\xd3\ +\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x22\x8f\ " def qInitResources():
--- a/Helpviewer/data/icons_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/data/icons_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,68 +2,219 @@ # Resource object code # -# Created: Mi. Mär. 12 19:07:16 2014 -# by: The Resource Compiler for PyQt (Qt v5.2.1) +# Created: So. Juni 29 18:58:04 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from __future__ import unicode_literals - -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x03\x16\ +\x00\x00\x03\xb1\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ +\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ +\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\x5e\x1a\ +\x91\x1c\x00\x00\x03\x56\x49\x44\x41\x54\x48\xc7\xdd\x95\x4d\x68\ +\x5c\x55\x14\xc7\x7f\xf7\xe3\xbd\x97\xe9\x34\x69\x5a\x93\x60\xdb\ +\x80\x60\xc1\x12\x9a\x20\x0d\x49\x88\x50\xca\x43\xbb\x70\x93\x85\ +\x62\x41\x2b\xea\x42\xb0\xb8\xb2\x20\x08\x6e\x64\xd0\x55\x4b\x2d\ +\x48\x37\x22\x48\x10\x8c\x20\xba\x09\x45\xa4\x12\xe2\x98\x8a\x29\ +\x1a\xa4\x92\x6a\x6d\x4a\x9b\xb4\x19\x9d\x98\xc4\xb1\xd3\x99\x79\ +\xf3\xde\x9b\xf7\xee\x75\x51\x2c\xe4\x63\x31\xc1\x6e\xf4\xec\xee\ +\xc7\x39\xbf\x7b\xee\xb9\xff\x73\xe1\xbf\x6e\xa2\x99\x4d\xfd\x9f\ +\x3e\xd4\xff\xdc\x23\x2f\x7d\x38\xbe\xf0\xc9\xa3\x8e\x94\xc1\xc1\ +\xae\xc1\xc9\xa1\xae\x43\x6f\x3c\xbb\xef\xd5\x5f\xb7\x04\xc8\xe7\ +\xf3\x76\xb3\x4d\x1f\x94\x4f\xf3\xee\x91\xf7\x99\x2d\xcd\x90\xda\ +\x98\x30\x89\x28\xdd\x5e\x65\xdf\x9d\x83\x9b\x06\xf5\x7d\xff\x5e\ +\x5c\xbd\x7e\x31\x9f\xcf\x6f\x70\xb8\xb6\x67\x8e\x6f\x0a\x13\x74\ +\x74\x08\x04\x29\x5e\xb5\x8d\xc9\xf9\x2f\x58\x9c\x2d\x6f\x16\x7c\ +\xcd\x58\x6f\x76\x82\x5c\x2e\xb7\x26\xb3\x87\x3f\xda\xf5\x43\x6c\ +\xa2\x81\xdf\x6a\xab\x08\x04\xd9\x44\x33\x2f\xaf\xce\x8c\xe5\x26\ +\x06\xd7\xf9\x6d\xb8\x01\xdd\x4c\x0d\x52\x63\x48\xad\x21\x6c\xc4\ +\x08\xa0\xc5\x1a\x8c\x69\xae\xc8\x4d\x01\x4c\x6a\x30\x58\x6a\x71\ +\x08\x08\xda\x74\x4a\x6a\xec\xfd\x03\x24\xc6\x24\xc6\x1a\xea\xc9\ +\xdd\x0c\x8c\x34\x24\xa9\x49\xb6\x04\x38\x3b\x73\xb6\xb7\x20\x0b\ +\x9c\xeb\x3c\x07\xa7\xf9\xde\xd3\x5a\x68\x29\xd1\x52\x26\x89\xb1\ +\x7d\x49\x9a\x12\x36\x42\xa4\x10\xc4\x6e\x8c\xc5\xf6\x0d\x7e\xde\ +\x3d\xed\x69\xad\x1d\xad\xd0\x12\xbb\xcc\x4f\xd4\xf6\xec\x67\xa2\ +\xf8\x59\xcf\x91\xdd\x47\xaf\xac\x01\xcc\xfd\x39\xf7\xde\xa9\xc7\ +\x4f\x51\x11\x65\x8e\xc6\x4f\x0f\x4a\x29\x11\xc2\x82\x00\x29\x04\ +\x59\x37\x63\x83\x30\x10\x00\x9e\xf2\xec\xf1\xde\xd7\xb3\x4a\xa8\ +\x61\x29\x24\x5a\x2a\xb6\x39\x59\xb6\xeb\xed\x34\x08\xf8\xea\xd6\ +\xd8\x3b\xc0\x33\x6b\x00\xa3\x97\x46\x87\x0f\x74\xf4\x70\xa3\x72\ +\x85\x62\x58\x44\x6a\x85\x52\xa0\x94\x44\x0b\xc9\x5c\x60\x44\xc3\ +\x84\x48\x01\xd3\x2b\x93\x42\x0b\x05\x48\x5a\x9d\x76\x8c\x51\xfc\ +\xb2\x74\x8d\x1b\xc5\x45\x5e\x1c\x1a\x61\x29\x28\x3c\xb9\xe1\x8a\ +\x82\x28\xb0\x97\x57\x7e\x26\x30\x65\x6a\x69\x1d\x65\x25\xca\x48\ +\x1c\xa3\x70\xd4\xdd\x6c\x94\x54\x78\xca\xa3\x45\xb5\xa0\x71\xa9\ +\xc4\x55\xbe\xfb\xe3\x22\xf3\xa5\x5b\x54\xc2\x90\xac\x69\xa7\xd6\ +\xa8\xd2\x30\xe9\xc6\x1a\x58\x63\xc7\xa7\x16\x2e\x1c\xeb\xe9\xec\ +\xc1\x53\x6d\x68\xa9\xf0\x94\x8b\x87\x8b\x46\xd1\xea\x64\xec\xc5\ +\xe5\xf3\xc2\xca\x98\xa1\xce\x27\x6c\x10\xd7\x85\x12\x9a\xbe\x07\ +\x0e\xd0\xb7\xab\x17\x8b\xc5\x95\x8a\x42\x78\x95\xc4\xa4\xe3\x9b\ +\x01\x4e\x64\xa2\xcc\xb1\xa9\xcb\x53\x14\xdd\xe2\x0c\x02\x90\x20\ +\x24\x89\xab\x54\xdf\x53\xfb\x47\xb2\x5a\x5b\x32\x6e\x96\xdb\xf5\ +\xbf\xc4\x97\x0b\xe7\x6b\x9e\x23\x67\x5d\xa5\xb4\xab\x14\xae\xd6\ +\xec\x8c\x3a\x06\xba\xdb\xbb\x89\x68\x9c\xd8\xf8\x4c\xdf\x66\xe5\ +\x64\xfe\x24\xf9\x7c\x9e\xdc\x9b\xb9\x7b\x0a\xb5\x80\x39\x63\xa7\ +\x83\x24\x18\xd6\x8e\xc4\xd3\x92\xba\x09\x48\x4c\x32\x7b\xf3\x85\ +\xca\x63\x6b\x95\xfc\xb2\xf5\x7d\x1f\xdf\xf7\x57\xfe\x99\x93\x4d\ +\x29\xd9\xa2\xab\x71\x15\x8b\x45\x29\x41\x64\x42\x52\xd3\x9c\x86\ +\x9a\x53\xb2\x35\x54\xa2\x0a\xa9\x13\x92\x71\x15\x51\x5c\x25\x69\ +\xb2\x57\x34\x05\xc0\xc0\x6a\xbd\x8c\x67\x22\xea\x8d\x06\x36\x89\ +\x48\xed\xbf\x00\xac\xef\x8a\x1f\xcb\x51\x5c\x62\x16\x4b\x15\x56\ +\x74\x8d\xbd\xdb\xba\xd9\x5b\xef\x1e\x78\x2d\xf7\xbc\xdd\x32\x60\ +\x7d\x3f\x07\x98\x5b\xfe\x1a\xe9\x2d\xb2\x50\x2d\x61\x52\x4d\x97\ +\xde\x8d\xd3\xea\xe0\xf7\xfb\xf7\xe7\xcb\x1c\x19\x7b\xf0\xd0\x1d\ +\xd4\x99\x0b\x4b\xbf\x0f\xb4\x7b\x3b\xea\x87\x77\x1e\xfe\xf6\xd2\ +\xf5\x1f\x5f\x59\x78\xab\x70\x93\xff\xbd\xfd\x0d\xf6\xbd\x75\x1d\ +\x3b\xea\x7e\x89\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\ +\x00\x00\x04\x7f\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ +\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ +\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\ +\x00\x00\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\ +\x5e\x1a\x91\x1c\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x01\x0a\ +\x17\x02\x30\xf6\x73\x58\xfb\x00\x00\x03\xff\x49\x44\x41\x54\x48\ +\xc7\xbd\x95\x6b\x4c\x9b\x75\x14\xc6\x9f\xb7\xd7\xc1\xe8\xe8\xca\ +\x66\x3b\x4a\xc9\x80\x7a\x03\x5a\xca\x8c\x81\x99\x60\x5e\x37\x2e\ +\x92\x2c\xd9\x07\x2c\x4a\xe4\x36\x32\x34\xc6\x84\x0c\xe2\x40\x12\ +\x63\x5f\xb2\xa8\x89\x41\xe2\x52\xd6\x80\x51\xc1\x38\xa5\xc8\x75\ +\x1b\x42\x3b\x88\x62\x59\x02\x6c\x0c\x07\x04\x4a\xe2\x56\x20\x8b\ +\x5c\x02\x65\xa9\xb6\x89\xbc\x57\xbf\xa0\x21\x0a\x8c\x6e\xd1\xf3\ +\xf9\x7f\xce\xef\xfc\x9f\x73\x9e\x1c\xe0\x3f\x0e\xe2\x51\xf3\x2a\ +\x2a\x2a\x4c\x99\x99\x99\x65\xa1\xa1\xa1\xa9\x1c\xcf\xc9\xfc\x7e\ +\xdf\xdd\x55\xef\x5a\x6b\x6d\x4f\xdd\xe5\x99\xb6\x19\xfa\xb1\x9a\ +\xb2\x58\xde\x2b\x59\x5c\x5a\xa4\x39\x8e\x15\x7c\x3e\x9f\x30\x37\ +\x3f\x27\xdc\x1e\x1f\x13\x3a\x3a\xdb\xf8\x8a\x77\xce\x59\x01\x48\ +\xfe\x7a\x2c\xd9\x9a\x39\x38\x38\x28\x3c\xac\x7a\x4d\x4d\x8d\x3e\ +\xf5\xf8\x0b\xf5\x52\xa9\x54\xca\x32\x1c\xc4\x12\x31\x5a\xed\x76\ +\xbe\xa3\xa3\xc3\x73\xe7\xce\x44\x0f\xc3\x30\x76\x00\xc2\xb6\x80\ +\x4d\xc8\xae\x00\x85\x62\xff\xe9\xf0\x70\x45\x08\xc7\x71\x60\x58\ +\x1a\x04\x41\xa0\xb7\xcf\xf1\xf5\xad\x5b\x63\xd5\x14\x45\x2d\x92\ +\x24\x79\x8e\x24\x49\x62\x47\x00\x00\x50\x14\xb5\xd3\x6c\xc4\x45\ +\x45\xf9\x76\x8f\x67\x1e\x31\x31\x7a\x30\x0c\x03\x91\x58\x8c\x23\ +\x1a\x8d\x1b\xc0\xf2\x76\x09\xa2\x20\xf5\x0f\x79\x36\x3e\xe1\x79\ +\xb7\x7b\x06\x2c\xcb\x80\x65\x59\xb0\x0c\x8b\xc2\xc2\x82\xf4\xf8\ +\xf8\x78\xe9\xd6\xc6\xaa\xaa\xaa\xc2\x83\x06\xa4\xa5\xa5\x3d\xa5\ +\xd7\xc7\x45\x4b\xa5\x32\xb8\x67\xdc\x20\x08\x02\x2c\xcb\x20\x56\ +\x1f\x97\x5e\x5c\x5c\xd0\x5b\x56\x56\x16\xbd\xbc\x7c\xff\xb9\xeb\ +\xd7\x9d\x5f\x28\x0e\x84\x8d\x05\x0b\x20\x48\xf2\xc5\x53\x5a\xad\ +\x96\xd0\x6a\xb5\xe8\xec\xea\xc6\x47\x1f\xd7\x82\x65\x59\xec\x93\ +\xcb\x11\xa5\x8b\x3e\x19\xba\x3f\x64\x56\x1f\xf7\xcc\x58\x64\x64\ +\x64\xc9\x90\x6b\xe8\x41\xb0\x00\x79\xa2\xc1\x98\x73\xf7\xde\x1c\ +\x3a\xbb\x7b\x60\x3a\x76\x0c\x3d\x0e\x07\x26\xa7\xa6\x00\x01\xd0\ +\xe9\x74\x08\x0b\x0b\x0b\x91\xed\x93\x11\x23\xa3\xa3\x6c\x7f\xff\ +\x40\x4b\x30\x00\x82\xa2\xde\x37\x27\x9b\x4c\x46\x43\x42\x02\x7e\ +\x5d\x5a\x82\x58\x24\x42\x6c\x4c\x0c\x5a\xdb\xdb\xc1\xf3\x3c\x94\ +\x4a\x25\x08\x82\xc0\xac\x7b\x56\xa8\xae\xac\x76\xf2\x3c\xdf\xb2\ +\xe3\x16\xfd\xb3\xb8\xcd\x66\xcd\x4b\x49\x39\xde\xb8\xb2\xb2\x02\ +\x83\xc1\x80\xec\xac\x0c\xf4\x3a\x1c\x38\x1a\xa5\x85\x29\xc9\x08\ +\x99\x5c\x86\xd5\xd5\x15\xac\x7b\xd7\x99\xd7\x2d\xf9\xdf\x33\x0c\ +\x53\x0d\x60\x05\xdb\x78\x40\xa0\x28\xea\x6f\x93\x98\xcd\x66\x71\ +\x73\xf3\x97\x96\xcb\xdf\x7e\xc3\x65\x65\x65\x09\x29\xa9\x29\x82\ +\xcb\xe5\x12\x3c\x9e\x7b\xc2\x8f\x83\x3f\x70\x79\x79\xaf\xfd\xf6\ +\x12\x49\xce\x91\x24\xe9\x12\x8b\xc5\x56\x00\x85\x9b\x66\xdd\xdd\ +\x07\x00\x50\x52\x52\xa2\x38\x91\x71\xa2\x69\x7a\x6a\x3a\xc7\xe9\ +\x74\x22\x42\x15\x01\x9d\x2e\x1a\x6a\x8d\x9a\xbf\x74\xc9\x76\xd3\ +\x6a\xb5\x5e\xa3\x69\xfa\x36\x80\x39\x00\x6b\x00\xfc\x14\x45\x6d\ +\x6c\xa6\x0b\xbb\x02\xca\xcb\xcb\xf5\xa6\x64\x43\x47\x5b\xeb\x77\ +\xc6\xf1\xf1\x9f\xa1\x52\xa9\xc0\xb2\x2c\xce\x14\x17\x09\x36\x9b\ +\xad\xeb\xe2\xa7\x17\x2b\x01\x2c\x00\xe0\x1e\xa6\xef\xbf\x00\x7e\ +\xbf\x2f\xfb\xc9\xa7\xe3\x46\x6c\xb6\x86\x88\xf9\xf9\x05\x48\xa4\ +\x12\xd0\x34\x8d\x97\xb3\xb3\x30\x39\x39\xe5\xda\x2c\xee\xd9\xeb\ +\xea\x6d\x05\x48\xaf\x5e\xed\xae\x3e\xac\x3e\x7c\xad\xa1\xe1\x33\ +\xc9\xda\xaa\x17\x22\x91\x08\x1c\xcb\x21\x29\x39\x09\xaa\x83\xaa\ +\x5f\x4a\x4b\xdf\x38\xbf\x29\x09\x82\x02\xe8\xf5\x7a\x79\xd1\x99\ +\xfc\x7a\xb5\x5a\x73\x76\x7a\x7a\x1a\x07\x14\x0a\xd0\x1b\x34\x02\ +\x81\x00\xa2\xa2\xa2\x90\x71\x32\xdd\x5b\x79\xbe\xaa\x12\xc0\xf8\ +\x56\x7d\xf7\x12\x22\x00\x78\xf3\xad\xd2\x2a\x8e\xe3\x72\x9b\x9a\ +\xbf\x7a\xd7\xbb\xfe\xe0\x15\xf3\xab\xe6\xfb\x4a\xa5\x12\x5a\xad\ +\x16\xc5\xc5\x85\x1b\x9f\xd4\xd6\x7d\xe0\xf5\x7a\xfb\xf6\xa2\xf9\ +\xb6\x3f\x38\x14\x71\xc8\x7c\xa5\xeb\xca\xcd\xe1\x1b\xc3\x8d\xc3\ +\x37\x86\x7d\x26\x43\x82\xc6\x68\x34\xd4\x27\x1a\x12\x79\x7b\x8b\ +\xfd\xf3\xdc\xdc\xdc\x3a\x00\x75\x8f\x72\x9d\x24\x00\x20\x97\xcb\ +\x7e\x57\x1f\xd1\xa8\x01\xa8\x01\xf8\xff\x60\x99\x27\x92\x93\x93\ +\x04\x47\x9f\xa3\xdb\x62\xa9\x79\xfb\xb1\x6f\x72\x63\xa3\xad\x20\ +\xfc\x60\x78\xd3\xe8\xc8\xe8\x08\x41\x10\x0b\x31\xb1\x47\x73\x7e\ +\x1a\x1c\xea\x6f\x6f\xeb\x2c\x0b\x76\xa8\x3b\x1d\x7d\xd1\x85\x0f\ +\x2f\x14\x31\x0c\x7d\x36\x10\x08\x10\x13\x13\x93\x3d\x03\xce\x81\ +\x66\x00\x4b\xc1\x0e\xf5\x7f\x8f\x3f\x01\x2e\x51\xa3\xa9\xc7\xde\ +\x69\x7b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x04\x2c\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ \x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ -\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ -\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x02\x93\x49\x44\ -\x41\x54\x38\x8d\x95\x91\xbd\x4f\x1b\x41\x10\xc5\x67\xe1\x96\xbb\ -\xf3\x25\xd8\x46\xe1\x82\x20\x91\x2c\x45\x38\x42\x51\x94\x02\x19\ -\x21\x04\x1d\xa2\xa3\x80\xa3\x30\x05\x25\x12\x15\x32\x14\x44\x48\ -\xfc\x05\x54\x96\x28\x29\x4c\x45\x0f\xae\xa0\xc0\x20\x0a\x7a\xa0\ -\x20\x46\x48\x24\x0e\x8e\xb1\x8d\xe3\x23\xb7\xc7\xde\xde\xee\x5e\ -\x8a\xc4\x16\x1f\x49\xc1\x2b\x67\xde\xfc\xf4\x66\x06\x65\xb3\xd9\ -\x81\x20\x08\x52\x08\xa1\x38\x3c\x43\x41\x10\xe4\x11\x42\x69\xc5\ -\xf7\xfd\x85\x91\x91\x91\x01\xc3\x30\xd4\xe7\x00\x08\x21\xd1\xc3\ -\xc3\xc3\x05\x45\x4a\x19\x07\x80\x6a\xbd\x5e\x77\x9f\x03\xc0\x18\ -\x87\xa4\x94\x71\x85\x52\x0a\x94\xd2\x27\xc3\xb9\x5c\x2e\xba\xb7\ -\xb7\xf7\x2a\x16\x8b\xb9\xc9\x64\xb2\x64\x18\x86\xb8\xdf\x17\x42\ -\xb8\x94\xd2\x76\x85\x73\x8e\x82\x20\x68\x36\x6a\xb5\x9a\x92\x4a\ -\xa5\x3e\x5e\x5c\x5c\x84\x55\x55\x85\x83\x83\x03\xd8\xd8\xd8\x78\ -\x37\x3f\x3f\xff\x65\x6a\x6a\xea\xfa\x3e\x84\x73\x8e\x14\xc6\x18\ -\xe2\x9c\x37\x8b\x2b\x2b\x2b\x1f\x6e\x6f\x6f\xdb\x97\x96\x96\x2a\ -\x63\x63\x63\x2e\x00\xc0\xc9\xc9\x49\x5b\x22\x91\x70\xe6\xe6\xe6\ -\x3e\x25\x93\xc9\x6f\xc3\xc3\xc3\x3f\x01\x00\x18\x63\xa8\x85\x73\ -\x8e\xa4\x94\x20\xa5\x84\xb3\xb3\x33\xa3\x5c\x2e\x47\xa7\xa7\xa7\ -\x6b\x96\x65\x5d\xa9\xaa\x5a\x50\x55\xf5\x6a\x68\x68\xe8\x47\x26\ -\x93\xe9\xa8\x56\xab\xd1\xf5\xf5\xf5\xf7\x9e\xe7\x21\x29\x25\x70\ -\xce\x51\x0b\x63\x0c\x49\x29\x61\x7b\x7b\xbb\x6b\x6b\x6b\xeb\xad\ -\x69\x9a\x80\x31\xf6\x8e\x8e\x8e\x24\x63\x8c\x33\xc6\xd8\xf1\xf1\ -\x31\xdf\xdd\xdd\x8d\x99\xa6\x09\x9a\xa6\x69\xe9\x74\x3a\x2e\xa5\ -\x6c\x26\x00\x29\x25\x10\x42\xc2\xf9\x7c\xbe\x4b\xd7\x75\xd8\xd9\ -\xd9\x31\x4d\xd3\x0c\x1a\xc9\x84\x10\x6d\xcb\xcb\xcb\x15\x5d\xd7\ -\x61\x76\x76\xf6\x7a\x7c\x7c\xdc\xfd\x9b\x00\x94\xc6\x0a\x33\x33\ -\x33\x25\x00\x78\x71\x7e\x7e\xfe\x72\x71\x71\xb1\x18\x8d\x46\x5d\ -\x29\x25\x00\x00\xf4\xf6\xf6\x3a\x99\x4c\x46\xd5\x75\x1d\xfa\xfa\ -\xfa\xca\xba\xae\x13\xc6\xd8\x9f\x23\x36\x00\xae\xeb\xda\x96\x65\ -\x95\x4e\x4f\x4f\xef\x22\x91\x48\x79\x6d\x6d\x2d\xde\xdf\xdf\x5f\ -\xc1\x18\xcb\x5c\x2e\xf7\xc6\x71\x9c\xc8\xc4\xc4\x44\x05\x63\x5c\ -\xa7\x94\x8a\xe6\x17\xee\x1f\x11\x63\x5c\x1e\x1c\x1c\xbc\xcb\x66\ -\xb3\x86\x6d\xdb\x1d\x9b\x9b\x9b\xaf\x01\x00\x4c\xd3\x04\xcb\xb2\ -\x2a\x89\x44\xa2\xe4\x38\x8e\x78\xf0\x46\xdf\xf7\x51\x23\xaa\xe7\ -\x79\xbe\xe7\x79\xb5\xd1\xd1\x51\x6d\x72\x72\xf2\xeb\xcd\xcd\x0d\ -\xb6\x6d\x5b\xe9\xe9\xe9\xf1\x11\x42\xbf\x6c\xdb\xae\x35\xbc\x00\ -\x00\xbe\xef\x3f\x04\x34\x44\x08\xa1\x84\x90\xef\x9a\xa6\x69\x9d\ -\x9d\x9d\xd8\xb6\xed\x3b\x21\x04\x87\x47\xf2\x7d\x1f\x29\x00\x70\ -\x59\x28\x14\xc2\xdd\xdd\xdd\xec\xb1\x81\x10\x42\x01\x80\x3e\xae\ -\x03\x00\x14\x8b\xc5\x36\x00\xb8\x54\x42\xa1\xd0\xea\xfe\xfe\xfe\ -\x67\x21\x44\xec\x5f\xc6\xff\xa9\xb5\xb5\xf5\x32\x1c\x0e\xaf\xfe\ -\x06\x47\x78\x84\x8a\xac\x27\x36\x0e\x00\x00\x00\x00\x49\x45\x4e\ -\x44\xae\x42\x60\x82\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x2e\x23\x00\x00\ +\x2e\x23\x01\x78\xa5\x3f\x76\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ +\xde\x03\x0c\x12\x06\x08\xae\xb5\x4a\x3d\x00\x00\x03\xb9\x49\x44\ +\x41\x54\x38\xcb\x5d\xcb\x5b\x4c\x5b\x75\x00\x07\xe0\xdf\xff\x9c\ +\xd3\x9e\x76\x6d\x69\xc1\x52\x84\xca\x40\x2e\x16\xc7\x9d\x31\x67\ +\x9c\x66\x03\x27\x73\x2f\x8a\x71\x2c\x12\x12\x12\x1f\xa6\x89\x2c\ +\x73\xc9\x36\x37\x13\x6f\x0f\x5e\xa2\xcc\x88\x0f\xb8\x87\x3d\x78\ +\x99\x09\x09\x4b\x34\xd1\x38\x86\x3a\xb9\x3a\x04\x06\x1d\x84\x6b\ +\xa1\x2d\xd0\x0b\xa5\xed\xa1\x17\x7a\x4a\xdb\x73\xf3\xc9\x17\xbf\ +\xf7\x8f\xe0\x7f\xea\x00\xac\xf6\x78\xb0\x7f\xb1\x10\x00\xd0\x07\ +\x50\xbf\x9d\x69\x36\x15\x55\xd5\x3f\x22\xe6\xab\xcd\xac\xbc\x64\ +\xcd\x65\x33\x82\x73\x79\x67\xa2\xa7\x7b\x36\xc8\xfc\x17\xaf\xff\ +\x74\x15\xee\x73\x9f\xe3\xd9\xf0\x3e\xd5\x4e\xb4\xf2\xbb\x57\x3a\ +\xcb\xac\x95\xcd\xaf\x2f\x14\x72\xf5\xad\x79\xe5\x15\xe1\x4c\xf2\ +\xf1\xd8\xf4\x10\x76\x84\x2d\x18\x92\x31\xec\x39\x82\xc3\x25\x96\ +\x83\x2d\x04\x00\x2e\x5f\xac\xc7\xf5\x1e\x3b\x00\xe0\x30\xa0\x39\ +\xd6\xf5\xd2\x25\x5e\x6f\x7c\x7f\x6e\x88\x66\x6d\x2f\x04\x51\x7b\ +\x54\xc0\xae\x5f\x40\x69\x41\x03\xbc\x53\x03\xd8\x18\xf7\x80\x4f\ +\x88\x23\xb6\x23\xc5\x2d\x14\x00\x68\xee\xd8\x71\xfe\xe7\x5e\xb4\ +\xb5\xe1\xc0\xe9\xdb\xbd\xb7\x72\x5a\xda\x3f\x76\xb8\xfd\x78\x30\ +\xf5\x9d\x1c\xe7\xb6\x51\x7a\x92\x81\x62\x52\x63\xda\x31\x89\xb9\ +\xbf\xfd\xf0\x2b\x40\xda\xc4\xc4\x3e\xb9\xb1\x92\xa1\x15\x1f\x8f\ +\xc1\x6c\x99\x4a\xda\x1a\xe9\x12\x53\xd5\x37\x74\x9e\xa5\xa3\xb1\ +\x22\x28\x91\x1c\x95\x8a\x11\x52\xe4\xe9\x4e\x03\x16\x07\x78\x84\ +\x97\x05\x78\xe7\x37\x40\xcb\xe9\x8c\x56\x94\x69\xa3\x4a\xee\x9e\ +\x73\x8a\x76\x82\xa1\x2f\x80\xa6\x77\xf0\xf5\xc4\xa7\x6f\xe9\x8a\ +\x6d\xbd\xae\xe1\x11\x29\x15\x72\xd0\xc9\x1d\x0e\x12\x05\x04\xdc\ +\x5e\x48\xfb\x09\xe8\xf2\x53\x70\xfc\xa9\xc8\x8f\xb2\x22\x65\xc8\ +\xa2\x6f\x5c\x7b\xbe\xbc\xab\xf1\xa3\x15\x85\x00\xc0\xbc\x32\x9a\ +\xfd\xfd\xef\x77\xdc\x81\x99\x87\x9a\x02\x36\xc2\xae\x8e\xfa\x90\ +\x65\x12\x11\xe6\x62\x30\x9b\x4f\x23\xbb\xf0\x14\x84\x3d\x23\x7c\ +\xbe\x10\x88\xb2\xb5\xb5\xe6\x2e\x6b\x5d\x9e\x79\xd3\xde\xda\x71\ +\x93\xd0\x00\xf0\x58\x53\xcb\xb5\x8d\x91\x6f\x4f\x1d\x88\x6d\x52\ +\xf6\xb1\x20\xd1\x54\x18\x91\x10\xd3\x38\x56\xdd\x83\x27\x6a\xda\ +\x50\x5d\x57\x8b\xd1\x87\x01\x94\x54\x14\x2b\x12\x2c\xc6\xd2\x43\ +\xe6\x8e\xe8\x5e\xcd\xf4\xc4\x1f\x17\x5c\x74\xdf\xe2\x6d\x53\x44\ +\xc5\xf6\x4c\xf5\xf5\x9b\xa3\x7e\x9e\x98\x73\x68\x44\x96\x7d\x28\ +\x50\xbf\x08\xe4\x34\xe1\xe5\xd6\x2a\xdc\x9b\x74\x81\x97\x15\x4c\ +\xce\x7b\xc9\x92\x33\x44\x68\x8d\x5a\xa5\xa5\x94\x13\x14\x9e\xfa\ +\x81\xa2\x8c\xf9\x15\x54\xc2\x63\x63\x58\x0d\x38\x5f\x1a\x9b\x0b\ +\x31\x68\x24\x82\x38\x7d\x1c\x95\x35\x79\x90\x28\x1a\x87\x8f\x94\ +\x40\x9d\x63\xc4\x1e\xab\x86\xd6\x92\x85\xcd\x9d\x38\x61\xb2\xb3\ +\x8a\xac\xe5\xb9\x8d\x54\x38\xb0\x5e\xe4\x78\x30\x02\x29\x1e\x05\ +\x51\x53\x90\x64\x05\xb1\x3d\x3d\x26\x96\x44\xc5\xbe\x16\x86\x27\ +\x18\xc7\x36\xc7\x43\xaf\x67\x90\x7b\xd0\x0c\xc5\xa8\x03\xa3\xd3\ +\x92\x86\xa3\x25\xe0\x79\xb1\x99\xe1\x9c\xc1\x48\x68\x66\x05\x11\ +\x2f\x0f\x0d\x14\x68\x55\x04\x1a\x35\x03\x5a\x21\xc4\xee\xe4\x94\ +\x8c\xd1\x43\x12\x94\x0a\x9b\xbc\x80\x24\xcb\x82\xe8\xb5\x60\x29\ +\x82\xd5\xb5\x20\x64\x31\x93\x62\xaa\xa4\xe8\xfd\x1d\x83\xe5\x33\ +\x29\x8f\xb7\xa6\x12\x9c\x64\xd0\xe8\x32\x3a\x2d\x1f\xdd\xd8\x4d\ +\xbc\x1d\x88\xa4\x35\x26\x5e\x42\x43\xa5\x05\x87\x74\x5a\x0c\xaf\ +\x85\x11\x57\x13\x45\xf0\xa4\xc9\xd2\xec\x3a\xb4\xa9\xf4\x10\x01\ +\x80\xfb\xeb\x23\x54\x55\x7e\x21\x9d\xda\xf5\xca\xf7\x06\x26\xa9\ +\xd7\x7e\xb9\x22\x9c\x4c\x5c\xfd\xd1\xa9\xb7\x75\xe8\x9f\xb4\x2a\ +\x6f\x9c\xad\x23\x65\x16\x13\xb8\xfd\x0c\xee\x8e\xaf\x63\x6c\x70\ +\x11\x8c\x2f\x3c\x4b\x85\x62\xc7\x19\xcf\xea\x2d\x7c\xf9\xd5\x7b\ +\x68\xef\x1f\x93\x18\x0a\xd0\xab\x21\xb5\x7b\x40\x14\xe5\xf2\x85\ +\x13\x67\x7e\x4d\x46\xf7\xd3\xe7\xc6\x1d\x1c\x5e\x6d\xb0\x60\x76\ +\x4b\xc4\x6e\x28\x01\x46\x10\x97\x52\xf1\x54\xa7\x7f\xed\xc3\x04\ +\x01\x00\x87\xeb\x2e\xb8\x40\x1c\xdb\xae\x05\xc4\xc2\x22\x3c\x3e\ +\x2b\x3e\xe8\xee\x02\x00\x3c\xf7\xca\xcd\x4a\xc5\x64\x38\x5b\x5d\ +\x5b\x58\xe0\xf2\x44\x64\xce\xbf\xfb\x17\xef\x0e\x0d\x2e\xff\x73\ +\x29\xfa\xcc\xf9\x7e\xfc\x0b\x0b\xb9\xbe\x45\x31\x2c\x8e\xcb\x00\ +\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x0b\x2d\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -287,75 +438,45 @@ \x00\x43\xf9\x5f\x81\xce\x3a\xd0\x73\x04\xff\x64\x7f\x00\x19\x1e\ \x09\x5d\x0e\xd9\xff\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\ \x60\x82\ -\x00\x00\x04\x2c\ +\x00\x00\x02\x4a\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ \x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ -\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x2e\x23\x00\x00\ -\x2e\x23\x01\x78\xa5\x3f\x76\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ -\xde\x03\x0c\x12\x06\x08\xae\xb5\x4a\x3d\x00\x00\x03\xb9\x49\x44\ -\x41\x54\x38\xcb\x5d\xcb\x5b\x4c\x5b\x75\x00\x07\xe0\xdf\xff\x9c\ -\xd3\x9e\x76\x6d\x69\xc1\x52\x84\xca\x40\x2e\x16\xc7\x9d\x31\x67\ -\x9c\x66\x03\x27\x73\x2f\x8a\x71\x2c\x12\x12\x12\x1f\xa6\x89\x2c\ -\x73\xc9\x36\x37\x13\x6f\x0f\x5e\xa2\xcc\x88\x0f\xb8\x87\x3d\x78\ -\x99\x09\x09\x4b\x34\xd1\x38\x86\x3a\xb9\x3a\x04\x06\x1d\x84\x6b\ -\xa1\x2d\xd0\x0b\xa5\xed\xa1\x17\x7a\x4a\xdb\x73\xf3\xc9\x17\xbf\ -\xf7\x8f\xe0\x7f\xea\x00\xac\xf6\x78\xb0\x7f\xb1\x10\x00\xd0\x07\ -\x50\xbf\x9d\x69\x36\x15\x55\xd5\x3f\x22\xe6\xab\xcd\xac\xbc\x64\ -\xcd\x65\x33\x82\x73\x79\x67\xa2\xa7\x7b\x36\xc8\xfc\x17\xaf\xff\ -\x74\x15\xee\x73\x9f\xe3\xd9\xf0\x3e\xd5\x4e\xb4\xf2\xbb\x57\x3a\ -\xcb\xac\x95\xcd\xaf\x2f\x14\x72\xf5\xad\x79\xe5\x15\xe1\x4c\xf2\ -\xf1\xd8\xf4\x10\x76\x84\x2d\x18\x92\x31\xec\x39\x82\xc3\x25\x96\ -\x83\x2d\x04\x00\x2e\x5f\xac\xc7\xf5\x1e\x3b\x00\xe0\x30\xa0\x39\ -\xd6\xf5\xd2\x25\x5e\x6f\x7c\x7f\x6e\x88\x66\x6d\x2f\x04\x51\x7b\ -\x54\xc0\xae\x5f\x40\x69\x41\x03\xbc\x53\x03\xd8\x18\xf7\x80\x4f\ -\x88\x23\xb6\x23\xc5\x2d\x14\x00\x68\xee\xd8\x71\xfe\xe7\x5e\xb4\ -\xb5\xe1\xc0\xe9\xdb\xbd\xb7\x72\x5a\xda\x3f\x76\xb8\xfd\x78\x30\ -\xf5\x9d\x1c\xe7\xb6\x51\x7a\x92\x81\x62\x52\x63\xda\x31\x89\xb9\ -\xbf\xfd\xf0\x2b\x40\xda\xc4\xc4\x3e\xb9\xb1\x92\xa1\x15\x1f\x8f\ -\xc1\x6c\x99\x4a\xda\x1a\xe9\x12\x53\xd5\x37\x74\x9e\xa5\xa3\xb1\ -\x22\x28\x91\x1c\x95\x8a\x11\x52\xe4\xe9\x4e\x03\x16\x07\x78\x84\ -\x97\x05\x78\xe7\x37\x40\xcb\xe9\x8c\x56\x94\x69\xa3\x4a\xee\x9e\ -\x73\x8a\x76\x82\xa1\x2f\x80\xa6\x77\xf0\xf5\xc4\xa7\x6f\xe9\x8a\ -\x6d\xbd\xae\xe1\x11\x29\x15\x72\xd0\xc9\x1d\x0e\x12\x05\x04\xdc\ -\x5e\x48\xfb\x09\xe8\xf2\x53\x70\xfc\xa9\xc8\x8f\xb2\x22\x65\xc8\ -\xa2\x6f\x5c\x7b\xbe\xbc\xab\xf1\xa3\x15\x85\x00\xc0\xbc\x32\x9a\ -\xfd\xfd\xef\x77\xdc\x81\x99\x87\x9a\x02\x36\xc2\xae\x8e\xfa\x90\ -\x65\x12\x11\xe6\x62\x30\x9b\x4f\x23\xbb\xf0\x14\x84\x3d\x23\x7c\ -\xbe\x10\x88\xb2\xb5\xb5\xe6\x2e\x6b\x5d\x9e\x79\xd3\xde\xda\x71\ -\x93\xd0\x00\xf0\x58\x53\xcb\xb5\x8d\x91\x6f\x4f\x1d\x88\x6d\x52\ -\xf6\xb1\x20\xd1\x54\x18\x91\x10\xd3\x38\x56\xdd\x83\x27\x6a\xda\ -\x50\x5d\x57\x8b\xd1\x87\x01\x94\x54\x14\x2b\x12\x2c\xc6\xd2\x43\ -\xe6\x8e\xe8\x5e\xcd\xf4\xc4\x1f\x17\x5c\x74\xdf\xe2\x6d\x53\x44\ -\xc5\xf6\x4c\xf5\xf5\x9b\xa3\x7e\x9e\x98\x73\x68\x44\x96\x7d\x28\ -\x50\xbf\x08\xe4\x34\xe1\xe5\xd6\x2a\xdc\x9b\x74\x81\x97\x15\x4c\ -\xce\x7b\xc9\x92\x33\x44\x68\x8d\x5a\xa5\xa5\x94\x13\x14\x9e\xfa\ -\x81\xa2\x8c\xf9\x15\x54\xc2\x63\x63\x58\x0d\x38\x5f\x1a\x9b\x0b\ -\x31\x68\x24\x82\x38\x7d\x1c\x95\x35\x79\x90\x28\x1a\x87\x8f\x94\ -\x40\x9d\x63\xc4\x1e\xab\x86\xd6\x92\x85\xcd\x9d\x38\x61\xb2\xb3\ -\x8a\xac\xe5\xb9\x8d\x54\x38\xb0\x5e\xe4\x78\x30\x02\x29\x1e\x05\ -\x51\x53\x90\x64\x05\xb1\x3d\x3d\x26\x96\x44\xc5\xbe\x16\x86\x27\ -\x18\xc7\x36\xc7\x43\xaf\x67\x90\x7b\xd0\x0c\xc5\xa8\x03\xa3\xd3\ -\x92\x86\xa3\x25\xe0\x79\xb1\x99\xe1\x9c\xc1\x48\x68\x66\x05\x11\ -\x2f\x0f\x0d\x14\x68\x55\x04\x1a\x35\x03\x5a\x21\xc4\xee\xe4\x94\ -\x8c\xd1\x43\x12\x94\x0a\x9b\xbc\x80\x24\xcb\x82\xe8\xb5\x60\x29\ -\x82\xd5\xb5\x20\x64\x31\x93\x62\xaa\xa4\xe8\xfd\x1d\x83\xe5\x33\ -\x29\x8f\xb7\xa6\x12\x9c\x64\xd0\xe8\x32\x3a\x2d\x1f\xdd\xd8\x4d\ -\xbc\x1d\x88\xa4\x35\x26\x5e\x42\x43\xa5\x05\x87\x74\x5a\x0c\xaf\ -\x85\x11\x57\x13\x45\xf0\xa4\xc9\xd2\xec\x3a\xb4\xa9\xf4\x10\x01\ -\x80\xfb\xeb\x23\x54\x55\x7e\x21\x9d\xda\xf5\xca\xf7\x06\x26\xa9\ -\xd7\x7e\xb9\x22\x9c\x4c\x5c\xfd\xd1\xa9\xb7\x75\xe8\x9f\xb4\x2a\ -\x6f\x9c\xad\x23\x65\x16\x13\xb8\xfd\x0c\xee\x8e\xaf\x63\x6c\x70\ -\x11\x8c\x2f\x3c\x4b\x85\x62\xc7\x19\xcf\xea\x2d\x7c\xf9\xd5\x7b\ -\x68\xef\x1f\x93\x18\x0a\xd0\xab\x21\xb5\x7b\x40\x14\xe5\xf2\x85\ -\x13\x67\x7e\x4d\x46\xf7\xd3\xe7\xc6\x1d\x1c\x5e\x6d\xb0\x60\x76\ -\x4b\xc4\x6e\x28\x01\x46\x10\x97\x52\xf1\x54\xa7\x7f\xed\xc3\x04\ -\x01\x00\x87\xeb\x2e\xb8\x40\x1c\xdb\xae\x05\xc4\xc2\x22\x3c\x3e\ -\x2b\x3e\xe8\xee\x02\x00\x3c\xf7\xca\xcd\x4a\xc5\x64\x38\x5b\x5d\ -\x5b\x58\xe0\xf2\x44\x64\xce\xbf\xfb\x17\xef\x0e\x0d\x2e\xff\x73\ -\x29\xfa\xcc\xf9\x7e\xfc\x0b\x0b\xb9\xbe\x45\x31\x2c\x8e\xcb\x00\ -\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ +\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ +\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x01\xc7\x49\x44\ +\x41\x54\x38\x8d\xa5\x93\xcd\x6a\x1a\x61\x14\x86\x1f\x33\x0e\x05\ +\x4d\x47\xda\x88\x64\x53\x14\x83\x43\x76\xc6\x95\x4c\x5d\xb9\x33\ +\x05\x17\xdd\x64\x99\x45\x2e\x20\xbd\x82\x76\x51\x7a\x03\xbd\x82\ +\x76\x93\x95\x0c\x82\x8b\xe2\x76\x32\xe8\x6a\x04\x85\x04\xa2\xd0\ +\xa2\x14\x84\x80\xc5\x9f\x5a\xb5\xf0\xa5\xa7\x1b\x2d\x93\xa1\x29\ +\x14\x0f\x9c\xcd\x39\xe7\x79\x39\x3f\xdf\x17\x12\x11\xb6\xb1\x9d\ +\xad\xe8\x07\x04\x12\x40\x1a\x88\xfa\x62\x51\xe0\x60\x9d\xfb\xa7\ +\xc0\x7e\x3e\x9f\x3f\xd6\x75\xfd\xa3\x6d\xdb\xe6\x1a\x8c\xda\xb6\ +\x6d\xea\xba\xfe\x21\x9f\xcf\x1f\x03\xfb\xf7\x08\x11\xd9\x78\xc2\ +\xb2\xac\x53\xa0\x0b\x5c\x69\x9a\x76\x59\xad\x56\x8f\xaa\xd5\xea\ +\x91\xa6\x69\x97\xc0\x15\xd0\xb5\x2c\xeb\x54\x44\x12\x1b\x2e\xe4\ +\x5b\x62\x3a\x95\x4a\xbd\x1f\x0c\x06\x4f\x00\x01\x1e\x85\xc3\xe1\ +\x39\x80\x52\x6a\x17\xf8\x09\x84\x92\xc9\xe4\xb8\xdf\xef\xbf\x02\ +\xbe\x04\x47\xb8\xf5\x3c\xef\x22\x93\xc9\x5c\x03\x0b\x60\xac\x94\ +\xd2\x94\x52\x1a\x30\x06\x16\x99\x4c\xe6\xda\xf3\xbc\x0b\xe0\x76\ +\x03\x85\x02\x67\x34\x46\xa3\xd1\x8b\x42\xa1\xf0\xbc\xd7\xeb\x3d\ +\xf3\x27\x4c\xd3\xfc\xda\x68\x34\x9a\xf1\x78\xfc\x13\x30\x7b\x68\ +\x89\x77\xad\x56\xab\xb7\x5c\x2e\xf7\xd6\x5d\xfc\xf1\xd5\x6a\xf5\ +\xb4\xdd\x6e\x77\x81\x3b\x3f\xe0\xef\x20\x5a\xaf\xd7\x0f\xca\xe5\ +\xf2\x6b\xa5\x94\x02\xe6\x01\xf1\x5d\x5d\xd7\xb5\x5a\xad\xf6\xae\ +\x54\x2a\x7d\x06\x7e\x04\x05\xd2\xb1\x58\xec\xcd\x6c\x36\xfb\x05\ +\x7c\x07\xc8\x66\xb3\xdf\x00\x3a\x9d\xce\xde\xba\xe6\xb1\x61\x18\ +\x3b\xd3\xe9\xf4\xed\xdf\x96\x38\xaf\x54\x2a\xcd\x48\x24\x32\x04\ +\x16\xb9\x5c\x6e\xe8\x38\xce\x8d\xe3\x38\x37\xb9\x5c\x6e\x08\x2c\ +\x22\x91\xc8\xb0\x52\xa9\x34\xef\x75\xe7\x7b\x07\x88\xc8\xa1\xeb\ +\xba\x67\xc5\x62\xf1\x7c\x32\x99\x9c\x88\x88\x21\x22\xc6\x64\x32\ +\x39\x29\x16\x8b\xe7\xae\xeb\x9e\x89\xc8\xa1\x9f\x09\x0a\x20\x22\ +\xa6\x88\xbc\x5c\xc3\x9b\x98\xb1\x8e\x99\xc1\xfa\xe0\x19\xff\xdb\ +\xb6\xfe\x8d\xbf\x01\x7c\x52\x08\x38\x8e\xd7\x1d\xc8\x00\x00\x00\ +\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x03\x30\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -926,505 +1047,6 @@ \xc9\x59\x56\x26\x36\x2b\xc0\x6a\x89\xf6\x3f\x92\xd9\xaf\xdf\xfe\ \x1f\xba\xc9\xa0\xf1\xd3\x43\x85\x2f\x00\x00\x00\x00\x49\x45\x4e\ \x44\xae\x42\x60\x82\ -\x00\x00\x07\x84\ -\x47\ -\x49\x46\x38\x39\x61\x36\x00\x37\x00\xf3\x00\x00\xff\xff\xff\x00\ -\x00\x00\x78\x78\x78\x1c\x1c\x1c\x0e\x0e\x0e\xd8\xd8\xd8\x54\x54\ -\x54\xdc\xdc\xdc\xc4\xc4\xc4\x48\x48\x48\x8a\x8a\x8a\x00\x00\x00\ -\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x21\xff\x0b\x4e\ -\x45\x54\x53\x43\x41\x50\x45\x32\x2e\x30\x03\x01\x00\x00\x00\x21\ -\xfe\x1a\x43\x72\x65\x61\x74\x65\x64\x20\x77\x69\x74\x68\x20\x61\ -\x6a\x61\x78\x6c\x6f\x61\x64\x2e\x69\x6e\x66\x6f\x00\x21\xf9\x04\ -\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\ -\xcc\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\ -\x9e\x25\x92\x10\x44\x82\xa0\xa7\xc2\xce\x84\x02\x93\x08\x4d\xbf\ -\x77\xb8\xea\xac\x44\x2f\x04\xa4\x0d\x41\xc5\xd9\xf1\xf3\x03\x0a\ -\x97\x9d\x5c\x91\x77\x2c\x18\x58\x86\x02\x46\xa6\xb3\x2d\x0b\x03\ -\xda\x40\x7b\x51\x05\xa9\x16\xc1\x60\x20\x18\x5d\x75\x06\x93\x80\ -\xd6\x26\x16\x4d\xe1\xd9\x40\x94\xc4\x8b\x45\x6f\x34\x71\x25\x73\ -\x33\x75\x20\x07\x79\x2c\x03\x07\x27\x6a\x6c\x24\x07\x6f\x06\x8d\ -\x50\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x1c\x8f\x87\x96\xa1\x1a\ -\x85\x2c\xa2\x47\xa6\x04\xa8\x14\x8a\x04\x7b\x96\xae\xb0\x17\xb2\ -\x97\xb5\x18\xaa\xac\x3d\xb9\xa5\x6b\xba\x43\xa4\x9f\xc2\xc3\xc4\ -\xc5\xc6\xc7\xc8\x9b\xc1\x8e\xbe\x24\xbc\x72\x74\x23\xb7\x25\xd3\ -\x20\xd5\xd2\x7f\x22\xcf\x84\xd1\x23\xcb\x72\xcd\xc9\x9e\xdf\xc5\ -\xdb\xc5\xd7\xc3\xe8\xc2\xe6\xe5\xe1\xe2\xef\x3d\x11\x00\x21\xf9\ -\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\ -\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\ -\x69\x9e\x68\xaa\x16\x06\x41\x18\x85\x5a\x16\x83\xeb\x0e\xb1\x2c\ -\xb6\xb6\x6b\xe8\xa2\x5e\x0f\x18\x12\xda\x88\x20\x5e\xef\x87\xf4\ -\x1c\x6a\xb6\xc1\xe1\x82\x48\xb8\x12\x88\xa6\xe4\xc0\x33\x4c\x2d\ -\x0a\xa3\x62\x24\x18\x0c\x04\x26\x84\xd1\x95\x05\x09\x7a\x68\x92\ -\x75\x9d\x08\x41\x6f\xa5\xf5\x11\x74\x27\x0c\xf2\x7a\x04\x21\x6f\ -\x36\x71\x23\x73\x46\x75\x83\x66\x86\x23\x6a\x6b\x6d\x5a\x1a\x61\ -\x42\x63\x92\x1c\x55\x57\x91\x97\x9c\x9d\x9e\x9f\xa0\xa1\x6e\x8c\ -\x97\x65\x67\x1a\x84\x2e\x8d\x40\xa9\x04\xab\x14\x7d\x7f\x4d\xb1\ -\x19\xb4\xb3\x3d\xb2\x17\xad\xaf\x32\xbb\xa8\xa4\x92\xa6\xbc\xa2\ -\xc4\xc5\xc6\xc7\xc8\xc9\xca\x27\xc2\x29\xcd\x64\x70\xcc\xd1\x22\ -\xb6\x25\xd5\x7c\xb8\x27\xd7\x1f\xbe\x26\xdd\x22\xcf\xcc\xc0\xcb\ -\x9e\xe1\xc7\xdf\xc6\xdb\xc4\xea\xa2\xe8\xc6\xe6\xe4\xf1\x27\x11\ -\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\ -\x37\x00\x00\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\ -\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\x0a\x44\x4d\ -\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\x86\x1f\x17\ -\x0c\x99\x2b\x18\x6a\x86\x02\x49\x79\x24\x15\x76\xb6\x81\x34\x54\ -\xac\x55\x45\x4f\x1e\xc1\x00\xcc\x9a\xc4\xb6\x72\x4d\x48\x42\xd7\ -\x44\xdd\x9b\x29\xcc\x23\xc3\x5f\x5f\xd1\x01\xbb\x3e\x30\x3b\x07\ -\x61\x06\x7e\x7f\x85\x86\x87\x88\x89\x8a\x12\x08\x09\x35\x09\x08\ -\x8b\x15\x0a\x68\x0a\x19\x54\x43\x08\x6e\x04\x91\x16\x71\x79\x29\ -\x8e\x6e\x09\x17\x7c\x3d\x3f\x9b\x6f\x16\xa6\x6c\x2c\xa9\x04\x17\ -\x9f\x3f\xa2\x68\xa4\xb1\x78\x99\x9b\x9d\x92\x94\x62\x96\x92\x13\ -\x8d\x8f\xbb\xc0\xc5\xc6\xc7\xc8\xc9\x13\x98\x28\xcc\x70\x3c\xa0\ -\x44\xd0\x23\xac\x27\xd5\x6a\xa7\x26\xd7\x5c\xd3\x26\xb2\x23\xce\ -\xde\xb8\xca\x88\xe1\xc5\xdf\xc6\xdb\xc5\xea\xc0\xe8\xc6\xe6\xe4\ -\xf1\x26\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\ -\x00\x36\x00\x37\x00\x00\x04\xcd\x10\xc8\x49\xab\xbd\x38\xeb\xcd\ -\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\ -\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\ -\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\x8a\x35\ -\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\xea\x09\ -\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\xbc\xaa\x60\xa8\ -\x19\x0a\x1a\x71\x3f\x05\x67\x80\x17\x6c\x5a\x29\x7d\x3c\x04\x06\ -\x18\x67\x43\x8c\x36\x8f\x41\x91\x92\x04\x18\x88\x43\x8b\x3c\x8e\ -\x99\x52\x48\x07\x67\x07\x7a\x13\x07\x8b\x06\xa4\xa5\xab\xac\xad\ -\xae\x27\x08\x09\x35\x09\x08\xac\x0a\x92\x0a\x23\x82\x23\x08\x97\ -\x04\xb5\x54\x46\x25\xb2\x97\x09\x21\x90\x24\xbe\x35\xc7\x95\xc9\ -\xca\x21\x9a\x24\xc4\x92\xc6\xd0\xa0\x25\xbd\x97\xc0\x79\xb7\x8c\ -\xb9\x48\xbb\x15\xb1\xb3\xdb\x3f\xd1\xab\xc8\xe8\xcd\xab\xe7\xec\ -\xd7\xaf\xf0\x2b\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ -\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcb\x10\xc8\x49\xab\xbd\x38\ -\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ -\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ -\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ -\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ -\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ -\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ -\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x99\x4c\x05\ -\x06\x35\x06\x05\x6e\x52\x27\x05\x67\xa0\x21\x8f\x23\x9d\x3c\x04\ -\x06\x40\x5d\x26\xab\x36\xae\x61\xb0\xb1\x04\x57\x6a\x25\xaa\x3c\ -\xad\x57\xa2\x19\x08\x09\x35\x09\x08\x17\x07\x67\x07\x43\x0a\xb1\ -\x0a\xc6\xaa\x06\xc9\x3f\x08\xb6\x04\xc5\x79\xc2\xb6\x09\x7a\xd4\ -\x35\xdb\xdc\x7a\xd8\xb1\xda\x79\xd3\xb6\xd6\x79\xcb\xab\xcd\x95\ -\xc1\xc3\xe7\x22\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ -\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\x38\ -\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ -\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ -\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ -\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ -\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ -\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ -\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x00\x08\x09\ -\x35\x09\x08\x96\x0a\x3c\x35\x0a\x94\x08\xa2\x36\x9f\x33\x52\x22\ -\x9c\xa7\x04\x09\x33\x6a\x20\xae\x36\x5f\x41\x21\xb4\x35\xb6\x5d\ -\x21\xad\xa7\xb0\x6e\xb2\x1f\xa6\xae\xa9\x6e\xab\x22\xa1\xa2\xa4\ -\x17\x05\x06\x35\x06\x05\x48\x9b\x9d\xc6\x15\x05\x67\xd2\x94\xcf\ -\xa2\x06\x95\xb4\xdf\xae\x95\xdc\x3c\xde\x94\x07\x67\x07\x96\x07\ -\xdc\x06\xea\x99\x28\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\ -\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\ -\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\ -\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\ -\x44\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\ -\x8a\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\ -\xc9\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\x22\x44\ -\xa2\x96\x40\xe0\x2b\x0a\x3c\x35\x0a\x7f\x12\x08\x82\x36\x7e\x3f\ -\x71\x16\x7b\x88\x04\x09\x8b\x6a\x16\x8f\x36\x3f\x67\x17\x95\x35\ -\x97\x41\x17\x8e\x88\x91\x39\x6c\x5a\x87\x8f\x8a\xa2\x52\x19\x81\ -\x82\x84\x85\x86\x8e\x7d\xae\xb2\xb3\xb4\xb5\x4c\x05\x06\x35\x06\ -\x05\xb3\x05\x67\xbc\x51\x4b\x22\xb9\x82\x06\x4e\x93\x20\x95\x26\ -\x98\x21\xca\x5f\x9d\x21\xc4\x3c\xc6\x33\xc8\x1f\x07\x67\x07\x6b\ -\xa9\x23\x07\xc4\x06\xda\xb6\x1d\x8c\xb2\xa3\xb4\xcc\xb2\xe8\xae\ -\xe6\xb4\xe4\xe2\xef\x27\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\ -\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\ -\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\ -\x30\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\ -\x0f\x44\xb3\xe1\x7e\x88\x44\x2d\x81\xd0\xb8\x60\x43\x80\x82\x57\ -\x53\x44\x39\x08\xaa\xad\x39\x7b\x1d\x3f\x4a\x2d\x21\x31\xe3\x7d\ -\x3b\x62\x5b\x69\x67\x13\x7e\xd2\xb5\x75\x30\x14\xd6\x92\x49\xc5\ -\xda\x19\x9b\xe6\xe2\xbd\x23\x53\x54\x56\x57\x58\x61\x4c\x85\x89\ -\x8a\x8b\x8c\x8d\x57\x05\x06\x35\x06\x05\x8e\x16\x05\x6c\x35\x03\ -\x94\x43\x4f\x7b\x13\x91\x54\x06\x9c\x66\x18\x69\x43\x98\x3d\xa5\ -\x62\xa7\x73\x17\xa0\x3c\xa2\x3f\x79\x37\x18\x07\xa8\x03\x07\x51\ -\x9d\x1a\x07\xa0\x06\xb9\x95\xc1\xc2\xc3\xc4\xc5\xc6\xc7\x1d\xbb\ -\x28\xca\x22\xb3\x9e\x44\xa4\x40\x6d\x27\xb7\x23\xd5\x26\xd7\x21\ -\xce\x27\xdb\x23\xcc\x26\xdf\xc8\x89\xe1\xc2\xdd\xc4\xd9\xc3\xe8\ -\xe5\xd1\xc5\xe4\xe2\xef\x25\x11\x00\x3b\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\ -\x00\x00\x03\xb1\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ -\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\x5e\x1a\ -\x91\x1c\x00\x00\x03\x56\x49\x44\x41\x54\x48\xc7\xdd\x95\x4d\x68\ -\x5c\x55\x14\xc7\x7f\xf7\xe3\xbd\x97\xe9\x34\x69\x5a\x93\x60\xdb\ -\x80\x60\xc1\x12\x9a\x20\x0d\x49\x88\x50\xca\x43\xbb\x70\x93\x85\ -\x62\x41\x2b\xea\x42\xb0\xb8\xb2\x20\x08\x6e\x64\xd0\x55\x4b\x2d\ -\x48\x37\x22\x48\x10\x8c\x20\xba\x09\x45\xa4\x12\xe2\x98\x8a\x29\ -\x1a\xa4\x92\x6a\x6d\x4a\x9b\xb4\x19\x9d\x98\xc4\xb1\xd3\x99\x79\ -\xf3\xde\x9b\xf7\xee\x75\x51\x2c\xe4\x63\x31\xc1\x6e\xf4\xec\xee\ -\xc7\x39\xbf\x7b\xee\xb9\xff\x73\xe1\xbf\x6e\xa2\x99\x4d\xfd\x9f\ -\x3e\xd4\xff\xdc\x23\x2f\x7d\x38\xbe\xf0\xc9\xa3\x8e\x94\xc1\xc1\ -\xae\xc1\xc9\xa1\xae\x43\x6f\x3c\xbb\xef\xd5\x5f\xb7\x04\xc8\xe7\ -\xf3\x76\xb3\x4d\x1f\x94\x4f\xf3\xee\x91\xf7\x99\x2d\xcd\x90\xda\ -\x98\x30\x89\x28\xdd\x5e\x65\xdf\x9d\x83\x9b\x06\xf5\x7d\xff\x5e\ -\x5c\xbd\x7e\x31\x9f\xcf\x6f\x70\xb8\xb6\x67\x8e\x6f\x0a\x13\x74\ -\x74\x08\x04\x29\x5e\xb5\x8d\xc9\xf9\x2f\x58\x9c\x2d\x6f\x16\x7c\ -\xcd\x58\x6f\x76\x82\x5c\x2e\xb7\x26\xb3\x87\x3f\xda\xf5\x43\x6c\ -\xa2\x81\xdf\x6a\xab\x08\x04\xd9\x44\x33\x2f\xaf\xce\x8c\xe5\x26\ -\x06\xd7\xf9\x6d\xb8\x01\xdd\x4c\x0d\x52\x63\x48\xad\x21\x6c\xc4\ -\x08\xa0\xc5\x1a\x8c\x69\xae\xc8\x4d\x01\x4c\x6a\x30\x58\x6a\x71\ -\x08\x08\xda\x74\x4a\x6a\xec\xfd\x03\x24\xc6\x24\xc6\x1a\xea\xc9\ -\xdd\x0c\x8c\x34\x24\xa9\x49\xb6\x04\x38\x3b\x73\xb6\xb7\x20\x0b\ -\x9c\xeb\x3c\x07\xa7\xf9\xde\xd3\x5a\x68\x29\xd1\x52\x26\x89\xb1\ -\x7d\x49\x9a\x12\x36\x42\xa4\x10\xc4\x6e\x8c\xc5\xf6\x0d\x7e\xde\ -\x3d\xed\x69\xad\x1d\xad\xd0\x12\xbb\xcc\x4f\xd4\xf6\xec\x67\xa2\ -\xf8\x59\xcf\x91\xdd\x47\xaf\xac\x01\xcc\xfd\x39\xf7\xde\xa9\xc7\ -\x4f\x51\x11\x65\x8e\xc6\x4f\x0f\x4a\x29\x11\xc2\x82\x00\x29\x04\ -\x59\x37\x63\x83\x30\x10\x00\x9e\xf2\xec\xf1\xde\xd7\xb3\x4a\xa8\ -\x61\x29\x24\x5a\x2a\xb6\x39\x59\xb6\xeb\xed\x34\x08\xf8\xea\xd6\ -\xd8\x3b\xc0\x33\x6b\x00\xa3\x97\x46\x87\x0f\x74\xf4\x70\xa3\x72\ -\x85\x62\x58\x44\x6a\x85\x52\xa0\x94\x44\x0b\xc9\x5c\x60\x44\xc3\ -\x84\x48\x01\xd3\x2b\x93\x42\x0b\x05\x48\x5a\x9d\x76\x8c\x51\xfc\ -\xb2\x74\x8d\x1b\xc5\x45\x5e\x1c\x1a\x61\x29\x28\x3c\xb9\xe1\x8a\ -\x82\x28\xb0\x97\x57\x7e\x26\x30\x65\x6a\x69\x1d\x65\x25\xca\x48\ -\x1c\xa3\x70\xd4\xdd\x6c\x94\x54\x78\xca\xa3\x45\xb5\xa0\x71\xa9\ -\xc4\x55\xbe\xfb\xe3\x22\xf3\xa5\x5b\x54\xc2\x90\xac\x69\xa7\xd6\ -\xa8\xd2\x30\xe9\xc6\x1a\x58\x63\xc7\xa7\x16\x2e\x1c\xeb\xe9\xec\ -\xc1\x53\x6d\x68\xa9\xf0\x94\x8b\x87\x8b\x46\xd1\xea\x64\xec\xc5\ -\xe5\xf3\xc2\xca\x98\xa1\xce\x27\x6c\x10\xd7\x85\x12\x9a\xbe\x07\ -\x0e\xd0\xb7\xab\x17\x8b\xc5\x95\x8a\x42\x78\x95\xc4\xa4\xe3\x9b\ -\x01\x4e\x64\xa2\xcc\xb1\xa9\xcb\x53\x14\xdd\xe2\x0c\x02\x90\x20\ -\x24\x89\xab\x54\xdf\x53\xfb\x47\xb2\x5a\x5b\x32\x6e\x96\xdb\xf5\ -\xbf\xc4\x97\x0b\xe7\x6b\x9e\x23\x67\x5d\xa5\xb4\xab\x14\xae\xd6\ -\xec\x8c\x3a\x06\xba\xdb\xbb\x89\x68\x9c\xd8\xf8\x4c\xdf\x66\xe5\ -\x64\xfe\x24\xf9\x7c\x9e\xdc\x9b\xb9\x7b\x0a\xb5\x80\x39\x63\xa7\ -\x83\x24\x18\xd6\x8e\xc4\xd3\x92\xba\x09\x48\x4c\x32\x7b\xf3\x85\ -\xca\x63\x6b\x95\xfc\xb2\xf5\x7d\x1f\xdf\xf7\x57\xfe\x99\x93\x4d\ -\x29\xd9\xa2\xab\x71\x15\x8b\x45\x29\x41\x64\x42\x52\xd3\x9c\x86\ -\x9a\x53\xb2\x35\x54\xa2\x0a\xa9\x13\x92\x71\x15\x51\x5c\x25\x69\ -\xb2\x57\x34\x05\xc0\xc0\x6a\xbd\x8c\x67\x22\xea\x8d\x06\x36\x89\ -\x48\xed\xbf\x00\xac\xef\x8a\x1f\xcb\x51\x5c\x62\x16\x4b\x15\x56\ -\x74\x8d\xbd\xdb\xba\xd9\x5b\xef\x1e\x78\x2d\xf7\xbc\xdd\x32\x60\ -\x7d\x3f\x07\x98\x5b\xfe\x1a\xe9\x2d\xb2\x50\x2d\x61\x52\x4d\x97\ -\xde\x8d\xd3\xea\xe0\xf7\xfb\xf7\xe7\xcb\x1c\x19\x7b\xf0\xd0\x1d\ -\xd4\x99\x0b\x4b\xbf\x0f\xb4\x7b\x3b\xea\x87\x77\x1e\xfe\xf6\xd2\ -\xf5\x1f\x5f\x59\x78\xab\x70\x93\xff\xbd\xfd\x0d\xf6\xbd\x75\x1d\ -\x3b\xea\x7e\x89\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\ -\x00\x00\x0c\x69\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\ -\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ -\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x2e\x23\x00\x00\ -\x2e\x23\x01\x78\xa5\x3f\x76\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ -\xde\x03\x0c\x12\x05\x12\x78\xfa\xe0\x84\x00\x00\x0b\xf6\x49\x44\ -\x41\x54\x58\xc3\x9d\xd7\x69\x90\x5c\xd5\x75\xc0\xf1\xff\x7d\xef\ -\x75\xbf\x5e\xa6\x7b\xf6\xa5\x47\xcc\x22\x89\x19\x49\xa3\x05\x09\ -\x89\x45\x80\x89\x01\xe1\x24\x88\xb0\x83\x65\x4a\x04\x41\x22\x30\ -\xd8\xae\x80\x29\x8c\x01\x83\x08\x81\xc4\xd8\x89\x31\x01\x1b\x03\ -\xe5\x38\x18\x0a\x01\x02\x04\x48\x48\x02\x8d\x24\x04\x48\x62\x98\ -\xd1\x3e\x1b\x33\x9a\x9e\x7d\xed\xe9\x6d\xe6\x75\xbf\x5e\xde\x7b\ -\x37\x1f\x08\x95\x38\x89\xcb\x84\xfb\xf5\xde\x3a\xe7\x57\xe7\xd4\ -\xbd\x75\x8f\xe0\x6b\xac\x4d\x0f\x2d\xa5\x76\xe1\x49\x4e\x1c\xbc\ -\x91\xfa\xc6\x1a\x7a\x3a\x5b\xc5\xb3\xcf\xed\x95\xff\xf3\x9c\x94\ -\x52\x00\xee\x9e\xfd\x5b\xf4\x4f\xc3\x9f\xb8\xae\x1b\x7a\x2a\xee\ -\x7f\x44\x38\x5f\xee\x9f\xd3\xd8\x84\xf8\x3a\x80\xf6\xc9\x66\xf6\ -\x6e\x69\x51\x57\x5e\x7e\x15\xe7\xd7\x2f\xb6\xbf\x4c\xf6\xdb\xb7\ -\x1e\xac\xde\xd5\xbc\xf7\xbc\xb1\xd1\xd8\x19\x65\x41\xf3\x74\x33\ -\x6f\x56\xba\x82\x35\xa5\x8d\x73\x8b\x0a\xaa\xfc\x51\xaf\xab\x24\ -\x7b\x2a\x40\xf5\xd6\x8d\x45\xb7\x3e\xb5\x69\xe7\xeb\xf2\xd1\x5f\ -\x6f\x73\xbe\x12\xa0\xf5\xf0\x0b\x9c\xb5\x72\x23\xef\x3e\x7b\x37\ -\x57\xdc\xf1\x24\x00\xef\x6f\x7b\x3c\x60\xc8\x9a\x79\x71\xd3\x5c\ -\x39\x15\x99\xf8\x96\xdb\x23\x56\xf9\x5c\x95\xf5\xc5\xa5\x73\xd4\ -\xda\xe5\x75\x0c\x4d\x4d\x49\xd5\x6b\x39\x5d\xc7\x5f\x45\xe4\xdf\ -\x91\x65\xe2\x5c\x8c\xa1\x3c\xed\xc7\x5a\xb5\xd8\xa8\xff\x27\xdb\ -\x0f\x8c\x3e\xfe\x97\x97\x56\x09\xed\x4f\x25\x7f\xf5\x99\xbb\x39\ -\x6b\xe5\x46\x9e\x7e\x78\xbd\x72\xc5\x1d\x4f\x3a\x72\xf8\x2d\xdf\ -\x0b\xfb\x0f\xdf\xd3\xdc\x62\xdc\x92\x2f\x1a\xac\x4e\xd6\x09\xbd\ -\x62\xd1\x14\x8b\xab\xeb\xa8\x58\x70\x36\x1d\xf1\x23\x52\xcc\xa6\ -\xf9\xf0\x95\x87\xc5\xca\x9a\x90\x9a\xf1\x16\x51\x10\xf5\xd0\x4e\ -\x07\x8d\x91\x69\x2a\x64\x9a\xa4\x66\x5f\x01\x3c\x9e\x68\x9f\x40\ -\xfd\x63\x89\xff\xe5\x67\xff\x8a\x35\xfe\x09\x75\x73\x42\xec\xf8\ -\xb8\x9d\x1d\x1f\x1e\xc7\x8e\x1c\x5c\xbf\xb3\xa3\x7f\xf3\x9e\x7d\ -\x9d\xd7\x9d\x79\xc6\x77\x02\x3b\xb7\xec\xd1\x56\xcc\xd1\x88\xe7\ -\xc6\x45\x7e\xdc\xcf\xf0\x47\xbf\x67\xb2\x3b\x2c\x3c\x89\x29\xd1\ -\xd9\x6b\xf0\xad\x6f\xfc\x15\x71\xb3\x0f\x23\x61\x20\x47\x92\x4c\ -\x77\x65\x49\xc4\x35\xbc\xba\xda\x7e\x2c\x9c\x7b\xb9\x61\x39\xe2\ -\x8f\x02\x8a\x6b\x06\xd9\xfe\xfe\x28\x3b\x3e\x6e\x67\x72\xf8\xb5\ -\xd0\x3d\xb7\xdf\xf6\xa2\xd3\xd4\xf4\x80\x6b\xce\x92\xd2\xd6\x3d\ -\xcd\xb2\xad\xb5\x4d\x1d\x1d\xee\x16\xc7\x3e\x3b\x22\x2e\xb8\xfa\ -\x9b\x68\x5a\x8a\x0b\xaf\x6a\x61\x66\x50\xa7\xf8\xea\x12\x1a\x8b\ -\x1b\xb1\x74\x49\xb4\xf5\x1d\x06\x0e\xc6\xf1\x44\x6d\x3e\xea\xd3\ -\x30\x4c\x89\xcb\xe7\xdb\xda\x35\x98\xde\x7d\xf1\x92\xda\xff\xbb\ -\x05\x5b\x76\x3d\x44\x77\xcf\x29\xf1\x1a\x9d\xf2\x8e\xf5\x2b\xe6\ -\xdd\x79\xff\xb3\x3b\x1a\x2e\xf8\xf6\x02\xcb\x56\x9d\x89\xc9\x76\ -\xc5\x8c\x27\x44\x2a\x9d\xc0\x4a\x5b\xb8\x8a\x21\x54\x73\x08\x99\ -\xf7\xa3\x16\xf9\xc8\x27\xf2\xec\xde\x32\x4c\x49\xbc\x8b\x89\xee\ -\x18\x75\x39\x95\xfe\xa1\x2c\xd2\xed\x62\xd1\x0a\x0d\x99\x53\x29\ -\x2f\x0e\x66\x21\xc2\x9c\x79\xa5\xfc\x2f\xc0\xfb\xfb\x7e\xc1\x9f\ -\x5f\xf4\x43\x00\xf9\xc8\x73\x1b\xe6\xa5\x44\xd9\xae\x0b\x37\xfc\ -\xa0\x21\x26\x5d\xb2\xe7\xcd\x37\x15\x4e\x66\x09\xce\xab\x66\xea\ -\x40\x17\x59\xd3\xe1\xcc\x4b\x16\xd1\x7b\xdc\x43\x6f\x74\x12\xff\ -\xaa\x85\xb8\x16\x98\xa4\xdf\x8d\xd2\xb4\xa0\x92\xc8\x64\x94\x53\ -\x8e\x8f\xb2\x15\x3a\xb9\xe4\x14\xa6\x61\x4b\x69\xe7\x05\x41\x33\ -\x0c\xe0\xd5\x90\x7f\x00\xd8\x75\xe8\x31\x56\x2e\x0c\x01\x88\xad\ -\xbf\xba\xad\xb8\xdd\xa3\xbe\xa1\x2e\xbd\x78\x7e\xf3\x6f\x9a\xb1\ -\xdb\x77\x8b\x3b\xef\xbb\x9a\x77\xd2\x0b\x29\x58\xae\xe0\xf7\x29\ -\x14\x04\x73\x2c\x38\xdf\xc3\xd2\xe5\x59\xa2\xaf\x64\xe9\x7b\x77\ -\x12\xe1\xd5\x29\xcd\xcc\xf2\xf6\xef\xc3\x84\x96\x95\x60\x99\x51\ -\x88\x66\xf1\xe6\x05\x16\xc2\xd1\x85\x6b\x36\x6d\xa6\x9b\xd7\x9f\ -\x13\xd4\x56\xaf\xff\xae\xa5\xfc\x77\xc0\x87\x67\x64\x28\x2b\xfe\ -\x0e\x52\x1e\xf1\x0c\xcf\x69\x7a\x31\xd6\x5f\xb5\x22\xb1\xe5\x03\ -\x71\xd3\xba\x6a\x6e\x7e\x6e\x35\x29\xdf\x11\x26\xe3\x2d\x5c\x74\ -\xd9\x02\x54\xe9\x27\xd2\x6f\x90\xf5\x14\x32\x10\x49\x11\x3a\xdd\ -\x47\xdb\xd6\x51\xa6\xf7\x45\x39\x70\x60\x94\xb3\x6e\x29\xc5\x65\ -\x0c\x91\xed\xcd\x92\x8d\x48\x84\x25\x65\x36\x9d\x57\x35\x32\xcf\ -\xff\x76\x6b\x62\xf8\xd2\x1b\xd6\xda\xdf\x5c\x79\x1b\x7f\x00\x58\ -\xd9\x69\x08\x80\xef\x3d\xfd\xf4\x63\xa9\x33\x4b\x2e\xff\x9b\x4d\ -\x77\x48\xad\x41\x13\x2d\xf4\x71\x64\xcf\x00\xff\xfe\x8b\x66\x0a\ -\xbd\x69\xe2\x6d\xc7\x29\xaf\x4e\xb2\x6a\xcd\x62\xd4\xe1\x71\xd2\ -\xfd\x0e\xda\xac\x45\xa4\x67\x96\xf0\x64\x84\x92\x46\x1f\x7d\xcd\ -\xc3\xe4\xc6\x4d\x8a\x55\x0b\xb7\x96\x93\x66\xca\x11\x5e\xd5\xf9\ -\x20\xe4\x3d\xed\x51\x80\x9b\xef\xd9\x2c\x85\x10\xff\x05\x78\xf3\ -\xf9\xb5\x44\x56\x3e\x29\xde\x69\x7e\xf0\xa2\x40\x49\xc1\x0f\x2a\ -\x6b\xca\x9d\x18\x1d\xa2\xf3\xbd\x4f\x68\x7f\xe2\x55\xc6\xfb\x7a\ -\xc8\xcf\x58\xc8\x78\x86\xf0\xbe\x23\x0c\x75\x24\x09\x06\x26\x69\ -\xdb\x3e\xcd\xe8\x87\x49\x4e\x1c\x1c\x46\x0b\xa4\x69\x5a\x39\x4b\ -\x4d\x60\x9a\xd6\x0f\x0c\xcc\x8c\x64\x26\x2d\xe4\xac\xe5\x16\xaa\ -\x87\xed\x4d\x73\x8a\xd6\xfd\x6c\xdb\x40\xea\x87\x57\x96\xb1\xeb\ -\xb5\xfb\x91\x52\x7e\xf1\x14\x4b\x29\x69\xfc\xe9\x06\x7a\xef\x7f\ -\x91\x47\xde\xbb\x6f\xef\x8c\x2c\xbe\x68\xf2\x78\x0b\x7a\x75\x00\ -\x7d\x7a\x14\x19\x8b\x12\x19\x48\x90\x30\x24\x73\x1a\x5d\xd4\x94\ -\x2b\x7c\xb2\x3b\x42\x55\xa9\x1b\x05\x87\x7d\x9f\x65\xb9\xe1\xde\ -\x4b\x18\x3f\xba\x8c\xf2\x82\x2a\x7c\x7e\xc1\x74\x24\x4b\x6f\x77\ -\x1f\x9a\xd9\x42\xb1\x7f\x78\xf7\xa6\x0d\x63\x57\xae\xd8\x80\x09\ -\xf0\xc2\x83\x6b\xd8\xf8\x78\x33\x00\x62\xac\xeb\x7a\xaa\x9f\xd9\ -\x02\xbf\x82\x17\xdb\x36\xad\x0d\x5b\xfe\xed\xd1\xf1\x01\x99\xee\ -\x3e\x24\x12\x1d\xe0\xf8\x6c\x96\xaf\xae\xc0\xb6\x0c\x5a\xde\x1b\ -\x64\x51\x7d\x31\x66\x7c\x94\x63\x47\x25\x45\x67\x78\xa8\x2c\xbc\ -\x86\x50\xf1\x25\x2c\x6a\x6a\xa0\xbf\x3f\xca\x74\xcc\x60\x74\x34\ -\x81\x23\x05\x1e\xbf\x8e\xe3\x38\xa0\x68\x13\xdd\xed\x43\x6f\x77\ -\xb4\xdc\xf3\xfd\xda\x85\xbf\x53\x86\xba\x6f\xc9\xc3\x8d\xc0\x2b\ -\x5f\x54\xa0\x79\xbc\x47\xb9\xa4\xaa\x41\xfe\xe3\x89\x3d\x3b\x7a\ -\x0f\xff\xf3\xa5\x25\x89\xa8\x9a\xb4\x7d\x2c\xac\x9d\xe0\xd8\xdb\ -\x06\x99\x1c\x14\xf8\x54\x06\x07\xe2\xd8\x45\x6e\x16\x5f\xb2\x84\ -\x91\x6d\x93\x2c\x3b\xff\x61\x6a\x6a\xeb\x59\x75\xde\x3c\x0e\x1f\ -\x1d\xe5\x54\x7f\x94\x83\x9f\x0d\x53\x3d\xb7\x9c\xb2\xd2\x02\xc6\ -\xc2\x63\xb8\x55\x55\x56\xd5\x97\x4b\x3b\x6f\x29\x47\x0e\xf5\x9d\ -\x6a\xdb\xb3\xfd\x1c\xdb\xd9\x19\xfb\xb2\xf5\xaa\x74\x76\xf3\x8d\ -\xc7\x3e\x57\xd6\x2c\x34\x2e\x38\xd0\x71\xfc\x1f\x26\x3e\xfd\x50\ -\x58\x33\x51\x31\x71\x62\x9c\xc8\x60\x1c\x43\xd1\x39\xd4\x92\xa4\ -\xf0\xdc\x6a\xea\xce\xaa\x62\x3c\x61\x12\x8a\x4b\xa4\xeb\x7b\x2c\ -\x5b\xb5\x84\xf1\x69\x83\xb9\xa7\x57\x22\x5c\x6e\x4c\x07\xbc\x01\ -\x0f\xe1\xfe\x08\xab\xcf\x9b\x8f\x2a\x1c\xdc\xba\x5b\x0c\x8d\xc4\ -\x44\xd6\xb4\xe4\x92\x15\xb5\xa5\xf1\x19\xcf\x35\x33\xd1\xba\x57\ -\x42\x8d\xeb\x72\x33\x91\xdd\x52\x8d\x35\xcd\x13\x7b\xee\xfe\x3b\ -\x67\xf9\xc6\xeb\x9f\xb7\x0b\xaa\x4e\x0f\xef\x7f\x4f\x24\xa6\x66\ -\x28\x52\xb3\x8c\x25\xdd\x04\xfd\x82\xb9\xc5\x92\x44\x77\x8c\xf1\ -\xce\x29\x42\xc2\x21\x6b\xaf\x63\xcd\xda\x8b\xe9\x0a\x4f\xb3\x78\ -\x49\x2d\xe5\x15\x41\x3c\xba\xc6\x6b\xdb\x4e\x32\x93\xb5\xc9\xda\ -\x0e\x86\x99\xe7\xed\x0f\x7a\x88\xc4\xd3\x8c\x4d\x18\x08\x4d\x15\ -\x81\x42\x9f\x2c\x2c\xf6\x95\xa6\x66\xad\x86\xc1\x8e\xfb\x5f\xfd\ -\xfe\x4f\x76\xa2\x7e\xf6\xc6\x7e\xa4\x94\x0b\xba\xc6\x4e\x3e\xd9\ -\xde\xb2\x9f\x74\x64\x90\xe8\xe7\x11\x66\x92\x50\xe6\x36\xc9\xc4\ -\xb2\x18\x69\x1b\x49\x1e\xb7\x22\x49\xc7\xbd\xcc\x5b\x72\x33\x8a\ -\xee\x45\x75\xeb\x5c\x75\xf9\x62\xa6\x12\x19\x62\x86\xc5\xe4\x6c\ -\x8e\xba\xfa\x72\x4c\x4b\x22\x2d\x8b\xa8\x61\xb1\xb4\xb1\x8c\xb1\ -\x98\x41\xda\xcc\x63\x66\x2c\x71\xe4\xd0\x29\x67\x6e\x7d\x59\x93\ -\xaa\x9d\xbd\xff\x83\xb7\xfe\x76\x40\x01\xd8\x4b\xeb\xb5\x9d\x13\ -\x27\xa8\x3a\xa3\x51\xca\x60\x29\x96\x57\xc5\xe5\x86\xf1\x88\x20\ -\x9d\x92\x90\xb3\xd0\x73\x92\x12\x04\x85\x15\x6b\x31\x6d\x1f\x6e\ -\x8f\xce\x95\x97\x35\x31\x38\x6e\xa0\x6a\x2a\x52\x53\x58\xb6\xb8\ -\x9a\x92\x12\x3f\x2e\xbf\x4e\x6b\x7f\x9c\xe2\x32\x1f\x6d\x7d\x71\ -\x54\x8f\x8e\xd4\x54\x14\xdd\x45\xc3\x8a\x79\x8a\xbb\xbc\xc8\x2a\ -\x2e\x2b\xb8\x17\x40\x91\xb2\x4b\x3b\x78\x60\xe8\xda\x79\xf3\x57\ -\xdb\x89\xf0\x5e\x11\xd2\x62\xa0\x7a\x30\xd2\x12\x2b\xab\x60\xa3\ -\x60\xce\x4a\x62\xb3\x79\xf4\xc2\x4a\xfa\x23\x73\x51\x5d\x2a\xbd\ -\xc3\x09\xa2\x33\x59\x84\xaa\x90\xb6\x24\x8e\x94\xd4\xcd\x09\x72\ -\x6a\x24\x4e\x5b\x6f\x04\x4f\xc0\x4b\x4a\x0a\xdc\x01\x1d\xe1\x71\ -\x63\xab\x0a\x86\x69\x51\x16\x2a\x22\x58\x12\x74\xf4\x02\xef\x0a\ -\x9f\xff\xf6\xa0\x02\xb5\xee\x50\xb9\xed\x3b\xb1\xef\x0d\xc2\xc7\ -\xc7\xe8\x09\x27\xf0\x3a\x79\x3c\x1e\x70\x34\x87\x78\x22\x47\x36\ -\xe3\x60\x49\x08\x0f\xfb\x51\x5d\x5e\x3e\x6a\x1b\xe2\x70\x77\x84\ -\xb8\x91\xc3\xe5\x52\xc1\x91\x54\x96\xfa\xe8\x1c\x88\xe2\xd6\x15\ -\x2e\x5a\x75\x1a\x81\x22\x1f\x8e\xc7\x85\xe2\x75\xa3\x78\x34\x54\ -\x8f\x0b\x97\x57\x23\x14\x0a\x52\x56\xec\xd3\x3c\x01\x6f\x95\xcb\ -\x5b\x58\xa3\xdd\xfb\xd2\xbd\x7a\x64\x4a\x0f\x56\x35\x14\xc8\x92\ -\xae\x31\x26\x27\xa2\x08\xc7\x21\xe3\x08\x90\x0e\x45\x3e\x15\x1c\ -\x07\x97\x90\xa4\x33\x2e\xf4\x72\x1f\xb1\x94\x85\x91\xc8\x10\x9b\ -\xcd\x62\x0c\xc6\x69\xeb\x9d\xa4\xaa\xa2\x10\x29\x25\x15\xa5\x05\ -\x58\x52\xd2\x3e\x99\xc6\x23\x21\x9f\xcd\x83\x10\x38\x36\x28\xba\ -\x1b\xd5\xe5\x22\x3e\x6d\x08\x45\x75\x09\x29\x9d\x02\xe5\xd1\x9b\ -\x1e\xcb\x5f\xb6\xfe\xaf\x33\x9f\x6f\x7b\x97\x70\x67\x04\x47\x75\ -\x23\x4d\x9b\x60\x26\x87\xae\x0b\xbc\xaa\x83\xb0\x41\x45\x52\x5a\ -\xee\x23\x1a\x37\x51\x5d\x0a\x1e\x8f\x8b\xcd\xbb\x7b\xf0\xfb\x5d\ -\x2c\x6f\xac\xc2\x01\x3a\x22\x26\x6f\x75\x44\x18\x4d\xe5\x99\xb6\ -\x00\xaf\x0b\x45\x77\x23\x3c\x6e\xd0\x14\x14\x45\x92\xfb\xcf\x1b\ -\x12\xf0\x29\xd8\x12\x5b\xf1\x89\x12\xe3\xe0\x4b\xef\x1e\x4d\x4e\ -\x98\x4e\x62\x22\x67\x9b\xa3\xb3\xd2\x98\x91\x8e\x21\x1d\x47\x98\ -\x8e\x4c\x1b\xc2\xd1\x14\xe1\x48\x5c\x96\x65\xcf\xd8\x39\x33\x4d\ -\x26\xeb\x90\x73\x1c\xea\x43\x01\xee\x7a\xae\x85\x68\x2a\xc3\xe1\ -\x51\x83\x13\xd3\x26\x8e\xdb\xcd\xa7\x63\x69\xbc\x01\x0f\x8a\x47\ -\x47\x78\x34\x50\x24\x9a\x47\xc5\xb6\x6c\x8e\x1e\x1b\x64\x2c\x3c\ -\xe1\xc4\xa6\xe2\x59\x4d\x53\x93\x2a\xc0\x8f\x36\xde\xd0\x57\xa0\ -\x67\xce\x12\x96\x93\xd3\x35\x8f\xad\x8b\x6c\x4e\x08\xd5\x0c\xea\ -\x5a\x3a\x18\xd0\x92\x5e\xaf\x16\x2b\x0a\x16\x0e\x4b\xd2\x71\x83\ -\xe5\xe5\x9a\x37\x88\xab\xc0\xc3\xe1\x91\x59\x36\xac\x5d\xc8\x96\ -\xa3\x11\x4e\xab\x2e\xe0\xd2\xa5\xd5\x14\x06\x74\x72\x8a\x4a\x56\ -\x7e\x51\x35\xc7\x01\xcb\x16\x14\x79\x34\x1c\x33\xcf\xd4\x68\x0c\ -\x3b\x95\xb2\x72\xc9\xcc\xc4\x48\x4f\xf3\xa3\xda\x1d\xdf\xbd\x8e\ -\x6b\x6f\xb8\xf3\xf0\xe6\xcd\x3f\xbe\xcb\x91\xc1\x15\xf9\xac\xed\ -\xc9\x18\x49\x19\x9d\x1c\x15\xaa\xc4\x2a\xf0\xea\xf9\xbc\x9d\x9b\ -\x01\x91\x12\xb6\x11\x48\x84\xc7\x7e\xda\x9f\x2a\xa9\x2a\x2a\xf6\ -\x71\x7a\x28\x40\xef\xb8\x41\x59\xb1\x07\xa1\x69\x7c\xa3\xa1\x94\ -\x78\xd6\xe1\xbc\xac\xc3\xa9\x58\x9a\xf7\x8e\x8f\x93\xcf\xda\x54\ -\x97\xf8\x10\xb3\xb3\x84\x13\x29\xb0\x1d\x7c\x2e\xb7\x2b\x93\x4c\ -\xed\x82\x4f\x2c\xed\xd9\xdf\xbc\x41\x5f\xdf\x47\x62\xfe\xfc\x0b\ -\x0f\x00\x07\xfe\xd4\x37\xfd\xc6\x35\x0b\x9a\xa6\x66\x72\x3f\x32\ -\x53\x59\x99\x4d\x98\x22\x35\x92\x64\xe9\xd2\x10\x4d\xa1\x20\x42\ -\x51\x40\x48\x6c\x45\x50\x51\xa8\xb3\x61\x75\x0d\x89\x64\x86\x13\ -\x5d\xa3\xb4\x9e\x4a\xa3\x3a\xe0\x38\x8e\xc4\xc9\x8b\xb1\xd1\xe8\ -\xcf\x01\xb4\xd7\x5f\xdf\xc4\xfc\xf9\x17\xca\x97\x5f\x7e\x80\xc1\ -\xa1\x09\x91\x33\x2d\xf2\x66\x86\xf8\xf4\x08\xd2\xb2\x28\xf0\xea\ -\xe4\x6d\x0b\x97\x92\x93\xc6\x4c\xa3\xd6\x54\x35\xf5\xb4\xd9\x97\ -\x58\xd7\x66\x14\x86\x74\x45\x6a\x32\x97\x17\x9d\x43\x49\xdc\x85\ -\x7e\x16\xa5\x73\x94\x78\xdd\x08\x55\xa5\x48\x57\x48\x9b\x79\x66\ -\x67\x14\x8e\x9c\x8a\xe1\xb1\x2c\xf2\x8e\xb4\x15\x29\xd5\x89\xa1\ -\xd8\xc3\xe9\xe8\x2f\xfb\xe6\x2e\xfd\x27\xf1\x95\x47\xb3\x7b\xbf\ -\xfd\x67\xfc\xfc\xb5\xfd\x00\x1c\xde\xff\xf6\x4d\xcf\x6f\x9e\xfc\ -\xfb\x8f\xa3\x05\x73\xa9\x08\x3a\xd2\xef\x51\x28\xf2\x71\xf5\xb9\ -\xb5\x5c\xbf\xac\x0a\x97\x22\xc8\x58\x36\x3d\xe3\x06\xad\xdd\x13\ -\xec\xf8\x38\x8c\x9a\xb3\x9d\xfc\x54\x54\x31\x7a\xc7\x5e\x71\x3a\ -\x1e\xba\x29\x5b\x79\x1f\x89\xc9\x27\x1c\xf5\xab\x02\x0e\x76\x0c\ -\xf2\xe0\xad\xeb\x90\x43\x23\xd4\x3d\xfa\xbb\x93\x37\xcf\x4f\xfd\ -\xdb\xce\x9d\xfd\xae\xa0\xdf\x73\x7e\x7d\x43\xa5\x55\x5d\x1e\xb0\ -\x6b\x4b\xbd\xca\xa2\x32\x1f\x39\xdb\x11\x03\xb1\x0c\x53\xf1\x94\ -\x9c\x49\xe7\xad\xf0\xb8\x61\x8b\xc9\x98\x66\x86\x27\x9e\x1a\x39\ -\xf9\xe0\xed\x29\x90\x99\xd4\x01\x59\x39\xff\x99\xaf\x37\x9c\x26\ -\x22\x9d\x62\xfb\xb6\x21\x65\xfd\xad\x7f\x61\x9f\xd6\xf8\xe3\xb3\ -\x5d\xe5\x55\x4f\xba\x6a\x2a\x16\xaf\x3a\xbb\xae\xf0\xbc\xa5\x21\ -\xe2\x19\x8b\xf8\x4c\x86\x74\x32\x43\xb8\x77\x22\x3d\xde\x3d\x72\ -\x58\xc4\x13\xf7\x9f\xf8\xf4\x81\x03\x25\xa1\x47\xd4\xd8\xf8\x23\ -\xf6\x97\xb1\xfe\xdf\x00\x29\x25\x42\x5c\x03\x6c\xe5\x97\x2f\x49\ -\xee\xba\xe9\x8b\x10\x85\x95\x77\xd7\xaa\xe5\xe5\xf5\x45\x35\x15\ -\x42\x78\x74\xcc\xd9\x2c\xd9\xa9\x29\x29\x63\xc9\xa1\xd8\xc8\x13\ -\x03\x00\x6b\xee\x3c\x46\xf3\xaf\x97\xb3\xf4\xd2\x13\x9c\xdc\xbd\ -\x0c\x80\xff\x00\x1c\x7c\x06\xd9\x9b\xd6\x5b\xe7\x00\x00\x00\x00\ -\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x02\x4a\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ -\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ -\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ -\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ -\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ -\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x01\xc7\x49\x44\ -\x41\x54\x38\x8d\xa5\x93\xcd\x6a\x1a\x61\x14\x86\x1f\x33\x0e\x05\ -\x4d\x47\xda\x88\x64\x53\x14\x83\x43\x76\xc6\x95\x4c\x5d\xb9\x33\ -\x05\x17\xdd\x64\x99\x45\x2e\x20\xbd\x82\x76\x51\x7a\x03\xbd\x82\ -\x76\x93\x95\x0c\x82\x8b\xe2\x76\x32\xe8\x6a\x04\x85\x04\xa2\xd0\ -\xa2\x14\x84\x80\xc5\x9f\x5a\xb5\xf0\xa5\xa7\x1b\x2d\x93\xa1\x29\ -\x14\x0f\x9c\xcd\x39\xe7\x79\x39\x3f\xdf\x17\x12\x11\xb6\xb1\x9d\ -\xad\xe8\x07\x04\x12\x40\x1a\x88\xfa\x62\x51\xe0\x60\x9d\xfb\xa7\ -\xc0\x7e\x3e\x9f\x3f\xd6\x75\xfd\xa3\x6d\xdb\xe6\x1a\x8c\xda\xb6\ -\x6d\xea\xba\xfe\x21\x9f\xcf\x1f\x03\xfb\xf7\x08\x11\xd9\x78\xc2\ -\xb2\xac\x53\xa0\x0b\x5c\x69\x9a\x76\x59\xad\x56\x8f\xaa\xd5\xea\ -\x91\xa6\x69\x97\xc0\x15\xd0\xb5\x2c\xeb\x54\x44\x12\x1b\x2e\xe4\ -\x5b\x62\x3a\x95\x4a\xbd\x1f\x0c\x06\x4f\x00\x01\x1e\x85\xc3\xe1\ -\x39\x80\x52\x6a\x17\xf8\x09\x84\x92\xc9\xe4\xb8\xdf\xef\xbf\x02\ -\xbe\x04\x47\xb8\xf5\x3c\xef\x22\x93\xc9\x5c\x03\x0b\x60\xac\x94\ -\xd2\x94\x52\x1a\x30\x06\x16\x99\x4c\xe6\xda\xf3\xbc\x0b\xe0\x76\ -\x03\x85\x02\x67\x34\x46\xa3\xd1\x8b\x42\xa1\xf0\xbc\xd7\xeb\x3d\ -\xf3\x27\x4c\xd3\xfc\xda\x68\x34\x9a\xf1\x78\xfc\x13\x30\x7b\x68\ -\x89\x77\xad\x56\xab\xb7\x5c\x2e\xf7\xd6\x5d\xfc\xf1\xd5\x6a\xf5\ -\xb4\xdd\x6e\x77\x81\x3b\x3f\xe0\xef\x20\x5a\xaf\xd7\x0f\xca\xe5\ -\xf2\x6b\xa5\x94\x02\xe6\x01\xf1\x5d\x5d\xd7\xb5\x5a\xad\xf6\xae\ -\x54\x2a\x7d\x06\x7e\x04\x05\xd2\xb1\x58\xec\xcd\x6c\x36\xfb\x05\ -\x7c\x07\xc8\x66\xb3\xdf\x00\x3a\x9d\xce\xde\xba\xe6\xb1\x61\x18\ -\x3b\xd3\xe9\xf4\xed\xdf\x96\x38\xaf\x54\x2a\xcd\x48\x24\x32\x04\ -\x16\xb9\x5c\x6e\xe8\x38\xce\x8d\xe3\x38\x37\xb9\x5c\x6e\x08\x2c\ -\x22\x91\xc8\xb0\x52\xa9\x34\xef\x75\xe7\x7b\x07\x88\xc8\xa1\xeb\ -\xba\x67\xc5\x62\xf1\x7c\x32\x99\x9c\x88\x88\x21\x22\xc6\x64\x32\ -\x39\x29\x16\x8b\xe7\xae\xeb\x9e\x89\xc8\xa1\x9f\x09\x0a\x20\x22\ -\xa6\x88\xbc\x5c\xc3\x9b\x98\xb1\x8e\x99\xc1\xfa\xe0\x19\xff\xdb\ -\xb6\xfe\x8d\xbf\x01\x7c\x52\x08\x38\x8e\xd7\x1d\xc8\x00\x00\x00\ -\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ -\x00\x00\x04\x7f\ -\x89\ -\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ -\x00\x00\x18\x00\x00\x00\x18\x08\x06\x00\x00\x00\xe0\x77\x3d\xf8\ -\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\ -\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\ -\x00\x00\x09\x70\x48\x59\x73\x00\x00\x1b\xaf\x00\x00\x1b\xaf\x01\ -\x5e\x1a\x91\x1c\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdc\x01\x0a\ -\x17\x02\x30\xf6\x73\x58\xfb\x00\x00\x03\xff\x49\x44\x41\x54\x48\ -\xc7\xbd\x95\x6b\x4c\x9b\x75\x14\xc6\x9f\xb7\xd7\xc1\xe8\xe8\xca\ -\x66\x3b\x4a\xc9\x80\x7a\x03\x5a\xca\x8c\x81\x99\x60\x5e\x37\x2e\ -\x92\x2c\xd9\x07\x2c\x4a\xe4\x36\x32\x34\xc6\x84\x0c\xe2\x40\x12\ -\x63\x5f\xb2\xa8\x89\x41\xe2\x52\xd6\x80\x51\xc1\x38\xa5\xc8\x75\ -\x1b\x42\x3b\x88\x62\x59\x02\x6c\x0c\x07\x04\x4a\xe2\x56\x20\x8b\ -\x5c\x02\x65\xa9\xb6\x89\xbc\x57\xbf\xa0\x21\x0a\x8c\x6e\xd1\xf3\ -\xf9\x7f\xce\xef\xfc\x9f\x73\x9e\x1c\xe0\x3f\x0e\xe2\x51\xf3\x2a\ -\x2a\x2a\x4c\x99\x99\x99\x65\xa1\xa1\xa1\xa9\x1c\xcf\xc9\xfc\x7e\ -\xdf\xdd\x55\xef\x5a\x6b\x6d\x4f\xdd\xe5\x99\xb6\x19\xfa\xb1\x9a\ -\xb2\x58\xde\x2b\x59\x5c\x5a\xa4\x39\x8e\x15\x7c\x3e\x9f\x30\x37\ -\x3f\x27\xdc\x1e\x1f\x13\x3a\x3a\xdb\xf8\x8a\x77\xce\x59\x01\x48\ -\xfe\x7a\x2c\xd9\x9a\x39\x38\x38\x28\x3c\xac\x7a\x4d\x4d\x8d\x3e\ -\xf5\xf8\x0b\xf5\x52\xa9\x54\xca\x32\x1c\xc4\x12\x31\x5a\xed\x76\ -\xbe\xa3\xa3\xc3\x73\xe7\xce\x44\x0f\xc3\x30\x76\x00\xc2\xb6\x80\ -\x4d\xc8\xae\x00\x85\x62\xff\xe9\xf0\x70\x45\x08\xc7\x71\x60\x58\ -\x1a\x04\x41\xa0\xb7\xcf\xf1\xf5\xad\x5b\x63\xd5\x14\x45\x2d\x92\ -\x24\x79\x8e\x24\x49\x62\x47\x00\x00\x50\x14\xb5\xd3\x6c\xc4\x45\ -\x45\xf9\x76\x8f\x67\x1e\x31\x31\x7a\x30\x0c\x03\x91\x58\x8c\x23\ -\x1a\x8d\x1b\xc0\xf2\x76\x09\xa2\x20\xf5\x0f\x79\x36\x3e\xe1\x79\ -\xb7\x7b\x06\x2c\xcb\x80\x65\x59\xb0\x0c\x8b\xc2\xc2\x82\xf4\xf8\ -\xf8\x78\xe9\xd6\xc6\xaa\xaa\xaa\xc2\x83\x06\xa4\xa5\xa5\x3d\xa5\ -\xd7\xc7\x45\x4b\xa5\x32\xb8\x67\xdc\x20\x08\x02\x2c\xcb\x20\x56\ -\x1f\x97\x5e\x5c\x5c\xd0\x5b\x56\x56\x16\xbd\xbc\x7c\xff\xb9\xeb\ -\xd7\x9d\x5f\x28\x0e\x84\x8d\x05\x0b\x20\x48\xf2\xc5\x53\x5a\xad\ -\x96\xd0\x6a\xb5\xe8\xec\xea\xc6\x47\x1f\xd7\x82\x65\x59\xec\x93\ -\xcb\x11\xa5\x8b\x3e\x19\xba\x3f\x64\x56\x1f\xf7\xcc\x58\x64\x64\ -\x64\xc9\x90\x6b\xe8\x41\xb0\x00\x79\xa2\xc1\x98\x73\xf7\xde\x1c\ -\x3a\xbb\x7b\x60\x3a\x76\x0c\x3d\x0e\x07\x26\xa7\xa6\x00\x01\xd0\ -\xe9\x74\x08\x0b\x0b\x0b\x91\xed\x93\x11\x23\xa3\xa3\x6c\x7f\xff\ -\x40\x4b\x30\x00\x82\xa2\xde\x37\x27\x9b\x4c\x46\x43\x42\x02\x7e\ -\x5d\x5a\x82\x58\x24\x42\x6c\x4c\x0c\x5a\xdb\xdb\xc1\xf3\x3c\x94\ -\x4a\x25\x08\x82\xc0\xac\x7b\x56\xa8\xae\xac\x76\xf2\x3c\xdf\xb2\ -\xe3\x16\xfd\xb3\xb8\xcd\x66\xcd\x4b\x49\x39\xde\xb8\xb2\xb2\x02\ -\x83\xc1\x80\xec\xac\x0c\xf4\x3a\x1c\x38\x1a\xa5\x85\x29\xc9\x08\ -\x99\x5c\x86\xd5\xd5\x15\xac\x7b\xd7\x99\xd7\x2d\xf9\xdf\x33\x0c\ -\x53\x0d\x60\x05\xdb\x78\x40\xa0\x28\xea\x6f\x93\x98\xcd\x66\x71\ -\x73\xf3\x97\x96\xcb\xdf\x7e\xc3\x65\x65\x65\x09\x29\xa9\x29\x82\ -\xcb\xe5\x12\x3c\x9e\x7b\xc2\x8f\x83\x3f\x70\x79\x79\xaf\xfd\xf6\ -\x12\x49\xce\x91\x24\xe9\x12\x8b\xc5\x56\x00\x85\x9b\x66\xdd\xdd\ -\x07\x00\x50\x52\x52\xa2\x38\x91\x71\xa2\x69\x7a\x6a\x3a\xc7\xe9\ -\x74\x22\x42\x15\x01\x9d\x2e\x1a\x6a\x8d\x9a\xbf\x74\xc9\x76\xd3\ -\x6a\xb5\x5e\xa3\x69\xfa\x36\x80\x39\x00\x6b\x00\xfc\x14\x45\x6d\ -\x6c\xa6\x0b\xbb\x02\xca\xcb\xcb\xf5\xa6\x64\x43\x47\x5b\xeb\x77\ -\xc6\xf1\xf1\x9f\xa1\x52\xa9\xc0\xb2\x2c\xce\x14\x17\x09\x36\x9b\ -\xad\xeb\xe2\xa7\x17\x2b\x01\x2c\x00\xe0\x1e\xa6\xef\xbf\x00\x7e\ -\xbf\x2f\xfb\xc9\xa7\xe3\x46\x6c\xb6\x86\x88\xf9\xf9\x05\x48\xa4\ -\x12\xd0\x34\x8d\x97\xb3\xb3\x30\x39\x39\xe5\xda\x2c\xee\xd9\xeb\ -\xea\x6d\x05\x48\xaf\x5e\xed\xae\x3e\xac\x3e\x7c\xad\xa1\xe1\x33\ -\xc9\xda\xaa\x17\x22\x91\x08\x1c\xcb\x21\x29\x39\x09\xaa\x83\xaa\ -\x5f\x4a\x4b\xdf\x38\xbf\x29\x09\x82\x02\xe8\xf5\x7a\x79\xd1\x99\ -\xfc\x7a\xb5\x5a\x73\x76\x7a\x7a\x1a\x07\x14\x0a\xd0\x1b\x34\x02\ -\x81\x00\xa2\xa2\xa2\x90\x71\x32\xdd\x5b\x79\xbe\xaa\x12\xc0\xf8\ -\x56\x7d\xf7\x12\x22\x00\x78\xf3\xad\xd2\x2a\x8e\xe3\x72\x9b\x9a\ -\xbf\x7a\xd7\xbb\xfe\xe0\x15\xf3\xab\xe6\xfb\x4a\xa5\x12\x5a\xad\ -\x16\xc5\xc5\x85\x1b\x9f\xd4\xd6\x7d\xe0\xf5\x7a\xfb\xf6\xa2\xf9\ -\xb6\x3f\x38\x14\x71\xc8\x7c\xa5\xeb\xca\xcd\xe1\x1b\xc3\x8d\xc3\ -\x37\x86\x7d\x26\x43\x82\xc6\x68\x34\xd4\x27\x1a\x12\x79\x7b\x8b\ -\xfd\xf3\xdc\xdc\xdc\x3a\x00\x75\x8f\x72\x9d\x24\x00\x20\x97\xcb\ -\x7e\x57\x1f\xd1\xa8\x01\xa8\x01\xf8\xff\x60\x99\x27\x92\x93\x93\ -\x04\x47\x9f\xa3\xdb\x62\xa9\x79\xfb\xb1\x6f\x72\x63\xa3\xad\x20\ -\xfc\x60\x78\xd3\xe8\xc8\xe8\x08\x41\x10\x0b\x31\xb1\x47\x73\x7e\ -\x1a\x1c\xea\x6f\x6f\xeb\x2c\x0b\x76\xa8\x3b\x1d\x7d\xd1\x85\x0f\ -\x2f\x14\x31\x0c\x7d\x36\x10\x08\x10\x13\x13\x93\x3d\x03\xce\x81\ -\x66\x00\x4b\xc1\x0e\xf5\x7f\x8f\x3f\x01\x2e\x51\xa3\xa9\xc7\xde\ -\x69\x7b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \x00\x00\x20\xb1\ \x89\ \x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ @@ -1951,6 +1573,382 @@ \x53\x4d\x4d\x4d\xc1\xa9\xa6\xf6\x23\xda\xff\x01\xb7\xbe\xbf\x34\ \x7c\xc5\x7a\x2d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\ \ +\x00\x00\x0c\x69\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\ +\x00\x00\x00\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\ +\xa7\x93\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x2e\x23\x00\x00\ +\x2e\x23\x01\x78\xa5\x3f\x76\x00\x00\x00\x07\x74\x49\x4d\x45\x07\ +\xde\x03\x0c\x12\x05\x12\x78\xfa\xe0\x84\x00\x00\x0b\xf6\x49\x44\ +\x41\x54\x58\xc3\x9d\xd7\x69\x90\x5c\xd5\x75\xc0\xf1\xff\x7d\xef\ +\x75\xbf\x5e\xa6\x7b\xf6\xa5\x47\xcc\x22\x89\x19\x49\xa3\x05\x09\ +\x89\x45\x80\x89\x01\xe1\x24\x88\xb0\x83\x65\x4a\x04\x41\x22\x30\ +\xd8\xae\x80\x29\x8c\x01\x83\x08\x81\xc4\xd8\x89\x31\x01\x1b\x03\ +\xe5\x38\x18\x0a\x01\x02\x04\x48\x48\x02\x8d\x24\x04\x48\x62\x98\ +\xd1\x3e\x1b\x33\x9a\x9e\x7d\xed\xe9\x6d\xe6\x75\xbf\x5e\xde\x7b\ +\x37\x1f\x08\x95\x38\x89\xcb\x84\xfb\xf5\xde\x3a\xe7\x57\xe7\xd4\ +\xbd\x75\x8f\xe0\x6b\xac\x4d\x0f\x2d\xa5\x76\xe1\x49\x4e\x1c\xbc\ +\x91\xfa\xc6\x1a\x7a\x3a\x5b\xc5\xb3\xcf\xed\x95\xff\xf3\x9c\x94\ +\x52\x00\xee\x9e\xfd\x5b\xf4\x4f\xc3\x9f\xb8\xae\x1b\x7a\x2a\xee\ +\x7f\x44\x38\x5f\xee\x9f\xd3\xd8\x84\xf8\x3a\x80\xf6\xc9\x66\xf6\ +\x6e\x69\x51\x57\x5e\x7e\x15\xe7\xd7\x2f\xb6\xbf\x4c\xf6\xdb\xb7\ +\x1e\xac\xde\xd5\xbc\xf7\xbc\xb1\xd1\xd8\x19\x65\x41\xf3\x74\x33\ +\x6f\x56\xba\x82\x35\xa5\x8d\x73\x8b\x0a\xaa\xfc\x51\xaf\xab\x24\ +\x7b\x2a\x40\xf5\xd6\x8d\x45\xb7\x3e\xb5\x69\xe7\xeb\xf2\xd1\x5f\ +\x6f\x73\xbe\x12\xa0\xf5\xf0\x0b\x9c\xb5\x72\x23\xef\x3e\x7b\x37\ +\x57\xdc\xf1\x24\x00\xef\x6f\x7b\x3c\x60\xc8\x9a\x79\x71\xd3\x5c\ +\x39\x15\x99\xf8\x96\xdb\x23\x56\xf9\x5c\x95\xf5\xc5\xa5\x73\xd4\ +\xda\xe5\x75\x0c\x4d\x4d\x49\xd5\x6b\x39\x5d\xc7\x5f\x45\xe4\xdf\ +\x91\x65\xe2\x5c\x8c\xa1\x3c\xed\xc7\x5a\xb5\xd8\xa8\xff\x27\xdb\ +\x0f\x8c\x3e\xfe\x97\x97\x56\x09\xed\x4f\x25\x7f\xf5\x99\xbb\x39\ +\x6b\xe5\x46\x9e\x7e\x78\xbd\x72\xc5\x1d\x4f\x3a\x72\xf8\x2d\xdf\ +\x0b\xfb\x0f\xdf\xd3\xdc\x62\xdc\x92\x2f\x1a\xac\x4e\xd6\x09\xbd\ +\x62\xd1\x14\x8b\xab\xeb\xa8\x58\x70\x36\x1d\xf1\x23\x52\xcc\xa6\ +\xf9\xf0\x95\x87\xc5\xca\x9a\x90\x9a\xf1\x16\x51\x10\xf5\xd0\x4e\ +\x07\x8d\x91\x69\x2a\x64\x9a\xa4\x66\x5f\x01\x3c\x9e\x68\x9f\x40\ +\xfd\x63\x89\xff\xe5\x67\xff\x8a\x35\xfe\x09\x75\x73\x42\xec\xf8\ +\xb8\x9d\x1d\x1f\x1e\xc7\x8e\x1c\x5c\xbf\xb3\xa3\x7f\xf3\x9e\x7d\ +\x9d\xd7\x9d\x79\xc6\x77\x02\x3b\xb7\xec\xd1\x56\xcc\xd1\x88\xe7\ +\xc6\x45\x7e\xdc\xcf\xf0\x47\xbf\x67\xb2\x3b\x2c\x3c\x89\x29\xd1\ +\xd9\x6b\xf0\xad\x6f\xfc\x15\x71\xb3\x0f\x23\x61\x20\x47\x92\x4c\ +\x77\x65\x49\xc4\x35\xbc\xba\xda\x7e\x2c\x9c\x7b\xb9\x61\x39\xe2\ +\x8f\x02\x8a\x6b\x06\xd9\xfe\xfe\x28\x3b\x3e\x6e\x67\x72\xf8\xb5\ +\xd0\x3d\xb7\xdf\xf6\xa2\xd3\xd4\xf4\x80\x6b\xce\x92\xd2\xd6\x3d\ +\xcd\xb2\xad\xb5\x4d\x1d\x1d\xee\x16\xc7\x3e\x3b\x22\x2e\xb8\xfa\ +\x9b\x68\x5a\x8a\x0b\xaf\x6a\x61\x66\x50\xa7\xf8\xea\x12\x1a\x8b\ +\x1b\xb1\x74\x49\xb4\xf5\x1d\x06\x0e\xc6\xf1\x44\x6d\x3e\xea\xd3\ +\x30\x4c\x89\xcb\xe7\xdb\xda\x35\x98\xde\x7d\xf1\x92\xda\xff\xbb\ +\x05\x5b\x76\x3d\x44\x77\xcf\x29\xf1\x1a\x9d\xf2\x8e\xf5\x2b\xe6\ +\xdd\x79\xff\xb3\x3b\x1a\x2e\xf8\xf6\x02\xcb\x56\x9d\x89\xc9\x76\ +\xc5\x8c\x27\x44\x2a\x9d\xc0\x4a\x5b\xb8\x8a\x21\x54\x73\x08\x99\ +\xf7\xa3\x16\xf9\xc8\x27\xf2\xec\xde\x32\x4c\x49\xbc\x8b\x89\xee\ +\x18\x75\x39\x95\xfe\xa1\x2c\xd2\xed\x62\xd1\x0a\x0d\x99\x53\x29\ +\x2f\x0e\x66\x21\xc2\x9c\x79\xa5\xfc\x2f\xc0\xfb\xfb\x7e\xc1\x9f\ +\x5f\xf4\x43\x00\xf9\xc8\x73\x1b\xe6\xa5\x44\xd9\xae\x0b\x37\xfc\ +\xa0\x21\x26\x5d\xb2\xe7\xcd\x37\x15\x4e\x66\x09\xce\xab\x66\xea\ +\x40\x17\x59\xd3\xe1\xcc\x4b\x16\xd1\x7b\xdc\x43\x6f\x74\x12\xff\ +\xaa\x85\xb8\x16\x98\xa4\xdf\x8d\xd2\xb4\xa0\x92\xc8\x64\x94\x53\ +\x8e\x8f\xb2\x15\x3a\xb9\xe4\x14\xa6\x61\x4b\x69\xe7\x05\x41\x33\ +\x0c\xe0\xd5\x90\x7f\x00\xd8\x75\xe8\x31\x56\x2e\x0c\x01\x88\xad\ +\xbf\xba\xad\xb8\xdd\xa3\xbe\xa1\x2e\xbd\x78\x7e\xf3\x6f\x9a\xb1\ +\xdb\x77\x8b\x3b\xef\xbb\x9a\x77\xd2\x0b\x29\x58\xae\xe0\xf7\x29\ +\x14\x04\x73\x2c\x38\xdf\xc3\xd2\xe5\x59\xa2\xaf\x64\xe9\x7b\x77\ +\x12\xe1\xd5\x29\xcd\xcc\xf2\xf6\xef\xc3\x84\x96\x95\x60\x99\x51\ +\x88\x66\xf1\xe6\x05\x16\xc2\xd1\x85\x6b\x36\x6d\xa6\x9b\xd7\x9f\ +\x13\xd4\x56\xaf\xff\xae\xa5\xfc\x77\xc0\x87\x67\x64\x28\x2b\xfe\ +\x0e\x52\x1e\xf1\x0c\xcf\x69\x7a\x31\xd6\x5f\xb5\x22\xb1\xe5\x03\ +\x71\xd3\xba\x6a\x6e\x7e\x6e\x35\x29\xdf\x11\x26\xe3\x2d\x5c\x74\ +\xd9\x02\x54\xe9\x27\xd2\x6f\x90\xf5\x14\x32\x10\x49\x11\x3a\xdd\ +\x47\xdb\xd6\x51\xa6\xf7\x45\x39\x70\x60\x94\xb3\x6e\x29\xc5\x65\ +\x0c\x91\xed\xcd\x92\x8d\x48\x84\x25\x65\x36\x9d\x57\x35\x32\xcf\ +\xff\x76\x6b\x62\xf8\xd2\x1b\xd6\xda\xdf\x5c\x79\x1b\x7f\x00\x58\ +\xd9\x69\x08\x80\xef\x3d\xfd\xf4\x63\xa9\x33\x4b\x2e\xff\x9b\x4d\ +\x77\x48\xad\x41\x13\x2d\xf4\x71\x64\xcf\x00\xff\xfe\x8b\x66\x0a\ +\xbd\x69\xe2\x6d\xc7\x29\xaf\x4e\xb2\x6a\xcd\x62\xd4\xe1\x71\xd2\ +\xfd\x0e\xda\xac\x45\xa4\x67\x96\xf0\x64\x84\x92\x46\x1f\x7d\xcd\ +\xc3\xe4\xc6\x4d\x8a\x55\x0b\xb7\x96\x93\x66\xca\x11\x5e\xd5\xf9\ +\x20\xe4\x3d\xed\x51\x80\x9b\xef\xd9\x2c\x85\x10\xff\x05\x78\xf3\ +\xf9\xb5\x44\x56\x3e\x29\xde\x69\x7e\xf0\xa2\x40\x49\xc1\x0f\x2a\ +\x6b\xca\x9d\x18\x1d\xa2\xf3\xbd\x4f\x68\x7f\xe2\x55\xc6\xfb\x7a\ +\xc8\xcf\x58\xc8\x78\x86\xf0\xbe\x23\x0c\x75\x24\x09\x06\x26\x69\ +\xdb\x3e\xcd\xe8\x87\x49\x4e\x1c\x1c\x46\x0b\xa4\x69\x5a\x39\x4b\ +\x4d\x60\x9a\xd6\x0f\x0c\xcc\x8c\x64\x26\x2d\xe4\xac\xe5\x16\xaa\ +\x87\xed\x4d\x73\x8a\xd6\xfd\x6c\xdb\x40\xea\x87\x57\x96\xb1\xeb\ +\xb5\xfb\x91\x52\x7e\xf1\x14\x4b\x29\x69\xfc\xe9\x06\x7a\xef\x7f\ +\x91\x47\xde\xbb\x6f\xef\x8c\x2c\xbe\x68\xf2\x78\x0b\x7a\x75\x00\ +\x7d\x7a\x14\x19\x8b\x12\x19\x48\x90\x30\x24\x73\x1a\x5d\xd4\x94\ +\x2b\x7c\xb2\x3b\x42\x55\xa9\x1b\x05\x87\x7d\x9f\x65\xb9\xe1\xde\ +\x4b\x18\x3f\xba\x8c\xf2\x82\x2a\x7c\x7e\xc1\x74\x24\x4b\x6f\x77\ +\x1f\x9a\xd9\x42\xb1\x7f\x78\xf7\xa6\x0d\x63\x57\xae\xd8\x80\x09\ +\xf0\xc2\x83\x6b\xd8\xf8\x78\x33\x00\x62\xac\xeb\x7a\xaa\x9f\xd9\ +\x02\xbf\x82\x17\xdb\x36\xad\x0d\x5b\xfe\xed\xd1\xf1\x01\x99\xee\ +\x3e\x24\x12\x1d\xe0\xf8\x6c\x96\xaf\xae\xc0\xb6\x0c\x5a\xde\x1b\ +\x64\x51\x7d\x31\x66\x7c\x94\x63\x47\x25\x45\x67\x78\xa8\x2c\xbc\ +\x86\x50\xf1\x25\x2c\x6a\x6a\xa0\xbf\x3f\xca\x74\xcc\x60\x74\x34\ +\x81\x23\x05\x1e\xbf\x8e\xe3\x38\xa0\x68\x13\xdd\xed\x43\x6f\x77\ +\xb4\xdc\xf3\xfd\xda\x85\xbf\x53\x86\xba\x6f\xc9\xc3\x8d\xc0\x2b\ +\x5f\x54\xa0\x79\xbc\x47\xb9\xa4\xaa\x41\xfe\xe3\x89\x3d\x3b\x7a\ +\x0f\xff\xf3\xa5\x25\x89\xa8\x9a\xb4\x7d\x2c\xac\x9d\xe0\xd8\xdb\ +\x06\x99\x1c\x14\xf8\x54\x06\x07\xe2\xd8\x45\x6e\x16\x5f\xb2\x84\ +\x91\x6d\x93\x2c\x3b\xff\x61\x6a\x6a\xeb\x59\x75\xde\x3c\x0e\x1f\ +\x1d\xe5\x54\x7f\x94\x83\x9f\x0d\x53\x3d\xb7\x9c\xb2\xd2\x02\xc6\ +\xc2\x63\xb8\x55\x55\x56\xd5\x97\x4b\x3b\x6f\x29\x47\x0e\xf5\x9d\ +\x6a\xdb\xb3\xfd\x1c\xdb\xd9\x19\xfb\xb2\xf5\xaa\x74\x76\xf3\x8d\ +\xc7\x3e\x57\xd6\x2c\x34\x2e\x38\xd0\x71\xfc\x1f\x26\x3e\xfd\x50\ +\x58\x33\x51\x31\x71\x62\x9c\xc8\x60\x1c\x43\xd1\x39\xd4\x92\xa4\ +\xf0\xdc\x6a\xea\xce\xaa\x62\x3c\x61\x12\x8a\x4b\xa4\xeb\x7b\x2c\ +\x5b\xb5\x84\xf1\x69\x83\xb9\xa7\x57\x22\x5c\x6e\x4c\x07\xbc\x01\ +\x0f\xe1\xfe\x08\xab\xcf\x9b\x8f\x2a\x1c\xdc\xba\x5b\x0c\x8d\xc4\ +\x44\xd6\xb4\xe4\x92\x15\xb5\xa5\xf1\x19\xcf\x35\x33\xd1\xba\x57\ +\x42\x8d\xeb\x72\x33\x91\xdd\x52\x8d\x35\xcd\x13\x7b\xee\xfe\x3b\ +\x67\xf9\xc6\xeb\x9f\xb7\x0b\xaa\x4e\x0f\xef\x7f\x4f\x24\xa6\x66\ +\x28\x52\xb3\x8c\x25\xdd\x04\xfd\x82\xb9\xc5\x92\x44\x77\x8c\xf1\ +\xce\x29\x42\xc2\x21\x6b\xaf\x63\xcd\xda\x8b\xe9\x0a\x4f\xb3\x78\ +\x49\x2d\xe5\x15\x41\x3c\xba\xc6\x6b\xdb\x4e\x32\x93\xb5\xc9\xda\ +\x0e\x86\x99\xe7\xed\x0f\x7a\x88\xc4\xd3\x8c\x4d\x18\x08\x4d\x15\ +\x81\x42\x9f\x2c\x2c\xf6\x95\xa6\x66\xad\x86\xc1\x8e\xfb\x5f\xfd\ +\xfe\x4f\x76\xa2\x7e\xf6\xc6\x7e\xa4\x94\x0b\xba\xc6\x4e\x3e\xd9\ +\xde\xb2\x9f\x74\x64\x90\xe8\xe7\x11\x66\x92\x50\xe6\x36\xc9\xc4\ +\xb2\x18\x69\x1b\x49\x1e\xb7\x22\x49\xc7\xbd\xcc\x5b\x72\x33\x8a\ +\xee\x45\x75\xeb\x5c\x75\xf9\x62\xa6\x12\x19\x62\x86\xc5\xe4\x6c\ +\x8e\xba\xfa\x72\x4c\x4b\x22\x2d\x8b\xa8\x61\xb1\xb4\xb1\x8c\xb1\ +\x98\x41\xda\xcc\x63\x66\x2c\x71\xe4\xd0\x29\x67\x6e\x7d\x59\x93\ +\xaa\x9d\xbd\xff\x83\xb7\xfe\x76\x40\x01\xd8\x4b\xeb\xb5\x9d\x13\ +\x27\xa8\x3a\xa3\x51\xca\x60\x29\x96\x57\xc5\xe5\x86\xf1\x88\x20\ +\x9d\x92\x90\xb3\xd0\x73\x92\x12\x04\x85\x15\x6b\x31\x6d\x1f\x6e\ +\x8f\xce\x95\x97\x35\x31\x38\x6e\xa0\x6a\x2a\x52\x53\x58\xb6\xb8\ +\x9a\x92\x12\x3f\x2e\xbf\x4e\x6b\x7f\x9c\xe2\x32\x1f\x6d\x7d\x71\ +\x54\x8f\x8e\xd4\x54\x14\xdd\x45\xc3\x8a\x79\x8a\xbb\xbc\xc8\x2a\ +\x2e\x2b\xb8\x17\x40\x91\xb2\x4b\x3b\x78\x60\xe8\xda\x79\xf3\x57\ +\xdb\x89\xf0\x5e\x11\xd2\x62\xa0\x7a\x30\xd2\x12\x2b\xab\x60\xa3\ +\x60\xce\x4a\x62\xb3\x79\xf4\xc2\x4a\xfa\x23\x73\x51\x5d\x2a\xbd\ +\xc3\x09\xa2\x33\x59\x84\xaa\x90\xb6\x24\x8e\x94\xd4\xcd\x09\x72\ +\x6a\x24\x4e\x5b\x6f\x04\x4f\xc0\x4b\x4a\x0a\xdc\x01\x1d\xe1\x71\ +\x63\xab\x0a\x86\x69\x51\x16\x2a\x22\x58\x12\x74\xf4\x02\xef\x0a\ +\x9f\xff\xf6\xa0\x02\xb5\xee\x50\xb9\xed\x3b\xb1\xef\x0d\xc2\xc7\ +\xc7\xe8\x09\x27\xf0\x3a\x79\x3c\x1e\x70\x34\x87\x78\x22\x47\x36\ +\xe3\x60\x49\x08\x0f\xfb\x51\x5d\x5e\x3e\x6a\x1b\xe2\x70\x77\x84\ +\xb8\x91\xc3\xe5\x52\xc1\x91\x54\x96\xfa\xe8\x1c\x88\xe2\xd6\x15\ +\x2e\x5a\x75\x1a\x81\x22\x1f\x8e\xc7\x85\xe2\x75\xa3\x78\x34\x54\ +\x8f\x0b\x97\x57\x23\x14\x0a\x52\x56\xec\xd3\x3c\x01\x6f\x95\xcb\ +\x5b\x58\xa3\xdd\xfb\xd2\xbd\x7a\x64\x4a\x0f\x56\x35\x14\xc8\x92\ +\xae\x31\x26\x27\xa2\x08\xc7\x21\xe3\x08\x90\x0e\x45\x3e\x15\x1c\ +\x07\x97\x90\xa4\x33\x2e\xf4\x72\x1f\xb1\x94\x85\x91\xc8\x10\x9b\ +\xcd\x62\x0c\xc6\x69\xeb\x9d\xa4\xaa\xa2\x10\x29\x25\x15\xa5\x05\ +\x58\x52\xd2\x3e\x99\xc6\x23\x21\x9f\xcd\x83\x10\x38\x36\x28\xba\ +\x1b\xd5\xe5\x22\x3e\x6d\x08\x45\x75\x09\x29\x9d\x02\xe5\xd1\x9b\ +\x1e\xcb\x5f\xb6\xfe\xaf\x33\x9f\x6f\x7b\x97\x70\x67\x04\x47\x75\ +\x23\x4d\x9b\x60\x26\x87\xae\x0b\xbc\xaa\x83\xb0\x41\x45\x52\x5a\ +\xee\x23\x1a\x37\x51\x5d\x0a\x1e\x8f\x8b\xcd\xbb\x7b\xf0\xfb\x5d\ +\x2c\x6f\xac\xc2\x01\x3a\x22\x26\x6f\x75\x44\x18\x4d\xe5\x99\xb6\ +\x00\xaf\x0b\x45\x77\x23\x3c\x6e\xd0\x14\x14\x45\x92\xfb\xcf\x1b\ +\x12\xf0\x29\xd8\x12\x5b\xf1\x89\x12\xe3\xe0\x4b\xef\x1e\x4d\x4e\ +\x98\x4e\x62\x22\x67\x9b\xa3\xb3\xd2\x98\x91\x8e\x21\x1d\x47\x98\ +\x8e\x4c\x1b\xc2\xd1\x14\xe1\x48\x5c\x96\x65\xcf\xd8\x39\x33\x4d\ +\x26\xeb\x90\x73\x1c\xea\x43\x01\xee\x7a\xae\x85\x68\x2a\xc3\xe1\ +\x51\x83\x13\xd3\x26\x8e\xdb\xcd\xa7\x63\x69\xbc\x01\x0f\x8a\x47\ +\x47\x78\x34\x50\x24\x9a\x47\xc5\xb6\x6c\x8e\x1e\x1b\x64\x2c\x3c\ +\xe1\xc4\xa6\xe2\x59\x4d\x53\x93\x2a\xc0\x8f\x36\xde\xd0\x57\xa0\ +\x67\xce\x12\x96\x93\xd3\x35\x8f\xad\x8b\x6c\x4e\x08\xd5\x0c\xea\ +\x5a\x3a\x18\xd0\x92\x5e\xaf\x16\x2b\x0a\x16\x0e\x4b\xd2\x71\x83\ +\xe5\xe5\x9a\x37\x88\xab\xc0\xc3\xe1\x91\x59\x36\xac\x5d\xc8\x96\ +\xa3\x11\x4e\xab\x2e\xe0\xd2\xa5\xd5\x14\x06\x74\x72\x8a\x4a\x56\ +\x7e\x51\x35\xc7\x01\xcb\x16\x14\x79\x34\x1c\x33\xcf\xd4\x68\x0c\ +\x3b\x95\xb2\x72\xc9\xcc\xc4\x48\x4f\xf3\xa3\xda\x1d\xdf\xbd\x8e\ +\x6b\x6f\xb8\xf3\xf0\xe6\xcd\x3f\xbe\xcb\x91\xc1\x15\xf9\xac\xed\ +\xc9\x18\x49\x19\x9d\x1c\x15\xaa\xc4\x2a\xf0\xea\xf9\xbc\x9d\x9b\ +\x01\x91\x12\xb6\x11\x48\x84\xc7\x7e\xda\x9f\x2a\xa9\x2a\x2a\xf6\ +\x71\x7a\x28\x40\xef\xb8\x41\x59\xb1\x07\xa1\x69\x7c\xa3\xa1\x94\ +\x78\xd6\xe1\xbc\xac\xc3\xa9\x58\x9a\xf7\x8e\x8f\x93\xcf\xda\x54\ +\x97\xf8\x10\xb3\xb3\x84\x13\x29\xb0\x1d\x7c\x2e\xb7\x2b\x93\x4c\ +\xed\x82\x4f\x2c\xed\xd9\xdf\xbc\x41\x5f\xdf\x47\x62\xfe\xfc\x0b\ +\x0f\x00\x07\xfe\xd4\x37\xfd\xc6\x35\x0b\x9a\xa6\x66\x72\x3f\x32\ +\x53\x59\x99\x4d\x98\x22\x35\x92\x64\xe9\xd2\x10\x4d\xa1\x20\x42\ +\x51\x40\x48\x6c\x45\x50\x51\xa8\xb3\x61\x75\x0d\x89\x64\x86\x13\ +\x5d\xa3\xb4\x9e\x4a\xa3\x3a\xe0\x38\x8e\xc4\xc9\x8b\xb1\xd1\xe8\ +\xcf\x01\xb4\xd7\x5f\xdf\xc4\xfc\xf9\x17\xca\x97\x5f\x7e\x80\xc1\ +\xa1\x09\x91\x33\x2d\xf2\x66\x86\xf8\xf4\x08\xd2\xb2\x28\xf0\xea\ +\xe4\x6d\x0b\x97\x92\x93\xc6\x4c\xa3\xd6\x54\x35\xf5\xb4\xd9\x97\ +\x58\xd7\x66\x14\x86\x74\x45\x6a\x32\x97\x17\x9d\x43\x49\xdc\x85\ +\x7e\x16\xa5\x73\x94\x78\xdd\x08\x55\xa5\x48\x57\x48\x9b\x79\x66\ +\x67\x14\x8e\x9c\x8a\xe1\xb1\x2c\xf2\x8e\xb4\x15\x29\xd5\x89\xa1\ +\xd8\xc3\xe9\xe8\x2f\xfb\xe6\x2e\xfd\x27\xf1\x95\x47\xb3\x7b\xbf\ +\xfd\x67\xfc\xfc\xb5\xfd\x00\x1c\xde\xff\xf6\x4d\xcf\x6f\x9e\xfc\ +\xfb\x8f\xa3\x05\x73\xa9\x08\x3a\xd2\xef\x51\x28\xf2\x71\xf5\xb9\ +\xb5\x5c\xbf\xac\x0a\x97\x22\xc8\x58\x36\x3d\xe3\x06\xad\xdd\x13\ +\xec\xf8\x38\x8c\x9a\xb3\x9d\xfc\x54\x54\x31\x7a\xc7\x5e\x71\x3a\ +\x1e\xba\x29\x5b\x79\x1f\x89\xc9\x27\x1c\xf5\xab\x02\x0e\x76\x0c\ +\xf2\xe0\xad\xeb\x90\x43\x23\xd4\x3d\xfa\xbb\x93\x37\xcf\x4f\xfd\ +\xdb\xce\x9d\xfd\xae\xa0\xdf\x73\x7e\x7d\x43\xa5\x55\x5d\x1e\xb0\ +\x6b\x4b\xbd\xca\xa2\x32\x1f\x39\xdb\x11\x03\xb1\x0c\x53\xf1\x94\ +\x9c\x49\xe7\xad\xf0\xb8\x61\x8b\xc9\x98\x66\x86\x27\x9e\x1a\x39\ +\xf9\xe0\xed\x29\x90\x99\xd4\x01\x59\x39\xff\x99\xaf\x37\x9c\x26\ +\x22\x9d\x62\xfb\xb6\x21\x65\xfd\xad\x7f\x61\x9f\xd6\xf8\xe3\xb3\ +\x5d\xe5\x55\x4f\xba\x6a\x2a\x16\xaf\x3a\xbb\xae\xf0\xbc\xa5\x21\ +\xe2\x19\x8b\xf8\x4c\x86\x74\x32\x43\xb8\x77\x22\x3d\xde\x3d\x72\ +\x58\xc4\x13\xf7\x9f\xf8\xf4\x81\x03\x25\xa1\x47\xd4\xd8\xf8\x23\ +\xf6\x97\xb1\xfe\xdf\x00\x29\x25\x42\x5c\x03\x6c\xe5\x97\x2f\x49\ +\xee\xba\xe9\x8b\x10\x85\x95\x77\xd7\xaa\xe5\xe5\xf5\x45\x35\x15\ +\x42\x78\x74\xcc\xd9\x2c\xd9\xa9\x29\x29\x63\xc9\xa1\xd8\xc8\x13\ +\x03\x00\x6b\xee\x3c\x46\xf3\xaf\x97\xb3\xf4\xd2\x13\x9c\xdc\xbd\ +\x0c\x80\xff\x00\x1c\x7c\x06\xd9\x9b\xd6\x5b\xe7\x00\x00\x00\x00\ +\x49\x45\x4e\x44\xae\x42\x60\x82\ +\x00\x00\x07\x84\ +\x47\ +\x49\x46\x38\x39\x61\x36\x00\x37\x00\xf3\x00\x00\xff\xff\xff\x00\ +\x00\x00\x78\x78\x78\x1c\x1c\x1c\x0e\x0e\x0e\xd8\xd8\xd8\x54\x54\ +\x54\xdc\xdc\xdc\xc4\xc4\xc4\x48\x48\x48\x8a\x8a\x8a\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x21\xff\x0b\x4e\ +\x45\x54\x53\x43\x41\x50\x45\x32\x2e\x30\x03\x01\x00\x00\x00\x21\ +\xfe\x1a\x43\x72\x65\x61\x74\x65\x64\x20\x77\x69\x74\x68\x20\x61\ +\x6a\x61\x78\x6c\x6f\x61\x64\x2e\x69\x6e\x66\x6f\x00\x21\xf9\x04\ +\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\ +\xcc\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\ +\x9e\x25\x92\x10\x44\x82\xa0\xa7\xc2\xce\x84\x02\x93\x08\x4d\xbf\ +\x77\xb8\xea\xac\x44\x2f\x04\xa4\x0d\x41\xc5\xd9\xf1\xf3\x03\x0a\ +\x97\x9d\x5c\x91\x77\x2c\x18\x58\x86\x02\x46\xa6\xb3\x2d\x0b\x03\ +\xda\x40\x7b\x51\x05\xa9\x16\xc1\x60\x20\x18\x5d\x75\x06\x93\x80\ +\xd6\x26\x16\x4d\xe1\xd9\x40\x94\xc4\x8b\x45\x6f\x34\x71\x25\x73\ +\x33\x75\x20\x07\x79\x2c\x03\x07\x27\x6a\x6c\x24\x07\x6f\x06\x8d\ +\x50\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x1c\x8f\x87\x96\xa1\x1a\ +\x85\x2c\xa2\x47\xa6\x04\xa8\x14\x8a\x04\x7b\x96\xae\xb0\x17\xb2\ +\x97\xb5\x18\xaa\xac\x3d\xb9\xa5\x6b\xba\x43\xa4\x9f\xc2\xc3\xc4\ +\xc5\xc6\xc7\xc8\x9b\xc1\x8e\xbe\x24\xbc\x72\x74\x23\xb7\x25\xd3\ +\x20\xd5\xd2\x7f\x22\xcf\x84\xd1\x23\xcb\x72\xcd\xc9\x9e\xdf\xc5\ +\xdb\xc5\xd7\xc3\xe8\xc2\xe6\xe5\xe1\xe2\xef\x3d\x11\x00\x21\xf9\ +\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\ +\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\ +\x69\x9e\x68\xaa\x16\x06\x41\x18\x85\x5a\x16\x83\xeb\x0e\xb1\x2c\ +\xb6\xb6\x6b\xe8\xa2\x5e\x0f\x18\x12\xda\x88\x20\x5e\xef\x87\xf4\ +\x1c\x6a\xb6\xc1\xe1\x82\x48\xb8\x12\x88\xa6\xe4\xc0\x33\x4c\x2d\ +\x0a\xa3\x62\x24\x18\x0c\x04\x26\x84\xd1\x95\x05\x09\x7a\x68\x92\ +\x75\x9d\x08\x41\x6f\xa5\xf5\x11\x74\x27\x0c\xf2\x7a\x04\x21\x6f\ +\x36\x71\x23\x73\x46\x75\x83\x66\x86\x23\x6a\x6b\x6d\x5a\x1a\x61\ +\x42\x63\x92\x1c\x55\x57\x91\x97\x9c\x9d\x9e\x9f\xa0\xa1\x6e\x8c\ +\x97\x65\x67\x1a\x84\x2e\x8d\x40\xa9\x04\xab\x14\x7d\x7f\x4d\xb1\ +\x19\xb4\xb3\x3d\xb2\x17\xad\xaf\x32\xbb\xa8\xa4\x92\xa6\xbc\xa2\ +\xc4\xc5\xc6\xc7\xc8\xc9\xca\x27\xc2\x29\xcd\x64\x70\xcc\xd1\x22\ +\xb6\x25\xd5\x7c\xb8\x27\xd7\x1f\xbe\x26\xdd\x22\xcf\xcc\xc0\xcb\ +\x9e\xe1\xc7\xdf\xc6\xdb\xc4\xea\xa2\xe8\xc6\xe6\xe4\xf1\x27\x11\ +\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\x00\x36\x00\ +\x37\x00\x00\x04\xce\x10\xc8\x49\xab\xbd\x38\xeb\xcd\xbb\xff\x60\ +\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\x0a\x44\x4d\ +\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\x86\x1f\x17\ +\x0c\x99\x2b\x18\x6a\x86\x02\x49\x79\x24\x15\x76\xb6\x81\x34\x54\ +\xac\x55\x45\x4f\x1e\xc1\x00\xcc\x9a\xc4\xb6\x72\x4d\x48\x42\xd7\ +\x44\xdd\x9b\x29\xcc\x23\xc3\x5f\x5f\xd1\x01\xbb\x3e\x30\x3b\x07\ +\x61\x06\x7e\x7f\x85\x86\x87\x88\x89\x8a\x12\x08\x09\x35\x09\x08\ +\x8b\x15\x0a\x68\x0a\x19\x54\x43\x08\x6e\x04\x91\x16\x71\x79\x29\ +\x8e\x6e\x09\x17\x7c\x3d\x3f\x9b\x6f\x16\xa6\x6c\x2c\xa9\x04\x17\ +\x9f\x3f\xa2\x68\xa4\xb1\x78\x99\x9b\x9d\x92\x94\x62\x96\x92\x13\ +\x8d\x8f\xbb\xc0\xc5\xc6\xc7\xc8\xc9\x13\x98\x28\xcc\x70\x3c\xa0\ +\x44\xd0\x23\xac\x27\xd5\x6a\xa7\x26\xd7\x5c\xd3\x26\xb2\x23\xce\ +\xde\xb8\xca\x88\xe1\xc5\xdf\xc6\xdb\xc5\xea\xc0\xe8\xc6\xe6\xe4\ +\xf1\x26\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\x00\x00\ +\x00\x36\x00\x37\x00\x00\x04\xcd\x10\xc8\x49\xab\xbd\x38\xeb\xcd\ +\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\x02\x5b\ +\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\xb3\xe1\ +\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\x8a\x35\ +\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\xea\x09\ +\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\xbc\xaa\x60\xa8\ +\x19\x0a\x1a\x71\x3f\x05\x67\x80\x17\x6c\x5a\x29\x7d\x3c\x04\x06\ +\x18\x67\x43\x8c\x36\x8f\x41\x91\x92\x04\x18\x88\x43\x8b\x3c\x8e\ +\x99\x52\x48\x07\x67\x07\x7a\x13\x07\x8b\x06\xa4\xa5\xab\xac\xad\ +\xae\x27\x08\x09\x35\x09\x08\xac\x0a\x92\x0a\x23\x82\x23\x08\x97\ +\x04\xb5\x54\x46\x25\xb2\x97\x09\x21\x90\x24\xbe\x35\xc7\x95\xc9\ +\xca\x21\x9a\x24\xc4\x92\xc6\xd0\xa0\x25\xbd\x97\xc0\x79\xb7\x8c\ +\xb9\x48\xbb\x15\xb1\xb3\xdb\x3f\xd1\xab\xc8\xe8\xcd\xab\xe7\xec\ +\xd7\xaf\xf0\x2b\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ +\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcb\x10\xc8\x49\xab\xbd\x38\ +\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ +\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ +\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ +\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ +\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ +\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ +\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x99\x4c\x05\ +\x06\x35\x06\x05\x6e\x52\x27\x05\x67\xa0\x21\x8f\x23\x9d\x3c\x04\ +\x06\x40\x5d\x26\xab\x36\xae\x61\xb0\xb1\x04\x57\x6a\x25\xaa\x3c\ +\xad\x57\xa2\x19\x08\x09\x35\x09\x08\x17\x07\x67\x07\x43\x0a\xb1\ +\x0a\xc6\xaa\x06\xc9\x3f\x08\xb6\x04\xc5\x79\xc2\xb6\x09\x7a\xd4\ +\x35\xdb\xdc\x7a\xd8\xb1\xda\x79\xd3\xb6\xd6\x79\xcb\xab\xcd\x95\ +\xc1\xc3\xe7\x22\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\x00\ +\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\x38\ +\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\x0c\ +\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\x44\ +\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\x8a\ +\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\xc9\ +\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\xf8\x3c\x3e\ +\x8e\xe4\x5f\xd8\x5a\x2a\x80\x19\x67\x48\x85\x18\x87\x3f\x89\x16\ +\x83\x43\x8d\x18\x7e\x3f\x91\x7a\x94\x95\x96\x97\x98\x00\x08\x09\ +\x35\x09\x08\x96\x0a\x3c\x35\x0a\x94\x08\xa2\x36\x9f\x33\x52\x22\ +\x9c\xa7\x04\x09\x33\x6a\x20\xae\x36\x5f\x41\x21\xb4\x35\xb6\x5d\ +\x21\xad\xa7\xb0\x6e\xb2\x1f\xa6\xae\xa9\x6e\xab\x22\xa1\xa2\xa4\ +\x17\x05\x06\x35\x06\x05\x48\x9b\x9d\xc6\x15\x05\x67\xd2\x94\xcf\ +\xa2\x06\x95\xb4\xdf\xae\x95\xdc\x3c\xde\x94\x07\x67\x07\x96\x07\ +\xdc\x06\xea\x99\x28\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\x2c\ +\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\xbd\ +\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\x30\ +\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\x0f\ +\x44\xb3\xe1\x86\x1f\x17\x0c\xc9\x34\x29\x8f\xce\x17\x94\xc8\x9b\ +\x8a\x8a\x35\x6b\x67\x67\x13\x96\xb8\x35\x2f\x08\xdc\x3b\x91\xc5\ +\xc9\xea\x09\x7b\x23\x3d\x53\xef\xa6\x7c\x4e\xaf\xdb\xef\x22\x44\ +\xa2\x96\x40\xe0\x2b\x0a\x3c\x35\x0a\x7f\x12\x08\x82\x36\x7e\x3f\ +\x71\x16\x7b\x88\x04\x09\x8b\x6a\x16\x8f\x36\x3f\x67\x17\x95\x35\ +\x97\x41\x17\x8e\x88\x91\x39\x6c\x5a\x87\x8f\x8a\xa2\x52\x19\x81\ +\x82\x84\x85\x86\x8e\x7d\xae\xb2\xb3\xb4\xb5\x4c\x05\x06\x35\x06\ +\x05\xb3\x05\x67\xbc\x51\x4b\x22\xb9\x82\x06\x4e\x93\x20\x95\x26\ +\x98\x21\xca\x5f\x9d\x21\xc4\x3c\xc6\x33\xc8\x1f\x07\x67\x07\x6b\ +\xa9\x23\x07\xc4\x06\xda\xb6\x1d\x8c\xb2\xa3\xb4\xcc\xb2\xe8\xae\ +\xe6\xb4\xe4\xe2\xef\x27\x11\x00\x21\xf9\x04\x09\x0a\x00\x00\x00\ +\x2c\x00\x00\x00\x00\x36\x00\x37\x00\x00\x04\xcc\x10\xc8\x49\xab\ +\xbd\x38\xeb\xcd\xbb\xff\x60\x28\x8e\x64\x69\x9e\x68\xaa\xae\xac\ +\x30\x0c\x02\x5b\x0a\x44\x4d\xc4\xb2\x38\xd8\xc4\x90\xeb\x3c\xdf\ +\x0f\x44\xb3\xe1\x7e\x88\x44\x2d\x81\xd0\xb8\x60\x43\x80\x82\x57\ +\x53\x44\x39\x08\xaa\xad\x39\x7b\x1d\x3f\x4a\x2d\x21\x31\xe3\x7d\ +\x3b\x62\x5b\x69\x67\x13\x7e\xd2\xb5\x75\x30\x14\xd6\x92\x49\xc5\ +\xda\x19\x9b\xe6\xe2\xbd\x23\x53\x54\x56\x57\x58\x61\x4c\x85\x89\ +\x8a\x8b\x8c\x8d\x57\x05\x06\x35\x06\x05\x8e\x16\x05\x6c\x35\x03\ +\x94\x43\x4f\x7b\x13\x91\x54\x06\x9c\x66\x18\x69\x43\x98\x3d\xa5\ +\x62\xa7\x73\x17\xa0\x3c\xa2\x3f\x79\x37\x18\x07\xa8\x03\x07\x51\ +\x9d\x1a\x07\xa0\x06\xb9\x95\xc1\xc2\xc3\xc4\xc5\xc6\xc7\x1d\xbb\ +\x28\xca\x22\xb3\x9e\x44\xa4\x40\x6d\x27\xb7\x23\xd5\x26\xd7\x21\ +\xce\x27\xdb\x23\xcc\x26\xdf\xc8\x89\xe1\xc2\xdd\xc4\xd9\xc3\xe8\ +\xe5\xd1\xc5\xe4\xe2\xef\x25\x11\x00\x3b\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\ +\x00\x00\x03\x16\ +\x89\ +\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\ +\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xff\x61\ +\x00\x00\x00\x04\x73\x42\x49\x54\x08\x08\x08\x08\x7c\x08\x64\x88\ +\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0d\xd7\x00\x00\x0d\xd7\ +\x01\x42\x28\x9b\x78\x00\x00\x00\x19\x74\x45\x58\x74\x53\x6f\x66\ +\x74\x77\x61\x72\x65\x00\x77\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\ +\x70\x65\x2e\x6f\x72\x67\x9b\xee\x3c\x1a\x00\x00\x02\x93\x49\x44\ +\x41\x54\x38\x8d\x95\x91\xbd\x4f\x1b\x41\x10\xc5\x67\xe1\x96\xbb\ +\xf3\x25\xd8\x46\xe1\x82\x20\x91\x2c\x45\x38\x42\x51\x94\x02\x19\ +\x21\x04\x1d\xa2\xa3\x80\xa3\x30\x05\x25\x12\x15\x32\x14\x44\x48\ +\xfc\x05\x54\x96\x28\x29\x4c\x45\x0f\xae\xa0\xc0\x20\x0a\x7a\xa0\ +\x20\x46\x48\x24\x0e\x8e\xb1\x8d\xe3\x23\xb7\xc7\xde\xde\xee\x5e\ +\x8a\xc4\x16\x1f\x49\xc1\x2b\x67\xde\xfc\xf4\x66\x06\x65\xb3\xd9\ +\x81\x20\x08\x52\x08\xa1\x38\x3c\x43\x41\x10\xe4\x11\x42\x69\xc5\ +\xf7\xfd\x85\x91\x91\x91\x01\xc3\x30\xd4\xe7\x00\x08\x21\xd1\xc3\ +\xc3\xc3\x05\x45\x4a\x19\x07\x80\x6a\xbd\x5e\x77\x9f\x03\xc0\x18\ +\x87\xa4\x94\x71\x85\x52\x0a\x94\xd2\x27\xc3\xb9\x5c\x2e\xba\xb7\ +\xb7\xf7\x2a\x16\x8b\xb9\xc9\x64\xb2\x64\x18\x86\xb8\xdf\x17\x42\ +\xb8\x94\xd2\x76\x85\x73\x8e\x82\x20\x68\x36\x6a\xb5\x9a\x92\x4a\ +\xa5\x3e\x5e\x5c\x5c\x84\x55\x55\x85\x83\x83\x03\xd8\xd8\xd8\x78\ +\x37\x3f\x3f\xff\x65\x6a\x6a\xea\xfa\x3e\x84\x73\x8e\x14\xc6\x18\ +\xe2\x9c\x37\x8b\x2b\x2b\x2b\x1f\x6e\x6f\x6f\xdb\x97\x96\x96\x2a\ +\x63\x63\x63\x2e\x00\xc0\xc9\xc9\x49\x5b\x22\x91\x70\xe6\xe6\xe6\ +\x3e\x25\x93\xc9\x6f\xc3\xc3\xc3\x3f\x01\x00\x18\x63\xa8\x85\x73\ +\x8e\xa4\x94\x20\xa5\x84\xb3\xb3\x33\xa3\x5c\x2e\x47\xa7\xa7\xa7\ +\x6b\x96\x65\x5d\xa9\xaa\x5a\x50\x55\xf5\x6a\x68\x68\xe8\x47\x26\ +\x93\xe9\xa8\x56\xab\xd1\xf5\xf5\xf5\xf7\x9e\xe7\x21\x29\x25\x70\ +\xce\x51\x0b\x63\x0c\x49\x29\x61\x7b\x7b\xbb\x6b\x6b\x6b\xeb\xad\ +\x69\x9a\x80\x31\xf6\x8e\x8e\x8e\x24\x63\x8c\x33\xc6\xd8\xf1\xf1\ +\x31\xdf\xdd\xdd\x8d\x99\xa6\x09\x9a\xa6\x69\xe9\x74\x3a\x2e\xa5\ +\x6c\x26\x00\x29\x25\x10\x42\xc2\xf9\x7c\xbe\x4b\xd7\x75\xd8\xd9\ +\xd9\x31\x4d\xd3\x0c\x1a\xc9\x84\x10\x6d\xcb\xcb\xcb\x15\x5d\xd7\ +\x61\x76\x76\xf6\x7a\x7c\x7c\xdc\xfd\x9b\x00\x94\xc6\x0a\x33\x33\ +\x33\x25\x00\x78\x71\x7e\x7e\xfe\x72\x71\x71\xb1\x18\x8d\x46\x5d\ +\x29\x25\x00\x00\xf4\xf6\xf6\x3a\x99\x4c\x46\xd5\x75\x1d\xfa\xfa\ +\xfa\xca\xba\xae\x13\xc6\xd8\x9f\x23\x36\x00\xae\xeb\xda\x96\x65\ +\x95\x4e\x4f\x4f\xef\x22\x91\x48\x79\x6d\x6d\x2d\xde\xdf\xdf\x5f\ +\xc1\x18\xcb\x5c\x2e\xf7\xc6\x71\x9c\xc8\xc4\xc4\x44\x05\x63\x5c\ +\xa7\x94\x8a\xe6\x17\xee\x1f\x11\x63\x5c\x1e\x1c\x1c\xbc\xcb\x66\ +\xb3\x86\x6d\xdb\x1d\x9b\x9b\x9b\xaf\x01\x00\x4c\xd3\x04\xcb\xb2\ +\x2a\x89\x44\xa2\xe4\x38\x8e\x78\xf0\x46\xdf\xf7\x51\x23\xaa\xe7\ +\x79\xbe\xe7\x79\xb5\xd1\xd1\x51\x6d\x72\x72\xf2\xeb\xcd\xcd\x0d\ +\xb6\x6d\x5b\xe9\xe9\xe9\xf1\x11\x42\xbf\x6c\xdb\xae\x35\xbc\x00\ +\x00\xbe\xef\x3f\x04\x34\x44\x08\xa1\x84\x90\xef\x9a\xa6\x69\x9d\ +\x9d\x9d\xd8\xb6\xed\x3b\x21\x04\x87\x47\xf2\x7d\x1f\x29\x00\x70\ +\x59\x28\x14\xc2\xdd\xdd\xdd\xec\xb1\x81\x10\x42\x01\x80\x3e\xae\ +\x03\x00\x14\x8b\xc5\x36\x00\xb8\x54\x42\xa1\xd0\xea\xfe\xfe\xfe\ +\x67\x21\x44\xec\x5f\xc6\xff\xa9\xb5\xb5\xf5\x32\x1c\x0e\xaf\xfe\ +\x06\x47\x78\x84\x8a\xac\x27\x36\x0e\x00\x00\x00\x00\x49\x45\x4e\ +\x44\xae\x42\x60\x82\ " qt_resource_name = b"\ @@ -1958,10 +1956,18 @@ \x00\x6f\xa6\x53\ \x00\x69\ \x00\x63\x00\x6f\x00\x6e\x00\x73\ -\x00\x0a\ -\x05\x78\x4f\x27\ -\x00\x72\ -\x00\x65\x00\x6c\x00\x6f\x00\x61\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x08\ +\x03\xc6\x59\xa7\ +\x00\x70\ +\x00\x6c\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x0b\ +\x00\xbd\xc0\x27\ +\x00\x73\ +\x00\x65\x00\x74\x00\x74\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x0d\ +\x0c\x56\x4d\x87\ +\x00\x65\ +\x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x14\ \x0b\x6a\x55\xa7\ \x00\x62\ @@ -1971,10 +1977,10 @@ \x0b\x07\x5a\x27\ \x00\x65\ \x00\x64\x00\x69\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x0d\ -\x0c\x56\x4d\x87\ -\x00\x65\ -\x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x31\x00\x36\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x09\ +\x06\x98\x83\x27\ +\x00\x63\ +\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x11\ \x0c\x97\x94\x07\ \x00\x61\ @@ -1985,47 +1991,39 @@ \x00\x61\ \x00\x64\x00\x42\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x50\x00\x6c\x00\x75\x00\x73\x00\x36\x00\x34\x00\x2e\x00\x70\x00\x6e\x00\x67\ \ -\x00\x0b\ -\x00\xb0\xe2\x96\ -\x00\x6c\ -\x00\x6f\x00\x61\x00\x64\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x67\x00\x69\x00\x66\ -\x00\x08\ -\x03\xc6\x59\xa7\ -\x00\x70\ -\x00\x6c\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\x0e\ +\x05\x17\xcb\xe7\ +\x00\x62\ +\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x6e\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x0d\ \x0c\x7a\x4d\x87\ \x00\x65\ \x00\x72\x00\x69\x00\x63\x00\x57\x00\x65\x00\x62\x00\x33\x00\x32\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x09\ -\x06\x98\x83\x27\ -\x00\x63\ -\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ \x00\x0b\ -\x00\xbd\xc0\x27\ -\x00\x73\ -\x00\x65\x00\x74\x00\x74\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x70\x00\x6e\x00\x67\ -\x00\x0e\ -\x05\x17\xcb\xe7\ -\x00\x62\ -\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x6e\x00\x50\x00\x61\x00\x67\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\ +\x00\xb0\xe2\x96\ +\x00\x6c\ +\x00\x6f\x00\x61\x00\x64\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x67\x00\x69\x00\x66\ +\x00\x0a\ +\x05\x78\x4f\x27\ +\x00\x72\ +\x00\x65\x00\x6c\x00\x6f\x00\x61\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\ " qt_resource_struct = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x0c\x00\x00\x00\x02\ -\x00\x00\x00\xde\x00\x00\x00\x00\x00\x01\x00\x00\x38\x50\ -\x00\x00\x01\x48\x00\x00\x00\x00\x00\x01\x00\x00\x52\x48\ -\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x3f\xd8\ -\x00\x00\x01\x64\x00\x00\x00\x00\x00\x01\x00\x00\x56\xcb\ +\x00\x00\x01\x50\x00\x00\x00\x00\x00\x01\x00\x00\x6c\xde\ +\x00\x00\x00\x26\x00\x00\x00\x00\x00\x01\x00\x00\x03\xb5\ \x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x30\x00\x00\x00\x00\x00\x01\x00\x00\x4f\xfa\ -\x00\x00\x00\x58\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x4b\ -\x00\x00\x00\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x03\x1a\ -\x00\x00\x00\xb6\x00\x00\x00\x00\x00\x01\x00\x00\x18\x26\ -\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x10\xc2\ -\x00\x00\x01\x10\x00\x00\x00\x00\x00\x01\x00\x00\x43\x8d\ -\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x14\xf2\ +\x00\x00\x01\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x3f\xbc\ +\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x74\x66\ +\x00\x00\x00\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x10\ +\x00\x00\x00\x90\x00\x00\x00\x00\x00\x01\x00\x00\x17\x99\ +\x00\x00\x00\x62\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x68\ +\x00\x00\x00\xe6\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x92\ +\x00\x00\x00\x42\x00\x00\x00\x00\x00\x01\x00\x00\x08\x38\ +\x00\x00\x01\x30\x00\x00\x00\x00\x00\x01\x00\x00\x60\x71\ +\x00\x00\x00\xbe\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x5e\ " def qInitResources():
--- a/Helpviewer/data/javascript_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Helpviewer/data/javascript_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,14 +2,12 @@ # Resource object code # -# Created: Fri Feb 24 21:13:08 2012 -# by: The Resource Compiler for PyQt (Qt v4.8.0) +# Created: So. Juni 29 18:58:05 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from __future__ import unicode_literals - -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ \x00\x00\x24\x34\
--- a/IconEditor/IconEditorGrid.py Sun Jun 29 14:00:30 2014 +0200 +++ b/IconEditor/IconEditorGrid.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QRect, QSize -from PyQt4.QtGui import QUndoCommand, QImage, QWidget, QColor, QPixmap, \ - QSizePolicy, QUndoStack, qRgba, QPainter, QApplication, QCursor, \ - QBrush, QDialog, qGray, qAlpha +from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QRect, QSize +from PyQt5.QtGui import QImage, QColor, QPixmap, qRgba, QPainter, QCursor, \ + QBrush, qGray, qAlpha +from PyQt5.QtWidgets import QUndoCommand, QWidget, QSizePolicy, QUndoStack, \ + QApplication, QDialog from E5Gui import E5MessageBox
--- a/IconEditor/IconEditorPalette.py Sun Jun 29 14:00:30 2014 +0200 +++ b/IconEditor/IconEditorPalette.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt -from PyQt4.QtGui import QWidget, QColor, QPainter, QBoxLayout, QLabel, \ - QFrame, QPushButton, QSpinBox, QGroupBox, QVBoxLayout, QRadioButton, \ - QSpacerItem, QSizePolicy, QPixmap, QColorDialog +from PyQt5.QtCore import pyqtSignal, Qt +from PyQt5.QtGui import QColor, QPainter, QPixmap +from PyQt5.QtWidgets import QWidget, QBoxLayout, QLabel, QFrame, QPushButton, \ + QSpinBox, QGroupBox, QVBoxLayout, QRadioButton, QSpacerItem, QSizePolicy, \ + QColorDialog class IconEditorPalette(QWidget):
--- a/IconEditor/IconEditorWindow.py Sun Jun 29 14:00:30 2014 +0200 +++ b/IconEditor/IconEditorWindow.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,11 @@ import os -from PyQt4.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, \ +from PyQt5.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QFileInfo, \ QFile, QEvent -from PyQt4.QtGui import QScrollArea, QPalette, QImage, QImageReader, \ - QImageWriter, QKeySequence, QLabel, QDockWidget, QWhatsThis +from PyQt5.QtGui import QPalette, QImage, QImageReader, QImageWriter, \ + QKeySequence +from PyQt5.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis from E5Gui.E5Action import E5Action, createActionGroup from E5Gui import E5FileDialog, E5MessageBox @@ -1326,7 +1327,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.__zoomOut() else: self.__zoomIn()
--- a/IconEditor/IconSizeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/IconEditor/IconSizeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -6,7 +6,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_IconSizeDialog import Ui_IconSizeDialog
--- a/IconEditor/cursors/cursors_rc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/IconEditor/cursors/cursors_rc.py Sun Jun 29 20:13:56 2014 +0200 @@ -2,127 +2,14 @@ # Resource object code # -# Created: Sa. Jun 15 15:50:33 2013 -# by: The Resource Compiler for PyQt (Qt v4.8.4) +# Created: So. Juni 29 18:58:03 2014 +# by: The Resource Compiler for PyQt (Qt v5.3.1) # # WARNING! All changes made in this file will be lost! -from __future__ import unicode_literals - -from PyQt4 import QtCore +from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x03\x14\ -\x2f\ -\x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ -\x63\x68\x61\x72\x20\x2a\x63\x6f\x6c\x6f\x72\x70\x69\x63\x6b\x65\ -\x72\x5b\x5d\x3d\x7b\x0a\x22\x32\x32\x20\x32\x32\x20\x31\x31\x20\ -\x31\x22\x2c\x0a\x22\x2e\x20\x63\x20\x4e\x6f\x6e\x65\x22\x2c\x0a\ -\x22\x23\x20\x63\x20\x23\x30\x30\x30\x30\x30\x30\x22\x2c\x0a\x22\ -\x66\x20\x63\x20\x23\x31\x35\x31\x35\x31\x35\x22\x2c\x0a\x22\x65\ -\x20\x63\x20\x23\x32\x61\x32\x61\x32\x61\x22\x2c\x0a\x22\x63\x20\ -\x63\x20\x23\x33\x33\x33\x33\x33\x33\x22\x2c\x0a\x22\x64\x20\x63\ -\x20\x23\x33\x61\x33\x61\x33\x61\x22\x2c\x0a\x22\x69\x20\x63\x20\ -\x23\x38\x30\x38\x30\x38\x30\x22\x2c\x0a\x22\x67\x20\x63\x20\x23\ -\x61\x61\x61\x61\x61\x61\x22\x2c\x0a\x22\x62\x20\x63\x20\x23\x64\ -\x35\x64\x35\x64\x35\x22\x2c\x0a\x22\x68\x20\x63\x20\x23\x64\x63\ -\x64\x63\x64\x63\x22\x2c\x0a\x22\x61\x20\x63\x20\x23\x66\x66\x66\ -\x66\x66\x66\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x23\x61\x2e\x22\x2c\x0a\ -\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x23\x62\x63\x23\x61\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\x64\x63\x63\ -\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x23\x62\x64\x64\x63\x65\x23\x22\x2c\x0a\x22\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\x64\ -\x64\x63\x65\x66\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x23\x23\x62\x64\x64\x63\x65\x66\x23\x61\x22\ -\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\ -\x64\x64\x64\x63\x65\x66\x23\x61\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\x65\x63\x65\x66\x23\ -\x61\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x23\x61\x67\x62\x65\x65\x23\x61\x2e\x2e\x2e\x22\x2c\x0a\ -\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\ -\x62\x66\x23\x61\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x23\x61\x2e\x2e\x2e\ -\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\ -\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x23\ -\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\ -\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\ -\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\ -\x22\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x23\x61\x68\x67\ -\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x22\x2c\x0a\x22\x2e\x23\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\ -\x69\x67\x23\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x69\x23\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\ -\x7d\x3b\x0a\ -\x00\x00\x00\x7d\ -\x00\ -\x00\x02\x93\x78\x9c\xd3\xd7\x52\x88\x08\xf0\x55\xd0\xd2\xe7\x2a\ -\x2e\x49\x2c\xc9\x4c\x56\x48\xce\x48\x2c\x52\xd0\x4a\xcc\xcc\x8d\ -\x8e\xb5\xad\xe6\x52\x32\x32\x52\x00\x22\x63\x05\x43\x25\x1d\x2e\ -\x25\x3d\x85\x64\x05\xbf\xfc\xbc\x54\x10\x3b\x11\xc8\x56\x36\x00\ -\x03\x10\x57\x19\xc4\x4d\x03\x03\xb0\x4a\xac\x00\x55\x46\x19\x97\ -\x8c\x72\xa2\xf2\x50\x92\x51\x86\x00\x3d\x64\x16\x58\x46\x39\x11\ -\x02\x80\x7c\x28\x4b\x99\xa0\x1e\x38\x48\x1c\x8a\xa1\x83\x3b\x4e\ -\x51\x00\x1e\x99\x5a\x6b\x2e\x00\x12\x9a\x79\xb2\ -\x00\x00\x02\xe1\ -\x2f\ -\x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ -\x63\x68\x61\x72\x20\x2a\x65\x72\x61\x73\x65\x72\x5b\x5d\x3d\x7b\ -\x0a\x22\x32\x32\x20\x32\x32\x20\x38\x20\x31\x22\x2c\x0a\x22\x2e\ -\x20\x63\x20\x4e\x6f\x6e\x65\x22\x2c\x0a\x22\x63\x20\x63\x20\x23\ -\x31\x34\x31\x34\x31\x34\x22\x2c\x0a\x22\x66\x20\x63\x20\x23\x32\ -\x63\x32\x63\x32\x63\x22\x2c\x0a\x22\x65\x20\x63\x20\x23\x34\x32\ -\x34\x32\x34\x32\x22\x2c\x0a\x22\x62\x20\x63\x20\x23\x39\x33\x39\ -\x33\x39\x33\x22\x2c\x0a\x22\x61\x20\x63\x20\x23\x63\x39\x63\x39\ -\x63\x39\x22\x2c\x0a\x22\x64\x20\x63\x20\x23\x64\x35\x64\x35\x64\ -\x35\x22\x2c\x0a\x22\x23\x20\x63\x20\x23\x66\x66\x66\x66\x66\x66\ -\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\ -\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x23\x2e\x2e\x22\x2c\ -\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\ -\x62\x62\x62\x62\x62\x62\x23\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\ -\x62\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x23\x22\x2c\x0a\x22\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\ -\x62\x62\x62\x62\x63\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x63\x23\x2e\ -\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\ -\x62\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ -\x2e\x2e\x2e\x2e\x23\x64\x61\x61\x62\x62\x62\x62\x62\x62\x62\x63\ -\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x23\x64\x65\ -\x65\x61\x61\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x2e\x2e\x22\x2c\ -\x0a\x22\x2e\x2e\x2e\x2e\x23\x64\x65\x65\x65\x65\x61\x61\x62\x62\ -\x62\x63\x23\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ -\x64\x65\x65\x65\x65\x65\x65\x61\x61\x62\x63\x23\x2e\x2e\x2e\x2e\ -\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x23\x64\x65\x65\x65\x65\x65\x65\ -\x65\x65\x61\x63\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\ -\x2e\x23\x64\x65\x65\x65\x65\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\x65\x65\x65\x65\ -\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x22\x2c\x0a\x22\x23\x64\x64\x65\x65\x65\x65\x65\x65\x65\x66\x23\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\ -\x64\x64\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x23\x64\x64\x64\x65\x65\x65\ -\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\ -\x0a\x22\x2e\x2e\x23\x64\x64\x64\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ -\x64\x64\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ -\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\ -\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x7d\x3b\x0a\ -\ \x00\x00\x03\x0d\ \x2f\ \x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ @@ -245,23 +132,120 @@ \x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ \x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x7d\ \x3b\x0a\ +\x00\x00\x00\x7d\ +\x00\ +\x00\x02\x93\x78\x9c\xd3\xd7\x52\x88\x08\xf0\x55\xd0\xd2\xe7\x2a\ +\x2e\x49\x2c\xc9\x4c\x56\x48\xce\x48\x2c\x52\xd0\x4a\xcc\xcc\x8d\ +\x8e\xb5\xad\xe6\x52\x32\x32\x52\x00\x22\x63\x05\x43\x25\x1d\x2e\ +\x25\x3d\x85\x64\x05\xbf\xfc\xbc\x54\x10\x3b\x11\xc8\x56\x36\x00\ +\x03\x10\x57\x19\xc4\x4d\x03\x03\xb0\x4a\xac\x00\x55\x46\x19\x97\ +\x8c\x72\xa2\xf2\x50\x92\x51\x86\x00\x3d\x64\x16\x58\x46\x39\x11\ +\x02\x80\x7c\x28\x4b\x99\xa0\x1e\x38\x48\x1c\x8a\xa1\x83\x3b\x4e\ +\x51\x00\x1e\x99\x5a\x6b\x2e\x00\x12\x9a\x79\xb2\ +\x00\x00\x03\x14\ +\x2f\ +\x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ +\x63\x68\x61\x72\x20\x2a\x63\x6f\x6c\x6f\x72\x70\x69\x63\x6b\x65\ +\x72\x5b\x5d\x3d\x7b\x0a\x22\x32\x32\x20\x32\x32\x20\x31\x31\x20\ +\x31\x22\x2c\x0a\x22\x2e\x20\x63\x20\x4e\x6f\x6e\x65\x22\x2c\x0a\ +\x22\x23\x20\x63\x20\x23\x30\x30\x30\x30\x30\x30\x22\x2c\x0a\x22\ +\x66\x20\x63\x20\x23\x31\x35\x31\x35\x31\x35\x22\x2c\x0a\x22\x65\ +\x20\x63\x20\x23\x32\x61\x32\x61\x32\x61\x22\x2c\x0a\x22\x63\x20\ +\x63\x20\x23\x33\x33\x33\x33\x33\x33\x22\x2c\x0a\x22\x64\x20\x63\ +\x20\x23\x33\x61\x33\x61\x33\x61\x22\x2c\x0a\x22\x69\x20\x63\x20\ +\x23\x38\x30\x38\x30\x38\x30\x22\x2c\x0a\x22\x67\x20\x63\x20\x23\ +\x61\x61\x61\x61\x61\x61\x22\x2c\x0a\x22\x62\x20\x63\x20\x23\x64\ +\x35\x64\x35\x64\x35\x22\x2c\x0a\x22\x68\x20\x63\x20\x23\x64\x63\ +\x64\x63\x64\x63\x22\x2c\x0a\x22\x61\x20\x63\x20\x23\x66\x66\x66\ +\x66\x66\x66\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x23\x61\x2e\x22\x2c\x0a\ +\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x23\x62\x63\x23\x61\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\x64\x63\x63\ +\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x23\x62\x64\x64\x63\x65\x23\x22\x2c\x0a\x22\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\x64\ +\x64\x63\x65\x66\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x23\x23\x62\x64\x64\x63\x65\x66\x23\x61\x22\ +\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\ +\x64\x64\x64\x63\x65\x66\x23\x61\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x62\x65\x63\x65\x66\x23\ +\x61\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x23\x61\x67\x62\x65\x65\x23\x61\x2e\x2e\x2e\x22\x2c\x0a\ +\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\ +\x62\x66\x23\x61\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x23\x61\x2e\x2e\x2e\ +\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\ +\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x23\ +\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\ +\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\ +\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\x61\x68\x67\x69\x23\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\ +\x22\x2e\x2e\x23\x61\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x23\x61\x68\x67\ +\x69\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x22\x2c\x0a\x22\x2e\x23\x68\x67\x69\x23\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\ +\x69\x67\x23\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x69\x23\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\ +\x7d\x3b\x0a\ +\x00\x00\x02\xe1\ +\x2f\ +\x2a\x20\x58\x50\x4d\x20\x2a\x2f\x0a\x73\x74\x61\x74\x69\x63\x20\ +\x63\x68\x61\x72\x20\x2a\x65\x72\x61\x73\x65\x72\x5b\x5d\x3d\x7b\ +\x0a\x22\x32\x32\x20\x32\x32\x20\x38\x20\x31\x22\x2c\x0a\x22\x2e\ +\x20\x63\x20\x4e\x6f\x6e\x65\x22\x2c\x0a\x22\x63\x20\x63\x20\x23\ +\x31\x34\x31\x34\x31\x34\x22\x2c\x0a\x22\x66\x20\x63\x20\x23\x32\ +\x63\x32\x63\x32\x63\x22\x2c\x0a\x22\x65\x20\x63\x20\x23\x34\x32\ +\x34\x32\x34\x32\x22\x2c\x0a\x22\x62\x20\x63\x20\x23\x39\x33\x39\ +\x33\x39\x33\x22\x2c\x0a\x22\x61\x20\x63\x20\x23\x63\x39\x63\x39\ +\x63\x39\x22\x2c\x0a\x22\x64\x20\x63\x20\x23\x64\x35\x64\x35\x64\ +\x35\x22\x2c\x0a\x22\x23\x20\x63\x20\x23\x66\x66\x66\x66\x66\x66\ +\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\ +\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x23\x2e\x2e\x22\x2c\ +\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\ +\x62\x62\x62\x62\x62\x62\x23\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\ +\x62\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x23\x22\x2c\x0a\x22\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\ +\x62\x62\x62\x62\x63\x23\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x23\x61\x62\x62\x62\x62\x62\x62\x62\x62\x62\x63\x23\x2e\ +\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x23\x61\x62\x62\x62\ +\x62\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\ +\x2e\x2e\x2e\x2e\x23\x64\x61\x61\x62\x62\x62\x62\x62\x62\x62\x63\ +\x23\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x2e\x23\x64\x65\ +\x65\x61\x61\x62\x62\x62\x62\x62\x63\x23\x2e\x2e\x2e\x2e\x22\x2c\ +\x0a\x22\x2e\x2e\x2e\x2e\x23\x64\x65\x65\x65\x65\x61\x61\x62\x62\ +\x62\x63\x23\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ +\x64\x65\x65\x65\x65\x65\x65\x61\x61\x62\x63\x23\x2e\x2e\x2e\x2e\ +\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x23\x64\x65\x65\x65\x65\x65\x65\ +\x65\x65\x61\x63\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\ +\x2e\x23\x64\x65\x65\x65\x65\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\x65\x65\x65\x65\ +\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x22\x2c\x0a\x22\x23\x64\x64\x65\x65\x65\x65\x65\x65\x65\x66\x23\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x23\x64\ +\x64\x64\x65\x65\x65\x65\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x23\x64\x64\x64\x65\x65\x65\ +\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\ +\x0a\x22\x2e\x2e\x23\x64\x64\x64\x65\x66\x23\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x23\ +\x64\x64\x66\x23\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\ +\x2e\x2e\x22\x2c\x0a\x22\x2e\x2e\x2e\x2e\x23\x23\x23\x2e\x2e\x2e\ +\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x2e\x22\x7d\x3b\x0a\ +\ " qt_resource_name = b"\ -\x00\x16\ -\x0c\xac\xdf\x8d\ -\x00\x63\ -\x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x70\x00\x69\x00\x63\x00\x6b\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\ -\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ -\x00\x0e\ -\x0a\x62\x1c\x4d\ -\x00\x61\ -\x00\x69\x00\x6d\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ -\x00\x11\ -\x03\x70\x24\x2d\ -\x00\x65\ -\x00\x72\x00\x61\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ -\ \x00\x0f\ \x0f\x83\xb2\x4d\ \x00\x66\ @@ -275,16 +259,30 @@ \x00\x70\ \x00\x61\x00\x69\x00\x6e\x00\x74\x00\x62\x00\x72\x00\x75\x00\x73\x00\x68\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\ \x00\x2e\x00\x78\x00\x70\x00\x6d\ +\x00\x0e\ +\x0a\x62\x1c\x4d\ +\x00\x61\ +\x00\x69\x00\x6d\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ +\x00\x16\ +\x0c\xac\xdf\x8d\ +\x00\x63\ +\x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x70\x00\x69\x00\x63\x00\x6b\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\ +\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ +\x00\x11\ +\x03\x70\x24\x2d\ +\x00\x65\ +\x00\x72\x00\x61\x00\x73\x00\x65\x00\x72\x00\x2d\x00\x63\x00\x75\x00\x72\x00\x73\x00\x6f\x00\x72\x00\x2e\x00\x78\x00\x70\x00\x6d\ +\ " qt_resource_struct = b"\ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\ -\x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x03\x99\ -\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x01\x00\x00\x09\x8f\ -\x00\x00\x00\x32\x00\x01\x00\x00\x00\x01\x00\x00\x03\x18\ -\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x9a\ +\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xcc\ +\x00\x00\x00\x24\x00\x00\x00\x00\x00\x01\x00\x00\x03\x11\ +\x00\x00\x00\x70\x00\x01\x00\x00\x00\x01\x00\x00\x07\x33\ +\x00\x00\x00\x40\x00\x00\x00\x00\x00\x01\x00\x00\x04\x1c\ +\x00\x00\x00\x92\x00\x00\x00\x00\x00\x01\x00\x00\x07\xb4\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x06\x7e\ " def qInitResources():
--- a/MultiProject/AddProjectDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/MultiProject/AddProjectDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog @@ -97,7 +97,7 @@ """ if not self.uid: # new project entry - from PyQt4.QtCore import QUuid + from PyQt5.QtCore import QUuid self.uid = QUuid.createUuid().toString() filename = Utilities.toNativeSeparators(self.filenameEdit.text())
--- a/MultiProject/MultiProject.py Sun Jun 29 14:00:30 2014 +0200 +++ b/MultiProject/MultiProject.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,10 @@ import os -from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QFileInfo, QFile, \ +from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QFileInfo, QFile, \ QIODevice, QObject -from PyQt4.QtGui import QMenu, QApplication, QDialog, QCursor, QToolBar +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QMenu, QApplication, QDialog, QToolBar from Globals import recentNameMultiProject
--- a/MultiProject/MultiProjectBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/MultiProject/MultiProjectBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QTreeWidget, QTreeWidgetItem, QDialog, QMenu +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QDialog, QMenu from E5Gui.E5Application import e5App
--- a/MultiProject/PropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/MultiProject/PropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_PropertiesDialog import Ui_PropertiesDialog
--- a/Network/IRC/IrcChannelEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcChannelEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_IrcChannelEditDialog import Ui_IrcChannelEditDialog
--- a/Network/IRC/IrcChannelWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcChannelWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,11 @@ import re -from PyQt4.QtCore import pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, \ +from PyQt5.QtCore import pyqtSlot, pyqtSignal, QDateTime, QPoint, QFileInfo, \ QTimer, QUrl -from PyQt4.QtGui import QWidget, QListWidgetItem, QIcon, QPainter, QMenu, \ - QApplication, QInputDialog, QLineEdit, QTextCursor, QDesktopServices +from PyQt5.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices +from PyQt5.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication, \ + QInputDialog, QLineEdit from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5Application import e5App
--- a/Network/IRC/IrcIdentitiesEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcIdentitiesEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import copy -from PyQt4.QtCore import pyqtSlot, Qt, QEvent -from PyQt4.QtGui import QDialog, QInputDialog, QLineEdit, QItemSelectionModel +from PyQt5.QtCore import pyqtSlot, Qt, QEvent, QItemSelectionModel +from PyQt5.QtWidgets import QDialog, QInputDialog, QLineEdit from E5Gui import E5MessageBox
--- a/Network/IRC/IrcMessageEdit.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcMessageEdit.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt +from PyQt5.QtCore import Qt from E5Gui.E5LineEdit import E5LineEdit, E5ClearableLineEdit @@ -75,9 +75,9 @@ @param evt reference to the wheel event (QWheelEvent) """ - if evt.delta() > 0: + if evt.angleDelta().y() > 0: self.__getHistory(True) - elif evt.delta() < 0: + elif evt.angleDelta().y() < 0: self.__getHistory(False) super(IrcMessageEdit, self).wheelEvent(evt)
--- a/Network/IRC/IrcNetworkEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcNetworkEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import copy -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Network/IRC/IrcNetworkListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcNetworkListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Network/IRC/IrcNetworkManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcNetworkManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import copy -from PyQt4.QtCore import pyqtSignal, QObject, QCoreApplication +from PyQt5.QtCore import pyqtSignal, QObject, QCoreApplication import Utilities from Utilities.AutoSaver import AutoSaver
--- a/Network/IRC/IrcNetworkWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcNetworkWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, pyqtSignal, QPoint, QFileInfo, QUrl -from PyQt4.QtGui import QWidget, QApplication, QMenu, QDesktopServices +from PyQt5.QtCore import pyqtSlot, pyqtSignal, QPoint, QFileInfo, QUrl +from PyQt5.QtGui import QDesktopServices +from PyQt5.QtWidgets import QWidget, QApplication, QMenu from E5Gui import E5MessageBox, E5FileDialog
--- a/Network/IRC/IrcServerEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcServerEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_IrcServerEditDialog import Ui_IrcServerEditDialog
--- a/Network/IRC/IrcUtilities.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcUtilities.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import re -from PyQt4.QtCore import QTime, QCoreApplication -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QTime, QCoreApplication +from PyQt5.QtWidgets import QApplication import Utilities import Preferences
--- a/Network/IRC/IrcWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Network/IRC/IrcWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,11 +16,11 @@ import re import logging -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer -from PyQt4.QtGui import QWidget, QToolButton, QLabel, QTabWidget -from PyQt4.QtNetwork import QTcpSocket, QAbstractSocket +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer +from PyQt5.QtWidgets import QWidget, QToolButton, QLabel, QTabWidget +from PyQt5.QtNetwork import QTcpSocket, QAbstractSocket try: - from PyQt4.QtNetwork import QSslSocket, QSslConfiguration + from PyQt5.QtNetwork import QSslSocket, QSslConfiguration from E5Network.E5SslErrorHandler import E5SslErrorHandler SSL_AVAILABLE = True except ImportError:
--- a/PluginManager/PluginDetailsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginDetailsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog +from PyQt5.QtCore import pyqtSlot from .Ui_PluginDetailsDialog import Ui_PluginDetailsDialog
--- a/PluginManager/PluginExceptions.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginExceptions.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QCoreApplication class PluginError(Exception): @@ -20,8 +20,8 @@ """ Constructor """ - self._errorMessage = \ - QApplication.translate("PluginError", "Unspecific plugin error.") + self._errorMessage = QCoreApplication.translate( + "PluginError", "Unspecific plugin error.") def __repr__(self): """ @@ -54,7 +54,7 @@ if msg: self._errorMessage = msg else: - self._errorMessage = QApplication.translate( + self._errorMessage = QCoreApplication.translate( "PluginError", "Plugin paths not found or not creatable.") @@ -67,8 +67,8 @@ """ Constructor """ - self._errorMessage = \ - QApplication.translate("PluginError", "No plugin modules found.") + self._errorMessage = QCoreApplication.translate( + "PluginError", "No plugin modules found.") class PluginLoadError(PluginError): @@ -83,7 +83,7 @@ @param name name of the plugin module (string) """ self._errorMessage = \ - QApplication.translate( + QCoreApplication.translate( "PluginError", "Error loading plugin module: {0}")\ .format(name) @@ -101,7 +101,7 @@ @param name name of the plugin module (string) """ self._errorMessage = \ - QApplication.translate( + QCoreApplication.translate( "PluginError", "Error activating plugin module: {0}")\ .format(name) @@ -119,7 +119,7 @@ @param missing description of the missing element (string) """ self._errorMessage = \ - QApplication.translate( + QCoreApplication.translate( "PluginError", "The plugin module {0} is missing {1}.")\ .format(name, missing) @@ -139,7 +139,7 @@ @param missing description of the missing element (string) """ self._errorMessage = \ - QApplication.translate( + QCoreApplication.translate( "PluginError", "The plugin class {0} of module {1} is missing {2}.")\ .format(class_, name, missing) @@ -157,7 +157,7 @@ @param name name of the plugin module (string) """ self._errorMessage = \ - QApplication.translate( + QCoreApplication.translate( "PluginError", "The plugin module {0} is not compatible with Python2.")\ .format(name)
--- a/PluginManager/PluginInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QTreeWidgetItem, QHeaderView, QMenu, QBrush +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtGui import QBrush +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView, QMenu from .Ui_PluginInfoDialog import Ui_PluginInfoDialog
--- a/PluginManager/PluginInstallDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginInstallDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -20,8 +20,8 @@ except (ImportError): import urlparse as parse # __IGNORE_WARNING__ -from PyQt4.QtCore import pyqtSlot, Qt, QDir, QFileInfo -from PyQt4.QtGui import QWidget, QDialogButtonBox, QAbstractButton, \ +from PyQt5.QtCore import pyqtSlot, Qt, QDir, QFileInfo +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QAbstractButton, \ QApplication, QDialog, QVBoxLayout from E5Gui import E5FileDialog
--- a/PluginManager/PluginManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,10 +14,10 @@ import imp import zipfile -from PyQt4.QtCore import pyqtSignal, QObject, QDate, QFile, QFileInfo, QUrl, \ +from PyQt5.QtCore import pyqtSignal, QObject, QDate, QFile, QFileInfo, QUrl, \ QIODevice -from PyQt4.QtGui import QPixmap -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ +from PyQt5.QtGui import QPixmap +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ QNetworkReply from E5Gui import E5MessageBox
--- a/PluginManager/PluginRepositoryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,11 +15,11 @@ import zipfile import glob -from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, \ +from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QFile, QIODevice, QUrl, \ QProcess, QPoint -from PyQt4.QtGui import QWidget, QDialogButtonBox, QAbstractButton, \ +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QAbstractButton, \ QTreeWidgetItem, QDialog, QVBoxLayout, QMenu -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ +from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, \ QNetworkReply from .Ui_PluginRepositoryDialog import Ui_PluginRepositoryDialog
--- a/PluginManager/PluginUninstallDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PluginManager/PluginUninstallDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import shutil import glob -from PyQt4.QtCore import pyqtSlot, pyqtSignal -from PyQt4.QtGui import QWidget, QDialog, QDialogButtonBox, QVBoxLayout +from PyQt5.QtCore import pyqtSlot, pyqtSignal +from PyQt5.QtWidgets import QWidget, QDialog, QDialogButtonBox, QVBoxLayout from E5Gui import E5MessageBox from E5Gui.E5MainWindow import E5MainWindow
--- a/Plugins/AboutPlugin/AboutDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/AboutPlugin/AboutDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QApplication, QDialog +from PyQt5.QtCore import QCoreApplication +from PyQt5.QtWidgets import QDialog from .Ui_AboutDialog import Ui_AboutDialog @@ -21,7 +22,7 @@ titleText = "<b>{0} - {1}</b>".format(UI.Info.Program, UI.Info.Version) -aboutText = QApplication.translate( +aboutText = QCoreApplication.translate( "AboutDialog", """<p>{0} is an Integrated Development Environment for the Python""" """ programming language. It is written using the PyQt Python bindings"""
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,10 @@ import os import fnmatch -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QTreeWidgetItem, QAbstractButton, \ - QDialogButtonBox, QApplication, QHeaderView, QIcon +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtGui import QIcon +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem, QAbstractButton, \ + QDialogButtonBox, QApplication, QHeaderView from E5Gui.E5Application import e5App
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QTreeWidgetItem +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem from .Ui_CodeStyleCodeSelectionDialog import Ui_CodeStyleCodeSelectionDialog
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QDialog, QTreeWidgetItem +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem from .translations import _messages, _messages_sample_args
--- a/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/translations.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QCoreApplication +from PyQt5.QtCore import QCoreApplication __all__ = ["getTranslatedMessage"]
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py Sun Jun 29 20:13:56 2014 +0200 @@ -108,8 +108,9 @@ for line in codestring.splitlines(): if any(line.startswith(c * 7) for c in "<>=|"): return [{'error': - (file_enc, lineindex, 0, "", "VCS conflict marker found") - }] + (file_enc, lineindex, 0, "", + "VCS conflict marker found") + }] lineindex += 1 if filename.endswith('.ptl'):
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckService.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, pyqtSignal +from PyQt5.QtCore import QObject, pyqtSignal from E5Gui.E5Application import e5App from Utilities import determinePythonVersion
--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os import fnmatch -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, \ +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ QApplication, QHeaderView from E5Gui.E5Application import e5App
--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QCoreApplication +from PyQt5.QtCore import QCoreApplication __all__ = ["getTranslatedFlakesMessage"]
--- a/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/TabnannyDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,8 +17,8 @@ import os import fnmatch -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem, \ +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ QApplication, QHeaderView from E5Gui.E5Application import e5App
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ import os import copy -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os.path -from PyQt4.QtCore import QProcess, QTimer -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QProcess, QTimer +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5MessageBox
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,9 @@ import os import copy -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QColorDialog, QColor +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QColorDialog from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os.path -from PyQt4.QtCore import QProcess, QTimer -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QProcess, QTimer +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5MessageBox
--- a/Plugins/PluginAbout.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginAbout.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QAction +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QAction import UI.Info import UI.PixmapCache
--- a/Plugins/PluginCodeStyleChecker.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginCodeStyleChecker.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,7 @@ import os -from PyQt4.QtCore import QObject, pyqtSignal -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QObject, pyqtSignal, QCoreApplication from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action @@ -169,7 +168,7 @@ fixes += 1 trFixedMsg = getTranslatedMessage(fixedMsg) - msg += "\n" + QApplication.translate( + msg += "\n" + QCoreApplication.translate( 'CodeStyleCheckerDialog', "Fix: {0}").format(trFixedMsg) result[2] = msg
--- a/Plugins/PluginEricapi.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginEricapi.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog, QApplication +from PyQt5.QtCore import QObject, QCoreApplication +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App @@ -54,7 +54,7 @@ data = { "programEntry": True, - "header": QApplication.translate( + "header": QCoreApplication.translate( "EricapiPlugin", "Eric5 API File Generator"), "exe": exe, "versionCommand": '--version',
--- a/Plugins/PluginEricdoc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginEricdoc.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog, QApplication +from PyQt5.QtCore import QObject, QCoreApplication +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App @@ -56,7 +56,7 @@ exe = os.path.join(getConfig("bindir"), exe + '.bat') dataList.append({ "programEntry": True, - "header": QApplication.translate( + "header": QCoreApplication.translate( "EricdocPlugin", "Eric5 Documentation Generator"), "exe": exe, "versionCommand": '--version', @@ -72,7 +72,7 @@ exe += '.exe' dataList.append({ "programEntry": True, - "header": QApplication.translate( + "header": QCoreApplication.translate( "EricdocPlugin", "Qt Help Tools"), "exe": exe, "versionCommand": '-v', @@ -88,7 +88,7 @@ exe += '.exe' dataList.append({ "programEntry": True, - "header": QApplication.translate( + "header": QCoreApplication.translate( "EricdocPlugin", "Qt Help Tools"), "exe": exe, "versionCommand": '-v',
--- a/Plugins/PluginSyntaxChecker.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginSyntaxChecker.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject from E5Gui.E5Action import E5Action from E5Gui.E5Application import e5App
--- a/Plugins/PluginTabnanny.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginTabnanny.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QObject, pyqtSignal +from PyQt5.QtCore import QObject, pyqtSignal from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginVcsMercurial.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginVcsMercurial.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,7 @@ import os -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QObject, QCoreApplication from E5Gui.E5Application import e5App @@ -56,7 +55,7 @@ data = { "programEntry": True, - "header": QApplication.translate( + "header": QCoreApplication.translate( "VcsMercurialPlugin", "Version Control - Mercurial"), "exe": exe, "versionCommand": 'version', @@ -97,7 +96,7 @@ if Utilities.isWindowsPlatform(): exe += '.exe' if Utilities.isinpath(exe): - return QApplication.translate('VcsMercurialPlugin', 'Mercurial') + return QCoreApplication.translate('VcsMercurialPlugin', 'Mercurial') else: return "" @@ -129,7 +128,7 @@ """ return { "zzz_mercurialPage": - [QApplication.translate("VcsMercurialPlugin", "Mercurial"), + [QCoreApplication.translate("VcsMercurialPlugin", "Mercurial"), os.path.join("VcsPlugins", "vcsMercurial", "icons", "preferences-mercurial.png"), createConfigurationPage, "vcsPage", None],
--- a/Plugins/PluginVcsPySvn.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginVcsPySvn.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,7 @@ import os -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QObject, QCoreApplication from E5Gui.E5Application import e5App @@ -60,7 +59,7 @@ data = { "programEntry": False, - "header": QApplication.translate( + "header": QCoreApplication.translate( "VcsPySvnPlugin", "Version Control - Subversion (pysvn)"), "text": text, "version": version, @@ -91,7 +90,8 @@ """ try: import pysvn # __IGNORE_WARNING__ - return QApplication.translate('VcsPySvnPlugin', 'Subversion (pysvn)') + return QCoreApplication.translate('VcsPySvnPlugin', + 'Subversion (pysvn)') except ImportError: return "" @@ -123,7 +123,7 @@ """ return { "zzz_subversionPage": - [QApplication.translate("VcsPySvnPlugin", "Subversion"), + [QCoreApplication.translate("VcsPySvnPlugin", "Subversion"), os.path.join("VcsPlugins", "vcsPySvn", "icons", "preferences-subversion.png"), createConfigurationPage, "vcsPage", None],
--- a/Plugins/PluginVcsSubversion.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginVcsSubversion.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,7 @@ import os -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QObject, QCoreApplication from E5Gui.E5Application import e5App @@ -56,7 +55,7 @@ data = { "programEntry": True, - "header": QApplication.translate( + "header": QCoreApplication.translate( "VcsSubversionPlugin", "Version Control - Subversion (svn)"), "exe": exe, "versionCommand": '--version', @@ -97,7 +96,7 @@ if Utilities.isWindowsPlatform(): exe += '.exe' if Utilities.isinpath(exe): - return QApplication.translate( + return QCoreApplication.translate( 'VcsSubversionPlugin', 'Subversion (svn)') else: return "" @@ -130,7 +129,7 @@ """ return { "zzz_subversionPage": - [QApplication.translate("VcsSubversionPlugin", "Subversion"), + [QCoreApplication.translate("VcsSubversionPlugin", "Subversion"), os.path.join("VcsPlugins", "vcsSubversion", "icons", "preferences-subversion.png"), createConfigurationPage, "vcsPage", None],
--- a/Plugins/PluginVmListspace.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginVmListspace.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject -from PyQt4.QtGui import QPixmap +from PyQt5.QtCore import QT_TRANSLATE_NOOP, QObject +from PyQt5.QtGui import QPixmap # Start-Of-Header name = "Listspace Plugin"
--- a/Plugins/PluginVmTabview.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginVmTabview.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QT_TRANSLATE_NOOP, QObject -from PyQt4.QtGui import QPixmap +from PyQt5.QtCore import QT_TRANSLATE_NOOP, QObject +from PyQt5.QtGui import QPixmap # Start-Of-Header name = "Tabview Plugin"
--- a/Plugins/PluginWizardE5MessageBox.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardE5MessageBox.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardPyRegExp.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQColorDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQFileDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import re -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQFontDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQInputDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQMessageBox.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQRegExp.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQRegExp.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/PluginWizardQRegularExpression.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/PluginWizardQRegularExpression.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui.E5Action import E5Action
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from Preferences.ConfigurationPages.ConfigurationPageBase import \ ConfigurationPageBase
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_HgFetchDialog import Ui_HgFetchDialog
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from ..HgExtension import HgExtension from ..HgDialog import HgDialog
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgGpgSignDialog import Ui_HgGpgSignDialog
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QRegExp, \ +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QRegExp, \ QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action
--- a/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from ..HgExtension import HgExtension from ..HgDialog import HgDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5FileDialog, E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,9 +16,9 @@ import os import re -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QLineEdit, \ - QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ + QLineEdit, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QFileInfo -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QFileInfo +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QDateTime -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QDateTime +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgBackoutDialog import Ui_HgBackoutDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarkDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgBookmarkDialog import Ui_HgBookmarkDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarkRenameDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgBookmarkRenameDialog import Ui_HgBookmarkRenameDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgBranchInputDialog import Ui_HgBranchInputDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgBundleDialog import Ui_HgBundleDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClient.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import struct import io -from PyQt4.QtCore import QProcess, QObject, QByteArray, QCoreApplication, \ +from PyQt5.QtCore import QProcess, QObject, QByteArray, QCoreApplication, \ QThread -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .HgUtilities import prepareProcess
--- a/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTextCursor +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QTextCursor +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgClientPromptDialog import Ui_HgClientPromptDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgCommandDialog import Ui_HgCommandDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -48,9 +48,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt -from PyQt4.QtGui import QWidget, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt +from PyQt5.QtWidgets import QWidget, QDialogButtonBox from .Ui_HgCommitDialog import Ui_HgCommitDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,10 +12,10 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer -from PyQt4.QtGui import ( - QWidget, QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem, - QLineEdit, QApplication) +from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt5.QtGui import QWidget +from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QLineEdit, QApplication from E5Gui import E5MessageBox from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os.path -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QLineEdit +from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo, Qt -from PyQt4.QtGui import QWidget, QDialogButtonBox, QBrush, QColor, \ - QTextCursor, QLineEdit, QApplication, QCursor +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo, Qt +from PyQt5.QtGui import QBrush, QColor, QTextCursor, QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QLineEdit, QApplication from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QDir -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QDir +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5FileDialog from E5Gui.E5Completers import E5DirCompleter
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtension.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtension.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class HgExtension(QObject):
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class HgExtensionProjectBrowserHelper(QObject):
--- a/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgExtensionProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class HgExtensionProjectHelper(QObject):
--- a/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QDateTime -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QDateTime +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgGraftDialog import Ui_HgGraftDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QDateTime -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QDateTime +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5FileDialog from E5Gui.E5Completers import E5FileCompleter
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,11 +16,11 @@ import os import re -from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ +from PyQt5.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, \ QSize, QPoint -from PyQt4.QtGui import QWidget, QDialogButtonBox, QHeaderView, \ - QTreeWidgetItem, QApplication, QCursor, QLineEdit, QColor, \ - QPixmap, QPainter, QPen, QBrush, QIcon, QMenu +from PyQt5.QtGui import QCursor, QColor, QPixmap, QPainter, QPen, QBrush, QIcon +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QHeaderView, \ + QTreeWidgetItem, QApplication, QLineEdit, QMenu from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray -from PyQt4.QtGui import QWidget, QDialogButtonBox, QApplication, \ - QLineEdit, QTextCursor +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray +from PyQt5.QtGui import QTextCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication, QLineEdit from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgMergeDialog import Ui_HgMergeDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgMultiRevisionSelectionDialog import \ Ui_HgMultiRevisionSelectionDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QDir -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QDir +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_HgOptionsDialog import Ui_HgOptionsDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgPhaseDialog import Ui_HgPhaseDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRemoveSubrepositoriesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_HgRemoveSubrepositoriesDialog import Ui_HgRemoveSubrepositoriesDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -7,8 +7,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QUrl -from PyQt4.QtGui import QDialog, QLineEdit +from PyQt5.QtCore import pyqtSlot, QUrl +from PyQt5.QtWidgets import QDialog, QLineEdit from .Ui_HgRepoConfigDataDialog import Ui_HgRepoConfigDataDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgRevisionSelectionDialog import Ui_HgRevisionSelectionDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgRevisionsSelectionDialog import Ui_HgRevisionsSelectionDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,10 @@ import os -from PyQt4.QtCore import QProcess, Qt, QSize -from PyQt4.QtGui import QAction, QToolBar, QPlainTextEdit, \ - QTextCursor, QBrush, QSpinBox, QComboBox +from PyQt5.QtCore import QProcess, Qt, QSize +from PyQt5.QtGui import QTextCursor, QBrush +from PyQt5.QtWidgets import QAction, QToolBar, QPlainTextEdit, QSpinBox, \ + QComboBox from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,8 +16,8 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer -from PyQt4.QtGui import QWidget, QDialogButtonBox, QMenu, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QMenu, QHeaderView, \ QTreeWidgetItem, QLineEdit from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,7 +13,7 @@ except NameError: pass -from PyQt4.QtCore import QProcess +from PyQt5.QtCore import QProcess from VCS.StatusMonitorThread import VcsStatusMonitorThread
--- a/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,8 +16,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgTagDialog import Ui_HgTagDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -42,9 +42,6 @@ <property name="editable"> <bool>true</bool> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -6,7 +6,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_HgUserConfigDataDialog import Ui_HgUserConfigDataDialog
--- a/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QProcessEnvironment +from PyQt5.QtCore import QProcessEnvironment import Utilities
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -8,8 +8,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5FileDialog from E5Gui.E5Completers import E5DirCompleter
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_LfRevisionsInputDialog import Ui_LfRevisionsInputDialog
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action
--- a/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QTimer -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QTimer +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtGui import QMenu, QDialog +from PyQt5.QtWidgets import QMenu, QDialog from Project.ProjectBrowserModel import ProjectBrowserFileItem
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui import E5MessageBox from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/HgPurgeListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_HgPurgeListDialog import Ui_HgPurgeListDialog
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action
--- a/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QProcess -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QProcess +from PyQt5.QtWidgets import QDialog from ..HgExtension import HgExtension from ..HgDialog import HgDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton, \ +from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, \ QListWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem from .Ui_HgQueuesFoldDialog import Ui_HgQueuesFoldDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, \ +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, \ QAbstractItemView from .Ui_HgQueuesGuardsSelectionDialog import Ui_HgQueuesGuardsSelectionDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QProcess, QTimer, Qt, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QProcess, QTimer, Qt, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QProcess, QCoreApplication -from PyQt4.QtGui import QDialog, QTreeWidgetItem +from PyQt5.QtCore import QProcess, QCoreApplication +from PyQt5.QtWidgets import QDialog, QTreeWidgetItem from .Ui_HgQueuesListAllGuardsDialog import Ui_HgQueuesListAllGuardsDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, \ +from PyQt5.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, \ QTreeWidgetItem, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QCoreApplication -from PyQt4.QtGui import QDialog, QListWidgetItem +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QCoreApplication +from PyQt5.QtWidgets import QDialog, QListWidgetItem from .Ui_HgQueuesListGuardsDialog import Ui_HgQueuesListGuardsDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QDateTime -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot, QDateTime +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgQueuesNewPatchDialog import Ui_HgQueuesNewPatchDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ except NameError: pass -from PyQt4.QtCore import pyqtSlot, QProcess, QCoreApplication -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractItemView, \ +from PyQt5.QtCore import pyqtSlot, QProcess, QCoreApplication +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractItemView, \ QListWidgetItem, QAbstractButton from .Ui_HgQueuesQueueManagementDialog import Ui_HgQueuesQueueManagementDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesRenamePatchDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgQueuesRenamePatchDialog import Ui_HgQueuesRenamePatchDialog
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QProcess -from PyQt4.QtGui import QDialog, QApplication, QInputDialog +from PyQt5.QtCore import QProcess +from PyQt5.QtWidgets import QDialog, QApplication, QInputDialog from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgRebaseDialog import Ui_HgRebaseDialog
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from ..HgExtension import HgExtension from ..HgDialog import HgDialog
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,10 +12,10 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer -from PyQt4.QtGui import QWidget, QDialogButtonBox, QTreeWidgetItem, \ - QAbstractButton, QMenu, QHeaderView, QApplication, QCursor, \ - QLineEdit +from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QTreeWidgetItem, \ + QAbstractButton, QMenu, QHeaderView, QApplication, QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDateTime -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QDateTime +from PyQt5.QtWidgets import QDialog from .Ui_HgShelveDataDialog import Ui_HgShelveDataDialog
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -6,8 +6,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_HgShelvesSelectionDialog import Ui_HgShelvesSelectionDialog
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_HgUnshelveDataDialog import Ui_HgUnshelveDataDialog
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QProcess -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QProcess +from PyQt5.QtWidgets import QDialog from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QValidator +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QValidator +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_TransplantDialog import Ui_TransplantDialog
--- a/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from ..HgExtension import HgExtension from ..HgDialog import HgDialog
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,8 +17,9 @@ import shutil import re -from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher -from PyQt4.QtGui import QApplication, QDialog, QInputDialog +from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, \ + QCoreApplication +from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog @@ -1419,27 +1420,27 @@ line.split("@@@") cdate, ctime = date.split()[:2] info = [] - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""") .format(index, changeset)) if tags: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") .format('<br/>'.join(tags.split()))) if bookmarks: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") .format('<br/>'.join(bookmarks.split()))) if branches: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") .format('<br/>'.join(branches.split()))) - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n""" @@ -1473,7 +1474,7 @@ else: url = "" - return QApplication.translate( + return QCoreApplication.translate( 'mercurial', """<h3>Repository information</h3>\n""" """<p><table>\n""" @@ -2062,44 +2063,44 @@ cdate, ctime = date.split()[:2] info.append("""<p><table>""") if mode == "heads": - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Head #{0}</b></td><td></td></tr>\n""" .format(index, changeset))) elif mode == "parents": - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n""" .format(index, changeset))) elif mode == "tip": - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Tip</b></td><td></td></tr>\n""")) - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""") .format(changeset)) if tags: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Tags</b></td><td>{0}</td></tr>""") .format('<br/>'.join(tags.split()))) if bookmarks: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Bookmarks</b></td><td>{0}</td></tr>""") .format('<br/>'.join(bookmarks.split()))) if branches: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Branches</b></td><td>{0}</td></tr>""") .format('<br/>'.join(branches.split()))) if parents: - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Parents</b></td><td>{0}</td></tr>""") .format('<br/>'.join(parents.split()))) - info.append(QApplication.translate( + info.append(QCoreApplication.translate( "mercurial", """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n""" """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
--- a/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from Preferences.ConfigurationPages.ConfigurationPageBase import \ ConfigurationPageBase
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,7 +12,7 @@ import pysvn -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,8 +14,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, Qt -from PyQt4.QtGui import QHeaderView, QDialog, QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import QMutexLocker, Qt +from PyQt5.QtWidgets import QHeaderView, QDialog, QDialogButtonBox, \ + QTreeWidgetItem from .SvnDialogMixin import SvnDialogMixin from .Ui_SvnBlameDialog import Ui_SvnBlameDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,10 @@ import pysvn -from PyQt4.QtCore import pyqtSlot, Qt, QMutexLocker -from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, \ - QApplication, QCursor +from PyQt5.QtCore import pyqtSlot, Qt, QMutexLocker +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, \ + QApplication from .SvnDialogMixin import SvnDialogMixin
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -50,9 +50,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -81,9 +78,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import pysvn -from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QDialogButtonBox +from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot +from PyQt5.QtWidgets import QWidget, QDialogButtonBox from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnConst.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QT_TRANSLATE_NOOP +from PyQt5.QtCore import QT_TRANSLATE_NOOP import pysvn
--- a/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os.path -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import pysvn -from PyQt4.QtGui import QDialog, QApplication, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QApplication, QDialogButtonBox from .SvnConst import svnNotifyActionMap
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QApplication, QDialog, QWidget, QCursor +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QApplication, QDialog, QWidget class SvnDialogMixin(object):
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, QFileInfo, QDateTime, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QColor, QCursor, QBrush, QApplication, \ - QTextCursor, QDialogButtonBox +from PyQt5.QtCore import QMutexLocker, QFileInfo, QDateTime, Qt, pyqtSlot +from PyQt5.QtGui import QColor, QCursor, QBrush, QTextCursor +from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import pysvn -from PyQt4.QtCore import QMutexLocker -from PyQt4.QtGui import QDialog, QApplication +from PyQt5.QtCore import QMutexLocker +from PyQt5.QtWidgets import QDialog, QApplication from .SvnUtilities import formatTime from .SvnDialogMixin import SvnDialogMixin
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,8 +14,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, QDate, QRegExp, Qt, pyqtSlot, QPoint -from PyQt4.QtGui import QCursor, QHeaderView, QWidget, QApplication, \ +from PyQt5.QtCore import QMutexLocker, QDate, QRegExp, Qt, pyqtSlot, QPoint +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QHeaderView, QWidget, QApplication, \ QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, QByteArray, QUrl, Qt -from PyQt4.QtGui import QWidget, QCursor, QApplication, QTextCursor, \ - QDialogButtonBox +from PyQt5.QtCore import QMutexLocker, QByteArray, QUrl, Qt +from PyQt5.QtGui import QCursor, QTextCursor +from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox from .SvnUtilities import formatTime
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLoginDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SvnLoginDialog import Ui_SvnLoginDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QRegExp +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -60,9 +60,6 @@ <property name="insertPolicy" > <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property> @@ -87,9 +84,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property> @@ -114,9 +108,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os -from PyQt4.QtCore import QDir, pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QDir, pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os -from PyQt4.QtCore import QDir, pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QDir, pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropDelDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_SvnPropDelDialog import Ui_SvnPropDelDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, Qt -from PyQt4.QtGui import QWidget, QHeaderView, QApplication, QDialogButtonBox, \ - QTreeWidgetItem +from PyQt5.QtCore import QMutexLocker, Qt +from PyQt5.QtWidgets import QWidget, QHeaderView, QApplication, \ + QDialogButtonBox, QTreeWidgetItem from .SvnDialogMixin import SvnDialogMixin from .Ui_SvnPropListDialog import Ui_SvnPropListDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnPropSetDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SvnPropSetDialog import Ui_SvnPropSetDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRelocateDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot -from PyQt4.QtGui import QCursor, QHeaderView, QDialog, QApplication, \ +from PyQt5.QtCore import QMutexLocker, Qt, pyqtSlot +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QHeaderView, QDialog, QApplication, \ QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnRevisionSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDate, QDateTime, Qt -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QDate, QDateTime, Qt +from PyQt5.QtWidgets import QDialog from .Ui_SvnRevisionSelectionDialog import Ui_SvnRevisionSelectionDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,9 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QCursor, QHeaderView, QApplication, QMenu, \ +from PyQt5.QtCore import QMutexLocker, Qt, pyqtSlot +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QHeaderView, QApplication, QMenu, \ QDialogButtonBox, QTreeWidgetItem from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnSwitchDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -52,9 +52,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ import pysvn -from PyQt4.QtCore import QMutexLocker, QRegExp, Qt -from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QInputDialog, \ +from PyQt5.QtCore import QMutexLocker, QRegExp, Qt +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QDialog, QInputDialog, \ QApplication, QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_SvnTagDialog import Ui_SvnTagDialog
--- a/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnTagDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -44,9 +44,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp, pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QRegExp, pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QDateTime, Qt +from PyQt5.QtCore import QDateTime, Qt import Utilities
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,8 +14,9 @@ import shutil import time -from PyQt4.QtCore import Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime -from PyQt4.QtGui import QLineEdit, QDialog, QInputDialog, QApplication +from PyQt5.QtCore import Qt, QMutexLocker, pyqtSignal, QRegExp, QDateTime, \ + QCoreApplication +from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -1727,12 +1728,12 @@ ".".join([str(v) for v in pysvn.svn_api_version[:3]]), pysvn.svn_api_version[3]) else: - apiVersion = QApplication.translate('subversion', "unknown") + apiVersion = QCoreApplication.translate('subversion', "unknown") hmsz = time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)) if sys.version_info[0] == 2: hmsz = hmsz.decode(sys.getfilesystemencoding()) - return QApplication.translate( + return QCoreApplication.translate( 'subversion', """<h3>Repository information</h3>""" """<table>"""
--- a/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from Preferences.ConfigurationPages.ConfigurationPageBase import \ ConfigurationPageBase
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,7 +10,7 @@ from __future__ import unicode_literals import os -from PyQt4.QtGui import QMenu +from PyQt5.QtWidgets import QMenu from E5Gui.E5Application import e5App
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import os -from PyQt4.QtCore import QTimer, QProcess, Qt, pyqtSlot -from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QDialogButtonBox, \ - QTreeWidgetItem +from PyQt5.QtCore import QTimer, QProcess, Qt, pyqtSlot +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QDialog, \ + QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,9 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QRegExp, QTimer -from PyQt4.QtGui import QDialog, QDialogButtonBox, QListWidgetItem, QLineEdit +from PyQt5.QtCore import pyqtSlot, Qt, QProcess, QRegExp, QTimer +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, \ + QLineEdit from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -50,9 +50,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -81,9 +78,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QDialogButtonBox +from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot +from PyQt5.QtWidgets import QWidget, QDialogButtonBox from .Ui_SvnCommitDialog import Ui_SvnCommitDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os.path -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QTimer, QProcess, pyqtSlot, Qt, QProcessEnvironment -from PyQt4.QtGui import QLineEdit, QDialog, QDialogButtonBox +from PyQt5.QtCore import QTimer, QProcess, pyqtSlot, Qt, QProcessEnvironment +from PyQt5.QtWidgets import QLineEdit, QDialog, QDialogButtonBox from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,9 +16,9 @@ import os -from PyQt4.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot, Qt -from PyQt4.QtGui import QWidget, QColor, QLineEdit, QBrush, QTextCursor, \ - QDialogButtonBox +from PyQt5.QtCore import QTimer, QFileInfo, QProcess, pyqtSlot, Qt +from PyQt5.QtGui import QColor, QBrush, QTextCursor +from PyQt5.QtWidgets import QWidget, QLineEdit, QDialogButtonBox from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,10 +15,11 @@ import os -from PyQt4.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot, \ +from PyQt5.QtCore import QTimer, QDate, QProcess, QRegExp, Qt, pyqtSlot, \ QPoint -from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QWidget, \ - QApplication, QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QWidget, QApplication, \ + QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,9 @@ import os -from PyQt4.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot -from PyQt4.QtGui import QWidget, QLineEdit, QApplication, QTextCursor, \ - QDialogButtonBox +from PyQt5.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot +from PyQt5.QtGui import QTextCursor +from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QRegExp +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -60,9 +60,6 @@ <property name="insertPolicy" > <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property> @@ -94,9 +91,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property> @@ -121,9 +115,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os -from PyQt4.QtCore import QDir, pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QDir, pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os -from PyQt4.QtCore import QDir, pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QDir, pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,8 +14,9 @@ except NameError: pass -from PyQt4.QtCore import QTimer, QProcess, QProcessEnvironment, QRegExp, Qt -from PyQt4.QtGui import QWidget, QHeaderView, QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import QTimer, QProcess, QProcessEnvironment, QRegExp, Qt +from PyQt5.QtWidgets import QWidget, QHeaderView, QDialogButtonBox, \ + QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRelocateDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SvnRelocateDialog import Ui_SvnRelocateDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,10 @@ import os -from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \ - QApplication, QDialogButtonBox, QTreeWidgetItem -from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QDialog, QApplication, \ + QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRevisionSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDate, QDateTime, Qt -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QDate, QDateTime, Qt +from PyQt5.QtWidgets import QDialog from .Ui_SvnRevisionSelectionDialog import Ui_SvnRevisionSelectionDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,9 +16,9 @@ import os -from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QHeaderView, QLineEdit, QApplication, QMenu, \ - QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot +from PyQt5.QtWidgets import QWidget, QHeaderView, QLineEdit, QApplication, \ + QMenu, QDialogButtonBox, QTreeWidgetItem from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,7 +13,7 @@ except NameError: pass -from PyQt4.QtCore import QRegExp, QProcess +from PyQt5.QtCore import QRegExp, QProcess from VCS.StatusMonitorThread import VcsStatusMonitorThread
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SvnSwitchDialog import Ui_SvnSwitchDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnSwitchDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -52,9 +52,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot -from PyQt4.QtGui import QHeaderView, QLineEdit, QDialog, QInputDialog, \ +from PyQt5.QtCore import QTimer, QProcess, QRegExp, Qt, pyqtSlot +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QDialog, QInputDialog, \ QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_SvnTagDialog import Ui_SvnTagDialog
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -44,9 +44,6 @@ <property name="editable" > <bool>true</bool> </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> <property name="duplicatesEnabled" > <bool>false</bool> </property>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp, pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QRegExp, pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,8 +17,8 @@ import re import shutil -from PyQt4.QtCore import pyqtSignal, QProcess, QRegExp -from PyQt4.QtGui import QLineEdit, QDialog, QInputDialog, QApplication +from PyQt5.QtCore import pyqtSignal, QProcess, QRegExp, QCoreApplication +from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -1595,7 +1595,7 @@ info['committed-time'] = "{0}{1}".format( time.split('.')[0], time[-1]) - return QApplication.translate( + return QCoreApplication.translate( 'subversion', """<h3>Repository information</h3>""" """<table>"""
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSignal, QFileInfo, QEvent, Qt -from PyQt4.QtGui import QStackedWidget, QSplitter, QListWidget, \ +from PyQt5.QtCore import pyqtSignal, QFileInfo, QEvent, Qt +from PyQt5.QtWidgets import QStackedWidget, QSplitter, QListWidget, \ QListWidgetItem, QSizePolicy, QMenu, QApplication from ViewManager.ViewManager import ViewManager
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,10 +11,11 @@ import os -from PyQt4.QtCore import QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, \ +from PyQt5.QtCore import QPoint, QFileInfo, pyqtSignal, QEvent, QByteArray, \ QMimeData, Qt, QSize -from PyQt4.QtGui import QWidget, QColor, QHBoxLayout, QDrag, QPixmap, \ - QSplitter, QTabBar, QApplication, QToolButton, QMenu, QLabel +from PyQt5.QtGui import QColor, QDrag, QPixmap +from PyQt5.QtWidgets import QWidget, QHBoxLayout, QSplitter, QTabBar, \ + QApplication, QToolButton, QMenu, QLabel from E5Gui.E5Application import e5App
--- a/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QColor, QColorDialog, QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QColorDialog, QDialog, QDialogButtonBox from E5Gui import E5MessageBox @@ -65,7 +66,7 @@ else: coStr = "QColor({0})".format(coStr) try: - exec('from PyQt4.QtCore import Qt;' + exec('from PyQt5.QtCore import Qt;' ' QColorDialog.getColor({0}, None, "{1}")'.format( coStr, self.eTitle.text())) except:
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -8,8 +8,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QAbstractButton +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton from E5Gui import E5MessageBox
--- a/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QFileDialog, QButtonGroup +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFileDialog, \ + QButtonGroup from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter @@ -56,7 +57,7 @@ self.__toggleInitialFilterAndResult) self.__toggleInitialFilterAndResult(1) - self.pyqtComboBox.addItems(["PyQt4", "PyQt5"]) + self.pyqtComboBox.addItems(["PyQt5", "PyQt5"]) if self.__pyqtVariant == 5: self.pyqtComboBox.setCurrentIndex(1) else: @@ -93,9 +94,9 @@ @param txt text of the selected combo box entry (string) """ - self.rfOpenFile.setEnabled(txt == "PyQt4") - self.rfOpenFiles.setEnabled(txt == "PyQt4") - self.rfSaveFile.setEnabled(txt == "PyQt4") + self.rfOpenFile.setEnabled(txt == "PyQt5") + self.rfOpenFiles.setEnabled(txt == "PyQt5") + self.rfSaveFile.setEnabled(txt == "PyQt5") if txt == "PyQt5": if self.rfOpenFile.isChecked():
--- a/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/FontDialogWizard/FontDialogWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox, QFontDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFontDialog from .Ui_FontDialogWizardDialog import Ui_FontDialogWizardDialog
--- a/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QLineEdit, QDoubleValidator, QDialog, QInputDialog, \ - QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QDoubleValidator +from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QDialogButtonBox from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog
--- a/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QMessageBox, QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QMessageBox, QDialog, QDialogButtonBox from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ +from PyQt5.QtCore import QRegExp +from PyQt5.QtGui import QRegExpValidator +from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ QLineEdit, QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, \ - QRegExpValidator, QLabel + QLabel from .Ui_PyRegExpWizardCharactersDialog import \ Ui_PyRegExpWizardCharactersDialog
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,10 @@ import os import re -from PyQt4.QtCore import QFileInfo, pyqtSlot -from PyQt4.QtGui import QWidget, QDialog, QInputDialog, QApplication, \ - QClipboard, QTextCursor, QDialogButtonBox, QVBoxLayout, QTableWidgetItem +from PyQt5.QtCore import QFileInfo, pyqtSlot +from PyQt5.QtGui import QClipboard, QTextCursor +from PyQt5.QtWidgets import QWidget, QDialog, QInputDialog, QApplication, \ + QDialogButtonBox, QVBoxLayout, QTableWidgetItem from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5MainWindow import E5MainWindow
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardRepeatDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_PyRegExpWizardRepeatDialog import Ui_PyRegExpWizardRepeatDialog
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ +from PyQt5.QtCore import QRegExp +from PyQt5.QtGui import QRegExpValidator +from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ QLineEdit, QPushButton, QDialog, QScrollArea, QComboBox, QVBoxLayout, \ - QRegExpValidator, QLabel + QLabel from .Ui_QRegExpWizardCharactersDialog import Ui_QRegExpWizardCharactersDialog
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,10 @@ import os -from PyQt4.QtCore import QFileInfo, QRegExp, Qt, pyqtSlot, qVersion -from PyQt4.QtGui import QWidget, QDialog, QApplication, QClipboard, \ - QTextCursor, QDialogButtonBox, QVBoxLayout, QTableWidgetItem +from PyQt5.QtCore import QFileInfo, QRegExp, Qt, pyqtSlot, qVersion +from PyQt5.QtGui import QClipboard, QTextCursor +from PyQt5.QtWidgets import QWidget, QDialog, QApplication, QDialogButtonBox, \ + QVBoxLayout, QTableWidgetItem from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5MainWindow import E5MainWindow
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardRepeatDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_QRegExpWizardRepeatDialog import Ui_QRegExpWizardRepeatDialog
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,11 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp -from PyQt4.QtGui import QWidget, QDialog, QVBoxLayout, QHBoxLayout, \ - QScrollArea, QPushButton, QSpacerItem, QSizePolicy, QComboBox, \ - QRegExpValidator, QLineEdit, QLabel +from PyQt5.QtCore import QRegExp +from PyQt5.QtGui import QRegExpValidator +from PyQt5.QtWidgets import QWidget, QDialog, QVBoxLayout, QHBoxLayout, \ + QScrollArea, QPushButton, QSpacerItem, QSizePolicy, QComboBox, QLineEdit, \ + QLabel from .Ui_QRegularExpressionWizardCharactersDialog import \ Ui_QRegularExpressionWizardCharactersDialog
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,10 @@ import sys import json -from PyQt4.QtCore import QFileInfo, pyqtSlot, QProcess, QByteArray -from PyQt4.QtGui import QWidget, QDialog, QInputDialog, QApplication, \ - QClipboard, QTextCursor, QDialogButtonBox, QVBoxLayout, QTableWidgetItem +from PyQt5.QtCore import QFileInfo, pyqtSlot, QProcess, QByteArray +from PyQt5.QtGui import QClipboard, QTextCursor +from PyQt5.QtWidgets import QWidget, QDialog, QInputDialog, QApplication, \ + QDialogButtonBox, QVBoxLayout, QTableWidgetItem from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5MainWindow import E5MainWindow
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardRepeatDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_QRegularExpressionWizardRepeatDialog import \ Ui_QRegularExpressionWizardRepeatDialog
--- a/Preferences/ConfigurationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,11 +12,11 @@ import os import types -from PyQt4.QtCore import QMetaObject, pyqtSignal, Qt, QRect, pyqtSlot -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QPixmap, \ - QTreeWidget, QStackedWidget, QDialog, QSplitter, QScrollArea, \ - QApplication, QDialogButtonBox, QFrame, QVBoxLayout, QTreeWidgetItem, \ - QLabel +from PyQt5.QtCore import QMetaObject, pyqtSignal, Qt, QRect, pyqtSlot +from PyQt5.QtGui import QPixmap +from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QTreeWidget, \ + QStackedWidget, QDialog, QSplitter, QScrollArea, QApplication, \ + QDialogButtonBox, QFrame, QVBoxLayout, QTreeWidgetItem, QLabel from E5Gui.E5Application import e5App from E5Gui.E5LineEdit import E5ClearableLineEdit
--- a/Preferences/ConfigurationPages/ConfigurationPageBase.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/ConfigurationPageBase.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QWidget, QIcon, QPixmap, QColor, QColorDialog, \ - QFontDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QIcon, QPixmap, QColor +from PyQt5.QtWidgets import QWidget, QColorDialog, QFontDialog class ConfigurationPageBase(QWidget):
--- a/Preferences/ConfigurationPages/CooperationPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/CooperationPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QRegExp -from PyQt4.QtGui import QRegExpValidator, QValidator +from PyQt5.QtCore import pyqtSlot, QRegExp +from PyQt5.QtGui import QRegExpValidator, QValidator from .ConfigurationPageBase import ConfigurationPageBase from .Ui_CooperationPage import Ui_CooperationPage
--- a/Preferences/ConfigurationPages/CorbaPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/CorbaPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,9 @@ import socket -from PyQt4.QtCore import QRegExp, pyqtSlot -from PyQt4.QtGui import QLineEdit, QInputDialog -from PyQt4.QtNetwork import QNetworkInterface, QAbstractSocket, QHostAddress +from PyQt5.QtCore import QRegExp, pyqtSlot +from PyQt5.QtWidgets import QLineEdit, QInputDialog +from PyQt5.QtNetwork import QNetworkInterface, QAbstractSocket, QHostAddress from E5Gui.E5Application import e5App from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/EditorAPIsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorAPIsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QDir, pyqtSlot, QFileInfo -from PyQt4.QtGui import QInputDialog +from PyQt5.QtCore import QDir, pyqtSlot, QFileInfo +from PyQt5.QtWidgets import QInputDialog from E5Gui.E5Application import e5App from E5Gui.E5Completers import E5FileCompleter
--- a/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciScintilla +from PyQt5.Qsci import QsciScintilla from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorAutocompletionQScintillaPage import \
--- a/Preferences/ConfigurationPages/EditorCalltipsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorCalltipsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciScintilla +from PyQt5.Qsci import QsciScintilla from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
--- a/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciScintilla +from PyQt5.Qsci import QsciScintilla from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorCalltipsQScintillaPage import Ui_EditorCalltipsQScintillaPage
--- a/Preferences/ConfigurationPages/EditorExportersPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorExportersPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QFontDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QFontDialog from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorExportersPage import Ui_EditorExportersPage
--- a/Preferences/ConfigurationPages/EditorFilePage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorFilePage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QListWidgetItem, QInputDialog, QLineEdit -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QListWidgetItem, QInputDialog, QLineEdit +from PyQt5.Qsci import QsciScintilla from E5Gui import E5MessageBox
--- a/Preferences/ConfigurationPages/EditorGeneralPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorGeneralPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciScintillaBase +from PyQt5.Qsci import QsciScintillaBase from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorGeneralPage import Ui_EditorGeneralPage
--- a/Preferences/ConfigurationPages/EditorHighlightersPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightersPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ from pygments.lexers import get_all_lexers -from PyQt4.QtCore import Qt, pyqtSlot, qVersion -from PyQt4.QtGui import QHeaderView, QTreeWidgetItem +from PyQt5.QtCore import Qt, pyqtSlot, qVersion +from PyQt5.QtWidgets import QHeaderView, QTreeWidgetItem from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorHighlightersPage import Ui_EditorHighlightersPage
--- a/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice -from PyQt4.QtGui import QPalette, QColorDialog, QFontDialog, \ - QInputDialog, QFont, QMenu +from PyQt5.QtCore import pyqtSlot, Qt, QFileInfo, QFile, QIODevice +from PyQt5.QtGui import QPalette, QFont +from PyQt5.QtWidgets import QColorDialog, QFontDialog, QInputDialog, QMenu from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorHighlightingStylesPage import Ui_EditorHighlightingStylesPage
--- a/Preferences/ConfigurationPages/EditorKeywordsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorKeywordsPage import Ui_EditorKeywordsPage
--- a/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorSpellCheckingPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/EditorStylesPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorStylesPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QColor, QPalette, QColorDialog -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QColor, QPalette +from PyQt5.QtWidgets import QColorDialog +from PyQt5.Qsci import QsciScintilla from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorStylesPage import Ui_EditorStylesPage @@ -31,8 +32,8 @@ self.setupUi(self) self.setObjectName("EditorStylesPage") - from QScintilla.QsciScintillaCompat import ( - QsciScintillaCompat, QSCINTILLA_VERSION) + from QScintilla.QsciScintillaCompat import QsciScintillaCompat, \ + QSCINTILLA_VERSION self.foldStyles = [ QsciScintilla.PlainFoldStyle, QsciScintilla.CircledFoldStyle,
--- a/Preferences/ConfigurationPages/EditorTypingPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EditorTypingPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorTypingPage import Ui_EditorTypingPage
--- a/Preferences/ConfigurationPages/EmailPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/EmailPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,9 @@ import smtplib import socket -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QApplication, QCursor +from PyQt5.QtCore import pyqtSlot, Qt +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QApplication from E5Gui import E5MessageBox
--- a/Preferences/ConfigurationPages/GraphicsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/GraphicsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_GraphicsPage import Ui_GraphicsPage
--- a/Preferences/ConfigurationPages/HelpAppearancePage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/HelpAppearancePage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QUrl +from PyQt5.QtCore import pyqtSlot, QUrl from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog @@ -71,7 +71,7 @@ self.qt5DocDirEdit.setText( Preferences.getHelp("Qt5DocDir")) self.pyqt4DocDirEdit.setText( - Preferences.getHelp("PyQt4DocDir")) + Preferences.getHelp("PyQt5DocDir")) self.pyqt5DocDirEdit.setText( Preferences.getHelp("PyQt5DocDir")) self.pysideDocDirEdit.setText( @@ -94,7 +94,7 @@ "Qt5DocDir", self.qt5DocDirEdit.text()) Preferences.setHelp( - "PyQt4DocDir", + "PyQt5DocDir", self.pyqt4DocDirEdit.text()) Preferences.setHelp( "PyQt5DocDir", @@ -168,11 +168,11 @@ @pyqtSlot() def on_pyqt4DocDirButton_clicked(self): """ - Private slot to select the PyQt4 documentation directory. + Private slot to select the PyQt5 documentation directory. """ entry = E5FileDialog.getOpenFileName( self, - self.tr("Select PyQt4 documentation entry"), + self.tr("Select PyQt5 documentation entry"), QUrl(self.pyqt4DocDirEdit.text()).path(), self.tr("HTML Files (*.html *.htm);;All Files (*)"))
--- a/Preferences/ConfigurationPages/HelpInterfacePage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/HelpInterfacePage.py Sun Jun 29 20:13:56 2014 +0200 @@ -6,8 +6,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QStyleFactory +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QStyleFactory from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/HelpViewersPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/HelpViewersPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QButtonGroup +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QButtonGroup from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/HelpVirusTotalPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/HelpVirusTotalPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_HelpVirusTotalPage import Ui_HelpVirusTotalPage
--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QLocale -from PyQt4.QtNetwork import QNetworkRequest -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import pyqtSlot, QLocale +from PyQt5.QtNetwork import QNetworkRequest +from PyQt5.QtWebKit import QWebSettings from .ConfigurationPageBase import ConfigurationPageBase from .Ui_HelpWebBrowserPage import Ui_HelpWebBrowserPage
--- a/Preferences/ConfigurationPages/IconsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/IconsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QListWidgetItem +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QListWidgetItem from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/IconsPreviewDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/IconsPreviewDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import os.path -from PyQt4.QtGui import QListWidgetItem, QDialog, QIcon -from PyQt4.QtCore import QDir +from PyQt5.QtGui import QIcon +from PyQt5.QtWidgets import QListWidgetItem, QDialog +from PyQt5.QtCore import QDir from .Ui_IconsPreviewDialog import Ui_IconsPreviewDialog
--- a/Preferences/ConfigurationPages/InterfacePage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/InterfacePage.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import glob import os -from PyQt4.QtCore import pyqtSlot, QTranslator -from PyQt4.QtGui import QStyleFactory +from PyQt5.QtCore import pyqtSlot, QTranslator +from PyQt5.QtWidgets import QStyleFactory from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_MasterPasswordEntryDialog import Ui_MasterPasswordEntryDialog
--- a/Preferences/ConfigurationPages/MultiProjectPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/MultiProjectPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_MultiProjectPage import Ui_MultiProjectPage
--- a/Preferences/ConfigurationPages/NetworkPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/NetworkPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/NotificationsPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/NotificationsPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, QPoint -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import pyqtSlot, QPoint +from PyQt5.QtWidgets import QApplication from .ConfigurationPageBase import ConfigurationPageBase from .Ui_NotificationsPage import Ui_NotificationsPage
--- a/Preferences/ConfigurationPages/PluginManagerPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/PluginManagerPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/PrinterPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/PrinterPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_PrinterPage import Ui_PrinterPage
--- a/Preferences/ConfigurationPages/ProjectBrowserPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/ProjectBrowserPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Application import e5App
--- a/Preferences/ConfigurationPages/QtPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/QtPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Preferences/ConfigurationPages/SecurityPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/SecurityPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog -from PyQt4.QtWebKit import QWebSettings +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog +from PyQt5.QtWebKit import QWebSettings from .ConfigurationPageBase import ConfigurationPageBase from .Ui_SecurityPage import Ui_SecurityPage
--- a/Preferences/ConfigurationPages/ShellPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/ShellPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_ShellPage import Ui_ShellPage
--- a/Preferences/ConfigurationPages/TemplatesPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/TemplatesPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from .ConfigurationPageBase import ConfigurationPageBase from .Ui_TemplatesPage import Ui_TemplatesPage
--- a/Preferences/ConfigurationPages/ViewmanagerPage.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ConfigurationPages/ViewmanagerPage.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtCore import pyqtSlot from E5Gui.E5Application import e5App
--- a/Preferences/PreferencesLexer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/PreferencesLexer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QColor, QFont, QApplication -from PyQt4.Qsci import QsciLexer +from PyQt5.QtGui import QColor, QFont, QCoreApplication +from PyQt5.Qsci import QsciLexer import Preferences import Globals @@ -24,7 +24,7 @@ """ Constructor """ - self._errorMessage = QApplication.translate( + self._errorMessage = QCoreApplication.translate( "PreferencesLexerError", "Unspecific PreferencesLexer error.") @@ -56,7 +56,7 @@ @param language lexer language (string) """ PreferencesLexerError.__init__(self) - self._errorMessage = QApplication.translate( + self._errorMessage = QCoreApplication.translate( "PreferencesLexerError", 'Unsupported Lexer Language: {0}').format(language)
--- a/Preferences/ProgramsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ProgramsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,8 +16,9 @@ import os import re -from PyQt4.QtCore import pyqtSlot, Qt, QProcess -from PyQt4.QtGui import QApplication, QTreeWidgetItem, QHeaderView, QCursor, \ +from PyQt5.QtCore import pyqtSlot, Qt, QProcess +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QApplication, QTreeWidgetItem, QHeaderView, \ QDialog, QDialogButtonBox from E5Gui.E5Application import e5App @@ -132,19 +133,19 @@ self.tr("Qt Assistant"), exe, version=version) # 2. do the PyQt programs - # 2a. Translation Extractor PyQt4 + # 2a. Translation Extractor PyQt5 self.__createProgramEntry( - self.tr("Translation Extractor (Python, PyQt4)"), + self.tr("Translation Extractor (Python, PyQt5)"), Utilities.isWindowsPlatform() and "pylupdate4.exe" or "pylupdate4", '-version', 'pylupdate', -1) - # 2b. Forms Compiler PyQt4 + # 2b. Forms Compiler PyQt5 self.__createProgramEntry( - self.tr("Forms Compiler (Python, PyQt4)"), + self.tr("Forms Compiler (Python, PyQt5)"), Utilities.isWindowsPlatform() and "pyuic4.bat" or "pyuic4", '--version', 'Python User', 4) - # 2c. Resource Compiler PyQt4 + # 2c. Resource Compiler PyQt5 self.__createProgramEntry( - self.tr("Resource Compiler (Python, PyQt4)"), + self.tr("Resource Compiler (Python, PyQt5)"), Utilities.isWindowsPlatform() and "pyrcc4.exe" or "pyrcc4", '-version', 'Resource Compiler', -1) # 2d. Translation Extractor PyQt5
--- a/Preferences/ShortcutDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ShortcutDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QEvent, Qt -from PyQt4.QtGui import QKeySequence, QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSignal, QEvent, Qt +from PyQt5.QtGui import QKeySequence +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_ShortcutDialog import Ui_ShortcutDialog
--- a/Preferences/Shortcuts.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/Shortcuts.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QFile, QIODevice -from PyQt4.QtGui import QKeySequence, QApplication +from PyQt5.QtCore import QFile, QIODevice, QCoreApplication +from PyQt5.QtGui import QKeySequence from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -202,8 +202,9 @@ else: E5MessageBox.critical( None, - QApplication.translate("Shortcuts", "Export Keyboard Shortcuts"), - QApplication.translate( + QCoreApplication.translate( + "Shortcuts", "Export Keyboard Shortcuts"), + QCoreApplication.translate( "Shortcuts", "<p>The keyboard shortcuts could not be written to file" " <b>{0}</b>.</p>") @@ -234,8 +235,9 @@ else: E5MessageBox.critical( None, - QApplication.translate("Shortcuts", "Import Keyboard Shortcuts"), - QApplication.translate( + QCoreApplication.translate( + "Shortcuts", "Import Keyboard Shortcuts"), + QCoreApplication.translate( "Shortcuts", "<p>The keyboard shortcuts could not be read from file" " <b>{0}</b>.</p>")
--- a/Preferences/ShortcutsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ShortcutsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QRegExp, Qt, pyqtSlot -from PyQt4.QtGui import QKeySequence, QHeaderView, QDialog, QTreeWidgetItem +from PyQt5.QtCore import pyqtSignal, QRegExp, Qt, pyqtSlot +from PyQt5.QtGui import QKeySequence +from PyQt5.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Preferences/ToolConfigurationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ToolConfigurationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import copy -from PyQt4.QtCore import Qt, pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import Qt, pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5MessageBox, E5FileDialog
--- a/Preferences/ToolGroupConfigurationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ToolGroupConfigurationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import copy -from PyQt4.QtCore import Qt, pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import Qt, pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui import E5MessageBox
--- a/Preferences/ViewProfileDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/ViewProfileDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_ViewProfileToolboxesDialog import Ui_ViewProfileToolboxesDialog from .Ui_ViewProfileSidebarsDialog import Ui_ViewProfileSidebarsDialog
--- a/Preferences/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Preferences/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -24,12 +24,13 @@ import json import sys -from PyQt4.QtCore import QDir, QPoint, QLocale, QSettings, QFileInfo, \ +from PyQt5.QtCore import QDir, QPoint, QLocale, QSettings, QFileInfo, \ QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo -from PyQt4.QtGui import QColor, QFont, QInputDialog, QPalette, QApplication -from PyQt4.QtNetwork import QNetworkRequest -from PyQt4.QtWebKit import QWebSettings -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtGui import QColor, QFont, QPalette +from PyQt5.QtWidgets import QInputDialog, QApplication +from PyQt5.QtNetwork import QNetworkRequest +from PyQt5.QtWebKit import QWebSettings +from PyQt5.Qsci import QsciScintilla from E5Gui import E5FileDialog @@ -37,7 +38,7 @@ from Globals import settingsNameOrganization, settingsNameGlobal, \ settingsNameRecent, isWindowsPlatform, findPythonInterpreters, \ - getPyQt4ModulesDirectory + getPyQt5ModulesDirectory from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \ ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \ @@ -312,9 +313,9 @@ "SpellCheckingPersonalExcludeList": "", "DefaultEncoding": "utf-8", - "DefaultOpenFilter": QApplication.translate( + "DefaultOpenFilter": QCoreApplication.translate( 'Lexers', 'Python Files (*.py *.py2 *.py3)'), - "DefaultSaveFilter": QApplication.translate( + "DefaultSaveFilter": QCoreApplication.translate( 'Lexers', "Python3 Files (*.py)"), "AdditionalOpenFilters": [], "AdditionalSaveFilters": [], @@ -679,7 +680,7 @@ "QtDocDir": "", "Qt4DocDir": "", "Qt5DocDir": "", - "PyQt4DocDir": "", + "PyQt5DocDir": "", "PyQt5DocDir": "", "PySideDocDir": "", "SingleHelpWindow": True, @@ -2368,7 +2369,7 @@ if s == "": s = QLibraryInfo.location(QLibraryInfo.TranslationsPath) if s == "" and isWindowsPlatform(): - transPath = os.path.join(getPyQt4ModulesDirectory(), "translations") + transPath = os.path.join(getPyQt5ModulesDirectory(), "translations") if os.path.exists(transPath): s = transPath return s
--- a/Project/AddDirectoryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/AddDirectoryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Project/AddFileDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/AddFileDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5DirCompleter, E5FileCompleter from E5Gui import E5FileDialog
--- a/Project/AddFoundFilesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/AddFoundFilesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_AddFoundFilesDialog import Ui_AddFoundFilesDialog
--- a/Project/AddLanguageDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/AddLanguageDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_AddLanguageDialog import Ui_AddLanguageDialog
--- a/Project/CreateDialogCodeDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/CreateDialogCodeDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,11 +11,12 @@ import os -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 +from PyQt5.QtCore import QMetaObject, QByteArray, QRegExp, Qt, pyqtSlot, \ + QMetaMethod, qVersion, QSortFilterProxyModel +from PyQt5.QtGui import QStandardItemModel, QBrush, QStandardItem +from PyQt5.QtWidgets import QWidget, QDialog, QDialogButtonBox, QAction +from PyQt5 import uic + from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Project/DebuggerPropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/DebuggerPropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os import sys -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Project/FiletypeAssociationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/FiletypeAssociationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, pyqtSlot -from PyQt4.QtGui import QHeaderView, QDialog, QTreeWidgetItem +from PyQt5.QtCore import Qt, pyqtSlot +from PyQt5.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem from .Ui_FiletypeAssociationDialog import Ui_FiletypeAssociationDialog
--- a/Project/LexerAssociationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/LexerAssociationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import Qt, pyqtSlot, qVersion -from PyQt4.QtGui import QHeaderView, QTreeWidgetItem, QDialog +from PyQt5.QtCore import Qt, pyqtSlot, qVersion +from PyQt5.QtWidgets import QHeaderView, QTreeWidgetItem, QDialog from .Ui_LexerAssociationDialog import Ui_LexerAssociationDialog
--- a/Project/NewDialogClassDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/NewDialogClassDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QDir, pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QDir, pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/Project/NewPythonPackageDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/NewPythonPackageDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox -from PyQt4.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot from .Ui_NewPythonPackageDialog import Ui_NewPythonPackageDialog
--- a/Project/Project.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/Project.py Sun Jun 29 20:13:56 2014 +0200 @@ -21,11 +21,12 @@ import copy import zipfile -from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo, pyqtSignal, \ +from PyQt5.QtCore import pyqtSlot, QFile, QFileInfo, pyqtSignal, \ QCryptographicHash, QIODevice, QByteArray, QObject, Qt -from PyQt4.QtGui import QCursor, QLineEdit, QToolBar, QDialog, QInputDialog, \ +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QLineEdit, QToolBar, QDialog, QInputDialog, \ QApplication, QMenu, QAction -from PyQt4.Qsci import QsciScintilla +from PyQt5.Qsci import QsciScintilla from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox
--- a/Project/ProjectBaseBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectBaseBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,11 @@ import os -from PyQt4.QtCore import QModelIndex, pyqtSignal, Qt -from PyQt4.QtGui import QTreeView, QCursor, QItemSelection, \ - QItemSelectionModel, QApplication, QMenu, QAbstractItemView, QDialog +from PyQt5.QtCore import QModelIndex, pyqtSignal, Qt, QCoreApplication, \ + QItemSelectionModel, QItemSelection +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QTreeView, QApplication, QMenu, QDialog, \ + QAbstractItemView from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -103,19 +105,19 @@ # create the popup menu for source files self.sourceMenu = QMenu(self) self.sourceMenu.addAction( - QApplication.translate('ProjectBaseBrowser', 'Open'), + QCoreApplication.translate('ProjectBaseBrowser', 'Open'), self._openItem) # create the popup menu for general use self.menu = QMenu(self) self.menu.addAction( - QApplication.translate('ProjectBaseBrowser', 'Open'), + QCoreApplication.translate('ProjectBaseBrowser', 'Open'), self._openItem) # create the menu for multiple selected files self.multiMenu = QMenu(self) self.multiMenu.addAction( - QApplication.translate('ProjectBaseBrowser', 'Open'), + QCoreApplication.translate('ProjectBaseBrowser', 'Open'), self._openItem) # create the background menu @@ -488,7 +490,7 @@ if local: compareString = \ - QApplication.translate('ProjectBaseBrowser', "local") + QCoreApplication.translate('ProjectBaseBrowser', "local") else: compareString = self.project.vcs.vcsName() @@ -530,8 +532,9 @@ if selectedEntries == 0: E5MessageBox.information( self, - QApplication.translate('ProjectBaseBrowser', "Select entries"), - QApplication.translate( + QCoreApplication.translate( + 'ProjectBaseBrowser', "Select entries"), + QCoreApplication.translate( 'ProjectBaseBrowser', """There were no matching entries found."""))
--- a/Project/ProjectBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QColor, QApplication +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QApplication from UI.Browser import Browser
--- a/Project/ProjectBrowserModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectBrowserModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os import re -from PyQt4.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt -from PyQt4.QtGui import QColor +from PyQt5.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt +from PyQt5.QtGui import QColor from UI.BrowserModel import BrowserModel, BrowserItem, BrowserDirectoryItem, \ BrowserFileItem @@ -345,7 +345,7 @@ QDir.Hidden | QDir.NoDotAndDotDot) else: - filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot) + filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) entryInfoList = qdir.entryInfoList(filter) if len(entryInfoList) > 0: @@ -398,7 +398,8 @@ self.watcher.removePaths(watchedDirs) self.rootItem.removeChildren() - self.reset() + self.beginResetModel() + self.endResetModel() # reset the module parser cache Utilities.ModuleParser.resetParsedModules() @@ -458,7 +459,8 @@ else: itm.addVcsStatus("") self.inRefresh = False - self.reset() + self.beginResetModel() + self.endResetModel() def findParentItemByName(self, type_, name, dontSplit=False): """ @@ -671,7 +673,7 @@ QDir.Hidden | QDir.NoDotAndDotDot) else: - filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot) + filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) for itm in self.watchedItems[path]: oldCnt = itm.childCount()
--- a/Project/ProjectFormsBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectFormsBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,8 +17,8 @@ import sys import shutil -from PyQt4.QtCore import QThread, QFileInfo, pyqtSignal, QProcess -from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QMenu +from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess +from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog
--- a/Project/ProjectInterfacesBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectInterfacesBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,8 +17,8 @@ import os import glob -from PyQt4.QtCore import QThread, pyqtSignal, QProcess -from PyQt4.QtGui import QDialog, QApplication, QMenu +from PyQt5.QtCore import QThread, pyqtSignal, QProcess +from PyQt5.QtWidgets import QDialog, QApplication, QMenu from E5Gui.E5Application import e5App from E5Gui import E5MessageBox
--- a/Project/ProjectOthersBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectOthersBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl -from PyQt4.QtGui import QDesktopServices, QDialog, QMenu +from PyQt5.QtCore import QModelIndex, pyqtSignal, QUrl +from PyQt5.QtGui import QDesktopServices +from PyQt5.QtWidgets import QDialog, QMenu from .ProjectBrowserModel import ProjectBrowserFileItem, \ ProjectBrowserSimpleDirectoryItem, ProjectBrowserDirectoryItem, \
--- a/Project/ProjectResourcesBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectResourcesBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import os -from PyQt4.QtCore import QThread, QFileInfo, pyqtSignal, PYQT_VERSION, QProcess -from PyQt4.QtGui import QDialog, QApplication, QMenu +from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, PYQT_VERSION, QProcess +from PyQt5.QtWidgets import QDialog, QApplication, QMenu from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog
--- a/Project/ProjectSourcesBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectSourcesBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSignal -from PyQt4.QtGui import QDialog, QInputDialog, QMenu +from PyQt5.QtCore import pyqtSignal +from PyQt5.QtWidgets import QDialog, QInputDialog, QMenu from E5Gui import E5MessageBox
--- a/Project/ProjectTranslationsBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/ProjectTranslationsBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -18,8 +18,8 @@ import shutil import fnmatch -from PyQt4.QtCore import pyqtSignal, QProcess -from PyQt4.QtGui import QDialog, QMenu +from PyQt5.QtCore import pyqtSignal, QProcess +from PyQt5.QtWidgets import QDialog, QMenu from E5Gui import E5MessageBox from E5Gui.E5Application import e5App
--- a/Project/PropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/PropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QDir, pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtCore import QDir, pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5Application import e5App from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter
--- a/Project/SpellingPropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/SpellingPropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/Project/TranslationPropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/TranslationPropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QListWidgetItem, QDialog, QDialogButtonBox +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QListWidgetItem, QDialog, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter, E5DirCompleter from E5Gui import E5FileDialog
--- a/Project/UserPropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Project/UserPropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App
--- a/PyUnit/UnittestDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/PyUnit/UnittestDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,9 +15,10 @@ import re import os -from PyQt4.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QColor, QDialog, QApplication, \ - QDialogButtonBox, QListWidgetItem +from PyQt5.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QWidget, QDialog, QApplication, QDialogButtonBox, \ + QListWidgetItem from E5Gui.E5Application import e5App from E5Gui.E5Completers import E5FileCompleter
--- a/PyUnit/UnittestDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/PyUnit/UnittestDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -57,9 +57,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>true</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/QScintilla/APIsManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/APIsManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QDir, QFileInfo, pyqtSignal, QObject -from PyQt4.Qsci import QsciAPIs +from PyQt5.QtCore import QDir, QFileInfo, pyqtSignal, QObject +from PyQt5.Qsci import QsciAPIs from . import Lexers import Preferences @@ -182,7 +182,7 @@ if self.__apis is not None: if Globals.isWindowsPlatform(): qsciPath = os.path.join( - Globals.getPyQt4ModulesDirectory(), "qsci") + Globals.getPyQt5ModulesDirectory(), "qsci") if os.path.exists(qsciPath): # it's the installer if self.__lexer.lexerName() is not None:
--- a/QScintilla/Editor.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Editor.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,12 +17,13 @@ import re import difflib -from PyQt4.QtCore import QDir, QTimer, QModelIndex, QFileInfo, pyqtSignal, \ +from PyQt5.QtCore import QDir, QTimer, QModelIndex, QFileInfo, pyqtSignal, \ pyqtSlot, QCryptographicHash, QEvent, QDateTime, QRegExp, Qt -from PyQt4.QtGui import QCursor, QPrinter, QPrintDialog, QLineEdit, \ - QActionGroup, QDialog, QAbstractPrintDialog, QInputDialog, QApplication, \ - QMenu, QPalette, QFont, QPixmap, QPainter -from PyQt4.Qsci import QsciScintilla, QsciMacro, QsciStyledText +from PyQt5.QtGui import QCursor, QPalette, QFont, QPixmap, QPainter +from PyQt5.QtWidgets import QLineEdit, QActionGroup, QDialog, QInputDialog, \ + QApplication, QMenu +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog +from PyQt5.Qsci import QsciScintilla, QsciMacro, QsciStyledText from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox @@ -2421,7 +2422,7 @@ """ Public slot to show a print preview of the text. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog from .Printer import Printer printer = Printer(mode=QPrinter.HighResolution) @@ -6179,7 +6180,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.zoomOut() else: self.zoomIn() @@ -6187,7 +6188,7 @@ return if evt.modifiers() & Qt.ShiftModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.gotoMethodClass(False) else: self.gotoMethodClass(True)
--- a/QScintilla/EditorAssembly.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/EditorAssembly.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTimer -from PyQt4.QtGui import QWidget, QGridLayout, QComboBox +from PyQt5.QtCore import QTimer +from PyQt5.QtWidgets import QWidget, QGridLayout, QComboBox import UI.PixmapCache
--- a/QScintilla/Exporters/ExporterBase.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/ExporterBase.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QFileInfo, QObject -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QFileInfo, QObject, QCoreApplication from E5Gui import E5MessageBox, E5FileDialog @@ -41,7 +40,7 @@ """ filter_ = filter filter_ += ";;" - filter_ += QApplication.translate('Exporter', "All Files (*)") + filter_ += QCoreApplication.translate('Exporter', "All Files (*)") fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( self.editor, self.tr("Export source"),
--- a/QScintilla/Exporters/ExporterHTML.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/ExporterHTML.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,10 @@ import os -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QCursor, QFontInfo, QApplication -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QCursor, QFontInfo +from PyQt5.QtWidgets import QApplication +from PyQt5.Qsci import QsciScintilla from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/ExporterODT.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/ExporterODT.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QApplication, QCursor, QTextDocument, \ - QTextDocumentWriter +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QCursor, QTextDocument, QTextDocumentWriter +from PyQt5.QtWidgets import QApplication from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/ExporterPDF.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/ExporterPDF.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,10 @@ # This code is a port of the C++ code found in SciTE 1.74 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org> -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QCursor, QFontInfo, QApplication -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QCursor, QFontInfo +from PyQt5.QtWidgets import QApplication +from PyQt5.Qsci import QsciScintilla from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/ExporterRTF.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/ExporterRTF.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,10 @@ import time -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QCursor, QFontInfo, QApplication -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QCursor, QFontInfo +from PyQt5.QtWidgets import QApplication +from PyQt5.Qsci import QsciScintilla from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/ExporterTEX.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/ExporterTEX.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,10 @@ import os -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QCursor, QApplication -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QApplication +from PyQt5.Qsci import QsciScintilla from E5Gui import E5MessageBox
--- a/QScintilla/Exporters/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Exporters/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QCoreApplication def getSupportedFormats(): @@ -21,11 +21,11 @@ for the exporters (string) """ supportedFormats = { - "HTML": QApplication.translate('Exporters', "HTML"), - "RTF": QApplication.translate('Exporters', "RTF"), - "PDF": QApplication.translate('Exporters', "PDF"), - "TeX": QApplication.translate('Exporters', "TeX"), - "ODT": QApplication.translate('Exporters', "ODT"), + "HTML": QCoreApplication.translate('Exporters', "HTML"), + "RTF": QCoreApplication.translate('Exporters', "RTF"), + "PDF": QCoreApplication.translate('Exporters', "PDF"), + "TeX": QCoreApplication.translate('Exporters', "TeX"), + "ODT": QCoreApplication.translate('Exporters', "ODT"), } return supportedFormats
--- a/QScintilla/GotoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/GotoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_GotoDialog import Ui_GotoDialog
--- a/QScintilla/Lexers/LexerBash.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerBash.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerBash +from PyQt5.Qsci import QsciLexerBash from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerBatch.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerBatch.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerBatch +from PyQt5.Qsci import QsciLexerBatch from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerCMake.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerCMake.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerCMake +from PyQt5.Qsci import QsciLexerCMake from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerCPP.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerCPP.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerCPP, QsciScintilla +from PyQt5.Qsci import QsciLexerCPP, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerCSS.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerCSS.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerCSS +from PyQt5.Qsci import QsciLexerCSS from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerCSharp.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerCSharp.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerCSharp, QsciScintilla +from PyQt5.Qsci import QsciLexerCSharp, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerCoffeeScript.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerCoffeeScript.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerCoffeeScript +from PyQt5.Qsci import QsciLexerCoffeeScript from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerContainer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerContainer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexer +from PyQt5.Qsci import QsciLexer from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerD.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerD.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerD, QsciScintilla +from PyQt5.Qsci import QsciLexerD, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerDiff.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerDiff.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerDiff +from PyQt5.Qsci import QsciLexerDiff from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerFortran.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerFortran.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerFortran +from PyQt5.Qsci import QsciLexerFortran from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerFortran77.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerFortran77.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerFortran77 +from PyQt5.Qsci import QsciLexerFortran77 from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerHTML.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerHTML.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerHTML +from PyQt5.Qsci import QsciLexerHTML from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerIDL.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerIDL.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerIDL, QsciScintilla +from PyQt5.Qsci import QsciLexerIDL, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerJava.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerJava.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerJava, QsciScintilla +from PyQt5.Qsci import QsciLexerJava, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerJavaScript.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerJavaScript.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerJavaScript, QsciScintilla +from PyQt5.Qsci import QsciLexerJavaScript, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerLua.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerLua.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerLua +from PyQt5.Qsci import QsciLexerLua from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerMakefile.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerMakefile.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerMakefile +from PyQt5.Qsci import QsciLexerMakefile from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerMatlab.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerMatlab.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerMatlab +from PyQt5.Qsci import QsciLexerMatlab from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerOctave.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerOctave.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerOctave +from PyQt5.Qsci import QsciLexerOctave from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerPO.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPO.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerPO +from PyQt5.Qsci import QsciLexerPO from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerPOV.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPOV.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerPOV +from PyQt5.Qsci import QsciLexerPOV from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerPascal.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPascal.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerPascal +from PyQt5.Qsci import QsciLexerPascal from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerPerl.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPerl.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerPerl +from PyQt5.Qsci import QsciLexerPerl from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerPostScript.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPostScript.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerPostScript +from PyQt5.Qsci import QsciLexerPostScript from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerProperties.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerProperties.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerProperties +from PyQt5.Qsci import QsciLexerProperties from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerPygments.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPygments.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,7 +14,7 @@ find_lexer_class from pygments.util import ClassNotFound -from PyQt4.QtGui import QColor, QFont +from PyQt5.QtGui import QColor, QFont from QScintilla.Lexers.LexerContainer import LexerContainer
--- a/QScintilla/Lexers/LexerPython.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerPython.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import re -from PyQt4.Qsci import QsciLexerPython, QsciScintilla +from PyQt5.Qsci import QsciLexerPython, QsciScintilla from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerQSS.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerQSS.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerCSS +from PyQt5.Qsci import QsciLexerCSS from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerRuby.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerRuby.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerRuby +from PyQt5.Qsci import QsciLexerRuby from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerSQL.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerSQL.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerSQL +from PyQt5.Qsci import QsciLexerSQL from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerTCL.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerTCL.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerTCL +from PyQt5.Qsci import QsciLexerTCL from .Lexer import Lexer
--- a/QScintilla/Lexers/LexerTeX.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerTeX.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerTeX +from PyQt5.Qsci import QsciLexerTeX from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerVHDL.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerVHDL.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerVHDL +from PyQt5.Qsci import QsciLexerVHDL from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerXML.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerXML.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerXML +from PyQt5.Qsci import QsciLexerXML from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/LexerYAML.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/LexerYAML.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.Qsci import QsciLexerYAML +from PyQt5.Qsci import QsciLexerYAML from .Lexer import Lexer import Preferences
--- a/QScintilla/Lexers/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Lexers/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import QCoreApplication from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION @@ -80,87 +80,87 @@ (string, string, string) """ supportedLanguages = { - "Bash": [QApplication.translate('Lexers', "Bash"), 'dummy.sh', + "Bash": [QCoreApplication.translate('Lexers', "Bash"), 'dummy.sh', "lexerBash.png"], - "Batch": [QApplication.translate('Lexers', "Batch"), 'dummy.bat', + "Batch": [QCoreApplication.translate('Lexers', "Batch"), 'dummy.bat', "lexerBatch.png"], - "C++": [QApplication.translate('Lexers', "C/C++"), 'dummy.cpp', + "C++": [QCoreApplication.translate('Lexers', "C/C++"), 'dummy.cpp', "lexerCPP.png"], - "C#": [QApplication.translate('Lexers', "C#"), 'dummy.cs', + "C#": [QCoreApplication.translate('Lexers', "C#"), 'dummy.cs', "lexerCsharp.png"], - "CMake": [QApplication.translate('Lexers', "CMake"), 'dummy.cmake', + "CMake": [QCoreApplication.translate('Lexers', "CMake"), 'dummy.cmake', "lexerCMake.png"], - "CSS": [QApplication.translate('Lexers', "CSS"), 'dummy.css', + "CSS": [QCoreApplication.translate('Lexers', "CSS"), 'dummy.css', "lexerCSS.png"], - "D": [QApplication.translate('Lexers', "D"), 'dummy.d', + "D": [QCoreApplication.translate('Lexers', "D"), 'dummy.d', "lexerD.png"], - "Diff": [QApplication.translate('Lexers', "Diff"), 'dummy.diff', + "Diff": [QCoreApplication.translate('Lexers', "Diff"), 'dummy.diff', "lexerDiff.png"], - "Fortran": [QApplication.translate('Lexers', "Fortran"), 'dummy.f95', - "lexerFortran.png"], - "Fortran77": [QApplication.translate('Lexers', "Fortran77"), 'dummy.f', - "lexerFortran.png"], - "HTML": [QApplication.translate('Lexers', "HTML/PHP/XML"), + "Fortran": [QCoreApplication.translate('Lexers', "Fortran"), + 'dummy.f95', "lexerFortran.png"], + "Fortran77": [QCoreApplication.translate('Lexers', "Fortran77"), + 'dummy.f', "lexerFortran.png"], + "HTML": [QCoreApplication.translate('Lexers', "HTML/PHP/XML"), 'dummy.html', "lexerHTML.png"], - "IDL": [QApplication.translate('Lexers', "IDL"), 'dummy.idl', + "IDL": [QCoreApplication.translate('Lexers', "IDL"), 'dummy.idl', "lexerIDL.png"], - "Java": [QApplication.translate('Lexers', "Java"), 'dummy.java', + "Java": [QCoreApplication.translate('Lexers', "Java"), 'dummy.java', "lexerJava.png"], - "JavaScript": [QApplication.translate('Lexers', "JavaScript"), + "JavaScript": [QCoreApplication.translate('Lexers', "JavaScript"), 'dummy.js', "lexerJavaScript.png"], - "Lua": [QApplication.translate('Lexers', "Lua"), 'dummy.lua', + "Lua": [QCoreApplication.translate('Lexers', "Lua"), 'dummy.lua', "lexerLua.png"], - "Makefile": [QApplication.translate('Lexers', "Makefile"), 'dummy.mak', - "lexerMakefile.png"], - "Pascal": [QApplication.translate('Lexers', "Pascal"), 'dummy.pas', + "Makefile": [QCoreApplication.translate('Lexers', "Makefile"), + 'dummy.mak', "lexerMakefile.png"], + "Pascal": [QCoreApplication.translate('Lexers', "Pascal"), 'dummy.pas', "lexerPascal.png"], - "Perl": [QApplication.translate('Lexers', "Perl"), 'dummy.pl', + "Perl": [QCoreApplication.translate('Lexers', "Perl"), 'dummy.pl', "lexerPerl.png"], - "PostScript": [QApplication.translate('Lexers', "PostScript"), + "PostScript": [QCoreApplication.translate('Lexers', "PostScript"), 'dummy.ps', "lexerPostscript.png"], - "Povray": [QApplication.translate('Lexers', "Povray"), 'dummy.pov', + "Povray": [QCoreApplication.translate('Lexers', "Povray"), 'dummy.pov', "lexerPOV.png"], - "Properties": [QApplication.translate('Lexers', "Properties"), + "Properties": [QCoreApplication.translate('Lexers', "Properties"), 'dummy.ini', "lexerProperties.png"], - "Python2": [QApplication.translate('Lexers', "Python2"), 'dummy.py', - "lexerPython.png"], - "Python3": [QApplication.translate('Lexers', "Python3"), 'dummy.py', - "lexerPython3.png"], - "QSS": [QApplication.translate('Lexers', "QSS"), 'dummy.qss', + "Python2": [QCoreApplication.translate('Lexers', "Python2"), + 'dummy.py', "lexerPython.png"], + "Python3": [QCoreApplication.translate('Lexers', "Python3"), + 'dummy.py', "lexerPython3.png"], + "QSS": [QCoreApplication.translate('Lexers', "QSS"), 'dummy.qss', "lexerCSS.png"], - "Ruby": [QApplication.translate('Lexers', "Ruby"), 'dummy.rb', + "Ruby": [QCoreApplication.translate('Lexers', "Ruby"), 'dummy.rb', "lexerRuby.png"], - "SQL": [QApplication.translate('Lexers', "SQL"), 'dummy.sql', + "SQL": [QCoreApplication.translate('Lexers', "SQL"), 'dummy.sql', "lexerSQL.png"], - "TCL": [QApplication.translate('Lexers', "TCL"), 'dummy.tcl', + "TCL": [QCoreApplication.translate('Lexers', "TCL"), 'dummy.tcl', "lexerTCL.png"], - "TeX": [QApplication.translate('Lexers', "TeX"), 'dummy.tex', + "TeX": [QCoreApplication.translate('Lexers', "TeX"), 'dummy.tex', "lexerTeX.png"], - "VHDL": [QApplication.translate('Lexers', "VHDL"), 'dummy.vhd', + "VHDL": [QCoreApplication.translate('Lexers', "VHDL"), 'dummy.vhd', "lexerVHDL.png"], - "XML": [QApplication.translate('Lexers', "XML"), 'dummy.xml', + "XML": [QCoreApplication.translate('Lexers', "XML"), 'dummy.xml', "lexerXML.png"], - "YAML": [QApplication.translate('Lexers', "YAML"), 'dummy.yml', + "YAML": [QCoreApplication.translate('Lexers', "YAML"), 'dummy.yml', "lexerYAML.png"], } if QSCINTILLA_VERSION() >= 0x020501: supportedLanguages.update({ - "Matlab": [QApplication.translate('Lexers', "Matlab"), + "Matlab": [QCoreApplication.translate('Lexers', "Matlab"), 'dummy.m.matlab', "lexerMatlab.png"], - "Octave": [QApplication.translate('Lexers', "Octave"), + "Octave": [QCoreApplication.translate('Lexers', "Octave"), 'dummy.m.octave', "lexerOctave.png"], }) if QSCINTILLA_VERSION() >= 0x020802: supportedLanguages["Gettext"] = \ - [QApplication.translate('Lexers', "Gettext"), 'dummy.po', + [QCoreApplication.translate('Lexers', "Gettext"), 'dummy.po', "lexerGettext.png"] if QSCINTILLA_VERSION() >= 0x020803: supportedLanguages["CoffeeScript"] = \ - [QApplication.translate('Lexers', "CoffeeScript"), 'dummy.coffee', - "lexerCoffeeScript.png"] + [QCoreApplication.translate('Lexers', "CoffeeScript"), + 'dummy.coffee', "lexerCoffeeScript.png"] for name in LexerRegistry: if not name.startswith("Pygments|"): @@ -168,7 +168,8 @@ LexerRegistry[name][:2] + [LexerRegistry[name][6]] supportedLanguages["Guessed"] = \ - [QApplication.translate('Lexers', "Pygments"), 'dummy.pygments', ""] + [QCoreApplication.translate('Lexers', "Pygments"), 'dummy.pygments', + ""] return supportedLanguages @@ -349,140 +350,140 @@ @return file filter list (list of strings or string) """ openFileFiltersList = [ - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Python Files (*.py *.py2 *.py3)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Python GUI Files (*.pyw *.pyw2 *.pyw3)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Pyrex Files (*.pyx)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Quixote Template Files (*.ptl)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Ruby Files (*.rb)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'IDL Files (*.idl)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'C Files (*.h *.c)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'C++ Files (*.h *.hpp *.hh *.cxx *.cpp *.cc)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'C# Files (*.cs)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'HTML Files (*.html *.htm *.asp *.shtml)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'CSS Files (*.css)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'QSS Files (*.qss)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'PHP Files (*.php *.php3 *.php4 *.php5 *.phtml)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'XML Files (*.xml *.xsl *.xslt *.dtd *.svg *.xul *.xsd)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Qt Resource Files (*.qrc)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'D Files (*.d *.di)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Java Files (*.java)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'JavaScript Files (*.js)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'SQL Files (*.sql)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Docbook Files (*.docbook)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Perl Files (*.pl *.pm *.ph)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Lua Files (*.lua)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Tex Files (*.tex *.sty *.aux *.toc *.idx)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Shell Files (*.sh)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Batch Files (*.bat *.cmd)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Diff Files (*.diff *.patch)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Makefiles (*.mak)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Properties Files (*.properties *.ini *.inf *.reg *.cfg' ' *.cnf *.rc)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Povray Files (*.pov)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'CMake Files (CMakeLists.txt *.cmake *.ctest)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'VHDL Files (*.vhd *.vhdl)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'TCL/Tk Files (*.tcl *.tk)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Fortran Files (*.f90 *.f95 *.f2k)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Fortran77 Files (*.f *.for)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Pascal Files (*.dpr *.dpk *.pas *.dfm *.inc *.pp)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'PostScript Files (*.ps)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'YAML Files (*.yaml *.yml)'), ] if QSCINTILLA_VERSION() >= 0x020501: openFileFiltersList.extend([ - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Matlab Files (*.m *.m.matlab)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Octave Files (*.m *.m.octave)'), ]) if QSCINTILLA_VERSION() >= 0x020802: openFileFiltersList.append( - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Gettext Files (*.po)'), ) if QSCINTILLA_VERSION() >= 0x020803: openFileFiltersList.append( - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'CoffeeScript Files (*.coffee)'), ) @@ -497,7 +498,7 @@ openFileFiltersList.sort() if includeAll: openFileFiltersList.append( - QApplication.translate('Lexers', 'All Files (*)')) + QCoreApplication.translate('Lexers', 'All Files (*)')) if asString: return ';;'.join(openFileFiltersList) @@ -519,175 +520,175 @@ @return file filter list (list of strings or string) """ saveFileFiltersList = [ - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Python2 Files (*.py2)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Python3 Files (*.py)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Python2 GUI Files (*.pyw2)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Python3 GUI Files (*.pyw)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Pyrex Files (*.pyx)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Quixote Template Files (*.ptl)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Ruby Files (*.rb)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "IDL Files (*.idl)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "C Files (*.c)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "C++ Files (*.cpp)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "C++/C Header Files (*.h)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "C# Files (*.cs)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "HTML Files (*.html)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "PHP Files (*.php)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "ASP Files (*.asp)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "CSS Files (*.css)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "QSS Files (*.qss)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "XML Files (*.xml)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "XSL Files (*.xsl)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "DTD Files (*.dtd)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Qt Resource Files (*.qrc)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "D Files (*.d)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "D Interface Files (*.di)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Java Files (*.java)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "JavaScript Files (*.js)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "SQL Files (*.sql)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Docbook Files (*.docbook)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Perl Files (*.pl)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Perl Module Files (*.pm)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Lua Files (*.lua)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Shell Files (*.sh)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Batch Files (*.bat)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "TeX Files (*.tex)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "TeX Template Files (*.sty)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Diff Files (*.diff)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Make Files (*.mak)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Properties Files (*.ini)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', "Configuration Files (*.cfg)"), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Povray Files (*.pov)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'CMake Files (CMakeLists.txt)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'CMake Macro Files (*.cmake)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'VHDL Files (*.vhd)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'TCL Files (*.tcl)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Tk Files (*.tk)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Fortran Files (*.f95)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Fortran77 Files (*.f)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Pascal Files (*.pas)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'PostScript Files (*.ps)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'YAML Files (*.yml)'), ] if QSCINTILLA_VERSION() >= 0x020501: saveFileFiltersList.extend([ - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Matlab Files (*.m)'), - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Octave Files (*.m.octave)'), ]) if QSCINTILLA_VERSION() >= 0x020802: saveFileFiltersList.append( - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'Gettext Files (*.po)'), ) if QSCINTILLA_VERSION() >= 0x020803: saveFileFiltersList.append( - QApplication.translate( + QCoreApplication.translate( 'Lexers', 'CoffeeScript Files (*.coffee)'), ) @@ -703,7 +704,7 @@ if includeAll: saveFileFiltersList.append( - QApplication.translate('Lexers', 'All Files (*)')) + QCoreApplication.translate('Lexers', 'All Files (*)')) if asString: return ';;'.join(saveFileFiltersList)
--- a/QScintilla/MiniEditor.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/MiniEditor.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,12 +12,13 @@ import os import re -from PyQt4.QtCore import QSignalMapper, QPoint, QTimer, QFileInfo, \ - pyqtSignal, QSize, QRegExp, Qt -from PyQt4.QtGui import QWidget, QCursor, QPrinter, QKeySequence, \ - QPrintDialog, QWhatsThis, QActionGroup, QDialog, QAbstractPrintDialog, \ - QInputDialog, QApplication, QMenu, QPalette, QFont, QVBoxLayout, QLabel -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import QSignalMapper, QPoint, QTimer, QFileInfo, \ + pyqtSignal, QSize, QRegExp, Qt, QCoreApplication +from PyQt5.QtGui import QCursor, QKeySequence, QPalette, QFont +from PyQt5.QtWidgets import QWidget, QWhatsThis, QActionGroup, QDialog, \ + QInputDialog, QApplication, QMenu, QVBoxLayout, QLabel +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog +from PyQt5.Qsci import QsciScintilla from E5Gui.E5Action import E5Action, createActionGroup from E5Gui import E5MessageBox, E5FileDialog @@ -453,7 +454,7 @@ self.printPreviewAct = E5Action( self.tr('Print Preview'), UI.PixmapCache.getIcon("printPreview.png"), - QApplication.translate('ViewManager', 'Print Preview'), + QCoreApplication.translate('ViewManager', 'Print Preview'), 0, 0, self, 'vm_file_print_preview') self.printPreviewAct.setStatusTip(self.tr( 'Print preview of the current file')) @@ -576,401 +577,426 @@ self.editorActGrp = createActionGroup(self) act = E5Action( - QApplication.translate('ViewManager', 'Move left one character'), - QApplication.translate('ViewManager', 'Move left one character'), - QKeySequence(QApplication.translate('ViewManager', 'Left')), 0, + QCoreApplication.translate('ViewManager', + 'Move left one character'), + QCoreApplication.translate('ViewManager', + 'Move left one character'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Left')), 0, self.editorActGrp, 'vm_edit_move_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT) if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+B'))) + QCoreApplication.translate('ViewManager', 'Meta+B'))) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move right one character'), - QApplication.translate('ViewManager', 'Move right one character'), - QKeySequence(QApplication.translate('ViewManager', 'Right')), 0, - self.editorActGrp, 'vm_edit_move_right_char') + QCoreApplication.translate('ViewManager', + 'Move right one character'), + QCoreApplication.translate('ViewManager', + 'Move right one character'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Right')), + 0, self.editorActGrp, 'vm_edit_move_right_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+F'))) + QCoreApplication.translate('ViewManager', 'Meta+F'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move up one line'), - QApplication.translate('ViewManager', 'Move up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Up')), 0, + QCoreApplication.translate('ViewManager', 'Move up one line'), + QCoreApplication.translate('ViewManager', 'Move up one line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Up')), 0, self.editorActGrp, 'vm_edit_move_up_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+P'))) + QCoreApplication.translate('ViewManager', 'Meta+P'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move down one line'), - QApplication.translate('ViewManager', 'Move down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Down')), 0, + QCoreApplication.translate('ViewManager', 'Move down one line'), + QCoreApplication.translate('ViewManager', 'Move down one line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Down')), 0, self.editorActGrp, 'vm_edit_move_down_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+N'))) + QCoreApplication.translate('ViewManager', 'Meta+N'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move left one word part'), - QApplication.translate('ViewManager', 'Move left one word part'), + QCoreApplication.translate('ViewManager', + 'Move left one word part'), + QCoreApplication.translate('ViewManager', + 'Move left one word part'), 0, 0, self.editorActGrp, 'vm_edit_move_left_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move right one word part'), - QApplication.translate('ViewManager', 'Move right one word part'), + QCoreApplication.translate('ViewManager', + 'Move right one word part'), + QCoreApplication.translate('ViewManager', + 'Move right one word part'), 0, 0, self.editorActGrp, 'vm_edit_move_right_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move left one word'), - QApplication.translate('ViewManager', 'Move left one word'), + QCoreApplication.translate('ViewManager', 'Move left one word'), + QCoreApplication.translate('ViewManager', 'Move left one word'), 0, 0, self.editorActGrp, 'vm_edit_move_left_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Left'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Left'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move right one word'), - QApplication.translate('ViewManager', 'Move right one word'), + QCoreApplication.translate('ViewManager', 'Move right one word'), + QCoreApplication.translate('ViewManager', 'Move right one word'), 0, 0, self.editorActGrp, 'vm_edit_move_right_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Right'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in document line'), 0, 0, self.editorActGrp, 'vm_edit_move_first_visible_char') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Home'))) + QCoreApplication.translate('ViewManager', 'Home'))) self.esm.setMapping(act, QsciScintilla.SCI_VCHOME) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display line'), 0, 0, self.editorActGrp, 'vm_edit_move_start_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Left'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Left'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Home'))) + QCoreApplication.translate('ViewManager', 'Alt+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of document line'), 0, 0, self.editorActGrp, 'vm_edit_move_end_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+E'))) + QCoreApplication.translate('ViewManager', 'Meta+E'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'End'))) + QCoreApplication.translate('ViewManager', 'End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Scroll view down one line'), - QApplication.translate('ViewManager', 'Scroll view down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')), + QCoreApplication.translate('ViewManager', + 'Scroll view down one line'), + QCoreApplication.translate('ViewManager', + 'Scroll view down one line'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_scroll_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Scroll view up one line'), - QApplication.translate('ViewManager', 'Scroll view up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0, - self.editorActGrp, 'vm_edit_scroll_up_line') + QCoreApplication.translate('ViewManager', + 'Scroll view up one line'), + QCoreApplication.translate('ViewManager', + 'Scroll view up one line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Ctrl+Up')), + 0, self.editorActGrp, 'vm_edit_scroll_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move up one paragraph'), - QApplication.translate('ViewManager', 'Move up one paragraph'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0, - self.editorActGrp, 'vm_edit_move_up_para') + QCoreApplication.translate('ViewManager', 'Move up one paragraph'), + QCoreApplication.translate('ViewManager', 'Move up one paragraph'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Alt+Up')), + 0, self.editorActGrp, 'vm_edit_move_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move down one paragraph'), - QApplication.translate('ViewManager', 'Move down one paragraph'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0, - self.editorActGrp, 'vm_edit_move_down_para') + QCoreApplication.translate('ViewManager', + 'Move down one paragraph'), + QCoreApplication.translate('ViewManager', + 'Move down one paragraph'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Down')), + 0, self.editorActGrp, 'vm_edit_move_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move up one page'), - QApplication.translate('ViewManager', 'Move up one page'), - QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0, + QCoreApplication.translate('ViewManager', 'Move up one page'), + QCoreApplication.translate('ViewManager', 'Move up one page'), + QKeySequence(QCoreApplication.translate('ViewManager', 'PgUp')), 0, self.editorActGrp, 'vm_edit_move_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move down one page'), - QApplication.translate('ViewManager', 'Move down one page'), - QKeySequence(QApplication.translate('ViewManager', 'PgDown')), 0, - self.editorActGrp, 'vm_edit_move_down_page') + QCoreApplication.translate('ViewManager', 'Move down one page'), + QCoreApplication.translate('ViewManager', 'Move down one page'), + QKeySequence(QCoreApplication.translate('ViewManager', 'PgDown')), + 0, self.editorActGrp, 'vm_edit_move_down_page') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+V'))) + QCoreApplication.translate('ViewManager', 'Meta+V'))) self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move to start of document'), - QApplication.translate('ViewManager', 'Move to start of document'), + QCoreApplication.translate('ViewManager', + 'Move to start of document'), + QCoreApplication.translate('ViewManager', + 'Move to start of document'), 0, 0, self.editorActGrp, 'vm_edit_move_start_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Up'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Up'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Home'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move to end of document'), - QApplication.translate('ViewManager', 'Move to end of document'), + QCoreApplication.translate('ViewManager', + 'Move to end of document'), + QCoreApplication.translate('ViewManager', + 'Move to end of document'), 0, 0, self.editorActGrp, 'vm_edit_move_end_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Down'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Down'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+End'))) + QCoreApplication.translate('ViewManager', 'Ctrl+End'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Indent one level'), - QApplication.translate('ViewManager', 'Indent one level'), - QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0, + QCoreApplication.translate('ViewManager', 'Indent one level'), + QCoreApplication.translate('ViewManager', 'Indent one level'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Tab')), 0, self.editorActGrp, 'vm_edit_indent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_TAB) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Unindent one level'), - QApplication.translate('ViewManager', 'Unindent one level'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')), + QCoreApplication.translate('ViewManager', 'Unindent one level'), + QCoreApplication.translate('ViewManager', 'Unindent one level'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Tab')), 0, self.editorActGrp, 'vm_edit_unindent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Left')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Left')), 0, self.editorActGrp, 'vm_edit_extend_selection_left_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+B'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+B'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Right')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Right')), 0, self.editorActGrp, 'vm_edit_extend_selection_right_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+F'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+F'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Up')), 0, - self.editorActGrp, 'vm_edit_extend_selection_up_line') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Up')), + 0, self.editorActGrp, 'vm_edit_extend_selection_up_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+P'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+P'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Down')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+N'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+N'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word part'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word part'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_left_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word part'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word part'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_right_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_left_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Left'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Left'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_right_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Right'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in document' ' line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in document' ' line'), @@ -978,49 +1004,49 @@ self.editorActGrp, 'vm_edit_extend_selection_first_visible_char') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Shift+Home'))) + QCoreApplication.translate('ViewManager', 'Shift+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document line'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+E'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+E'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Shift+End'))) + QCoreApplication.translate('ViewManager', 'Shift+End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one paragraph'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one paragraph'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Up')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUPEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one paragraph'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one paragraph'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+Down')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWNEXTEND) @@ -1028,91 +1054,93 @@ self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one page'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Shift+PgDown')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_page') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+V'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+V'))) self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_start_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Up'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Up'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Home'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTARTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Down'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Down'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+End'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+End'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( - 'ViewManager', - 'Delete previous character'), - QApplication.translate('ViewManager', 'Delete previous character'), - QKeySequence(QApplication.translate('ViewManager', 'Backspace')), + QCoreApplication.translate('ViewManager', + 'Delete previous character'), + QCoreApplication.translate('ViewManager', + 'Delete previous character'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Backspace')), 0, self.editorActGrp, 'vm_edit_delete_previous_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+H'))) + QCoreApplication.translate('ViewManager', 'Meta+H'))) else: act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Shift+Backspace'))) + QCoreApplication.translate('ViewManager', 'Shift+Backspace'))) self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete previous character if not at start of line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete previous character if not at start of line'), 0, 0, @@ -1122,194 +1150,203 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete current character'), - QApplication.translate('ViewManager', 'Delete current character'), - QKeySequence(QApplication.translate('ViewManager', 'Del')), 0, + QCoreApplication.translate('ViewManager', + 'Delete current character'), + QCoreApplication.translate('ViewManager', + 'Delete current character'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Del')), 0, self.editorActGrp, 'vm_edit_delete_current_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+D'))) + QCoreApplication.translate('ViewManager', 'Meta+D'))) self.esm.setMapping(act, QsciScintilla.SCI_CLEAR) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete word to left'), - QApplication.translate('ViewManager', 'Delete word to left'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Backspace')), + QCoreApplication.translate('ViewManager', 'Delete word to left'), + QCoreApplication.translate('ViewManager', 'Delete word to left'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_word_left') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDLEFT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete word to right'), - QApplication.translate('ViewManager', 'Delete word to right'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0, - self.editorActGrp, 'vm_edit_delete_word_right') + QCoreApplication.translate('ViewManager', 'Delete word to right'), + QCoreApplication.translate('ViewManager', 'Delete word to right'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Del')), + 0, self.editorActGrp, 'vm_edit_delete_word_right') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete line to left'), - QApplication.translate('ViewManager', 'Delete line to left'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+Backspace')), + QCoreApplication.translate('ViewManager', 'Delete line to left'), + QCoreApplication.translate('ViewManager', 'Delete line to left'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_line_left') self.esm.setMapping(act, QsciScintilla.SCI_DELLINELEFT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete line to right'), - QApplication.translate('ViewManager', 'Delete line to right'), + QCoreApplication.translate('ViewManager', 'Delete line to right'), + QCoreApplication.translate('ViewManager', 'Delete line to right'), 0, 0, self.editorActGrp, 'vm_edit_delete_line_right') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+K'))) + QCoreApplication.translate('ViewManager', 'Meta+K'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Del'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Del'))) self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Insert new line'), - QApplication.translate('ViewManager', 'Insert new line'), - QKeySequence(QApplication.translate('ViewManager', 'Return')), - QKeySequence(QApplication.translate('ViewManager', 'Enter')), + QCoreApplication.translate('ViewManager', 'Insert new line'), + QCoreApplication.translate('ViewManager', 'Insert new line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Return')), + QKeySequence(QCoreApplication.translate('ViewManager', 'Enter')), self.editorActGrp, 'vm_edit_insert_line') self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete current line'), - QApplication.translate('ViewManager', 'Delete current line'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+L')), + QCoreApplication.translate('ViewManager', 'Delete current line'), + QCoreApplication.translate('ViewManager', 'Delete current line'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+L')), 0, self.editorActGrp, 'vm_edit_delete_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDELETE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Duplicate current line'), - QApplication.translate('ViewManager', 'Duplicate current line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0, - self.editorActGrp, 'vm_edit_duplicate_current_line') + QCoreApplication.translate('ViewManager', + 'Duplicate current line'), + QCoreApplication.translate('ViewManager', + 'Duplicate current line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Ctrl+D')), + 0, self.editorActGrp, 'vm_edit_duplicate_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Swap current and previous lines'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Swap current and previous lines'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0, - self.editorActGrp, 'vm_edit_swap_current_previous_line') + QKeySequence(QCoreApplication.translate('ViewManager', 'Ctrl+T')), + 0, self.editorActGrp, 'vm_edit_swap_current_previous_line') self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Cut current line'), - QApplication.translate('ViewManager', 'Cut current line'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+L')), + QCoreApplication.translate('ViewManager', 'Cut current line'), + QCoreApplication.translate('ViewManager', 'Cut current line'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+L')), 0, self.editorActGrp, 'vm_edit_cut_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECUT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Copy current line'), - QApplication.translate('ViewManager', 'Copy current line'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+T')), + QCoreApplication.translate('ViewManager', 'Copy current line'), + QCoreApplication.translate('ViewManager', 'Copy current line'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+T')), 0, self.editorActGrp, 'vm_edit_copy_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECOPY) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Toggle insert/overtype'), - QApplication.translate('ViewManager', 'Toggle insert/overtype'), - QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0, + QCoreApplication.translate('ViewManager', + 'Toggle insert/overtype'), + QCoreApplication.translate('ViewManager', + 'Toggle insert/overtype'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Ins')), 0, self.editorActGrp, 'vm_edit_toggle_insert_overtype') self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to lower case'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to lower case'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+U')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+U')), 0, self.editorActGrp, 'vm_edit_convert_selection_lower') self.esm.setMapping(act, QsciScintilla.SCI_LOWERCASE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to upper case'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to upper case'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+U')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+U')), 0, self.editorActGrp, 'vm_edit_convert_selection_upper') self.esm.setMapping(act, QsciScintilla.SCI_UPPERCASE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display line'), 0, 0, self.editorActGrp, 'vm_edit_move_end_displayed_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Right'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+End'))) + QCoreApplication.translate('ViewManager', 'Alt+End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display line'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_displayed_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Formfeed'), - QApplication.translate('ViewManager', 'Formfeed'), + QCoreApplication.translate('ViewManager', 'Formfeed'), + QCoreApplication.translate('ViewManager', 'Formfeed'), 0, 0, self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) @@ -1317,87 +1354,88 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Escape'), - QApplication.translate('ViewManager', 'Escape'), - QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0, + QCoreApplication.translate('ViewManager', 'Escape'), + QCoreApplication.translate('ViewManager', 'Escape'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Esc')), 0, self.editorActGrp, 'vm_edit_escape') self.esm.setMapping(act, QsciScintilla.SCI_CANCEL) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one line'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Down')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+N'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+N'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Ctrl+Up')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+P'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+P'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEUPRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection left one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection left one character'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Left')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_left_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+B'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+B'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection right one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection right one character'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Ctrl+Right')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Ctrl+Right')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_right_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+F'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+F'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to first' ' visible character in document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to first' ' visible character in document line'), @@ -1406,70 +1444,70 @@ 'vm_edit_extend_rect_selection_first_visible_char') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Home'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to end of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to end of document line'), 0, 0, self.editorActGrp, 'vm_edit_extend_rect_selection_end_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+E'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+E'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+End'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+PgUp')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one page'), - QKeySequence(QApplication.translate('ViewManager', - 'Alt+Shift+PgDown')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_page') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+V'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+V'))) self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Duplicate current selection'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Duplicate current selection'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+D')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') self.esm.setMapping(act, QsciScintilla.SCI_SELECTIONDUPLICATE) act.triggered.connect(self.esm.map) @@ -1477,84 +1515,85 @@ if hasattr(QsciScintilla, "SCI_SCROLLTOSTART"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to start of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to start of document'), 0, 0, self.editorActGrp, 'vm_edit_scroll_start_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Home'))) + QCoreApplication.translate('ViewManager', 'Home'))) self.esm.setMapping(act, QsciScintilla.SCI_SCROLLTOSTART) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_SCROLLTOEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to end of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to end of document'), 0, 0, self.editorActGrp, 'vm_edit_scroll_end_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'End'))) + QCoreApplication.translate('ViewManager', 'End'))) self.esm.setMapping(act, QsciScintilla.SCI_SCROLLTOEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_VERTICALCENTRECARET"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll vertically to center current line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll vertically to center current line'), 0, 0, self.editorActGrp, 'vm_edit_scroll_vertically_center') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+L'))) + QCoreApplication.translate('ViewManager', 'Meta+L'))) self.esm.setMapping(act, QsciScintilla.SCI_VERTICALCENTRECARET) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_WORDRIGHTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of next word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of next word'), 0, 0, self.editorActGrp, 'vm_edit_move_end_next_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_WORDRIGHTENDEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of next word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of next word'), 0, 0, self.editorActGrp, 'vm_edit_select_end_next_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Right'))) + QCoreApplication.translate('ViewManager', + 'Alt+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTENDEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_WORDLEFTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of previous word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of previous word'), 0, 0, self.editorActGrp, 'vm_edit_move_end_previous_word') @@ -1564,9 +1603,9 @@ if hasattr(QsciScintilla, "SCI_WORDLEFTENDEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of previous word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of previous word'), 0, 0, self.editorActGrp, 'vm_edit_select_end_previous_word') @@ -1576,25 +1615,25 @@ if hasattr(QsciScintilla, "SCI_HOME"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of document line'), 0, 0, self.editorActGrp, 'vm_edit_move_start_document_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+A'))) + QCoreApplication.translate('ViewManager', 'Meta+A'))) self.esm.setMapping(act, QsciScintilla.SCI_HOME) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMEEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document line'), 0, 0, @@ -1602,34 +1641,35 @@ 'vm_edit_extend_selection_start_document_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+A'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+A'))) self.esm.setMapping(act, QsciScintilla.SCI_HOME) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMERECTEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to start of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to start of document line'), 0, 0, self.editorActGrp, 'vm_edit_select_rect_start_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+A'))) + QCoreApplication.translate('ViewManager', + 'Meta+Alt+Shift+A'))) self.esm.setMapping(act, QsciScintilla.SCI_HOMERECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMEDISPLAYEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display line'), 0, 0, @@ -1637,17 +1677,18 @@ 'vm_edit_extend_selection_start_display_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Left'))) + QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMEWRAP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display or document line'), 0, 0, @@ -1658,10 +1699,10 @@ if hasattr(QsciScintilla, "SCI_HOMEWRAPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display or document line'), 0, 0, @@ -1673,11 +1714,11 @@ if hasattr(QsciScintilla, "SCI_VCHOMEWRAP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in display' ' or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in display' ' or document line'), @@ -1690,11 +1731,11 @@ if hasattr(QsciScintilla, "SCI_VCHOMEWRAPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in' ' display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in' ' display or document line'), @@ -1707,10 +1748,10 @@ if hasattr(QsciScintilla, "SCI_LINEENDWRAP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display or document line'), 0, 0, @@ -1721,10 +1762,10 @@ if hasattr(QsciScintilla, "SCI_LINEENDWRAPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display or document line'), 0, 0, @@ -1736,9 +1777,9 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move up one page'), 0, 0, self.editorActGrp, 'vm_edit_stuttered_move_up_page') @@ -1748,10 +1789,10 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection up one page'), 0, 0, @@ -1763,9 +1804,9 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWN"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move down one page'), 0, 0, self.editorActGrp, 'vm_edit_stuttered_move_down_page') @@ -1775,10 +1816,10 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWNEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection down one page'), 0, 0, @@ -1790,27 +1831,27 @@ if hasattr(QsciScintilla, "SCI_DELWORDRIGHTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete right to end of next word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete right to end of next word'), 0, 0, self.editorActGrp, 'vm_edit_delete_right_end_next_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Del'))) + QCoreApplication.translate('ViewManager', 'Alt+Del'))) self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESUP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines up one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines up one line'), 0, 0, @@ -1821,10 +1862,10 @@ if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESDOWN"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines down one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines down one line'), 0, 0, @@ -1834,14 +1875,14 @@ self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Duplicate current selection'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Duplicate current selection'), - QKeySequence(QApplication.translate('ViewManager', - 'Ctrl+Shift+D')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') self.esm.setMapping(act, QsciScintilla.SCI_SELECTIONDUPLICATE) act.triggered.connect(self.esm.map) @@ -1855,16 +1896,16 @@ commands. """ self.searchAct = E5Action( - QApplication.translate('ViewManager', 'Search'), + QCoreApplication.translate('ViewManager', 'Search'), UI.PixmapCache.getIcon("find.png"), - QApplication.translate('ViewManager', '&Search...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Search...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+F", "Search|Search")), 0, self, 'vm_search') self.searchAct.setStatusTip( - QApplication.translate('ViewManager', 'Search for a text')) - self.searchAct.setWhatsThis(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search for a text')) + self.searchAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search</b>""" """<p>Search for some text in the current editor. A""" @@ -1875,16 +1916,16 @@ self.searchActions.append(self.searchAct) self.searchNextAct = E5Action( - QApplication.translate('ViewManager', 'Search next'), + QCoreApplication.translate('ViewManager', 'Search next'), UI.PixmapCache.getIcon("findNext.png"), - QApplication.translate('ViewManager', 'Search &next'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search &next'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "F3", "Search|Search next")), 0, self, 'vm_search_next') - self.searchNextAct.setStatusTip(QApplication.translate( + self.searchNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search next occurrence of text')) - self.searchNextAct.setWhatsThis(QApplication.translate( + self.searchNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search next</b>""" """<p>Search the next occurrence of some text in the current""" @@ -1895,16 +1936,16 @@ self.searchActions.append(self.searchNextAct) self.searchPrevAct = E5Action( - QApplication.translate('ViewManager', 'Search previous'), + QCoreApplication.translate('ViewManager', 'Search previous'), UI.PixmapCache.getIcon("findPrev.png"), - QApplication.translate('ViewManager', 'Search &previous'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search &previous'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+F3", "Search|Search previous")), 0, self, 'vm_search_previous') - self.searchPrevAct.setStatusTip(QApplication.translate( + self.searchPrevAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search previous occurrence of text')) - self.searchPrevAct.setWhatsThis(QApplication.translate( + self.searchPrevAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search previous</b>""" """<p>Search the previous occurrence of some text in the""" @@ -1915,17 +1956,17 @@ self.searchActions.append(self.searchPrevAct) self.searchClearMarkersAct = E5Action( - QApplication.translate('ViewManager', - 'Clear search markers'), + QCoreApplication.translate('ViewManager', + 'Clear search markers'), UI.PixmapCache.getIcon("findClear.png"), - QApplication.translate('ViewManager', 'Clear search markers'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Clear search markers'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+3", "Search|Clear search markers")), 0, self, 'vm_clear_search_markers') - self.searchClearMarkersAct.setStatusTip(QApplication.translate( + self.searchClearMarkersAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Clear all displayed search markers')) - self.searchClearMarkersAct.setWhatsThis(QApplication.translate( + self.searchClearMarkersAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Clear search markers</b>""" """<p>Clear all displayed search markers.</p>""" @@ -1935,15 +1976,15 @@ self.searchActions.append(self.searchClearMarkersAct) self.replaceAct = E5Action( - QApplication.translate('ViewManager', 'Replace'), - QApplication.translate('ViewManager', '&Replace...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Replace'), + QCoreApplication.translate('ViewManager', '&Replace...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+R", "Search|Replace")), 0, self, 'vm_search_replace') - self.replaceAct.setStatusTip(QApplication.translate( + self.replaceAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Replace some text')) - self.replaceAct.setWhatsThis(QApplication.translate( + self.replaceAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Replace</b>""" """<p>Search for some text in the current editor and replace""" @@ -2513,7 +2554,7 @@ """ Private slot to show a print preview of the text. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog from .Printer import Printer printer = Printer(mode=QPrinter.HighResolution)
--- a/QScintilla/Printer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Printer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTime, QDate, Qt -from PyQt4.QtGui import QColor, QPrinter, QApplication -from PyQt4.Qsci import QsciPrinter +from PyQt5.QtCore import QTime, QDate, Qt, QCoreApplication +from PyQt5.QtGui import QColor +from PyQt5.QtPrintSupport import QPrinter +from PyQt5.Qsci import QsciPrinter import Preferences @@ -62,7 +63,7 @@ """ fn = self.docName() - header = QApplication.translate( + header = QCoreApplication.translate( 'Printer', '{0} - Printed on {1}, {2} - Page {3}')\ .format(fn, self.date, self.time, pagenr)
--- a/QScintilla/QsciScintillaCompat.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/QsciScintillaCompat.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt -from PyQt4.QtGui import QPalette, QColor, QApplication -from PyQt4.Qsci import QsciScintillaBase, QsciScintilla, \ +from PyQt5.QtCore import pyqtSignal, Qt +from PyQt5.QtGui import QPalette, QColor +from PyQt5.QtWidgets import QApplication +from PyQt5.Qsci import QsciScintillaBase, QsciScintilla, \ QSCINTILLA_VERSION as QSCIQSCINTILLA_VERSION ###############################################################################
--- a/QScintilla/ReplaceWidget.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/ReplaceWidget.ui Sun Jun 29 20:13:56 2014 +0200 @@ -60,9 +60,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -130,9 +127,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/QScintilla/SearchReplaceWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/SearchReplaceWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QHBoxLayout, QToolButton, QScrollArea, \ +from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot +from PyQt5.QtWidgets import QWidget, QHBoxLayout, QToolButton, QScrollArea, \ QSizePolicy, QFrame from .Editor import Editor
--- a/QScintilla/SearchWidget.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/SearchWidget.ui Sun Jun 29 20:13:56 2014 +0200 @@ -60,9 +60,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/QScintilla/Shell.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/Shell.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,10 +12,11 @@ import sys import re -from PyQt4.QtCore import pyqtSignal, QFileInfo, Qt, QEvent -from PyQt4.QtGui import QDialog, QInputDialog, QApplication, QClipboard, \ - QMenu, QPalette, QFont, QWidget, QHBoxLayout, QVBoxLayout, QShortcut -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent +from PyQt5.QtGui import QClipboard, QPalette, QFont +from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \ + QWidget, QHBoxLayout, QVBoxLayout, QShortcut +from PyQt5.Qsci import QsciScintilla from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -856,7 +857,7 @@ @param evt reference to the wheel event (QWheelEvent) """ if evt.modifiers() & Qt.ControlModifier: - if evt.delta() < 0: + if evt.angleDelta().y() < 0: self.zoomOut() else: self.zoomIn()
--- a/QScintilla/ShellHistoryDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/ShellHistoryDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QListWidgetItem, QItemSelectionModel, QDialog +from PyQt5.QtCore import pyqtSlot, QItemSelectionModel +from PyQt5.QtWidgets import QListWidgetItem, QDialog from .Ui_ShellHistoryDialog import Ui_ShellHistoryDialog
--- a/QScintilla/SortOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/SortOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_SortOptionsDialog import Ui_SortOptionsDialog
--- a/QScintilla/SpellChecker.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/SpellChecker.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,7 +14,7 @@ import os import sys -from PyQt4.QtCore import QTimer, QObject +from PyQt5.QtCore import QTimer, QObject import Preferences import Utilities
--- a/QScintilla/SpellCheckingDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/SpellCheckingDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog from .Ui_SpellCheckingDialog import Ui_SpellCheckingDialog
--- a/QScintilla/SpellingDictionaryEditDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/SpellingDictionaryEditDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot, Qt -from PyQt4.QtGui import QDialog, QStringListModel, QSortFilterProxyModel +from PyQt5.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel +from PyQt5.QtWidgets import QDialog from .Ui_SpellingDictionaryEditDialog import Ui_SpellingDictionaryEditDialog
--- a/QScintilla/TypingCompleters/CompleterBase.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/TypingCompleters/CompleterBase.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,7 +13,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject +from PyQt5.QtCore import QObject class CompleterBase(QObject):
--- a/QScintilla/TypingCompleters/CompleterPython.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/TypingCompleters/CompleterPython.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,8 +15,8 @@ import re -from PyQt4.QtCore import QRegExp -from PyQt4.Qsci import QsciLexerPython +from PyQt5.QtCore import QRegExp +from PyQt5.Qsci import QsciLexerPython from .CompleterBase import CompleterBase
--- a/QScintilla/TypingCompleters/CompleterRuby.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/TypingCompleters/CompleterRuby.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import re -from PyQt4.QtCore import QRegExp -from PyQt4.Qsci import QsciLexerRuby +from PyQt5.QtCore import QRegExp +from PyQt5.Qsci import QsciLexerRuby from .CompleterBase import CompleterBase
--- a/QScintilla/ZoomDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/QScintilla/ZoomDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_ZoomDialog import Ui_ZoomDialog
--- a/Snapshot/SnapWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Snapshot/SnapWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,15 +10,16 @@ from __future__ import unicode_literals # -# SnapWidget and its associated modules are PyQt4 ports of Ksnapshot. +# SnapWidget and its associated modules are PyQt5 ports of Ksnapshot. # import os -from PyQt4.QtCore import pyqtSlot, QFile, QFileInfo, QTimer, QPoint, \ +from PyQt5.QtCore import pyqtSlot, QFile, QFileInfo, QTimer, QPoint, \ QMimeData, Qt, QEvent, QRegExp, qVersion -from PyQt4.QtGui import QWidget, QImageWriter, QApplication, QPixmap, \ - QCursor, QDrag, QShortcut, QKeySequence, QDesktopServices +from PyQt5.QtGui import QImageWriter, QPixmap, QCursor, QDrag, QKeySequence, \ + QDesktopServices +from PyQt5.QtWidgets import QWidget, QApplication, QShortcut from E5Gui import E5FileDialog, E5MessageBox
--- a/Snapshot/SnapshotFreehandGrabber.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Snapshot/SnapshotFreehandGrabber.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion -from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, \ - QPainter, QPalette, QToolTip, QPolygon, QPen, QBrush, QPaintEngine +from PyQt5.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion +from PyQt5.QtGui import QPixmap, QColor, QRegion, QPainter, QPalette, \ + QPolygon, QPen, QBrush, QPaintEngine +from PyQt5.QtWidgets import QWidget, QApplication, QToolTip def drawPolygon(painter, polygon, outline, fill=QColor()):
--- a/Snapshot/SnapshotPreview.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Snapshot/SnapshotPreview.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QPoint, Qt -from PyQt4.QtGui import QLabel, QApplication +from PyQt5.QtCore import pyqtSignal, QPoint, Qt +from PyQt5.QtWidgets import QLabel, QApplication class SnapshotPreview(QLabel):
--- a/Snapshot/SnapshotRegionGrabber.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Snapshot/SnapshotRegionGrabber.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion -from PyQt4.QtGui import QWidget, QPixmap, QColor, QRegion, QApplication, \ - QPainter, QPalette, QToolTip, QPaintEngine, QPen, QBrush +from PyQt5.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, qVersion +from PyQt5.QtGui import QPixmap, QColor, QRegion, QPainter, QPalette, \ + QPaintEngine, QPen, QBrush +from PyQt5.QtWidgets import QWidget, QApplication, QToolTip def drawRect(painter, rect, outline, fill=QColor()):
--- a/Snapshot/SnapshotTimer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Snapshot/SnapshotTimer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, QTimer, QRect -from PyQt4.QtGui import QWidget, QApplication, QPainter, QToolTip, QPalette +from PyQt5.QtCore import pyqtSignal, Qt, QTimer, QRect +from PyQt5.QtGui import QPainter, QPalette +from PyQt5.QtWidgets import QWidget, QApplication, QToolTip class SnapshotTimer(QWidget):
--- a/SqlBrowser/SqlBrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/SqlBrowser/SqlBrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QTimer, QUrl -from PyQt4.QtGui import QKeySequence, qApp -from PyQt4.QtSql import QSqlError, QSqlDatabase +from PyQt5.QtCore import QTimer, QUrl +from PyQt5.QtGui import QKeySequence +from PyQt5.QtWidgets import qApp +from PyQt5.QtSql import QSqlError, QSqlDatabase from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/SqlBrowser/SqlBrowserWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/SqlBrowser/SqlBrowserWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot -from PyQt4.QtGui import QWidget, QStandardItemModel, QDialog, QAbstractItemView -from PyQt4.QtSql import QSqlDatabase, QSqlError, QSqlTableModel, \ +from PyQt5.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot +from PyQt5.QtGui import QStandardItemModel +from PyQt5.QtWidgets import QWidget, QDialog, QAbstractItemView +from PyQt5.QtSql import QSqlDatabase, QSqlError, QSqlTableModel, \ QSqlQueryModel, QSqlQuery from E5Gui import E5MessageBox
--- a/SqlBrowser/SqlConnectionDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/SqlBrowser/SqlConnectionDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QDialogButtonBox -from PyQt4.QtSql import QSqlDatabase +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QDialogButtonBox +from PyQt5.QtSql import QSqlDatabase from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog
--- a/SqlBrowser/SqlConnectionWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/SqlBrowser/SqlConnectionWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,10 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSignal, Qt, qVersion -from PyQt4.QtGui import QWidget, QHeaderView, QTreeWidget, QVBoxLayout, \ +from PyQt5.QtCore import pyqtSignal, Qt, qVersion +from PyQt5.QtWidgets import QWidget, QHeaderView, QTreeWidget, QVBoxLayout, \ QTreeWidgetItem, QAction -from PyQt4.QtSql import QSqlDatabase +from PyQt5.QtSql import QSqlDatabase class SqlConnectionWidget(QWidget):
--- a/Tasks/Task.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tasks/Task.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import os import time -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QTreeWidgetItem +from PyQt5.QtCore import Qt +from PyQt5.QtWidgets import QTreeWidgetItem import UI.PixmapCache import Preferences @@ -113,16 +113,16 @@ boldFont.setBold(True) for col in range(5): if self.taskType == Task.TypeFixme: - self.setBackgroundColor( + self.setBackground( col, Preferences.getTasks("TasksFixmeColor")) elif self.taskType == Task.TypeWarning: - self.setBackgroundColor( + self.setBackground( col, Preferences.getTasks("TasksWarningColor")) elif self.taskType == Task.TypeTodo: - self.setBackgroundColor( + self.setBackground( col, Preferences.getTasks("TasksTodoColor")) else: - self.setBackgroundColor( + self.setBackground( col, Preferences.getTasks("TasksNoteColor")) if self._isProjectTask: self.setFont(col, boldFont)
--- a/Tasks/TaskFilter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tasks/TaskFilter.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp +from PyQt5.QtCore import QRegExp from .Task import Task
--- a/Tasks/TaskFilterConfigDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tasks/TaskFilterConfigDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Task import Task
--- a/Tasks/TaskPropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tasks/TaskPropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import time -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from E5Gui.E5Completers import E5FileCompleter
--- a/Tasks/TaskViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tasks/TaskViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,8 +16,8 @@ import os import fnmatch -from PyQt4.QtCore import pyqtSignal, Qt -from PyQt4.QtGui import QHeaderView, QLineEdit, QTreeWidget, QDialog, \ +from PyQt5.QtCore import pyqtSignal, Qt +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QTreeWidget, QDialog, \ QInputDialog, QApplication, QMenu, QAbstractItemView, QTreeWidgetItem from E5Gui.E5Application import e5App
--- a/Templates/TemplateMultipleVariablesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Templates/TemplateMultipleVariablesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QSize, Qt -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ +from PyQt5.QtCore import QSize, Qt +from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ QLineEdit, QPushButton, QTextEdit, QDialog, QScrollArea, QFrame, \ QGridLayout, QVBoxLayout, QLabel
--- a/Templates/TemplatePropertiesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Templates/TemplatePropertiesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QRegExp, Qt, pyqtSlot -from PyQt4.QtGui import QDialog, QRegExpValidator +from PyQt5.QtCore import QRegExp, Qt, pyqtSlot +from PyQt5.QtGui import QRegExpValidator +from PyQt5.QtWidgets import QDialog from .Ui_TemplatePropertiesDialog import Ui_TemplatePropertiesDialog
--- a/Templates/TemplateSingleVariableDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Templates/TemplateSingleVariableDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_TemplateSingleVariableDialog import Ui_TemplateSingleVariableDialog
--- a/Templates/TemplateViewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Templates/TemplateViewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ import os import re -from PyQt4.QtCore import QFile, QFileInfo, QIODevice, Qt -from PyQt4.QtGui import QTreeWidget, QDialog, QApplication, QMenu, \ +from PyQt5.QtCore import QFile, QFileInfo, QIODevice, Qt, QCoreApplication +from PyQt5.QtWidgets import QTreeWidget, QDialog, QApplication, QMenu, \ QTreeWidgetItem from E5Gui.E5Application import e5App @@ -95,8 +95,9 @@ if not quiet: E5MessageBox.critical( None, - QApplication.translate("TemplateGroup", "Add Template"), - QApplication.translate( + QCoreApplication.translate("TemplateGroup", + "Add Template"), + QCoreApplication.translate( "TemplateGroup", """<p>The group <b>{0}</b> already contains a""" """ template named <b>{1}</b>.</p>""")
--- a/Toolbox/SingleApplication.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Toolbox/SingleApplication.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtNetwork import QLocalServer, QLocalSocket +from PyQt5.QtNetwork import QLocalServer, QLocalSocket class SingleApplicationServer(QLocalServer):
--- a/Toolbox/Startup.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Toolbox/Startup.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,9 @@ import os import sys -from PyQt4.QtCore import QTranslator, QLocale, QLibraryInfo, QDir, \ +from PyQt5.QtCore import QTranslator, QLocale, QLibraryInfo, QDir, \ QTextCodec, qVersion -from PyQt4.QtGui import QApplication +from PyQt5.QtWidgets import QApplication from E5Gui.E5Application import E5Application @@ -138,7 +138,7 @@ Module function to set the Qt library paths correctly for windows systems. """ if Globals.isWindowsPlatform(): - libPath = os.path.join(Globals.getPyQt4ModulesDirectory(), "plugins") + libPath = os.path.join(Globals.getPyQt5ModulesDirectory(), "plugins") if os.path.exists(libPath): libPath = QDir.fromNativeSeparators(libPath) libraryPaths = QApplication.libraryPaths()
--- a/Tools/TRPreviewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tools/TRPreviewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,12 +11,14 @@ import os -from PyQt4.QtCore import QDir, QTimer, QFileInfo, pyqtSignal, QEvent, QSize, \ - QTranslator, QObject, Qt -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ - QKeySequence, QWhatsThis, QMdiArea, qApp, QApplication, QComboBox, \ - QVBoxLayout, QAction, QLabel -from PyQt4 import uic +from PyQt5.QtCore import QDir, QTimer, QFileInfo, pyqtSignal, QEvent, QSize, \ + QTranslator, QObject, Qt, QCoreApplication +from PyQt5.QtGui import QKeySequence +from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ + QWhatsThis, QMdiArea, qApp, QApplication, QComboBox, QVBoxLayout, \ + QAction, QLabel +from PyQt5 import uic + from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5MainWindow import E5MainWindow @@ -27,7 +29,8 @@ import Preferences -noTranslationName = QApplication.translate("TRPreviewer", "<No translation>") +noTranslationName = QCoreApplication.translate( + "TRPreviewer", "<No translation>") class TRPreviewer(E5MainWindow):
--- a/Tools/TRSingleApplication.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tools/TRSingleApplication.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import pyqtSignal +from PyQt5.QtCore import pyqtSignal from Toolbox.SingleApplication import SingleApplicationClient, \ SingleApplicationServer
--- a/Tools/TrayStarter.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tools/TrayStarter.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,9 @@ import sys import os -from PyQt4.QtCore import QProcess, QSettings, QFileInfo -from PyQt4.QtGui import QSystemTrayIcon, QMenu, qApp, QCursor, QDialog, \ - QApplication +from PyQt5.QtCore import QProcess, QSettings, QFileInfo +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QSystemTrayIcon, QMenu, qApp, QDialog, QApplication from E5Gui import E5MessageBox
--- a/Tools/UIPreviewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Tools/UIPreviewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,13 +9,14 @@ from __future__ import unicode_literals -from PyQt4.QtCore import qVersion, QDir, QFileInfo, QEvent, QSize, Qt -from PyQt4.QtGui import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ - QCursor, QPrinter, QKeySequence, QPrintDialog, QWhatsThis, QPixmap, \ - QImageWriter, QPainter, QDialog, QScrollArea, qApp, QApplication, \ - QStyleFactory, QFrame, QMainWindow, QComboBox, QVBoxLayout, QAction, \ - QLabel -from PyQt4 import uic +from PyQt5.QtCore import qVersion, QDir, QFileInfo, QEvent, QSize, Qt +from PyQt5.QtGui import QCursor, QKeySequence, QPixmap, QImageWriter, QPainter +from PyQt5.QtWidgets import QSizePolicy, QSpacerItem, QWidget, QHBoxLayout, \ + QWhatsThis, QDialog, QScrollArea, qApp, QApplication, QStyleFactory, \ + QFrame, QMainWindow, QComboBox, QVBoxLayout, QAction, QLabel +from PyQt5.QtPrintSupport import QPrinter, QPrintDialog +from PyQt5 import uic + from E5Gui import E5MessageBox, E5FileDialog from E5Gui.E5MainWindow import E5MainWindow @@ -549,7 +550,7 @@ """ Private slot to handle the Print Preview menu action. """ - from PyQt4.QtGui import QPrintPreviewDialog + from PyQt5.QtPrintSupport import QPrintPreviewDialog if self.mainWidget is None: E5MessageBox.critical(
--- a/UI/AuthenticationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/AuthenticationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QStyle +from PyQt5.QtWidgets import QDialog, QStyle from .Ui_AuthenticationDialog import Ui_AuthenticationDialog
--- a/UI/Browser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/Browser.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,9 +11,10 @@ import os -from PyQt4.QtCore import QModelIndex, pyqtSignal, QUrl, Qt, qVersion -from PyQt4.QtGui import QTreeView, QDesktopServices, QItemSelectionModel, \ - QApplication, QMenu, QAbstractItemView +from PyQt5.QtCore import QModelIndex, pyqtSignal, QUrl, Qt, qVersion, \ + QCoreApplication, QItemSelectionModel +from PyQt5.QtGui import QDesktopServices +from PyQt5.QtWidgets import QTreeView, QApplication, QMenu, QAbstractItemView from E5Gui.E5Application import e5App from E5Gui import E5FileDialog @@ -69,7 +70,8 @@ """ super(Browser, self).__init__(parent) - self.setWindowTitle(QApplication.translate('Browser', 'File-Browser')) + self.setWindowTitle(QCoreApplication.translate('Browser', + 'File-Browser')) self.setWindowIcon(UI.PixmapCache.getIcon("eric.png")) self.__embeddedBrowser = Preferences.getUI("LayoutFileBrowserEmbedded") @@ -89,7 +91,7 @@ self.expanded.connect(self._resizeColumns) self.collapsed.connect(self._resizeColumns) - self.setWhatsThis(QApplication.translate( + self.setWhatsThis(QCoreApplication.translate( 'Browser', """<b>The Browser Window</b>""" """<p>This allows you to easily navigate the hierarchy of""" @@ -190,70 +192,70 @@ # create the popup menu for source files self.sourceMenu = QMenu(self) self.sourceMenu.addAction( - QApplication.translate('Browser', 'Open'), self._openItem) + QCoreApplication.translate('Browser', 'Open'), self._openItem) self.unittestAct = self.sourceMenu.addAction( - QApplication.translate('Browser', 'Run unittest...'), + QCoreApplication.translate('Browser', 'Run unittest...'), self.handleUnittest) self.sourceMenu.addAction( - QApplication.translate('Browser', 'Copy Path to Clipboard'), + QCoreApplication.translate('Browser', 'Copy Path to Clipboard'), self._copyToClipboard) # create the popup menu for general use self.menu = QMenu(self) self.menu.addAction( - QApplication.translate('Browser', 'Open'), self._openItem) + QCoreApplication.translate('Browser', 'Open'), self._openItem) self.editPixmapAct = self.menu.addAction( - QApplication.translate('Browser', 'Open in Icon Editor'), + QCoreApplication.translate('Browser', 'Open in Icon Editor'), self._editPixmap) self.menu.addAction( - QApplication.translate('Browser', 'Copy Path to Clipboard'), + QCoreApplication.translate('Browser', 'Copy Path to Clipboard'), self._copyToClipboard) if self.__embeddedBrowser in [1, 2]: self.menu.addSeparator() self.menu.addAction( - QApplication.translate('Browser', 'Configure...'), + QCoreApplication.translate('Browser', 'Configure...'), self.__configure) # create the menu for multiple selected files self.multiMenu = QMenu(self) self.multiMenu.addAction( - QApplication.translate('Browser', 'Open'), self._openItem) + QCoreApplication.translate('Browser', 'Open'), self._openItem) if self.__embeddedBrowser in [1, 2]: self.multiMenu.addSeparator() self.multiMenu.addAction( - QApplication.translate('Browser', 'Configure...'), + QCoreApplication.translate('Browser', 'Configure...'), self.__configure) # create the directory menu self.dirMenu = QMenu(self) self.dirMenu.addAction( - QApplication.translate('Browser', 'New toplevel directory...'), + QCoreApplication.translate('Browser', 'New toplevel directory...'), self.__newToplevelDir) self.addAsTopLevelAct = self.dirMenu.addAction( - QApplication.translate('Browser', 'Add as toplevel directory'), + QCoreApplication.translate('Browser', 'Add as toplevel directory'), self.__addAsToplevelDir) self.removeFromToplevelAct = self.dirMenu.addAction( - QApplication.translate('Browser', 'Remove from toplevel'), + QCoreApplication.translate('Browser', 'Remove from toplevel'), self.__removeToplevel) self.dirMenu.addSeparator() self.dirMenu.addAction( - QApplication.translate('Browser', 'Refresh directory'), + QCoreApplication.translate('Browser', 'Refresh directory'), self.__refreshDirectory) self.dirMenu.addSeparator() self.dirMenu.addAction( - QApplication.translate('Browser', 'Find in this directory'), + QCoreApplication.translate('Browser', 'Find in this directory'), self.__findInDirectory) self.dirMenu.addAction( - QApplication.translate( + QCoreApplication.translate( 'Browser', 'Find&&Replace in this directory'), self.__replaceInDirectory) self.dirMenu.addAction( - QApplication.translate('Browser', 'Copy Path to Clipboard'), + QCoreApplication.translate('Browser', 'Copy Path to Clipboard'), self._copyToClipboard) if self.__embeddedBrowser in [1, 2]: self.dirMenu.addSeparator() self.dirMenu.addAction( - QApplication.translate('Browser', 'Configure...'), + QCoreApplication.translate('Browser', 'Configure...'), self.__configure) # create the attribute menu @@ -263,25 +265,25 @@ self.attributeMenu = QMenu(self) self.attributeMenu.addAction( - QApplication.translate('Browser', 'New toplevel directory...'), + QCoreApplication.translate('Browser', 'New toplevel directory...'), self.__newToplevelDir) self.attributeMenu.addSeparator() self.attributeMenu.addMenu(self.gotoMenu) if self.__embeddedBrowser in [1, 2]: self.attributeMenu.addSeparator() self.attributeMenu.addAction( - QApplication.translate('Browser', 'Configure...'), + QCoreApplication.translate('Browser', 'Configure...'), self.__configure) # create the background menu self.backMenu = QMenu(self) self.backMenu.addAction( - QApplication.translate('Browser', 'New toplevel directory...'), + QCoreApplication.translate('Browser', 'New toplevel directory...'), self.__newToplevelDir) if self.__embeddedBrowser in [1, 2]: self.backMenu.addSeparator() self.backMenu.addAction( - QApplication.translate('Browser', 'Configure...'), + QCoreApplication.translate('Browser', 'Configure...'), self.__configure) def mouseDoubleClickEvent(self, mouseEvent): @@ -486,7 +488,7 @@ """ dname = E5FileDialog.getExistingDirectory( None, - QApplication.translate('Browser', "New toplevel directory"), + QCoreApplication.translate('Browser', "New toplevel directory"), "", E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) if dname:
--- a/UI/BrowserModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/BrowserModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -18,9 +18,10 @@ import fnmatch import json -from PyQt4.QtCore import QDir, QModelIndex, QAbstractItemModel, \ - QFileSystemWatcher, Qt, QProcess -from PyQt4.QtGui import QImageReader, QApplication, QFont +from PyQt5.QtCore import QDir, QModelIndex, QAbstractItemModel, \ + QFileSystemWatcher, Qt, QProcess, QCoreApplication +from PyQt5.QtGui import QImageReader, QFont +from PyQt5.QtWidgets import QApplication import UI.PixmapCache import Preferences @@ -60,7 +61,7 @@ self.__sysPathItem = None if not nopopulate: - rootData = QApplication.translate("BrowserModel", "Name") + rootData = QCoreApplication.translate("BrowserModel", "Name") self.rootItem = BrowserItem(None, rootData) self.__populateModel() @@ -236,8 +237,9 @@ """ Public method to clear the model. """ + self.beginResetModel() self.rootItem.removeChildren() - self.reset() + self.endResetModel() def item(self, index): """ @@ -299,7 +301,7 @@ filter = QDir.Filters( QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot) else: - filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot) + filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) for itm in self.watchedItems[path]: oldCnt = itm.childCount() @@ -530,7 +532,7 @@ filter = QDir.Filters( QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot) else: - filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot) + filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot) entryInfoList = qdir.entryInfoList(filter) if len(entryInfoList) > 0: if repopulate: @@ -628,14 +630,14 @@ if "@@Coding@@" in keys: node = BrowserCodingItem( parentItem, - QApplication.translate("BrowserModel", "Coding: {0}") + QCoreApplication.translate("BrowserModel", "Coding: {0}") .format(dict["@@Coding@@"].coding)) self._addItem(node, parentItem) if "@@Globals@@" in keys: node = BrowserClassAttributesItem( parentItem, dict["@@Globals@@"].globals, - QApplication.translate("BrowserModel", "Globals")) + QCoreApplication.translate("BrowserModel", "Globals")) self._addItem(node, parentItem) if repopulate: self.endInsertRows() @@ -679,7 +681,7 @@ if len(cl.attributes): node = BrowserClassAttributesItem( parentItem, cl.attributes, - QApplication.translate("BrowserModel", "Attributes")) + QCoreApplication.translate("BrowserModel", "Attributes")) if repopulate: self.addItem( node, self.createIndex(parentItem.row(), 0, parentItem)) @@ -689,7 +691,7 @@ if len(cl.globals): node = BrowserClassAttributesItem( parentItem, cl.globals, - QApplication.translate("BrowserModel", "Class Attributes"), + QCoreApplication.translate("BrowserModel", "Class Attributes"), True) if repopulate: self.addItem(
--- a/UI/BrowserSortFilterProxyModel.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/BrowserSortFilterProxyModel.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QModelIndex -from PyQt4.QtGui import QSortFilterProxyModel +from PyQt5.QtCore import QModelIndex, QSortFilterProxyModel import Preferences
--- a/UI/CompareDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/CompareDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,9 +17,9 @@ import re from difflib import _mdiff, IS_CHARACTER_JUNK -from PyQt4.QtCore import QTimer, QEvent, pyqtSlot -from PyQt4.QtGui import QWidget, QColor, QFontMetrics, QBrush, QApplication, \ - QTextCursor, QDialogButtonBox +from PyQt5.QtCore import QTimer, QEvent, pyqtSlot +from PyQt5.QtGui import QColor, QFontMetrics, QBrush, QTextCursor +from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/Config.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/Config.py Sun Jun 29 20:13:56 2014 +0200 @@ -7,6 +7,6 @@ Module defining common data to be used by all windows.. """ -from PyQt4.QtCore import QSize +from PyQt5.QtCore import QSize ToolBarIconSize = QSize(20, 18)
--- a/UI/DeleteFilesConfirmationDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/DeleteFilesConfirmationDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog, QDialogButtonBox +from PyQt5.QtWidgets import QDialog, QDialogButtonBox from .Ui_DeleteFilesConfirmationDialog import Ui_DeleteFilesConfirmationDialog
--- a/UI/DiffDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/DiffDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,9 @@ import os import time -from PyQt4.QtCore import QFileInfo, QEvent, pyqtSlot -from PyQt4.QtGui import QWidget, QColor, QBrush, QApplication, QTextCursor, \ - QDialogButtonBox +from PyQt5.QtCore import QFileInfo, QEvent, pyqtSlot +from PyQt5.QtGui import QColor, QBrush, QTextCursor +from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/EmailDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/EmailDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,10 @@ import smtplib import socket -from PyQt4.QtCore import Qt, pyqtSlot, qVersion -from PyQt4.QtGui import QCursor, QHeaderView, QLineEdit, QDialog, \ - QInputDialog, QApplication, QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import Qt, pyqtSlot, qVersion +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QHeaderView, QLineEdit, QDialog, QInputDialog, \ + QApplication, QDialogButtonBox, QTreeWidgetItem from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/ErrorLogDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/ErrorLogDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QDialog, QStyle +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtWidgets import QDialog, QStyle from .Ui_ErrorLogDialog import Ui_ErrorLogDialog
--- a/UI/FindFileDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/FindFileDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,10 @@ import os import re -from PyQt4.QtCore import pyqtSignal, Qt, pyqtSlot -from PyQt4.QtGui import QCursor, QDialog, QApplication, QMenu, \ - QDialogButtonBox, QTreeWidgetItem +from PyQt5.QtCore import pyqtSignal, Qt, pyqtSlot +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QDialog, QApplication, QMenu, QDialogButtonBox, \ + QTreeWidgetItem from E5Gui.E5Application import e5App from E5Gui import E5MessageBox, E5FileDialog
--- a/UI/FindFileDialog.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/FindFileDialog.ui Sun Jun 29 20:13:56 2014 +0200 @@ -43,9 +43,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property> @@ -78,9 +75,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/UI/FindFileNameDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/FindFileNameDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,9 @@ import os import sys -from PyQt4.QtCore import pyqtSignal, pyqtSlot -from PyQt4.QtGui import QWidget, QHeaderView, QApplication, QDialogButtonBox, \ - QTreeWidgetItem +from PyQt5.QtCore import pyqtSignal, pyqtSlot +from PyQt5.QtWidgets import QWidget, QHeaderView, QApplication, \ + QDialogButtonBox, QTreeWidgetItem from E5Gui.E5Completers import E5DirCompleter from E5Gui import E5FileDialog
--- a/UI/LogView.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/LogView.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,10 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, pyqtSignal -from PyQt4.QtGui import QTextEdit, QBrush, QApplication, QMenu, QTextCursor, \ - QWidget, QHBoxLayout, QTextDocument +from PyQt5.QtCore import Qt, pyqtSignal +from PyQt5.QtGui import QBrush, QTextCursor, QTextDocument +from PyQt5.QtWidgets import QTextEdit, QApplication, QMenu, QWidget, \ + QHBoxLayout from E5Gui.E5Application import e5App
--- a/UI/NotificationWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/NotificationWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt, QTimer, QPoint -from PyQt4.QtGui import QWidget, QPixmap +from PyQt5.QtCore import Qt, QTimer, QPoint +from PyQt5.QtGui import QPixmap +from PyQt5.QtWidgets import QWidget from .Ui_NotificationWidget import Ui_NotificationWidget
--- a/UI/NumbersWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/NumbersWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,9 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel, \ +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel, \ qVersion -from PyQt4.QtGui import QWidget, QHeaderView +from PyQt5.QtWidgets import QWidget, QHeaderView from E5Gui.E5Application import e5App @@ -98,8 +98,9 @@ @param bits number of bits to show (integer) """ + self.beginResetModel() self.__bits = bits - self.reset() + self.endResetModel() def setValue(self, value): """ @@ -107,8 +108,9 @@ @param value value to show (integer) """ + self.beginResetModel() self.__value = value - self.reset() + self.endResetModel() def setBitsAndValue(self, bits, value): """ @@ -119,7 +121,8 @@ """ self.__bits = bits self.__value = value - self.reset() + self.beginResetModel() + self.endResetModel() def getValue(self): """ @@ -202,7 +205,7 @@ self.binTable.horizontalHeader().setSectionResizeMode( QHeaderView.ResizeToContents) else: - self.binTable.horizontalHeader().setResizeMode( + self.binTable.horizontalHeader().setSectionResizeMode( QHeaderView.ResizeToContents) self.__model.setBitsAndValue(self.__bytes * 8, self.__input) self.__model.dataChanged.connect(self.__binModelDataChanged)
--- a/UI/PixmapCache.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/PixmapCache.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import Qt, QSize -from PyQt4.QtGui import QPixmap, QIcon, QPainter +from PyQt5.QtCore import Qt, QSize +from PyQt5.QtGui import QPixmap, QIcon, QPainter class PixmapCache(object):
--- a/UI/Previewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/Previewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QTimer -from PyQt4.QtGui import QStackedWidget +from PyQt5.QtCore import QTimer +from PyQt5.QtWidgets import QStackedWidget import Preferences
--- a/UI/Previewers/PreviewerHTML.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/Previewers/PreviewerHTML.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,9 @@ import threading import re -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QSize, QThread -from PyQt4.QtGui import QWidget -from PyQt4.QtWebKit import QWebPage +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QSize, QThread +from PyQt5.QtWidgets import QWidget +from PyQt5.QtWebKitWidgets import QWebPage from E5Gui.E5Application import e5App
--- a/UI/Previewers/PreviewerQSS.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/Previewers/PreviewerQSS.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,9 @@ import os -from PyQt4.QtCore import qVersion -from PyQt4.QtGui import QWidget, QMenu, QLabel, QHeaderView, QListWidgetItem +from PyQt5.QtCore import qVersion +from PyQt5.QtWidgets import QWidget, QMenu, QLabel, QHeaderView, \ + QListWidgetItem from .Ui_PreviewerQSS import Ui_PreviewerQSS @@ -53,7 +54,7 @@ else: self.tree.header().setResizeMode( QHeaderView.ResizeToContents) - self.table.horizontalHeader().setResizeMode( + self.table.horizontalHeader().setSectionResizeMode( QHeaderView.ResizeToContents) self.tree.topLevelItem(0).setExpanded(True)
--- a/UI/SearchWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/SearchWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,8 @@ from __future__ import unicode_literals -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt -from PyQt4.QtGui import QWidget, QSpacerItem, QSizePolicy +from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt +from PyQt5.QtWidgets import QWidget, QSpacerItem, QSizePolicy from .Ui_SearchWidget import Ui_SearchWidget
--- a/UI/SearchWidget.ui Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/SearchWidget.ui Sun Jun 29 20:13:56 2014 +0200 @@ -56,9 +56,6 @@ <property name="insertPolicy"> <enum>QComboBox::InsertAtTop</enum> </property> - <property name="autoCompletion"> - <bool>false</bool> - </property> <property name="duplicatesEnabled"> <bool>false</bool> </property>
--- a/UI/SplashScreen.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/SplashScreen.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,9 @@ import os.path import logging -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QApplication, QPixmap, QSplashScreen, QColor +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QPixmap, QColor +from PyQt5.QtWidgets import QApplication, QSplashScreen from eric5config import getConfig
--- a/UI/SymbolsWidget.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/SymbolsWidget.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,10 +17,10 @@ chr = unichr # __IGNORE_WARNING__ import htmlentitydefs as html_entities # __IGNORE_WARNING__ -from PyQt4.QtCore import pyqtSlot, pyqtSignal, QAbstractTableModel, \ - QModelIndex, Qt, qVersion -from PyQt4.QtGui import QWidget, QHeaderView, QAbstractItemView, QColor, \ - QItemSelectionModel +from PyQt5.QtCore import pyqtSlot, pyqtSignal, QAbstractTableModel, \ + QModelIndex, Qt, qVersion, QItemSelectionModel +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QWidget, QHeaderView, QAbstractItemView from .Ui_SymbolsWidget import Ui_SymbolsWidget @@ -328,8 +328,9 @@ @param index index of the character table (integer) """ + self.beginResetModel() self.__currentTableIndex = index - self.reset() + self.endResetModel() def headerData(self, section, orientation, role=Qt.DisplayRole): """ @@ -494,7 +495,7 @@ self.symbolsTable.horizontalHeader().setSectionResizeMode( QHeaderView.Fixed) else: - self.symbolsTable.horizontalHeader().setResizeMode( + self.symbolsTable.horizontalHeader().setSectionResizeMode( QHeaderView.Fixed) fm = self.fontMetrics() em = fm.width("M")
--- a/UI/UserInterface.py Sun Jun 29 14:00:30 2014 +0200 +++ b/UI/UserInterface.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,14 +17,15 @@ import sys import logging -from PyQt4.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \ +from PyQt5.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \ PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ QObject, Qt -from PyQt4.QtGui import QSizePolicy, QWidget, QKeySequence, QDesktopServices, \ - QWhatsThis, QToolBar, QDialog, QSplitter, QApplication, QMenu, \ - QVBoxLayout, QDockWidget, QAction, QLabel -from PyQt4.Qsci import QSCINTILLA_VERSION_STR -from PyQt4.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ +from PyQt5.QtGui import QKeySequence, QDesktopServices +from PyQt5.QtWidgets import QSizePolicy, QWidget, QWhatsThis, QToolBar, \ + QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \ + QAction, QLabel +from PyQt5.Qsci import QSCINTILLA_VERSION_STR +from PyQt5.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager, \ QNetworkRequest, QNetworkReply from .Info import Version, BugAddress, Program, FeatureAddress @@ -2247,17 +2248,17 @@ self.actions.append(self.qt5DocAct) self.pyqt4DocAct = E5Action( - self.tr('PyQt4 Documentation'), + self.tr('PyQt5 Documentation'), self.tr('PyQt&4 Documentation'), 0, 0, self, 'pyqt4_documentation') - self.pyqt4DocAct.setStatusTip(self.tr('Open PyQt4 Documentation')) + self.pyqt4DocAct.setStatusTip(self.tr('Open PyQt5 Documentation')) self.pyqt4DocAct.setWhatsThis(self.tr( - """<b>PyQt4 Documentation</b>""" - """<p>Display the PyQt4 Documentation. Dependent upon your""" + """<b>PyQt5 Documentation</b>""" + """<p>Display the PyQt5 Documentation. Dependent upon your""" """ settings, this will either show the help in Eric's internal""" """ help viewer, or execute a web browser or Qt Assistant. </p>""" )) - self.pyqt4DocAct.triggered.connect(self.__showPyQt4Doc) + self.pyqt4DocAct.triggered.connect(self.__showPyQt5Doc) self.actions.append(self.pyqt4DocAct) try: @@ -2944,7 +2945,7 @@ versionText += """<tr><td><b>QScintilla</b></td><td>{0}</td></tr>"""\ .format(QSCINTILLA_VERSION_STR) try: - from PyQt4.QtWebKit import qWebKitVersion + from PyQt5.QtWebKit import qWebKitVersion versionText += """<tr><td><b>WebKit</b></td><td>{0}</td></tr>"""\ .format(qWebKitVersion()) except ImportError:
--- a/Utilities/AutoSaver.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/AutoSaver.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QObject, QBasicTimer, QTime +from PyQt5.QtCore import QObject, QBasicTimer, QTime class AutoSaver(QObject):
--- a/Utilities/BackgroundService.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/BackgroundService.py Sun Jun 29 20:13:56 2014 +0200 @@ -17,9 +17,9 @@ import sys from zlib import adler32 -from PyQt4.QtCore import QProcess, pyqtSignal, QTimer -from PyQt4.QtGui import QApplication -from PyQt4.QtNetwork import QTcpServer, QHostAddress +from PyQt5.QtCore import QProcess, pyqtSignal, QTimer +from PyQt5.QtWidgets import QApplication +from PyQt5.QtNetwork import QTcpServer, QHostAddress from E5Gui import E5MessageBox from E5Gui.E5Application import e5App
--- a/Utilities/FtpUtilities.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/FtpUtilities.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,7 +11,7 @@ import os -from PyQt4.QtCore import QObject, QDate, QDateTime, QTime +from PyQt5.QtCore import QObject, QDate, QDateTime, QTime from E5Network.E5UrlInfo import E5UrlInfo
--- a/Utilities/ModuleParser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/ModuleParser.py Sun Jun 29 20:13:56 2014 +0200 @@ -126,7 +126,7 @@ ) | (?P<Method> - (^ [ \t]* @ (?: PyQt4 \. )? (?: QtCore \. )? + (^ [ \t]* @ (?: PyQt[45] \. )? (?: QtCore \. )? (?: pyqtSignature | pyqtSlot ) [ \t]* \( (?P<MethodPyQtSignature> [^)]* )
--- a/Utilities/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -56,14 +56,14 @@ from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32 -from PyQt4.QtCore import QRegExp, QDir, QProcess, Qt, QByteArray, \ +from PyQt5.QtCore import QRegExp, QDir, QProcess, Qt, QByteArray, \ qVersion, PYQT_VERSION_STR, QCoreApplication, QCryptographicHash -from PyQt4.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla +from PyQt5.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla # import these methods into the Utilities namespace from Globals import ( # __IGNORE_WARNING__ isWindowsPlatform, isLinuxPlatform, isMacPlatform, getConfigDir, - setConfigDir, getPythonModulesDirectory, getPyQt4ModulesDirectory, + setConfigDir, getPythonModulesDirectory, getPyQt5ModulesDirectory, getQtBinariesPath) from E5Gui.E5Application import e5App @@ -1596,12 +1596,12 @@ info = "Version Numbers:{0} Python {1}{2}".format( linesep, sys.version.split()[0], linesep) - info += " Qt {0}{1} PyQt4 {2}{3}".format( + info += " Qt {0}{1} PyQt5 {2}{3}".format( qVersion(), linesep, PYQT_VERSION_STR, linesep) info += " sip {0}{1} QScintilla {2}{3}".format( sip_version_str, linesep, QSCINTILLA_VERSION_STR, linesep) try: - from PyQt4.QtWebKit import qWebKitVersion + from PyQt5.QtWebKit import qWebKitVersion info += " WebKit {0}{1}".format(qWebKitVersion(), linesep) except ImportError: pass
--- a/Utilities/crypto/__init__.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/crypto/__init__.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,8 +12,8 @@ import random import base64 -from PyQt4.QtCore import QCoreApplication -from PyQt4.QtGui import QLineEdit, QInputDialog +from PyQt5.QtCore import QCoreApplication +from PyQt5.QtWidgets import QLineEdit, QInputDialog from E5Gui import E5MessageBox @@ -317,7 +317,7 @@ if __name__ == "__main__": import sys - from PyQt4.QtGui import QApplication + from PyQt5.QtWidgets import QApplication app = QApplication([])
--- a/Utilities/uic.py Sun Jun 29 14:00:30 2014 +0200 +++ b/Utilities/uic.py Sun Jun 29 20:13:56 2014 +0200 @@ -22,9 +22,9 @@ @param recurse flag indicating to recurse into subdirectories (boolean) """ # __IGNORE_WARNING__ try: - from PyQt4.uic import compileUiDir + from PyQt5.uic import compileUiDir except ImportError: - from PyQt4.uic import compileUi + from PyQt5.uic import compileUi def compileUiDir(dir, recurse=False, # __IGNORE_WARNING__ map=None, **compileUi_args): @@ -33,7 +33,7 @@ directory tree. Note: This function is a modified version of the one found in - PyQt4. + PyQt5. @param dir Name of the directory to scan for files whose name ends with '.ui'. By default the generated Python module is created
--- a/VCS/CommandOptionsDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/CommandOptionsDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_CommandOptionsDialog import Ui_VcsCommandOptionsDialog
--- a/VCS/ProjectBrowserHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/ProjectBrowserHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,8 +11,8 @@ import os -from PyQt4.QtCore import QObject -from PyQt4.QtGui import QDialog +from PyQt5.QtCore import QObject +from PyQt5.QtWidgets import QDialog from E5Gui.E5Application import e5App
--- a/VCS/ProjectHelper.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/ProjectHelper.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,8 +13,8 @@ import shutil import copy -from PyQt4.QtCore import pyqtSlot, QDir, QFileInfo, QObject -from PyQt4.QtGui import QDialog, QInputDialog +from PyQt5.QtCore import pyqtSlot, QDir, QFileInfo, QObject +from PyQt5.QtWidgets import QDialog, QInputDialog from E5Gui.E5Action import E5Action from E5Gui import E5MessageBox
--- a/VCS/RepositoryInfoDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/RepositoryInfoDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtGui import QDialog +from PyQt5.QtWidgets import QDialog from .Ui_RepositoryInfoDialog import Ui_VcsRepositoryInfoDialog
--- a/VCS/StatusMonitorLed.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/StatusMonitorLed.py Sun Jun 29 20:13:56 2014 +0200 @@ -10,8 +10,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import Qt -from PyQt4.QtGui import QColor, QInputDialog, QMenu +from PyQt5.QtCore import Qt +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QInputDialog, QMenu from E5Gui.E5Led import E5ClickableLed, E5LedRectangular
--- a/VCS/StatusMonitorThread.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/StatusMonitorThread.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QThread, QMutex, QWaitCondition, pyqtSignal +from PyQt5.QtCore import QThread, QMutex, QWaitCondition, pyqtSignal class VcsStatusMonitorThread(QThread):
--- a/VCS/VersionControl.py Sun Jun 29 14:00:30 2014 +0200 +++ b/VCS/VersionControl.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,9 @@ import os -from PyQt4.QtCore import QObject, QThread, QMutex, QProcess, \ +from PyQt5.QtCore import QObject, QThread, QMutex, QProcess, \ Qt, pyqtSignal -from PyQt4.QtGui import QApplication +from PyQt5.QtWidgets import QApplication from E5Gui import E5MessageBox
--- a/ViewManager/BookmarkedFilesDialog.py Sun Jun 29 14:00:30 2014 +0200 +++ b/ViewManager/BookmarkedFilesDialog.py Sun Jun 29 20:13:56 2014 +0200 @@ -9,8 +9,9 @@ from __future__ import unicode_literals -from PyQt4.QtCore import QFileInfo, Qt, pyqtSlot -from PyQt4.QtGui import QListWidgetItem, QColor, QDialog +from PyQt5.QtCore import QFileInfo, Qt, pyqtSlot +from PyQt5.QtGui import QColor +from PyQt5.QtWidgets import QListWidgetItem, QDialog from E5Gui.E5Completers import E5FileCompleter from E5Gui import E5FileDialog @@ -43,7 +44,7 @@ for bookmark in self.bookmarks: itm = QListWidgetItem(bookmark, self.filesList) if not QFileInfo(bookmark).exists(): - itm.setBackgroundColor(QColor(Qt.red)) + itm.setBackground(QColor(Qt.red)) if len(self.bookmarks): self.filesList.setCurrentRow(0) @@ -91,7 +92,7 @@ bookmark = Utilities.toNativeSeparators(bookmark) itm = QListWidgetItem(bookmark, self.filesList) if not QFileInfo(bookmark).exists(): - itm.setBackgroundColor(QColor(Qt.red)) + itm.setBackground(QColor(Qt.red)) self.fileEdit.clear() self.bookmarks.append(bookmark) row = self.filesList.currentRow() @@ -109,9 +110,9 @@ itm = self.filesList.item(row) itm.setText(bookmark) if not QFileInfo(bookmark).exists(): - itm.setBackgroundColor(QColor(Qt.red)) + itm.setBackground(QColor(Qt.red)) else: - itm.setBackgroundColor(QColor()) + itm.setBackground(QColor()) @pyqtSlot() def on_deleteButton_clicked(self):
--- a/ViewManager/ViewManager.py Sun Jun 29 14:00:30 2014 +0200 +++ b/ViewManager/ViewManager.py Sun Jun 29 20:13:56 2014 +0200 @@ -11,11 +11,12 @@ import os -from PyQt4.QtCore import pyqtSignal, QSignalMapper, QTimer, \ - QFileInfo, QRegExp, QObject, Qt -from PyQt4.QtGui import QColor, QKeySequence, QLineEdit, QToolBar, \ - QWidgetAction, QDialog, QApplication, QMenu, QPalette, QComboBox, QPixmap -from PyQt4.Qsci import QsciScintilla +from PyQt5.QtCore import pyqtSignal, QSignalMapper, QTimer, \ + QFileInfo, QRegExp, QObject, Qt, QCoreApplication +from PyQt5.QtGui import QColor, QKeySequence, QPalette, QPixmap +from PyQt5.QtWidgets import QLineEdit, QToolBar, QWidgetAction, QDialog, \ + QApplication, QMenu, QComboBox +from PyQt5.Qsci import QsciScintilla from E5Gui.E5Application import e5App from E5Gui import E5FileDialog, E5MessageBox @@ -563,16 +564,17 @@ Private method defining the user interface actions for file handling. """ self.newAct = E5Action( - QApplication.translate('ViewManager', 'New'), + QCoreApplication.translate('ViewManager', 'New'), UI.PixmapCache.getIcon("new.png"), - QApplication.translate('ViewManager', '&New'), + QCoreApplication.translate('ViewManager', '&New'), QKeySequence( - QApplication.translate('ViewManager', "Ctrl+N", "File|New")), + QCoreApplication.translate('ViewManager', "Ctrl+N", + "File|New")), 0, self, 'vm_file_new') self.newAct.setStatusTip( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Open an empty editor window')) - self.newAct.setWhatsThis(QApplication.translate( + self.newAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>New</b>""" """<p>An empty editor window will be created.</p>""" @@ -581,15 +583,16 @@ self.fileActions.append(self.newAct) self.openAct = E5Action( - QApplication.translate('ViewManager', 'Open'), + QCoreApplication.translate('ViewManager', 'Open'), UI.PixmapCache.getIcon("open.png"), - QApplication.translate('ViewManager', '&Open...'), + QCoreApplication.translate('ViewManager', '&Open...'), QKeySequence( - QApplication.translate('ViewManager', "Ctrl+O", "File|Open")), + QCoreApplication.translate('ViewManager', "Ctrl+O", + "File|Open")), 0, self, 'vm_file_open') - self.openAct.setStatusTip(QApplication.translate( + self.openAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Open a file')) - self.openAct.setWhatsThis(QApplication.translate( + self.openAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Open a file</b>""" """<p>You will be asked for the name of a file to be opened""" @@ -601,15 +604,17 @@ self.closeActGrp = createActionGroup(self) self.closeAct = E5Action( - QApplication.translate('ViewManager', 'Close'), + QCoreApplication.translate('ViewManager', 'Close'), UI.PixmapCache.getIcon("close.png"), - QApplication.translate('ViewManager', '&Close'), + QCoreApplication.translate('ViewManager', '&Close'), QKeySequence( - QApplication.translate('ViewManager', "Ctrl+W", "File|Close")), + QCoreApplication.translate('ViewManager', "Ctrl+W", + "File|Close")), 0, self.closeActGrp, 'vm_file_close') self.closeAct.setStatusTip( - QApplication.translate('ViewManager', 'Close the current window')) - self.closeAct.setWhatsThis(QApplication.translate( + QCoreApplication.translate('ViewManager', + 'Close the current window')) + self.closeAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Close Window</b>""" """<p>Close the current window.</p>""" @@ -618,12 +623,13 @@ self.fileActions.append(self.closeAct) self.closeAllAct = E5Action( - QApplication.translate('ViewManager', 'Close All'), - QApplication.translate('ViewManager', 'Clos&e All'), + QCoreApplication.translate('ViewManager', 'Close All'), + QCoreApplication.translate('ViewManager', 'Clos&e All'), 0, 0, self.closeActGrp, 'vm_file_close_all') self.closeAllAct.setStatusTip( - QApplication.translate('ViewManager', 'Close all editor windows')) - self.closeAllAct.setWhatsThis(QApplication.translate( + QCoreApplication.translate('ViewManager', + 'Close all editor windows')) + self.closeAllAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Close All Windows</b>""" """<p>Close all editor windows.</p>""" @@ -636,15 +642,15 @@ self.saveActGrp = createActionGroup(self) self.saveAct = E5Action( - QApplication.translate('ViewManager', 'Save'), + QCoreApplication.translate('ViewManager', 'Save'), UI.PixmapCache.getIcon("fileSave.png"), - QApplication.translate('ViewManager', '&Save'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Save'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+S", "File|Save")), 0, self.saveActGrp, 'vm_file_save') self.saveAct.setStatusTip( - QApplication.translate('ViewManager', 'Save the current file')) - self.saveAct.setWhatsThis(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Save the current file')) + self.saveAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Save File</b>""" """<p>Save the contents of current editor window.</p>""" @@ -653,15 +659,15 @@ self.fileActions.append(self.saveAct) self.saveAsAct = E5Action( - QApplication.translate('ViewManager', 'Save as'), + QCoreApplication.translate('ViewManager', 'Save as'), UI.PixmapCache.getIcon("fileSaveAs.png"), - QApplication.translate('ViewManager', 'Save &as...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Save &as...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+Ctrl+S", "File|Save As")), 0, self.saveActGrp, 'vm_file_save_as') - self.saveAsAct.setStatusTip(QApplication.translate( + self.saveAsAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Save the current file to a new one')) - self.saveAsAct.setWhatsThis(QApplication.translate( + self.saveAsAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Save File as</b>""" """<p>Save the contents of current editor window to a new file.""" @@ -671,13 +677,13 @@ self.fileActions.append(self.saveAsAct) self.saveAllAct = E5Action( - QApplication.translate('ViewManager', 'Save all'), + QCoreApplication.translate('ViewManager', 'Save all'), UI.PixmapCache.getIcon("fileSaveAll.png"), - QApplication.translate('ViewManager', 'Save a&ll'), + QCoreApplication.translate('ViewManager', 'Save a&ll'), 0, 0, self.saveActGrp, 'vm_file_save_all') - self.saveAllAct.setStatusTip(QApplication.translate( + self.saveAllAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Save all files')) - self.saveAllAct.setWhatsThis(QApplication.translate( + self.saveAllAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Save All Files</b>""" """<p>Save the contents of all editor windows.</p>""" @@ -688,15 +694,15 @@ self.saveActGrp.setEnabled(False) self.printAct = E5Action( - QApplication.translate('ViewManager', 'Print'), + QCoreApplication.translate('ViewManager', 'Print'), UI.PixmapCache.getIcon("print.png"), - QApplication.translate('ViewManager', '&Print'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Print'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+P", "File|Print")), 0, self, 'vm_file_print') - self.printAct.setStatusTip(QApplication.translate( + self.printAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Print the current file')) - self.printAct.setWhatsThis(QApplication.translate( + self.printAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Print File</b>""" """<p>Print the contents of current editor window.</p>""" @@ -706,13 +712,13 @@ self.fileActions.append(self.printAct) self.printPreviewAct = E5Action( - QApplication.translate('ViewManager', 'Print Preview'), + QCoreApplication.translate('ViewManager', 'Print Preview'), UI.PixmapCache.getIcon("printPreview.png"), - QApplication.translate('ViewManager', 'Print Preview'), + QCoreApplication.translate('ViewManager', 'Print Preview'), 0, 0, self, 'vm_file_print_preview') - self.printPreviewAct.setStatusTip(QApplication.translate( + self.printPreviewAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Print preview of the current file')) - self.printPreviewAct.setWhatsThis(QApplication.translate( + self.printPreviewAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Print Preview</b>""" """<p>Print preview of the current editor window.</p>""" @@ -723,14 +729,14 @@ self.fileActions.append(self.printPreviewAct) self.findFileNameAct = E5Action( - QApplication.translate('ViewManager', 'Search File'), - QApplication.translate('ViewManager', 'Search &File...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search File'), + QCoreApplication.translate('ViewManager', 'Search &File...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Ctrl+F", "File|Search File")), 0, self, 'vm_file_search_file') - self.findFileNameAct.setStatusTip(QApplication.translate( + self.findFileNameAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search for a file')) - self.findFileNameAct.setWhatsThis(QApplication.translate( + self.findFileNameAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search File</b>""" """<p>Search for a file.</p>""" @@ -744,12 +750,14 @@ @return the generated menu """ - menu = QMenu(QApplication.translate('ViewManager', '&File'), self.ui) + menu = QMenu(QCoreApplication.translate('ViewManager', '&File'), + self.ui) self.recentMenu = QMenu( - QApplication.translate('ViewManager', 'Open &Recent Files'), + QCoreApplication.translate('ViewManager', 'Open &Recent Files'), menu) self.bookmarkedMenu = QMenu( - QApplication.translate('ViewManager', 'Open &Bookmarked Files'), + QCoreApplication.translate('ViewManager', + 'Open &Bookmarked Files'), menu) self.exportersMenu = self.__initContextMenuExporters() menu.setTearOffEnabled(True) @@ -790,10 +798,11 @@ (E5ToolBarManager) @return the generated toolbar """ - tb = QToolBar(QApplication.translate('ViewManager', 'File'), self.ui) + tb = QToolBar(QCoreApplication.translate('ViewManager', 'File'), + self.ui) tb.setIconSize(UI.Config.ToolBarIconSize) tb.setObjectName("FileToolbar") - tb.setToolTip(QApplication.translate('ViewManager', 'File')) + tb.setToolTip(QCoreApplication.translate('ViewManager', 'File')) tb.addAction(self.newAct) tb.addAction(self.openAct) @@ -815,7 +824,7 @@ @return reference to the generated menu (QMenu) """ - menu = QMenu(QApplication.translate('ViewManager', "Export as")) + menu = QMenu(QCoreApplication.translate('ViewManager', "Export as")) import QScintilla.Exporters supportedExporters = QScintilla.Exporters.getSupportedFormats() @@ -840,17 +849,17 @@ self.editActGrp = createActionGroup(self) self.undoAct = E5Action( - QApplication.translate('ViewManager', 'Undo'), + QCoreApplication.translate('ViewManager', 'Undo'), UI.PixmapCache.getIcon("editUndo.png"), - QApplication.translate('ViewManager', '&Undo'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Undo'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Z", "Edit|Undo")), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Backspace", "Edit|Undo")), self.editActGrp, 'vm_edit_undo') - self.undoAct.setStatusTip(QApplication.translate( + self.undoAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Undo the last change')) - self.undoAct.setWhatsThis(QApplication.translate( + self.undoAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Undo</b>""" """<p>Undo the last change done in the current editor.</p>""" @@ -859,16 +868,16 @@ self.editActions.append(self.undoAct) self.redoAct = E5Action( - QApplication.translate('ViewManager', 'Redo'), + QCoreApplication.translate('ViewManager', 'Redo'), UI.PixmapCache.getIcon("editRedo.png"), - QApplication.translate('ViewManager', '&Redo'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Redo'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+Z", "Edit|Redo")), 0, self.editActGrp, 'vm_edit_redo') - self.redoAct.setStatusTip(QApplication.translate( + self.redoAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Redo the last change')) - self.redoAct.setWhatsThis(QApplication.translate( + self.redoAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Redo</b>""" """<p>Redo the last change done in the current editor.</p>""" @@ -877,17 +886,17 @@ self.editActions.append(self.redoAct) self.revertAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Revert to last saved state'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Re&vert to last saved state'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Y", "Edit|Revert")), 0, self.editActGrp, 'vm_edit_revert') - self.revertAct.setStatusTip(QApplication.translate( + self.revertAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Revert to last saved state')) - self.revertAct.setWhatsThis(QApplication.translate( + self.revertAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Revert to last saved state</b>""" """<p>Undo all changes up to the last saved state""" @@ -899,17 +908,17 @@ self.copyActGrp = createActionGroup(self.editActGrp) self.cutAct = E5Action( - QApplication.translate('ViewManager', 'Cut'), + QCoreApplication.translate('ViewManager', 'Cut'), UI.PixmapCache.getIcon("editCut.png"), - QApplication.translate('ViewManager', 'Cu&t'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Cu&t'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+X", "Edit|Cut")), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+Del", "Edit|Cut")), self.copyActGrp, 'vm_edit_cut') - self.cutAct.setStatusTip(QApplication.translate( + self.cutAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Cut the selection')) - self.cutAct.setWhatsThis(QApplication.translate( + self.cutAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Cut</b>""" """<p>Cut the selected text of the current editor to the""" @@ -919,17 +928,17 @@ self.editActions.append(self.cutAct) self.copyAct = E5Action( - QApplication.translate('ViewManager', 'Copy'), + QCoreApplication.translate('ViewManager', 'Copy'), UI.PixmapCache.getIcon("editCopy.png"), - QApplication.translate('ViewManager', '&Copy'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Copy'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+C", "Edit|Copy")), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Ins", "Edit|Copy")), self.copyActGrp, 'vm_edit_copy') - self.copyAct.setStatusTip(QApplication.translate( + self.copyAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Copy the selection')) - self.copyAct.setWhatsThis(QApplication.translate( + self.copyAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Copy</b>""" """<p>Copy the selected text of the current editor to the""" @@ -939,17 +948,17 @@ self.editActions.append(self.copyAct) self.pasteAct = E5Action( - QApplication.translate('ViewManager', 'Paste'), + QCoreApplication.translate('ViewManager', 'Paste'), UI.PixmapCache.getIcon("editPaste.png"), - QApplication.translate('ViewManager', '&Paste'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Paste'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+V", "Edit|Paste")), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+Ins", "Edit|Paste")), self.copyActGrp, 'vm_edit_paste') - self.pasteAct.setStatusTip(QApplication.translate( + self.pasteAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Paste the last cut/copied text')) - self.pasteAct.setWhatsThis(QApplication.translate( + self.pasteAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Paste</b>""" """<p>Paste the last cut/copied text from the clipboard to""" @@ -959,16 +968,16 @@ self.editActions.append(self.pasteAct) self.deleteAct = E5Action( - QApplication.translate('ViewManager', 'Clear'), + QCoreApplication.translate('ViewManager', 'Clear'), UI.PixmapCache.getIcon("editDelete.png"), - QApplication.translate('ViewManager', 'Clear'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Clear'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Shift+C", "Edit|Clear")), 0, self.copyActGrp, 'vm_edit_clear') - self.deleteAct.setStatusTip(QApplication.translate( + self.deleteAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Clear all text')) - self.deleteAct.setWhatsThis(QApplication.translate( + self.deleteAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Clear</b>""" """<p>Delete all text of the current editor.</p>""" @@ -977,15 +986,15 @@ self.editActions.append(self.deleteAct) self.joinAct = E5Action( - QApplication.translate('ViewManager', 'Join Lines'), - QApplication.translate('ViewManager', 'Join Lines'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Join Lines'), + QCoreApplication.translate('ViewManager', 'Join Lines'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+J", "Edit|Join Lines")), 0, self.copyActGrp, 'vm_edit_join_lines') - self.joinAct.setStatusTip(QApplication.translate( + self.joinAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Join Lines')) - self.joinAct.setWhatsThis(QApplication.translate( + self.joinAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Join Lines</b>""" """<p>Join the current and the next lines.</p>""" @@ -994,16 +1003,16 @@ self.editActions.append(self.joinAct) self.indentAct = E5Action( - QApplication.translate('ViewManager', 'Indent'), + QCoreApplication.translate('ViewManager', 'Indent'), UI.PixmapCache.getIcon("editIndent.png"), - QApplication.translate('ViewManager', '&Indent'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Indent'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+I", "Edit|Indent")), 0, self.editActGrp, 'vm_edit_indent') - self.indentAct.setStatusTip(QApplication.translate( + self.indentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Indent line')) - self.indentAct.setWhatsThis(QApplication.translate( + self.indentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Indent</b>""" """<p>Indents the current line or the lines of the""" @@ -1013,16 +1022,16 @@ self.editActions.append(self.indentAct) self.unindentAct = E5Action( - QApplication.translate('ViewManager', 'Unindent'), + QCoreApplication.translate('ViewManager', 'Unindent'), UI.PixmapCache.getIcon("editUnindent.png"), - QApplication.translate('ViewManager', 'U&nindent'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'U&nindent'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+I", "Edit|Unindent")), 0, self.editActGrp, 'vm_edit_unindent') - self.unindentAct.setStatusTip(QApplication.translate( + self.unindentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Unindent line')) - self.unindentAct.setWhatsThis(QApplication.translate( + self.unindentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Unindent</b>""" """<p>Unindents the current line or the lines of the""" @@ -1032,16 +1041,16 @@ self.editActions.append(self.unindentAct) self.smartIndentAct = E5Action( - QApplication.translate('ViewManager', 'Smart indent'), + QCoreApplication.translate('ViewManager', 'Smart indent'), UI.PixmapCache.getIcon("editSmartIndent.png"), - QApplication.translate('ViewManager', 'Smart indent'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Smart indent'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Alt+I", "Edit|Smart indent")), 0, self.editActGrp, 'vm_edit_smart_indent') - self.smartIndentAct.setStatusTip(QApplication.translate( + self.smartIndentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Smart indent Line or Selection')) - self.smartIndentAct.setWhatsThis(QApplication.translate( + self.smartIndentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Smart indent</b>""" """<p>Indents the current line or the lines of the""" @@ -1051,16 +1060,16 @@ self.editActions.append(self.smartIndentAct) self.commentAct = E5Action( - QApplication.translate('ViewManager', 'Comment'), + QCoreApplication.translate('ViewManager', 'Comment'), UI.PixmapCache.getIcon("editComment.png"), - QApplication.translate('ViewManager', 'C&omment'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'C&omment'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+M", "Edit|Comment")), 0, self.editActGrp, 'vm_edit_comment') - self.commentAct.setStatusTip(QApplication.translate( + self.commentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Comment Line or Selection')) - self.commentAct.setWhatsThis(QApplication.translate( + self.commentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Comment</b>""" """<p>Comments the current line or the lines of the""" @@ -1070,16 +1079,16 @@ self.editActions.append(self.commentAct) self.uncommentAct = E5Action( - QApplication.translate('ViewManager', 'Uncomment'), + QCoreApplication.translate('ViewManager', 'Uncomment'), UI.PixmapCache.getIcon("editUncomment.png"), - QApplication.translate('ViewManager', 'Unco&mment'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Unco&mment'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Ctrl+M", "Edit|Uncomment")), 0, self.editActGrp, 'vm_edit_uncomment') - self.uncommentAct.setStatusTip(QApplication.translate( + self.uncommentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Uncomment Line or Selection')) - self.uncommentAct.setWhatsThis(QApplication.translate( + self.uncommentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Uncomment</b>""" """<p>Uncomments the current line or the lines of the""" @@ -1089,18 +1098,18 @@ self.editActions.append(self.uncommentAct) self.toggleCommentAct = E5Action( - QApplication.translate('ViewManager', 'Toggle Comment'), + QCoreApplication.translate('ViewManager', 'Toggle Comment'), UI.PixmapCache.getIcon("editToggleComment.png"), - QApplication.translate('ViewManager', 'Toggle Comment'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Toggle Comment'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+M", "Edit|Toggle Comment")), 0, self.editActGrp, 'vm_edit_toggle_comment') - self.toggleCommentAct.setStatusTip(QApplication.translate( + self.toggleCommentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Toggle the comment of the current line, selection or' ' comment block')) - self.toggleCommentAct.setWhatsThis(QApplication.translate( + self.toggleCommentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Toggle Comment</b>""" """<p>If the current line does not start with a block comment,""" @@ -1111,14 +1120,14 @@ self.editActions.append(self.toggleCommentAct) self.streamCommentAct = E5Action( - QApplication.translate('ViewManager', 'Stream Comment'), - QApplication.translate('ViewManager', 'Stream Comment'), + QCoreApplication.translate('ViewManager', 'Stream Comment'), + QCoreApplication.translate('ViewManager', 'Stream Comment'), 0, 0, self.editActGrp, 'vm_edit_stream_comment') - self.streamCommentAct.setStatusTip(QApplication.translate( + self.streamCommentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Stream Comment Line or Selection')) - self.streamCommentAct.setWhatsThis(QApplication.translate( + self.streamCommentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Stream Comment</b>""" """<p>Stream comments the current line or the current""" @@ -1128,13 +1137,13 @@ self.editActions.append(self.streamCommentAct) self.boxCommentAct = E5Action( - QApplication.translate('ViewManager', 'Box Comment'), - QApplication.translate('ViewManager', 'Box Comment'), + QCoreApplication.translate('ViewManager', 'Box Comment'), + QCoreApplication.translate('ViewManager', 'Box Comment'), 0, 0, self.editActGrp, 'vm_edit_box_comment') - self.boxCommentAct.setStatusTip(QApplication.translate( + self.boxCommentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Box Comment Line or Selection')) - self.boxCommentAct.setWhatsThis(QApplication.translate( + self.boxCommentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Box Comment</b>""" """<p>Box comments the current line or the lines of the""" @@ -1144,15 +1153,15 @@ self.editActions.append(self.boxCommentAct) self.selectBraceAct = E5Action( - QApplication.translate('ViewManager', 'Select to brace'), - QApplication.translate('ViewManager', 'Select to &brace'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Select to brace'), + QCoreApplication.translate('ViewManager', 'Select to &brace'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+E", "Edit|Select to brace")), 0, self.editActGrp, 'vm_edit_select_to_brace') - self.selectBraceAct.setStatusTip(QApplication.translate( + self.selectBraceAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Select text to the matching brace')) - self.selectBraceAct.setWhatsThis(QApplication.translate( + self.selectBraceAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Select to brace</b>""" """<p>Select text of the current editor to the matching""" @@ -1162,15 +1171,15 @@ self.editActions.append(self.selectBraceAct) self.selectAllAct = E5Action( - QApplication.translate('ViewManager', 'Select all'), - QApplication.translate('ViewManager', '&Select all'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Select all'), + QCoreApplication.translate('ViewManager', '&Select all'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+A", "Edit|Select all")), 0, self.editActGrp, 'vm_edit_select_all') - self.selectAllAct.setStatusTip(QApplication.translate( + self.selectAllAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Select all text')) - self.selectAllAct.setWhatsThis(QApplication.translate( + self.selectAllAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Select All</b>""" """<p>Select all text of the current editor.</p>""" @@ -1179,15 +1188,15 @@ self.editActions.append(self.selectAllAct) self.deselectAllAct = E5Action( - QApplication.translate('ViewManager', 'Deselect all'), - QApplication.translate('ViewManager', '&Deselect all'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Deselect all'), + QCoreApplication.translate('ViewManager', '&Deselect all'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Ctrl+A", "Edit|Deselect all")), 0, self.editActGrp, 'vm_edit_deselect_all') - self.deselectAllAct.setStatusTip(QApplication.translate( + self.deselectAllAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Deselect all text')) - self.deselectAllAct.setWhatsThis(QApplication.translate( + self.deselectAllAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Deselect All</b>""" """<p>Deselect all text of the current editor.</p>""" @@ -1196,15 +1205,15 @@ self.editActions.append(self.deselectAllAct) self.convertEOLAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert Line End Characters'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert &Line End Characters'), 0, 0, self.editActGrp, 'vm_edit_convert_eol') - self.convertEOLAct.setStatusTip(QApplication.translate( + self.convertEOLAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Convert Line End Characters')) - self.convertEOLAct.setWhatsThis(QApplication.translate( + self.convertEOLAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Convert Line End Characters</b>""" """<p>Convert the line end characters to the currently set""" @@ -1214,13 +1223,13 @@ self.editActions.append(self.convertEOLAct) self.shortenEmptyAct = E5Action( - QApplication.translate('ViewManager', 'Shorten empty lines'), - QApplication.translate('ViewManager', 'Shorten empty lines'), + QCoreApplication.translate('ViewManager', 'Shorten empty lines'), + QCoreApplication.translate('ViewManager', 'Shorten empty lines'), 0, 0, self.editActGrp, 'vm_edit_shorten_empty_lines') - self.shortenEmptyAct.setStatusTip(QApplication.translate( + self.shortenEmptyAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Shorten empty lines')) - self.shortenEmptyAct.setWhatsThis(QApplication.translate( + self.shortenEmptyAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Shorten empty lines</b>""" """<p>Shorten lines consisting solely of whitespace""" @@ -1230,15 +1239,15 @@ self.editActions.append(self.shortenEmptyAct) self.autoCompleteAct = E5Action( - QApplication.translate('ViewManager', 'Autocomplete'), - QApplication.translate('ViewManager', '&Autocomplete'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Autocomplete'), + QCoreApplication.translate('ViewManager', '&Autocomplete'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Space", "Edit|Autocomplete")), 0, self.editActGrp, 'vm_edit_autocomplete') - self.autoCompleteAct.setStatusTip(QApplication.translate( + self.autoCompleteAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Autocomplete current word')) - self.autoCompleteAct.setWhatsThis(QApplication.translate( + self.autoCompleteAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Autocomplete</b>""" """<p>Performs an autocompletion of the word containing""" @@ -1248,19 +1257,19 @@ self.editActions.append(self.autoCompleteAct) self.autoCompleteFromDocAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Autocomplete from Document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Autocomplete from Document'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+Space", "Edit|Autocomplete from Document")), 0, self.editActGrp, 'vm_edit_autocomplete_from_document') - self.autoCompleteFromDocAct.setStatusTip(QApplication.translate( + self.autoCompleteFromDocAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Autocomplete current word from Document')) - self.autoCompleteFromDocAct.setWhatsThis(QApplication.translate( + self.autoCompleteFromDocAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Autocomplete from Document</b>""" """<p>Performs an autocompletion from document of the word""" @@ -1271,17 +1280,19 @@ self.editActions.append(self.autoCompleteFromDocAct) self.autoCompleteFromAPIsAct = E5Action( - QApplication.translate('ViewManager', 'Autocomplete from APIs'), - QApplication.translate('ViewManager', 'Autocomplete from APIs'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', + 'Autocomplete from APIs'), + QCoreApplication.translate('ViewManager', + 'Autocomplete from APIs'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Alt+Space", "Edit|Autocomplete from APIs")), 0, self.editActGrp, 'vm_edit_autocomplete_from_api') - self.autoCompleteFromAPIsAct.setStatusTip(QApplication.translate( + self.autoCompleteFromAPIsAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Autocomplete current word from APIs')) - self.autoCompleteFromAPIsAct.setWhatsThis(QApplication.translate( + self.autoCompleteFromAPIsAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Autocomplete from APIs</b>""" """<p>Performs an autocompletion from APIs of the word""" @@ -1292,19 +1303,19 @@ self.editActions.append(self.autoCompleteFromAPIsAct) self.autoCompleteFromAllAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Autocomplete from Document and APIs'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Autocomplete from Document and APIs'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Shift+Space", "Edit|Autocomplete from Document and APIs")), 0, self.editActGrp, 'vm_edit_autocomplete_from_all') - self.autoCompleteFromAllAct.setStatusTip(QApplication.translate( + self.autoCompleteFromAllAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Autocomplete current word from Document and APIs')) - self.autoCompleteFromAllAct.setWhatsThis(QApplication.translate( + self.autoCompleteFromAllAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Autocomplete from Document and APIs</b>""" """<p>Performs an autocompletion from document and APIs""" @@ -1315,15 +1326,15 @@ self.editActions.append(self.autoCompleteFromAllAct) self.calltipsAct = E5Action( - QApplication.translate('ViewManager', 'Calltip'), - QApplication.translate('ViewManager', '&Calltip'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Calltip'), + QCoreApplication.translate('ViewManager', '&Calltip'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Space", "Edit|Calltip")), 0, self.editActGrp, 'vm_edit_calltip') - self.calltipsAct.setStatusTip(QApplication.translate( + self.calltipsAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Show Calltips')) - self.calltipsAct.setWhatsThis(QApplication.translate( + self.calltipsAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Calltip</b>""" """<p>Show calltips based on the characters immediately to the""" @@ -1333,16 +1344,16 @@ self.editActions.append(self.calltipsAct) self.sortAct = E5Action( - QApplication.translate('ViewManager', 'Sort'), - QApplication.translate('ViewManager', 'Sort'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Sort'), + QCoreApplication.translate('ViewManager', 'Sort'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Alt+S", "Edit|Sort")), 0, self.editActGrp, 'vm_edit_sort') - self.sortAct.setStatusTip(QApplication.translate( + self.sortAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Sort the lines containing the rectangular selection')) - self.sortAct.setWhatsThis(QApplication.translate( + self.sortAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Sort</b>""" """<p>Sort the lines spanned by a rectangular selection based on""" @@ -1364,388 +1375,408 @@ self.editorActGrp = createActionGroup(self.editActGrp) act = E5Action( - QApplication.translate('ViewManager', 'Move left one character'), - QApplication.translate('ViewManager', 'Move left one character'), - QKeySequence(QApplication.translate('ViewManager', 'Left')), 0, + QCoreApplication.translate('ViewManager', + 'Move left one character'), + QCoreApplication.translate('ViewManager', + 'Move left one character'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Left')), 0, self.editorActGrp, 'vm_edit_move_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT) if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+B'))) + QCoreApplication.translate('ViewManager', 'Meta+B'))) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move right one character'), - QApplication.translate('ViewManager', 'Move right one character'), - QKeySequence(QApplication.translate('ViewManager', 'Right')), 0, - self.editorActGrp, 'vm_edit_move_right_char') + QCoreApplication.translate('ViewManager', + 'Move right one character'), + QCoreApplication.translate('ViewManager', + 'Move right one character'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Right')), + 0, self.editorActGrp, 'vm_edit_move_right_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+F'))) + QCoreApplication.translate('ViewManager', 'Meta+F'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move up one line'), - QApplication.translate('ViewManager', 'Move up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Up')), 0, + QCoreApplication.translate('ViewManager', 'Move up one line'), + QCoreApplication.translate('ViewManager', 'Move up one line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Up')), 0, self.editorActGrp, 'vm_edit_move_up_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+P'))) + QCoreApplication.translate('ViewManager', 'Meta+P'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move down one line'), - QApplication.translate('ViewManager', 'Move down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Down')), 0, + QCoreApplication.translate('ViewManager', 'Move down one line'), + QCoreApplication.translate('ViewManager', 'Move down one line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Down')), 0, self.editorActGrp, 'vm_edit_move_down_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+N'))) + QCoreApplication.translate('ViewManager', 'Meta+N'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move left one word part'), - QApplication.translate('ViewManager', 'Move left one word part'), + QCoreApplication.translate('ViewManager', + 'Move left one word part'), + QCoreApplication.translate('ViewManager', + 'Move left one word part'), 0, 0, self.editorActGrp, 'vm_edit_move_left_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move right one word part'), - QApplication.translate('ViewManager', 'Move right one word part'), + QCoreApplication.translate('ViewManager', + 'Move right one word part'), + QCoreApplication.translate('ViewManager', + 'Move right one word part'), 0, 0, self.editorActGrp, 'vm_edit_move_right_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move left one word'), - QApplication.translate('ViewManager', 'Move left one word'), + QCoreApplication.translate('ViewManager', 'Move left one word'), + QCoreApplication.translate('ViewManager', 'Move left one word'), 0, 0, self.editorActGrp, 'vm_edit_move_left_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Left'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Left'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move right one word'), - QApplication.translate('ViewManager', 'Move right one word'), + QCoreApplication.translate('ViewManager', 'Move right one word'), + QCoreApplication.translate('ViewManager', 'Move right one word'), 0, 0, self.editorActGrp, 'vm_edit_move_right_word') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in document line'), 0, 0, self.editorActGrp, 'vm_edit_move_first_visible_char') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Home'))) + QCoreApplication.translate('ViewManager', 'Home'))) self.esm.setMapping(act, QsciScintilla.SCI_VCHOME) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display line'), 0, 0, self.editorActGrp, 'vm_edit_move_start_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Left'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Left'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Home'))) + QCoreApplication.translate('ViewManager', 'Alt+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of document line'), 0, 0, self.editorActGrp, 'vm_edit_move_end_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+E'))) + QCoreApplication.translate('ViewManager', 'Meta+E'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'End'))) + QCoreApplication.translate('ViewManager', 'End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Scroll view down one line'), - QApplication.translate('ViewManager', 'Scroll view down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')), - 0, - self.editorActGrp, 'vm_edit_scroll_down_line') + QCoreApplication.translate('ViewManager', + 'Scroll view down one line'), + QCoreApplication.translate('ViewManager', + 'Scroll view down one line'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Down')), + 0, self.editorActGrp, 'vm_edit_scroll_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Scroll view up one line'), - QApplication.translate('ViewManager', 'Scroll view up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0, - self.editorActGrp, 'vm_edit_scroll_up_line') + QCoreApplication.translate('ViewManager', + 'Scroll view up one line'), + QCoreApplication.translate('ViewManager', + 'Scroll view up one line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Ctrl+Up')), + 0, self.editorActGrp, 'vm_edit_scroll_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move up one paragraph'), - QApplication.translate('ViewManager', 'Move up one paragraph'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0, - self.editorActGrp, 'vm_edit_move_up_para') + QCoreApplication.translate('ViewManager', 'Move up one paragraph'), + QCoreApplication.translate('ViewManager', 'Move up one paragraph'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Alt+Up')), + 0, self.editorActGrp, 'vm_edit_move_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move down one paragraph'), - QApplication.translate('ViewManager', 'Move down one paragraph'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0, - self.editorActGrp, 'vm_edit_move_down_para') + QCoreApplication.translate('ViewManager', + 'Move down one paragraph'), + QCoreApplication.translate('ViewManager', + 'Move down one paragraph'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Down')), + 0, self.editorActGrp, 'vm_edit_move_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move up one page'), - QApplication.translate('ViewManager', 'Move up one page'), - QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0, + QCoreApplication.translate('ViewManager', 'Move up one page'), + QCoreApplication.translate('ViewManager', 'Move up one page'), + QKeySequence(QCoreApplication.translate('ViewManager', 'PgUp')), 0, self.editorActGrp, 'vm_edit_move_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move down one page'), - QApplication.translate('ViewManager', 'Move down one page'), - QKeySequence(QApplication.translate('ViewManager', 'PgDown')), 0, - self.editorActGrp, 'vm_edit_move_down_page') + QCoreApplication.translate('ViewManager', 'Move down one page'), + QCoreApplication.translate('ViewManager', 'Move down one page'), + QKeySequence(QCoreApplication.translate('ViewManager', 'PgDown')), + 0, self.editorActGrp, 'vm_edit_move_down_page') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+V'))) + QCoreApplication.translate('ViewManager', 'Meta+V'))) self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move to start of document'), - QApplication.translate('ViewManager', 'Move to start of document'), + QCoreApplication.translate('ViewManager', + 'Move to start of document'), + QCoreApplication.translate('ViewManager', + 'Move to start of document'), 0, 0, self.editorActGrp, 'vm_edit_move_start_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Up'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Up'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Home'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Move to end of document'), - QApplication.translate('ViewManager', 'Move to end of document'), + QCoreApplication.translate('ViewManager', + 'Move to end of document'), + QCoreApplication.translate('ViewManager', + 'Move to end of document'), 0, 0, self.editorActGrp, 'vm_edit_move_end_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Down'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Down'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+End'))) + QCoreApplication.translate('ViewManager', 'Ctrl+End'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Indent one level'), - QApplication.translate('ViewManager', 'Indent one level'), - QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0, + QCoreApplication.translate('ViewManager', 'Indent one level'), + QCoreApplication.translate('ViewManager', 'Indent one level'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Tab')), 0, self.editorActGrp, 'vm_edit_indent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_TAB) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Unindent one level'), - QApplication.translate('ViewManager', 'Unindent one level'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')), - 0, - self.editorActGrp, 'vm_edit_unindent_one_level') + QCoreApplication.translate('ViewManager', 'Unindent one level'), + QCoreApplication.translate('ViewManager', 'Unindent one level'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Tab')), + 0, self.editorActGrp, 'vm_edit_unindent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Left')), - 0, - self.editorActGrp, 'vm_edit_extend_selection_left_char') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Left')), + 0, self.editorActGrp, 'vm_edit_extend_selection_left_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+B'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+B'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one character'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Right')), - 0, - self.editorActGrp, 'vm_edit_extend_selection_right_char') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Right')), + 0, self.editorActGrp, 'vm_edit_extend_selection_right_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+F'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+F'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Extend selection up one line'), + QCoreApplication.translate( 'ViewManager', 'Extend selection up one line'), - QApplication.translate( - 'ViewManager', 'Extend selection up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Up')), 0, - self.editorActGrp, 'vm_edit_extend_selection_up_line') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Up')), + 0, self.editorActGrp, 'vm_edit_extend_selection_up_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+P'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+P'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one line'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Down')), - 0, - self.editorActGrp, 'vm_edit_extend_selection_down_line') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Down')), + 0, self.editorActGrp, 'vm_edit_extend_selection_down_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+N'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+N'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word part'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word part'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_left_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word part'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word part'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_right_word_part') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection left one word'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_left_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Left'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Left'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Left'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection right one word'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_right_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Right'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in document' ' line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in document' ' line'), @@ -1753,34 +1784,34 @@ self.editorActGrp, 'vm_edit_extend_selection_first_visible_char') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Shift+Home'))) + QCoreApplication.translate('ViewManager', 'Shift+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document line'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+E'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+E'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Shift+End'))) + QCoreApplication.translate('ViewManager', 'Shift+End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one paragraph'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one paragraph'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_para') @@ -1789,11 +1820,11 @@ self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one paragraph'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one paragraph'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Shift+Down')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_para') @@ -1802,88 +1833,90 @@ self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection up one page'), - QKeySequence(QApplication.translate('ViewManager', 'Shift+PgUp')), - 0, - self.editorActGrp, 'vm_edit_extend_selection_up_page') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+PgUp')), + 0, self.editorActGrp, 'vm_edit_extend_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection down one page'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Shift+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_selection_down_page') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+V'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+V'))) self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_start_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Up'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Up'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Home'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTARTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of document'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Down'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Down'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+End'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+End'))) self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete previous character'), - QApplication.translate('ViewManager', 'Delete previous character'), - QKeySequence(QApplication.translate('ViewManager', 'Backspace')), - 0, - self.editorActGrp, 'vm_edit_delete_previous_char') + QCoreApplication.translate('ViewManager', + 'Delete previous character'), + QCoreApplication.translate('ViewManager', + 'Delete previous character'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Backspace')), + 0, self.editorActGrp, 'vm_edit_delete_previous_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+H'))) + QCoreApplication.translate('ViewManager', 'Meta+H'))) else: act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Shift+Backspace'))) + QCoreApplication.translate('ViewManager', 'Shift+Backspace'))) self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete previous character if not at start of line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete previous character if not at start of line'), 0, 0, @@ -1893,21 +1926,23 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete current character'), - QApplication.translate('ViewManager', 'Delete current character'), - QKeySequence(QApplication.translate('ViewManager', 'Del')), 0, - self.editorActGrp, 'vm_edit_delete_current_char') + QCoreApplication.translate('ViewManager', + 'Delete current character'), + QCoreApplication.translate('ViewManager', + 'Delete current character'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Del')), + 0, self.editorActGrp, 'vm_edit_delete_current_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+D'))) + QCoreApplication.translate('ViewManager', 'Meta+D'))) self.esm.setMapping(act, QsciScintilla.SCI_CLEAR) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete word to left'), - QApplication.translate('ViewManager', 'Delete word to left'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Delete word to left'), + QCoreApplication.translate('ViewManager', 'Delete word to left'), + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Ctrl+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_word_left') @@ -1916,18 +1951,19 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete word to right'), - QApplication.translate('ViewManager', 'Delete word to right'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0, - self.editorActGrp, 'vm_edit_delete_word_right') + QCoreApplication.translate('ViewManager', 'Delete word to right'), + QCoreApplication.translate('ViewManager', 'Delete word to right'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Ctrl+Del')), + 0, self.editorActGrp, 'vm_edit_delete_word_right') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete line to left'), - QApplication.translate('ViewManager', 'Delete line to left'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Delete line to left'), + QCoreApplication.translate('ViewManager', 'Delete line to left'), + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Ctrl+Shift+Backspace')), 0, self.editorActGrp, 'vm_edit_delete_line_left') @@ -1936,46 +1972,47 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete line to right'), - QApplication.translate('ViewManager', 'Delete line to right'), + QCoreApplication.translate('ViewManager', 'Delete line to right'), + QCoreApplication.translate('ViewManager', 'Delete line to right'), 0, 0, self.editorActGrp, 'vm_edit_delete_line_right') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+K'))) + QCoreApplication.translate('ViewManager', 'Meta+K'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Del'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Del'))) self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Insert new line'), - QApplication.translate('ViewManager', 'Insert new line'), - QKeySequence(QApplication.translate('ViewManager', 'Return')), - QKeySequence(QApplication.translate('ViewManager', 'Enter')), + QCoreApplication.translate('ViewManager', 'Insert new line'), + QCoreApplication.translate('ViewManager', 'Insert new line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Return')), + QKeySequence(QCoreApplication.translate('ViewManager', 'Enter')), self.editorActGrp, 'vm_edit_insert_line') self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Insert new line below current line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Insert new line below current line'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Shift+Return')), - QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Shift+Enter')), self.editorActGrp, 'vm_edit_insert_line_below') act.triggered.connect(self.__newLineBelow) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Delete current line'), - QApplication.translate('ViewManager', 'Delete current line'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Delete current line'), + QCoreApplication.translate('ViewManager', 'Delete current line'), + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Ctrl+Shift+L')), 0, self.editorActGrp, 'vm_edit_delete_current_line') @@ -1984,39 +2021,41 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Duplicate current line'), - QApplication.translate('ViewManager', 'Duplicate current line'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0, - self.editorActGrp, 'vm_edit_duplicate_current_line') + QCoreApplication.translate( + 'ViewManager', 'Duplicate current line'), + QCoreApplication.translate( + 'ViewManager', 'Duplicate current line'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Ctrl+D')), + 0, self.editorActGrp, 'vm_edit_duplicate_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Swap current and previous lines'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Swap current and previous lines'), - QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0, - self.editorActGrp, 'vm_edit_swap_current_previous_line') + QKeySequence(QCoreApplication.translate('ViewManager', 'Ctrl+T')), + 0, self.editorActGrp, 'vm_edit_swap_current_previous_line') self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Cut current line'), - QApplication.translate('ViewManager', 'Cut current line'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+L')), - 0, - self.editorActGrp, 'vm_edit_cut_current_line') + QCoreApplication.translate('ViewManager', 'Cut current line'), + QCoreApplication.translate('ViewManager', 'Cut current line'), + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+L')), + 0, self.editorActGrp, 'vm_edit_cut_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECUT) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Copy current line'), - QApplication.translate('ViewManager', 'Copy current line'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Copy current line'), + QCoreApplication.translate('ViewManager', 'Copy current line'), + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Ctrl+Shift+T')), 0, self.editorActGrp, 'vm_edit_copy_current_line') @@ -2025,48 +2064,50 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Toggle insert/overtype'), - QApplication.translate('ViewManager', 'Toggle insert/overtype'), - QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0, - self.editorActGrp, 'vm_edit_toggle_insert_overtype') + QCoreApplication.translate( + 'ViewManager', 'Toggle insert/overtype'), + QCoreApplication.translate( + 'ViewManager', 'Toggle insert/overtype'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Ins')), + 0, self.editorActGrp, 'vm_edit_toggle_insert_overtype') self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display line'), 0, 0, self.editorActGrp, 'vm_edit_move_end_displayed_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Right'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+End'))) + QCoreApplication.translate('ViewManager', 'Alt+End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display line'), 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_displayed_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) + QCoreApplication.translate('ViewManager', 'Ctrl+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Formfeed'), - QApplication.translate('ViewManager', 'Formfeed'), + QCoreApplication.translate('ViewManager', 'Formfeed'), + QCoreApplication.translate('ViewManager', 'Formfeed'), 0, 0, self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) @@ -2074,87 +2115,87 @@ self.editActions.append(act) act = E5Action( - QApplication.translate('ViewManager', 'Escape'), - QApplication.translate('ViewManager', 'Escape'), - QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0, + QCoreApplication.translate('ViewManager', 'Escape'), + QCoreApplication.translate('ViewManager', 'Escape'), + QKeySequence(QCoreApplication.translate('ViewManager', 'Esc')), 0, self.editorActGrp, 'vm_edit_escape') self.esm.setMapping(act, QsciScintilla.SCI_CANCEL) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one line'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+N'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+N'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one line'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Ctrl+Up')), - 0, - self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Ctrl+Up')), + 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+P'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+P'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEUPRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection left one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection left one character'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_left_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+B'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+B'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection right one character'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection right one character'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Ctrl+Right')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_right_char') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+F'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+F'))) self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to first visible character in' ' document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to first visible character in' ' document line'), @@ -2163,38 +2204,38 @@ 'vm_edit_extend_rect_selection_first_visible_char') if not isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Home'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+Home'))) self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to end of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to end of document line'), 0, 0, self.editorActGrp, 'vm_edit_extend_rect_selection_end_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+E'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+E'))) else: act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+End'))) + QCoreApplication.translate('ViewManager', 'Alt+Shift+End'))) self.esm.setMapping(act, QsciScintilla.SCI_LINEENDRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection up one page'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Shift+PgUp')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page') @@ -2203,29 +2244,29 @@ self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection down one page'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Alt+Shift+PgDown')), 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_page') if isMacPlatform(): act.setAlternateShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+V'))) + QCoreApplication.translate('ViewManager', 'Meta+Alt+Shift+V'))) self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Duplicate current selection'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Duplicate current selection'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Ctrl+Shift+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') @@ -2235,84 +2276,85 @@ if hasattr(QsciScintilla, "SCI_SCROLLTOSTART"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to start of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to start of document'), 0, 0, self.editorActGrp, 'vm_edit_scroll_start_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Home'))) + QCoreApplication.translate('ViewManager', 'Home'))) self.esm.setMapping(act, QsciScintilla.SCI_SCROLLTOSTART) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_SCROLLTOEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to end of document'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll to end of document'), 0, 0, self.editorActGrp, 'vm_edit_scroll_end_text') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'End'))) + QCoreApplication.translate('ViewManager', 'End'))) self.esm.setMapping(act, QsciScintilla.SCI_SCROLLTOEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_VERTICALCENTRECARET"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll vertically to center current line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Scroll vertically to center current line'), 0, 0, self.editorActGrp, 'vm_edit_scroll_vertically_center') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+L'))) + QCoreApplication.translate('ViewManager', 'Meta+L'))) self.esm.setMapping(act, QsciScintilla.SCI_VERTICALCENTRECARET) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_WORDRIGHTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of next word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of next word'), 0, 0, self.editorActGrp, 'vm_edit_move_end_next_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Right'))) + QCoreApplication.translate('ViewManager', 'Alt+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_WORDRIGHTENDEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of next word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of next word'), 0, 0, self.editorActGrp, 'vm_edit_select_end_next_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Shift+Right'))) + QCoreApplication.translate('ViewManager', + 'Alt+Shift+Right'))) self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTENDEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_WORDLEFTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of previous word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of previous word'), 0, 0, self.editorActGrp, 'vm_edit_move_end_previous_word') @@ -2322,9 +2364,9 @@ if hasattr(QsciScintilla, "SCI_WORDLEFTENDEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of previous word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of previous word'), 0, 0, self.editorActGrp, 'vm_edit_select_end_previous_word') @@ -2334,25 +2376,25 @@ if hasattr(QsciScintilla, "SCI_HOME"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of document line'), 0, 0, self.editorActGrp, 'vm_edit_move_start_document_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+A'))) + QCoreApplication.translate('ViewManager', 'Meta+A'))) self.esm.setMapping(act, QsciScintilla.SCI_HOME) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMEEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of document line'), 0, 0, @@ -2360,34 +2402,35 @@ 'vm_edit_extend_selection_start_document_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Shift+A'))) + QCoreApplication.translate('ViewManager', 'Meta+Shift+A'))) self.esm.setMapping(act, QsciScintilla.SCI_HOME) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMERECTEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to start of document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend rectangular selection to start of document line'), 0, 0, self.editorActGrp, 'vm_edit_select_rect_start_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Meta+Alt+Shift+A'))) + QCoreApplication.translate('ViewManager', + 'Meta+Alt+Shift+A'))) self.esm.setMapping(act, QsciScintilla.SCI_HOMERECTEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMEDISPLAYEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display line'), 0, 0, @@ -2395,17 +2438,18 @@ 'vm_edit_extend_selection_start_display_line') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Ctrl+Shift+Left'))) + QCoreApplication.translate('ViewManager', + 'Ctrl+Shift+Left'))) self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_HOMEWRAP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to start of display or document line'), 0, 0, @@ -2416,10 +2460,10 @@ if hasattr(QsciScintilla, "SCI_HOMEWRAPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to start of display or document line'), 0, 0, @@ -2431,11 +2475,11 @@ if hasattr(QsciScintilla, "SCI_VCHOMEWRAP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in display or document' ' line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to first visible character in display or document' ' line'), @@ -2448,11 +2492,11 @@ if hasattr(QsciScintilla, "SCI_VCHOMEWRAPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in' ' display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to first visible character in' ' display or document line'), @@ -2465,10 +2509,10 @@ if hasattr(QsciScintilla, "SCI_LINEENDWRAP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move to end of display or document line'), 0, 0, @@ -2479,10 +2523,10 @@ if hasattr(QsciScintilla, "SCI_LINEENDWRAPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display or document line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Extend selection to end of display or document line'), 0, 0, @@ -2494,9 +2538,9 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move up one page'), 0, 0, self.editorActGrp, 'vm_edit_stuttered_move_up_page') @@ -2506,9 +2550,9 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEUPEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection up one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection up one page'), 0, 0, self.editorActGrp, @@ -2519,9 +2563,9 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWN"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered move down one page'), 0, 0, self.editorActGrp, 'vm_edit_stuttered_move_down_page') @@ -2531,9 +2575,9 @@ if hasattr(QsciScintilla, "SCI_STUTTEREDPAGEDOWNEXTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection down one page'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Stuttered extend selection down one page'), 0, 0, self.editorActGrp, @@ -2544,24 +2588,24 @@ if hasattr(QsciScintilla, "SCI_DELWORDRIGHTEND"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete right to end of next word'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Delete right to end of next word'), 0, 0, self.editorActGrp, 'vm_edit_delete_right_end_next_word') if isMacPlatform(): act.setShortcut(QKeySequence( - QApplication.translate('ViewManager', 'Alt+Del'))) + QCoreApplication.translate('ViewManager', 'Alt+Del'))) self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHTEND) act.triggered.connect(self.esm.map) self.editActions.append(act) if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESUP"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines up one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines up one line'), 0, 0, self.editorActGrp, 'vm_edit_move_selection_up_one_line') @@ -2571,9 +2615,9 @@ if hasattr(QsciScintilla, "SCI_MOVESELECTEDLINESDOWN"): act = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines down one line'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Move selected lines down one line'), 0, 0, self.editorActGrp, 'vm_edit_move_selection_down_one_line') @@ -2584,23 +2628,23 @@ self.editorActGrp.setEnabled(False) self.editLowerCaseAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to lower case'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to lower case'), - QKeySequence(QApplication.translate('ViewManager', 'Alt+Shift+U')), - 0, - self.editActGrp, 'vm_edit_convert_selection_lower') + QKeySequence(QCoreApplication.translate('ViewManager', + 'Alt+Shift+U')), + 0, self.editActGrp, 'vm_edit_convert_selection_lower') self.esm.setMapping(self.editLowerCaseAct, QsciScintilla.SCI_LOWERCASE) self.editLowerCaseAct.triggered.connect(self.esm.map) self.editActions.append(self.editLowerCaseAct) self.editUpperCaseAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to upper case'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Convert selection to upper case'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', 'Ctrl+Shift+U')), 0, self.editActGrp, 'vm_edit_convert_selection_upper') @@ -2615,7 +2659,8 @@ @return the generated menu """ autocompletionMenu = QMenu( - QApplication.translate('ViewManager', '&Autocomplete'), self.ui) + QCoreApplication.translate('ViewManager', '&Autocomplete'), + self.ui) autocompletionMenu.setTearOffEnabled(True) autocompletionMenu.addAction(self.autoCompleteAct) autocompletionMenu.addAction(self.autoCompleteFromDocAct) @@ -2624,8 +2669,9 @@ autocompletionMenu.addSeparator() autocompletionMenu.addAction(self.calltipsAct) - searchMenu = \ - QMenu(QApplication.translate('ViewManager', '&Search'), self.ui) + searchMenu = QMenu( + QCoreApplication.translate('ViewManager', '&Search'), + self.ui) searchMenu.setTearOffEnabled(True) searchMenu.addAction(self.quickSearchAct) searchMenu.addAction(self.quickSearchBackAct) @@ -2644,7 +2690,8 @@ searchMenu.addAction(self.searchOpenFilesAct) searchMenu.addAction(self.replaceOpenFilesAct) - menu = QMenu(QApplication.translate('ViewManager', '&Edit'), self.ui) + menu = QMenu(QCoreApplication.translate('ViewManager', '&Edit'), + self.ui) menu.setTearOffEnabled(True) menu.addAction(self.undoAct) menu.addAction(self.redoAct) @@ -2696,10 +2743,11 @@ (E5ToolBarManager) @return the generated toolbar """ - tb = QToolBar(QApplication.translate('ViewManager', 'Edit'), self.ui) + tb = QToolBar(QCoreApplication.translate('ViewManager', 'Edit'), + self.ui) tb.setIconSize(UI.Config.ToolBarIconSize) tb.setObjectName("EditToolbar") - tb.setToolTip(QApplication.translate('ViewManager', 'Edit')) + tb.setToolTip(QCoreApplication.translate('ViewManager', 'Edit')) tb.addAction(self.undoAct) tb.addAction(self.redoAct) @@ -2733,16 +2781,16 @@ self.searchActGrp = createActionGroup(self) self.searchAct = E5Action( - QApplication.translate('ViewManager', 'Search'), + QCoreApplication.translate('ViewManager', 'Search'), UI.PixmapCache.getIcon("find.png"), - QApplication.translate('ViewManager', '&Search...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Search...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+F", "Search|Search")), 0, self.searchActGrp, 'vm_search') - self.searchAct.setStatusTip(QApplication.translate( + self.searchAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search for a text')) - self.searchAct.setWhatsThis(QApplication.translate( + self.searchAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search</b>""" """<p>Search for some text in the current editor. A""" @@ -2753,17 +2801,17 @@ self.searchActions.append(self.searchAct) self.searchNextAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Search next'), UI.PixmapCache.getIcon("findNext.png"), - QApplication.translate('ViewManager', 'Search &next'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search &next'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "F3", "Search|Search next")), 0, self.searchActGrp, 'vm_search_next') - self.searchNextAct.setStatusTip(QApplication.translate( + self.searchNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search next occurrence of text')) - self.searchNextAct.setWhatsThis(QApplication.translate( + self.searchNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search next</b>""" """<p>Search the next occurrence of some text in the current""" @@ -2774,16 +2822,16 @@ self.searchActions.append(self.searchNextAct) self.searchPrevAct = E5Action( - QApplication.translate('ViewManager', 'Search previous'), + QCoreApplication.translate('ViewManager', 'Search previous'), UI.PixmapCache.getIcon("findPrev.png"), - QApplication.translate('ViewManager', 'Search &previous'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search &previous'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+F3", "Search|Search previous")), 0, self.searchActGrp, 'vm_search_previous') - self.searchPrevAct.setStatusTip(QApplication.translate( + self.searchPrevAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search previous occurrence of text')) - self.searchPrevAct.setWhatsThis(QApplication.translate( + self.searchPrevAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search previous</b>""" """<p>Search the previous occurrence of some text in the current""" @@ -2794,16 +2842,16 @@ self.searchActions.append(self.searchPrevAct) self.searchClearMarkersAct = E5Action( - QApplication.translate('ViewManager', 'Clear search markers'), + QCoreApplication.translate('ViewManager', 'Clear search markers'), UI.PixmapCache.getIcon("findClear.png"), - QApplication.translate('ViewManager', 'Clear search markers'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Clear search markers'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+3", "Search|Clear search markers")), 0, self.searchActGrp, 'vm_clear_search_markers') - self.searchClearMarkersAct.setStatusTip(QApplication.translate( + self.searchClearMarkersAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Clear all displayed search markers')) - self.searchClearMarkersAct.setWhatsThis(QApplication.translate( + self.searchClearMarkersAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Clear search markers</b>""" """<p>Clear all displayed search markers.</p>""" @@ -2813,20 +2861,20 @@ self.searchActions.append(self.searchClearMarkersAct) self.searchNextWordAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Search current word forward'), UI.PixmapCache.getIcon("findWordNext.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Search current word forward'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+.", "Search|Search current word forward")), 0, self.searchActGrp, 'vm_search_word_next') - self.searchNextWordAct.setStatusTip(QApplication.translate( + self.searchNextWordAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search next occurrence of the current word')) - self.searchNextWordAct.setWhatsThis(QApplication.translate( + self.searchNextWordAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search current word forward</b>""" """<p>Search the next occurrence of the current word of the""" @@ -2836,20 +2884,20 @@ self.searchActions.append(self.searchNextWordAct) self.searchPrevWordAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Search current word backward'), UI.PixmapCache.getIcon("findWordPrev.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Search current word backward'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+,", "Search|Search current word backward")), 0, self.searchActGrp, 'vm_search_word_previous') - self.searchPrevWordAct.setStatusTip(QApplication.translate( + self.searchPrevWordAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search previous occurrence of the current word')) - self.searchPrevWordAct.setWhatsThis(QApplication.translate( + self.searchPrevWordAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search current word backward</b>""" """<p>Search the previous occurrence of the current word of the""" @@ -2859,15 +2907,15 @@ self.searchActions.append(self.searchPrevWordAct) self.replaceAct = E5Action( - QApplication.translate('ViewManager', 'Replace'), - QApplication.translate('ViewManager', '&Replace...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Replace'), + QCoreApplication.translate('ViewManager', '&Replace...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+R", "Search|Replace")), 0, self.searchActGrp, 'vm_search_replace') - self.replaceAct.setStatusTip(QApplication.translate( + self.replaceAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Replace some text')) - self.replaceAct.setWhatsThis(QApplication.translate( + self.replaceAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Replace</b>""" """<p>Search for some text in the current editor and replace it.""" @@ -2878,16 +2926,16 @@ self.searchActions.append(self.replaceAct) self.quickSearchAct = E5Action( - QApplication.translate('ViewManager', 'Quicksearch'), + QCoreApplication.translate('ViewManager', 'Quicksearch'), UI.PixmapCache.getIcon("quickFindNext.png"), - QApplication.translate('ViewManager', '&Quicksearch'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Quicksearch'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+K", "Search|Quicksearch")), 0, self.searchActGrp, 'vm_quicksearch') - self.quickSearchAct.setStatusTip(QApplication.translate( + self.quickSearchAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Perform a quicksearch')) - self.quickSearchAct.setWhatsThis(QApplication.translate( + self.quickSearchAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Quicksearch</b>""" """<p>This activates the quicksearch function of the IDE by""" @@ -2899,17 +2947,19 @@ self.searchActions.append(self.quickSearchAct) self.quickSearchBackAct = E5Action( - QApplication.translate('ViewManager', 'Quicksearch backwards'), + QCoreApplication.translate( + 'ViewManager', 'Quicksearch backwards'), UI.PixmapCache.getIcon("quickFindPrev.png"), - QApplication.translate('ViewManager', 'Quicksearch &backwards'), - QKeySequence(QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Quicksearch &backwards'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+J", "Search|Quicksearch backwards")), 0, self.searchActGrp, 'vm_quicksearch_backwards') - self.quickSearchBackAct.setStatusTip(QApplication.translate( + self.quickSearchBackAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Perform a quicksearch backwards')) - self.quickSearchBackAct.setWhatsThis(QApplication.translate( + self.quickSearchBackAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Quicksearch backwards</b>""" """<p>This searches the previous occurrence of the quicksearch""" @@ -2919,17 +2969,17 @@ self.searchActions.append(self.quickSearchBackAct) self.quickSearchExtendAct = E5Action( - QApplication.translate('ViewManager', 'Quicksearch extend'), + QCoreApplication.translate('ViewManager', 'Quicksearch extend'), UI.PixmapCache.getIcon("quickFindExtend.png"), - QApplication.translate('ViewManager', 'Quicksearch e&xtend'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Quicksearch e&xtend'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+H", "Search|Quicksearch extend")), 0, self.searchActGrp, 'vm_quicksearch_extend') - self.quickSearchExtendAct.setStatusTip(QApplication.translate( + self.quickSearchExtendAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Extend the quicksearch to the end of the current word')) - self.quickSearchExtendAct.setWhatsThis(QApplication.translate( + self.quickSearchExtendAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Quicksearch extend</b>""" """<p>This extends the quicksearch text to the end of the word""" @@ -2940,16 +2990,16 @@ self.searchActions.append(self.quickSearchExtendAct) self.gotoAct = E5Action( - QApplication.translate('ViewManager', 'Goto Line'), + QCoreApplication.translate('ViewManager', 'Goto Line'), UI.PixmapCache.getIcon("goto.png"), - QApplication.translate('ViewManager', '&Goto Line...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Goto Line...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+G", "Search|Goto Line")), 0, self.searchActGrp, 'vm_search_goto_line') - self.gotoAct.setStatusTip(QApplication.translate( + self.gotoAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Goto Line')) - self.gotoAct.setWhatsThis(QApplication.translate( + self.gotoAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Goto Line</b>""" """<p>Go to a specific line of text in the current editor.""" @@ -2959,16 +3009,16 @@ self.searchActions.append(self.gotoAct) self.gotoBraceAct = E5Action( - QApplication.translate('ViewManager', 'Goto Brace'), + QCoreApplication.translate('ViewManager', 'Goto Brace'), UI.PixmapCache.getIcon("gotoBrace.png"), - QApplication.translate('ViewManager', 'Goto &Brace'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Goto &Brace'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+L", "Search|Goto Brace")), 0, self.searchActGrp, 'vm_search_goto_brace') - self.gotoBraceAct.setStatusTip(QApplication.translate( + self.gotoBraceAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Goto Brace')) - self.gotoBraceAct.setWhatsThis(QApplication.translate( + self.gotoBraceAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Goto Brace</b>""" """<p>Go to the matching brace in the current editor.</p>""" @@ -2977,17 +3027,20 @@ self.searchActions.append(self.gotoBraceAct) self.gotoLastEditAct = E5Action( - QApplication.translate('ViewManager', 'Goto Last Edit Location'), + QCoreApplication.translate( + 'ViewManager', 'Goto Last Edit Location'), UI.PixmapCache.getIcon("gotoLastEditPosition.png"), - QApplication.translate('ViewManager', 'Goto Last &Edit Location'), - QKeySequence(QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Goto Last &Edit Location'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+G", "Search|Goto Last Edit Location")), 0, self.searchActGrp, 'vm_search_goto_last_edit_location') self.gotoLastEditAct.setStatusTip( - QApplication.translate('ViewManager', 'Goto Last Edit Location')) - self.gotoLastEditAct.setWhatsThis(QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Goto Last Edit Location')) + self.gotoLastEditAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Goto Last Edit Location</b>""" """<p>Go to the location of the last edit in the current""" @@ -2997,20 +3050,20 @@ self.searchActions.append(self.gotoLastEditAct) self.gotoPreviousDefAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Goto Previous Method or Class'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Goto Previous Method or Class'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+Up", "Search|Goto Previous Method or Class")), 0, self.searchActGrp, 'vm_search_goto_previous_method_or_class') self.gotoPreviousDefAct.setStatusTip( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Go to the previous method or class definition')) - self.gotoPreviousDefAct.setWhatsThis(QApplication.translate( + self.gotoPreviousDefAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Goto Previous Method or Class</b>""" """<p>Goes to the line of the previous method or class""" @@ -3021,16 +3074,18 @@ self.searchActions.append(self.gotoPreviousDefAct) self.gotoNextDefAct = E5Action( - QApplication.translate('ViewManager', 'Goto Next Method or Class'), - QApplication.translate('ViewManager', 'Goto Next Method or Class'), - QKeySequence(QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Goto Next Method or Class'), + QCoreApplication.translate( + 'ViewManager', 'Goto Next Method or Class'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Shift+Down", "Search|Goto Next Method or Class")), 0, self.searchActGrp, 'vm_search_goto_next_method_or_class') - self.gotoNextDefAct.setStatusTip(QApplication.translate( + self.gotoNextDefAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Go to the next method or class definition')) - self.gotoNextDefAct.setWhatsThis(QApplication.translate( + self.gotoNextDefAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Goto Next Method or Class</b>""" """<p>Goes to the line of the next method or class definition""" @@ -3042,16 +3097,16 @@ self.searchActGrp.setEnabled(False) self.searchFilesAct = E5Action( - QApplication.translate('ViewManager', 'Search in Files'), + QCoreApplication.translate('ViewManager', 'Search in Files'), UI.PixmapCache.getIcon("projectFind.png"), - QApplication.translate('ViewManager', 'Search in &Files...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Search in &Files...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+Ctrl+F", "Search|Search Files")), 0, self, 'vm_search_in_files') - self.searchFilesAct.setStatusTip(QApplication.translate( + self.searchFilesAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search for a text in files')) - self.searchFilesAct.setWhatsThis(QApplication.translate( + self.searchFilesAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search in Files</b>""" """<p>Search for some text in the files of a directory tree""" @@ -3062,15 +3117,15 @@ self.searchActions.append(self.searchFilesAct) self.replaceFilesAct = E5Action( - QApplication.translate('ViewManager', 'Replace in Files'), - QApplication.translate('ViewManager', 'Replace in F&iles...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Replace in Files'), + QCoreApplication.translate('ViewManager', 'Replace in F&iles...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+Ctrl+R", "Search|Replace in Files")), 0, self, 'vm_replace_in_files') - self.replaceFilesAct.setStatusTip(QApplication.translate( + self.replaceFilesAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search for a text in files and replace it')) - self.replaceFilesAct.setWhatsThis(QApplication.translate( + self.replaceFilesAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Replace in Files</b>""" """<p>Search for some text in the files of a directory tree""" @@ -3082,17 +3137,19 @@ self.searchActions.append(self.replaceFilesAct) self.searchOpenFilesAct = E5Action( - QApplication.translate('ViewManager', 'Search in Open Files'), + QCoreApplication.translate( + 'ViewManager', 'Search in Open Files'), UI.PixmapCache.getIcon("documentFind.png"), - QApplication.translate('ViewManager', 'Search in Open Files...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Search in Open Files...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Meta+Ctrl+Alt+F", "Search|Search Open Files")), 0, self.searchActGrp, 'vm_search_in_open_files') - self.searchOpenFilesAct.setStatusTip(QApplication.translate( + self.searchOpenFilesAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search for a text in open files')) - self.searchOpenFilesAct.setWhatsThis(QApplication.translate( + self.searchOpenFilesAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Search in Open Files</b>""" """<p>Search for some text in the currently opened files.""" @@ -3103,16 +3160,18 @@ self.searchActions.append(self.searchOpenFilesAct) self.replaceOpenFilesAct = E5Action( - QApplication.translate('ViewManager', 'Replace in Open Files'), - QApplication.translate('ViewManager', 'Replace in Open Files...'), - QKeySequence(QApplication.translate( + QCoreApplication.translate( + 'ViewManager', 'Replace in Open Files'), + QCoreApplication.translate( + 'ViewManager', 'Replace in Open Files...'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Meta+Ctrl+Alt+R", "Search|Replace in Open Files")), 0, self.searchActGrp, 'vm_replace_in_open_files') - self.replaceOpenFilesAct.setStatusTip(QApplication.translate( + self.replaceOpenFilesAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Search for a text in open files and replace it')) - self.replaceOpenFilesAct.setWhatsThis(QApplication.translate( + self.replaceOpenFilesAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Replace in Open Files</b>""" """<p>Search for some text in the currently opened files""" @@ -3131,11 +3190,12 @@ (E5ToolBarManager) @return a tuple of the generated toolbar (search, quicksearch) """ - qtb = QToolBar(QApplication.translate('ViewManager', 'Quicksearch'), - self.ui) + qtb = QToolBar(QCoreApplication.translate( + 'ViewManager', 'Quicksearch'), self.ui) qtb.setIconSize(UI.Config.ToolBarIconSize) qtb.setObjectName("QuicksearchToolbar") - qtb.setToolTip(QApplication.translate('ViewManager', 'Quicksearch')) + qtb.setToolTip(QCoreApplication.translate( + 'ViewManager', 'Quicksearch')) self.quickFindLineEdit = QuickSearchLineEdit(self) self.quickFindtextCombo = QComboBox(self) @@ -3153,12 +3213,11 @@ self.quickFindtextCombo._editor = self.quickFindtextCombo.lineEdit() # this allows us not to jump across searched text # just because of autocompletion enabled - self.quickFindtextCombo.setAutoCompletion(False) self.quickFindtextCombo.setMinimumWidth(250) self.quickFindtextCombo.setSizeAdjustPolicy( QComboBox.AdjustToMinimumContentsLengthWithIcon) self.quickFindtextCombo.addItem("") - self.quickFindtextCombo.setWhatsThis(QApplication.translate( + self.quickFindtextCombo.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<p>Enter the searchtext directly into this field.""" """ The search will be performed case insensitive.""" @@ -3194,10 +3253,11 @@ self.__quickSearchToolbar = qtb self.__quickSearchToolbarVisibility = None - tb = QToolBar(QApplication.translate('ViewManager', 'Search'), self.ui) + tb = QToolBar(QCoreApplication.translate('ViewManager', 'Search'), + self.ui) tb.setIconSize(UI.Config.ToolBarIconSize) tb.setObjectName("SearchToolbar") - tb.setToolTip(QApplication.translate('ViewManager', 'Search')) + tb.setToolTip(QCoreApplication.translate('ViewManager', 'Search')) tb.addAction(self.searchAct) tb.addAction(self.searchNextAct) @@ -3235,17 +3295,17 @@ self.viewFoldActGrp = createActionGroup(self) self.zoomInAct = E5Action( - QApplication.translate('ViewManager', 'Zoom in'), + QCoreApplication.translate('ViewManager', 'Zoom in'), UI.PixmapCache.getIcon("zoomIn.png"), - QApplication.translate('ViewManager', 'Zoom &in'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Zoom &in'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl++", "View|Zoom in")), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Zoom In", "View|Zoom in")), self.viewActGrp, 'vm_view_zoom_in') - self.zoomInAct.setStatusTip(QApplication.translate( + self.zoomInAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Zoom in on the text')) - self.zoomInAct.setWhatsThis(QApplication.translate( + self.zoomInAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Zoom in</b>""" """<p>Zoom in on the text. This makes the text bigger.</p>""" @@ -3254,17 +3314,17 @@ self.viewActions.append(self.zoomInAct) self.zoomOutAct = E5Action( - QApplication.translate('ViewManager', 'Zoom out'), + QCoreApplication.translate('ViewManager', 'Zoom out'), UI.PixmapCache.getIcon("zoomOut.png"), - QApplication.translate('ViewManager', 'Zoom &out'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Zoom &out'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+-", "View|Zoom out")), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Zoom Out", "View|Zoom out")), self.viewActGrp, 'vm_view_zoom_out') - self.zoomOutAct.setStatusTip(QApplication.translate( + self.zoomOutAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Zoom out on the text')) - self.zoomOutAct.setWhatsThis(QApplication.translate( + self.zoomOutAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Zoom out</b>""" """<p>Zoom out on the text. This makes the text smaller.</p>""" @@ -3273,16 +3333,16 @@ self.viewActions.append(self.zoomOutAct) self.zoomResetAct = E5Action( - QApplication.translate('ViewManager', 'Zoom reset'), + QCoreApplication.translate('ViewManager', 'Zoom reset'), UI.PixmapCache.getIcon("zoomReset.png"), - QApplication.translate('ViewManager', 'Zoom &reset'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Zoom &reset'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+0", "View|Zoom reset")), 0, self.viewActGrp, 'vm_view_zoom_reset') - self.zoomResetAct.setStatusTip(QApplication.translate( + self.zoomResetAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Reset the zoom of the text')) - self.zoomResetAct.setWhatsThis(QApplication.translate( + self.zoomResetAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Zoom reset</b>""" """<p>Reset the zoom of the text. """ @@ -3292,16 +3352,16 @@ self.viewActions.append(self.zoomResetAct) self.zoomToAct = E5Action( - QApplication.translate('ViewManager', 'Zoom'), + QCoreApplication.translate('ViewManager', 'Zoom'), UI.PixmapCache.getIcon("zoomTo.png"), - QApplication.translate('ViewManager', '&Zoom'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Zoom'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+#", "View|Zoom")), 0, self.viewActGrp, 'vm_view_zoom') - self.zoomToAct.setStatusTip(QApplication.translate( + self.zoomToAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Zoom the text')) - self.zoomToAct.setWhatsThis(QApplication.translate( + self.zoomToAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Zoom</b>""" """<p>Zoom the text. This opens a dialog where the""" @@ -3311,12 +3371,12 @@ self.viewActions.append(self.zoomToAct) self.toggleAllAct = E5Action( - QApplication.translate('ViewManager', 'Toggle all folds'), - QApplication.translate('ViewManager', 'Toggle &all folds'), + QCoreApplication.translate('ViewManager', 'Toggle all folds'), + QCoreApplication.translate('ViewManager', 'Toggle &all folds'), 0, 0, self.viewFoldActGrp, 'vm_view_toggle_all_folds') - self.toggleAllAct.setStatusTip(QApplication.translate( + self.toggleAllAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Toggle all folds')) - self.toggleAllAct.setWhatsThis(QApplication.translate( + self.toggleAllAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Toggle all folds</b>""" """<p>Toggle all folds of the current editor.</p>""" @@ -3325,14 +3385,14 @@ self.viewActions.append(self.toggleAllAct) self.toggleAllChildrenAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Toggle all folds (including children)'), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Toggle all &folds (including children)'), 0, 0, self.viewFoldActGrp, 'vm_view_toggle_all_folds_children') - self.toggleAllChildrenAct.setStatusTip(QApplication.translate( + self.toggleAllChildrenAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Toggle all folds (including children)')) - self.toggleAllChildrenAct.setWhatsThis(QApplication.translate( + self.toggleAllChildrenAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Toggle all folds (including children)</b>""" """<p>Toggle all folds of the current editor including""" @@ -3343,12 +3403,12 @@ self.viewActions.append(self.toggleAllChildrenAct) self.toggleCurrentAct = E5Action( - QApplication.translate('ViewManager', 'Toggle current fold'), - QApplication.translate('ViewManager', 'Toggle ¤t fold'), + QCoreApplication.translate('ViewManager', 'Toggle current fold'), + QCoreApplication.translate('ViewManager', 'Toggle ¤t fold'), 0, 0, self.viewFoldActGrp, 'vm_view_toggle_current_fold') - self.toggleCurrentAct.setStatusTip(QApplication.translate( + self.toggleCurrentAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Toggle current fold')) - self.toggleCurrentAct.setWhatsThis(QApplication.translate( + self.toggleCurrentAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Toggle current fold</b>""" """<p>Toggle the folds of the current line of the current""" @@ -3358,14 +3418,14 @@ self.viewActions.append(self.toggleCurrentAct) self.unhighlightAct = E5Action( - QApplication.translate('ViewManager', 'Remove all highlights'), + QCoreApplication.translate('ViewManager', 'Remove all highlights'), UI.PixmapCache.getIcon("unhighlight.png"), - QApplication.translate('ViewManager', 'Remove all highlights'), + QCoreApplication.translate('ViewManager', 'Remove all highlights'), 0, 0, self, 'vm_view_unhighlight') - self.unhighlightAct.setStatusTip(QApplication.translate( + self.unhighlightAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Remove all highlights')) - self.unhighlightAct.setWhatsThis(QApplication.translate( + self.unhighlightAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Remove all highlights</b>""" """<p>Remove the highlights of all editors.</p>""" @@ -3374,13 +3434,13 @@ self.viewActions.append(self.unhighlightAct) self.newDocumentViewAct = E5Action( - QApplication.translate('ViewManager', 'New Document View'), + QCoreApplication.translate('ViewManager', 'New Document View'), UI.PixmapCache.getIcon("documentNewView.png"), - QApplication.translate('ViewManager', 'New &Document View'), + QCoreApplication.translate('ViewManager', 'New &Document View'), 0, 0, self, 'vm_view_new_document_view') - self.newDocumentViewAct.setStatusTip(QApplication.translate( + self.newDocumentViewAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Open a new view of the current document')) - self.newDocumentViewAct.setWhatsThis(QApplication.translate( + self.newDocumentViewAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>New Document View</b>""" """<p>Opens a new view of the current document. Both views show""" @@ -3391,16 +3451,16 @@ self.viewActions.append(self.newDocumentViewAct) self.newDocumentSplitViewAct = E5Action( - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'New Document View (with new split)'), UI.PixmapCache.getIcon("splitVertical.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'New Document View (with new split)'), 0, 0, self, 'vm_view_new_document_split_view') - self.newDocumentSplitViewAct.setStatusTip(QApplication.translate( + self.newDocumentSplitViewAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Open a new view of the current document in a new split')) - self.newDocumentSplitViewAct.setWhatsThis(QApplication.translate( + self.newDocumentSplitViewAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>New Document View</b>""" """<p>Opens a new view of the current document in a new split.""" @@ -3412,13 +3472,13 @@ self.viewActions.append(self.newDocumentSplitViewAct) self.splitViewAct = E5Action( - QApplication.translate('ViewManager', 'Split view'), + QCoreApplication.translate('ViewManager', 'Split view'), UI.PixmapCache.getIcon("splitVertical.png"), - QApplication.translate('ViewManager', '&Split view'), + QCoreApplication.translate('ViewManager', '&Split view'), 0, 0, self, 'vm_view_split_view') - self.splitViewAct.setStatusTip(QApplication.translate( + self.splitViewAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Add a split to the view')) - self.splitViewAct.setWhatsThis(QApplication.translate( + self.splitViewAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Split view</b>""" """<p>Add a split to the view.</p>""" @@ -3427,12 +3487,12 @@ self.viewActions.append(self.splitViewAct) self.splitOrientationAct = E5Action( - QApplication.translate('ViewManager', 'Arrange horizontally'), - QApplication.translate('ViewManager', 'Arrange &horizontally'), + QCoreApplication.translate('ViewManager', 'Arrange horizontally'), + QCoreApplication.translate('ViewManager', 'Arrange &horizontally'), 0, 0, self, 'vm_view_arrange_horizontally', True) - self.splitOrientationAct.setStatusTip(QApplication.translate( + self.splitOrientationAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Arrange the splitted views horizontally')) - self.splitOrientationAct.setWhatsThis(QApplication.translate( + self.splitOrientationAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Arrange horizontally</b>""" """<p>Arrange the splitted views horizontally.</p>""" @@ -3442,13 +3502,13 @@ self.viewActions.append(self.splitOrientationAct) self.splitRemoveAct = E5Action( - QApplication.translate('ViewManager', 'Remove split'), + QCoreApplication.translate('ViewManager', 'Remove split'), UI.PixmapCache.getIcon("remsplitVertical.png"), - QApplication.translate('ViewManager', '&Remove split'), + QCoreApplication.translate('ViewManager', '&Remove split'), 0, 0, self, 'vm_view_remove_split') - self.splitRemoveAct.setStatusTip(QApplication.translate( + self.splitRemoveAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Remove the current split')) - self.splitRemoveAct.setWhatsThis(QApplication.translate( + self.splitRemoveAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Remove split</b>""" """<p>Remove the current split.</p>""" @@ -3457,15 +3517,15 @@ self.viewActions.append(self.splitRemoveAct) self.nextSplitAct = E5Action( - QApplication.translate('ViewManager', 'Next split'), - QApplication.translate('ViewManager', '&Next split'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Next split'), + QCoreApplication.translate('ViewManager', '&Next split'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Alt+N", "View|Next split")), 0, self, 'vm_next_split') - self.nextSplitAct.setStatusTip(QApplication.translate( + self.nextSplitAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Move to the next split')) - self.nextSplitAct.setWhatsThis(QApplication.translate( + self.nextSplitAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Next split</b>""" """<p>Move to the next split.</p>""" @@ -3474,14 +3534,14 @@ self.viewActions.append(self.nextSplitAct) self.prevSplitAct = E5Action( - QApplication.translate('ViewManager', 'Previous split'), - QApplication.translate('ViewManager', '&Previous split'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Previous split'), + QCoreApplication.translate('ViewManager', '&Previous split'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+Alt+P", "View|Previous split")), 0, self, 'vm_previous_split') - self.prevSplitAct.setStatusTip(QApplication.translate( + self.prevSplitAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Move to the previous split')) - self.prevSplitAct.setWhatsThis(QApplication.translate( + self.prevSplitAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Previous split</b>""" """<p>Move to the previous split.</p>""" @@ -3490,13 +3550,13 @@ self.viewActions.append(self.prevSplitAct) self.previewAct = E5Action( - QApplication.translate('ViewManager', 'Preview'), + QCoreApplication.translate('ViewManager', 'Preview'), UI.PixmapCache.getIcon("previewer.png"), - QApplication.translate('ViewManager', 'Preview'), + QCoreApplication.translate('ViewManager', 'Preview'), 0, 0, self, 'vm_preview', True) - self.previewAct.setStatusTip(QApplication.translate( + self.previewAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Preview the current file in the web browser')) - self.previewAct.setWhatsThis(QApplication.translate( + self.previewAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Preview</b>""" """<p>This opens the web browser with a preview of""" @@ -3525,7 +3585,8 @@ @return the generated menu """ - menu = QMenu(QApplication.translate('ViewManager', '&View'), self.ui) + menu = QMenu(QCoreApplication.translate('ViewManager', '&View'), + self.ui) menu.setTearOffEnabled(True) menu.addActions(self.viewActGrp.actions()) menu.addSeparator() @@ -3555,10 +3616,11 @@ (E5ToolBarManager) @return the generated toolbar """ - tb = QToolBar(QApplication.translate('ViewManager', 'View'), self.ui) + tb = QToolBar(QCoreApplication.translate('ViewManager', 'View'), + self.ui) tb.setIconSize(UI.Config.ToolBarIconSize) tb.setObjectName("ViewToolbar") - tb.setToolTip(QApplication.translate('ViewManager', 'View')) + tb.setToolTip(QCoreApplication.translate('ViewManager', 'View')) tb.addActions(self.viewActGrp.actions()) tb.addSeparator() @@ -3587,12 +3649,14 @@ self.macroActGrp = createActionGroup(self) self.macroStartRecAct = E5Action( - QApplication.translate('ViewManager', 'Start Macro Recording'), - QApplication.translate('ViewManager', 'S&tart Macro Recording'), + QCoreApplication.translate( + 'ViewManager', 'Start Macro Recording'), + QCoreApplication.translate( + 'ViewManager', 'S&tart Macro Recording'), 0, 0, self.macroActGrp, 'vm_macro_start_recording') - self.macroStartRecAct.setStatusTip(QApplication.translate( + self.macroStartRecAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Start Macro Recording')) - self.macroStartRecAct.setWhatsThis(QApplication.translate( + self.macroStartRecAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Start Macro Recording</b>""" """<p>Start recording editor commands into a new macro.</p>""" @@ -3601,12 +3665,12 @@ self.macroActions.append(self.macroStartRecAct) self.macroStopRecAct = E5Action( - QApplication.translate('ViewManager', 'Stop Macro Recording'), - QApplication.translate('ViewManager', 'Sto&p Macro Recording'), + QCoreApplication.translate('ViewManager', 'Stop Macro Recording'), + QCoreApplication.translate('ViewManager', 'Sto&p Macro Recording'), 0, 0, self.macroActGrp, 'vm_macro_stop_recording') - self.macroStopRecAct.setStatusTip(QApplication.translate( + self.macroStopRecAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Stop Macro Recording')) - self.macroStopRecAct.setWhatsThis(QApplication.translate( + self.macroStopRecAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Stop Macro Recording</b>""" """<p>Stop recording editor commands into a new macro.</p>""" @@ -3615,12 +3679,12 @@ self.macroActions.append(self.macroStopRecAct) self.macroRunAct = E5Action( - QApplication.translate('ViewManager', 'Run Macro'), - QApplication.translate('ViewManager', '&Run Macro'), + QCoreApplication.translate('ViewManager', 'Run Macro'), + QCoreApplication.translate('ViewManager', '&Run Macro'), 0, 0, self.macroActGrp, 'vm_macro_run') - self.macroRunAct.setStatusTip(QApplication.translate( + self.macroRunAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Run Macro')) - self.macroRunAct.setWhatsThis(QApplication.translate( + self.macroRunAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Run Macro</b>""" """<p>Run a previously recorded editor macro.</p>""" @@ -3629,12 +3693,12 @@ self.macroActions.append(self.macroRunAct) self.macroDeleteAct = E5Action( - QApplication.translate('ViewManager', 'Delete Macro'), - QApplication.translate('ViewManager', '&Delete Macro'), + QCoreApplication.translate('ViewManager', 'Delete Macro'), + QCoreApplication.translate('ViewManager', '&Delete Macro'), 0, 0, self.macroActGrp, 'vm_macro_delete') - self.macroDeleteAct.setStatusTip(QApplication.translate( + self.macroDeleteAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Delete Macro')) - self.macroDeleteAct.setWhatsThis(QApplication.translate( + self.macroDeleteAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Delete Macro</b>""" """<p>Delete a previously recorded editor macro.</p>""" @@ -3643,12 +3707,12 @@ self.macroActions.append(self.macroDeleteAct) self.macroLoadAct = E5Action( - QApplication.translate('ViewManager', 'Load Macro'), - QApplication.translate('ViewManager', '&Load Macro'), + QCoreApplication.translate('ViewManager', 'Load Macro'), + QCoreApplication.translate('ViewManager', '&Load Macro'), 0, 0, self.macroActGrp, 'vm_macro_load') - self.macroLoadAct.setStatusTip(QApplication.translate( + self.macroLoadAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Load Macro')) - self.macroLoadAct.setWhatsThis(QApplication.translate( + self.macroLoadAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Load Macro</b>""" """<p>Load an editor macro from a file.</p>""" @@ -3657,12 +3721,12 @@ self.macroActions.append(self.macroLoadAct) self.macroSaveAct = E5Action( - QApplication.translate('ViewManager', 'Save Macro'), - QApplication.translate('ViewManager', '&Save Macro'), + QCoreApplication.translate('ViewManager', 'Save Macro'), + QCoreApplication.translate('ViewManager', '&Save Macro'), 0, 0, self.macroActGrp, 'vm_macro_save') - self.macroSaveAct.setStatusTip(QApplication.translate( + self.macroSaveAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Save Macro')) - self.macroSaveAct.setWhatsThis(QApplication.translate( + self.macroSaveAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Save Macro</b>""" """<p>Save a previously recorded editor macro to a file.</p>""" @@ -3678,7 +3742,8 @@ @return the generated menu """ - menu = QMenu(QApplication.translate('ViewManager', "&Macros"), self.ui) + menu = QMenu(QCoreApplication.translate('ViewManager', "&Macros"), + self.ui) menu.setTearOffEnabled(True) menu.addActions(self.macroActGrp.actions()) @@ -3696,16 +3761,16 @@ self.bookmarkActGrp = createActionGroup(self) self.bookmarkToggleAct = E5Action( - QApplication.translate('ViewManager', 'Toggle Bookmark'), + QCoreApplication.translate('ViewManager', 'Toggle Bookmark'), UI.PixmapCache.getIcon("bookmarkToggle.png"), - QApplication.translate('ViewManager', '&Toggle Bookmark'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Toggle Bookmark'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Ctrl+T", "Bookmark|Toggle")), 0, self.bookmarkActGrp, 'vm_bookmark_toggle') - self.bookmarkToggleAct.setStatusTip(QApplication.translate( + self.bookmarkToggleAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Toggle Bookmark')) - self.bookmarkToggleAct.setWhatsThis(QApplication.translate( + self.bookmarkToggleAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Toggle Bookmark</b>""" """<p>Toggle a bookmark at the current line of the current""" @@ -3715,16 +3780,16 @@ self.bookmarkActions.append(self.bookmarkToggleAct) self.bookmarkNextAct = E5Action( - QApplication.translate('ViewManager', 'Next Bookmark'), + QCoreApplication.translate('ViewManager', 'Next Bookmark'), UI.PixmapCache.getIcon("bookmarkNext.png"), - QApplication.translate('ViewManager', '&Next Bookmark'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Next Bookmark'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+PgDown", "Bookmark|Next")), 0, self.bookmarkActGrp, 'vm_bookmark_next') - self.bookmarkNextAct.setStatusTip(QApplication.translate( + self.bookmarkNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Next Bookmark')) - self.bookmarkNextAct.setWhatsThis(QApplication.translate( + self.bookmarkNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Next Bookmark</b>""" """<p>Go to next bookmark of the current editor.</p>""" @@ -3733,16 +3798,16 @@ self.bookmarkActions.append(self.bookmarkNextAct) self.bookmarkPreviousAct = E5Action( - QApplication.translate('ViewManager', 'Previous Bookmark'), + QCoreApplication.translate('ViewManager', 'Previous Bookmark'), UI.PixmapCache.getIcon("bookmarkPrevious.png"), - QApplication.translate('ViewManager', '&Previous Bookmark'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', '&Previous Bookmark'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Ctrl+PgUp", "Bookmark|Previous")), 0, self.bookmarkActGrp, 'vm_bookmark_previous') - self.bookmarkPreviousAct.setStatusTip(QApplication.translate( + self.bookmarkPreviousAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Previous Bookmark')) - self.bookmarkPreviousAct.setWhatsThis(QApplication.translate( + self.bookmarkPreviousAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Previous Bookmark</b>""" """<p>Go to previous bookmark of the current editor.</p>""" @@ -3751,15 +3816,15 @@ self.bookmarkActions.append(self.bookmarkPreviousAct) self.bookmarkClearAct = E5Action( - QApplication.translate('ViewManager', 'Clear Bookmarks'), - QApplication.translate('ViewManager', '&Clear Bookmarks'), - QKeySequence(QApplication.translate( + QCoreApplication.translate('ViewManager', 'Clear Bookmarks'), + QCoreApplication.translate('ViewManager', '&Clear Bookmarks'), + QKeySequence(QCoreApplication.translate( 'ViewManager', "Alt+Ctrl+C", "Bookmark|Clear")), 0, self.bookmarkActGrp, 'vm_bookmark_clear') - self.bookmarkClearAct.setStatusTip(QApplication.translate( + self.bookmarkClearAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Clear Bookmarks')) - self.bookmarkClearAct.setWhatsThis(QApplication.translate( + self.bookmarkClearAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Clear Bookmarks</b>""" """<p>Clear bookmarks of all editors.</p>""" @@ -3768,14 +3833,14 @@ self.bookmarkActions.append(self.bookmarkClearAct) self.syntaxErrorGotoAct = E5Action( - QApplication.translate('ViewManager', 'Goto Syntax Error'), + QCoreApplication.translate('ViewManager', 'Goto Syntax Error'), UI.PixmapCache.getIcon("syntaxErrorGoto.png"), - QApplication.translate('ViewManager', '&Goto Syntax Error'), + QCoreApplication.translate('ViewManager', '&Goto Syntax Error'), 0, 0, self.bookmarkActGrp, 'vm_syntaxerror_goto') - self.syntaxErrorGotoAct.setStatusTip(QApplication.translate( + self.syntaxErrorGotoAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Goto Syntax Error')) - self.syntaxErrorGotoAct.setWhatsThis(QApplication.translate( + self.syntaxErrorGotoAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Goto Syntax Error</b>""" """<p>Go to next syntax error of the current editor.</p>""" @@ -3784,13 +3849,13 @@ self.bookmarkActions.append(self.syntaxErrorGotoAct) self.syntaxErrorClearAct = E5Action( - QApplication.translate('ViewManager', 'Clear Syntax Errors'), - QApplication.translate('ViewManager', 'Clear &Syntax Errors'), + QCoreApplication.translate('ViewManager', 'Clear Syntax Errors'), + QCoreApplication.translate('ViewManager', 'Clear &Syntax Errors'), 0, 0, self.bookmarkActGrp, 'vm_syntaxerror_clear') - self.syntaxErrorClearAct.setStatusTip(QApplication.translate( + self.syntaxErrorClearAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Clear Syntax Errors')) - self.syntaxErrorClearAct.setWhatsThis(QApplication.translate( + self.syntaxErrorClearAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Clear Syntax Errors</b>""" """<p>Clear syntax errors of all editors.</p>""" @@ -3800,14 +3865,14 @@ self.bookmarkActions.append(self.syntaxErrorClearAct) self.warningsNextAct = E5Action( - QApplication.translate('ViewManager', 'Next warning message'), + QCoreApplication.translate('ViewManager', 'Next warning message'), UI.PixmapCache.getIcon("warningNext.png"), - QApplication.translate('ViewManager', '&Next warning message'), + QCoreApplication.translate('ViewManager', '&Next warning message'), 0, 0, self.bookmarkActGrp, 'vm_warning_next') - self.warningsNextAct.setStatusTip(QApplication.translate( + self.warningsNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Next warning message')) - self.warningsNextAct.setWhatsThis(QApplication.translate( + self.warningsNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Next warning message</b>""" """<p>Go to next line of the current editor""" @@ -3817,15 +3882,16 @@ self.bookmarkActions.append(self.warningsNextAct) self.warningsPreviousAct = E5Action( - QApplication.translate('ViewManager', 'Previous warning message'), + QCoreApplication.translate( + 'ViewManager', 'Previous warning message'), UI.PixmapCache.getIcon("warningPrev.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', '&Previous warning message'), 0, 0, self.bookmarkActGrp, 'vm_warning_previous') - self.warningsPreviousAct.setStatusTip(QApplication.translate( + self.warningsPreviousAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Previous warning message')) - self.warningsPreviousAct.setWhatsThis(QApplication.translate( + self.warningsPreviousAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Previous warning message</b>""" """<p>Go to previous line of the current editor""" @@ -3835,13 +3901,15 @@ self.bookmarkActions.append(self.warningsPreviousAct) self.warningsClearAct = E5Action( - QApplication.translate('ViewManager', 'Clear Warning Messages'), - QApplication.translate('ViewManager', 'Clear &Warning Messages'), + QCoreApplication.translate( + 'ViewManager', 'Clear Warning Messages'), + QCoreApplication.translate( + 'ViewManager', 'Clear &Warning Messages'), 0, 0, self.bookmarkActGrp, 'vm_warnings_clear') - self.warningsClearAct.setStatusTip(QApplication.translate( + self.warningsClearAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Clear Warning Messages')) - self.warningsClearAct.setWhatsThis(QApplication.translate( + self.warningsClearAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Clear Warning Messages</b>""" """<p>Clear pyflakes warning messages of all editors.</p>""" @@ -3850,14 +3918,14 @@ self.bookmarkActions.append(self.warningsClearAct) self.notcoveredNextAct = E5Action( - QApplication.translate('ViewManager', 'Next uncovered line'), + QCoreApplication.translate('ViewManager', 'Next uncovered line'), UI.PixmapCache.getIcon("notcoveredNext.png"), - QApplication.translate('ViewManager', '&Next uncovered line'), + QCoreApplication.translate('ViewManager', '&Next uncovered line'), 0, 0, self.bookmarkActGrp, 'vm_uncovered_next') - self.notcoveredNextAct.setStatusTip(QApplication.translate( + self.notcoveredNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Next uncovered line')) - self.notcoveredNextAct.setWhatsThis(QApplication.translate( + self.notcoveredNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Next uncovered line</b>""" """<p>Go to next line of the current editor marked as not""" @@ -3867,15 +3935,16 @@ self.bookmarkActions.append(self.notcoveredNextAct) self.notcoveredPreviousAct = E5Action( - QApplication.translate('ViewManager', 'Previous uncovered line'), + QCoreApplication.translate( + 'ViewManager', 'Previous uncovered line'), UI.PixmapCache.getIcon("notcoveredPrev.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', '&Previous uncovered line'), 0, 0, self.bookmarkActGrp, 'vm_uncovered_previous') - self.notcoveredPreviousAct.setStatusTip(QApplication.translate( + self.notcoveredPreviousAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Previous uncovered line')) - self.notcoveredPreviousAct.setWhatsThis(QApplication.translate( + self.notcoveredPreviousAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Previous uncovered line</b>""" """<p>Go to previous line of the current editor marked""" @@ -3886,14 +3955,14 @@ self.bookmarkActions.append(self.notcoveredPreviousAct) self.taskNextAct = E5Action( - QApplication.translate('ViewManager', 'Next Task'), + QCoreApplication.translate('ViewManager', 'Next Task'), UI.PixmapCache.getIcon("taskNext.png"), - QApplication.translate('ViewManager', '&Next Task'), + QCoreApplication.translate('ViewManager', '&Next Task'), 0, 0, self.bookmarkActGrp, 'vm_task_next') - self.taskNextAct.setStatusTip(QApplication.translate( + self.taskNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Next Task')) - self.taskNextAct.setWhatsThis(QApplication.translate( + self.taskNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Next Task</b>""" """<p>Go to next line of the current editor having a task.</p>""" @@ -3902,15 +3971,15 @@ self.bookmarkActions.append(self.taskNextAct) self.taskPreviousAct = E5Action( - QApplication.translate('ViewManager', 'Previous Task'), + QCoreApplication.translate('ViewManager', 'Previous Task'), UI.PixmapCache.getIcon("taskPrev.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', '&Previous Task'), 0, 0, self.bookmarkActGrp, 'vm_task_previous') - self.taskPreviousAct.setStatusTip(QApplication.translate( + self.taskPreviousAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Previous Task')) - self.taskPreviousAct.setWhatsThis(QApplication.translate( + self.taskPreviousAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Previous Task</b>""" """<p>Go to previous line of the current editor having a""" @@ -3920,14 +3989,14 @@ self.bookmarkActions.append(self.taskPreviousAct) self.changeNextAct = E5Action( - QApplication.translate('ViewManager', 'Next Change'), + QCoreApplication.translate('ViewManager', 'Next Change'), UI.PixmapCache.getIcon("changeNext.png"), - QApplication.translate('ViewManager', '&Next Change'), + QCoreApplication.translate('ViewManager', '&Next Change'), 0, 0, self.bookmarkActGrp, 'vm_change_next') - self.changeNextAct.setStatusTip(QApplication.translate( + self.changeNextAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Next Change')) - self.changeNextAct.setWhatsThis(QApplication.translate( + self.changeNextAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Next Change</b>""" """<p>Go to next line of the current editor having a change""" @@ -3937,15 +4006,15 @@ self.bookmarkActions.append(self.changeNextAct) self.changePreviousAct = E5Action( - QApplication.translate('ViewManager', 'Previous Change'), + QCoreApplication.translate('ViewManager', 'Previous Change'), UI.PixmapCache.getIcon("changePrev.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', '&Previous Change'), 0, 0, self.bookmarkActGrp, 'vm_change_previous') - self.changePreviousAct.setStatusTip(QApplication.translate( + self.changePreviousAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Previous Change')) - self.changePreviousAct.setWhatsThis(QApplication.translate( + self.changePreviousAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Previous Change</b>""" """<p>Go to previous line of the current editor having""" @@ -3962,10 +4031,10 @@ @return the generated menu """ - menu = QMenu(QApplication.translate('ViewManager', '&Bookmarks'), + menu = QMenu(QCoreApplication.translate('ViewManager', '&Bookmarks'), self.ui) self.bookmarksMenu = QMenu( - QApplication.translate('ViewManager', '&Bookmarks'), + QCoreApplication.translate('ViewManager', '&Bookmarks'), menu) menu.setTearOffEnabled(True) @@ -4006,11 +4075,11 @@ (E5ToolBarManager) @return the generated toolbar """ - tb = QToolBar(QApplication.translate('ViewManager', 'Bookmarks'), + tb = QToolBar(QCoreApplication.translate('ViewManager', 'Bookmarks'), self.ui) tb.setIconSize(UI.Config.ToolBarIconSize) tb.setObjectName("BookmarksToolbar") - tb.setToolTip(QApplication.translate('ViewManager', 'Bookmarks')) + tb.setToolTip(QCoreApplication.translate('ViewManager', 'Bookmarks')) tb.addAction(self.bookmarkToggleAct) tb.addAction(self.bookmarkNextAct) @@ -4044,17 +4113,17 @@ self.spellingActGrp = createActionGroup(self) self.spellCheckAct = E5Action( - QApplication.translate('ViewManager', 'Check spelling'), + QCoreApplication.translate('ViewManager', 'Check spelling'), UI.PixmapCache.getIcon("spellchecking.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', 'Check &spelling...'), - QKeySequence(QApplication.translate( + QKeySequence(QCoreApplication.translate( 'ViewManager', "Shift+F7", "Spelling|Spell Check")), 0, self.spellingActGrp, 'vm_spelling_spellcheck') - self.spellCheckAct.setStatusTip(QApplication.translate( + self.spellCheckAct.setStatusTip(QCoreApplication.translate( 'ViewManager', 'Perform spell check of current editor')) - self.spellCheckAct.setWhatsThis(QApplication.translate( + self.spellCheckAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Check spelling</b>""" """<p>Perform a spell check of the current editor.</p>""" @@ -4063,15 +4132,16 @@ self.spellingActions.append(self.spellCheckAct) self.autoSpellCheckAct = E5Action( - QApplication.translate('ViewManager', 'Automatic spell checking'), + QCoreApplication.translate( + 'ViewManager', 'Automatic spell checking'), UI.PixmapCache.getIcon("autospellchecking.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', '&Automatic spell checking'), 0, 0, self.spellingActGrp, 'vm_spelling_autospellcheck', True) - self.autoSpellCheckAct.setStatusTip(QApplication.translate( + self.autoSpellCheckAct.setStatusTip(QCoreApplication.translate( 'ViewManager', '(De-)Activate automatic spell checking')) - self.autoSpellCheckAct.setWhatsThis(QApplication.translate( + self.autoSpellCheckAct.setWhatsThis(QCoreApplication.translate( 'ViewManager', """<b>Automatic spell checking</b>""" """<p>Activate or deactivate the automatic spell checking""" @@ -4102,20 +4172,21 @@ @param menu reference to the menu to add actions to (QMenu) """ - self.__editSpellingMenu = QMenu(QApplication.translate( + self.__editSpellingMenu = QMenu(QCoreApplication.translate( 'ViewManager', "Edit Dictionary")) self.__editProjectPwlAct = self.__editSpellingMenu.addAction( - QApplication.translate('ViewManager', "Project Word List"), + QCoreApplication.translate('ViewManager', "Project Word List"), self.__editProjectPWL) self.__editProjectPelAct = self.__editSpellingMenu.addAction( - QApplication.translate('ViewManager', "Project Exception List"), + QCoreApplication.translate( + 'ViewManager', "Project Exception List"), self.__editProjectPEL) self.__editSpellingMenu.addSeparator() self.__editUserPwlAct = self.__editSpellingMenu.addAction( - QApplication.translate('ViewManager', "User Word List"), + QCoreApplication.translate('ViewManager', "User Word List"), self.__editUserPWL) self.__editUserPelAct = self.__editSpellingMenu.addAction( - QApplication.translate('ViewManager', "User Exception List"), + QCoreApplication.translate('ViewManager', "User Exception List"), self.__editUserPEL) self.__editSpellingMenu.aboutToShow.connect( self.__showEditSpellingMenu) @@ -4133,11 +4204,11 @@ (E5ToolBarManager) @return the generated toolbar """ - tb = QToolBar(QApplication.translate('ViewManager', 'Spelling'), + tb = QToolBar(QCoreApplication.translate('ViewManager', 'Spelling'), self.ui) tb.setIconSize(UI.Config.ToolBarIconSize) tb.setObjectName("SpellingToolbar") - tb.setToolTip(QApplication.translate('ViewManager', 'Spelling')) + tb.setToolTip(QCoreApplication.translate('ViewManager', 'Spelling')) tb.addAction(self.spellCheckAct) tb.addAction(self.autoSpellCheckAct) @@ -4162,7 +4233,7 @@ filter = self._getOpenFileFilter() progs = E5FileDialog.getOpenFileNamesAndFilter( self.ui, - QApplication.translate('ViewManager', "Open files"), + QCoreApplication.translate('ViewManager', "Open files"), self._getOpenStartDir(), QScintilla.Lexers.getOpenFileFiltersList(True, True), filter)[0] @@ -4203,8 +4274,8 @@ else: res = E5MessageBox.okToClearData( self.ui, - QApplication.translate('ViewManager', "File Modified"), - QApplication.translate( + QCoreApplication.translate('ViewManager', "File Modified"), + QCoreApplication.translate( 'ViewManager', """<p>The file <b>{0}</b> has unsaved changes.</p>""") .format(fn), @@ -4512,12 +4583,14 @@ if line is None: line = '' self.sbLine.setText( - QApplication.translate('ViewManager', 'Line: {0:5}').format(line)) + QCoreApplication.translate('ViewManager', 'Line: {0:5}') + .format(line)) if pos is None: pos = '' self.sbPos.setText( - QApplication.translate('ViewManager', 'Pos: {0:5}').format(pos)) + QCoreApplication.translate('ViewManager', 'Pos: {0:5}') + .format(pos)) if encoding is None: encoding = '' @@ -4534,14 +4607,15 @@ else: self.sbLang.setText("") self.sbLang.setToolTip( - QApplication.translate('ViewManager', 'Language: {0}') + QCoreApplication.translate('ViewManager', 'Language: {0}') .format(language)) if eol is None: eol = '' self.sbEol.setPixmap(self.__eolPixmap(eol)) self.sbEol.setToolTip( - QApplication.translate('ViewManager', 'EOL Mode: {0}').format(eol)) + QCoreApplication.translate('ViewManager', 'EOL Mode: {0}') + .format(eol)) if zoom is None: if QApplication.focusWidget() == e5App().getObject("Shell"): @@ -4871,7 +4945,7 @@ self.recentMenu.addSeparator() self.recentMenu.addAction( - QApplication.translate('ViewManager', '&Clear'), + QCoreApplication.translate('ViewManager', '&Clear'), self.__clearRecent) def __openSourceFile(self, act): @@ -4905,13 +4979,13 @@ if len(self.bookmarked): self.bookmarkedMenu.addSeparator() self.bookmarkedMenu.addAction( - QApplication.translate('ViewManager', '&Add'), + QCoreApplication.translate('ViewManager', '&Add'), self.__addBookmarked) self.bookmarkedMenu.addAction( - QApplication.translate('ViewManager', '&Edit...'), + QCoreApplication.translate('ViewManager', '&Edit...'), self.__editBookmarked) self.bookmarkedMenu.addAction( - QApplication.translate('ViewManager', '&Clear'), + QCoreApplication.translate('ViewManager', '&Clear'), self.__clearBookmarked) def __addBookmarked(self): @@ -6068,9 +6142,9 @@ except (IOError, OSError) as err: E5MessageBox.critical( self.ui, - QApplication.translate( + QCoreApplication.translate( 'ViewManager', "Edit Spelling Dictionary"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', """<p>The spelling dictionary file <b>{0}</b> could""" """ not be read.</p><p>Reason: {1}</p>""").format( @@ -6083,7 +6157,7 @@ SpellingDictionaryEditDialog dlg = SpellingDictionaryEditDialog( data, - QApplication.translate('ViewManager', "Editing {0}") + QCoreApplication.translate('ViewManager', "Editing {0}") .format(fileInfo), self.ui) if dlg.exec_() == QDialog.Accepted: @@ -6095,9 +6169,9 @@ except (IOError, OSError) as err: E5MessageBox.critical( self.ui, - QApplication.translate( + QCoreApplication.translate( 'ViewManager', "Edit Spelling Dictionary"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', """<p>The spelling dictionary file <b>{0}</b>""" """ could not be written.</p>""" @@ -6108,9 +6182,9 @@ if self.ui.notificationsEnabled(): self.ui.showNotification( UI.PixmapCache.getPixmap("spellchecking48.png"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', "Edit Spelling Dictionary"), - QApplication.translate( + QCoreApplication.translate( 'ViewManager', "The spelling dictionary was saved successfully."))
--- a/compileUiFiles.py Sun Jun 29 14:00:30 2014 +0200 +++ b/compileUiFiles.py Sun Jun 29 20:13:56 2014 +0200 @@ -20,9 +20,9 @@ Compile the .ui files to Python sources. """ # __IGNORE_WARNING__ try: - from PyQt4.uic import compileUiDir + from PyQt5.uic import compileUiDir except ImportError: - from PyQt4.uic import compileUi + from PyQt5.uic import compileUi def compileUiDir(dir, recurse=False, # __IGNORE_WARNING__ map=None, **compileUi_args): @@ -31,7 +31,7 @@ directory tree. Note: This function is a modified version of the one found in - PyQt4. + PyQt5. @param dir Name of the directory to scan for files whose name ends with '.ui'. By default the generated Python module is created
--- a/eric5.e4p Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5.e4p Sun Jun 29 20:13:56 2014 +0200 @@ -8,7 +8,7 @@ <ProjectExcludeList>Dictionaries/excludes.dic</ProjectExcludeList> <Hash>df7daa8781250f7664e6ecaeaf1361fa2efd39ee</Hash> <ProgLanguage mixed="1">Python3</ProgLanguage> - <ProjectType>Qt4</ProjectType> + <ProjectType>PyQt5</ProjectType> <Description>eric5 is an integrated development environment for the Python and Ruby language. It uses the PyQt4 bindings and the QScintilla2 editor widget.</Description> <Version>5.5.x</Version> <Author>Detlev Offenbach</Author> @@ -1733,13 +1733,17 @@ </Vcs> <FiletypeAssociations> <FiletypeAssociation pattern="*.idl" type="INTERFACES"/> + <FiletypeAssociation pattern="*.js" type="SOURCES"/> <FiletypeAssociation pattern="*.py" type="SOURCES"/> + <FiletypeAssociation pattern="*.py3" type="SOURCES"/> <FiletypeAssociation pattern="*.pyw" type="SOURCES"/> + <FiletypeAssociation pattern="*.pyw3" type="SOURCES"/> <FiletypeAssociation pattern="*.qm" type="TRANSLATIONS"/> <FiletypeAssociation pattern="*.qrc" type="RESOURCES"/> <FiletypeAssociation pattern="*.rb" type="SOURCES"/> <FiletypeAssociation pattern="*.ts" type="TRANSLATIONS"/> <FiletypeAssociation pattern="*.ui" type="FORMS"/> + <FiletypeAssociation pattern="*.ui.h" type="FORMS"/> <FiletypeAssociation pattern="Ui_*.py" type="__IGNORE__"/> </FiletypeAssociations> <Documentation>
--- a/eric5.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,17 +15,13 @@ try: # Only for Py2 import StringIO as io # __IGNORE_EXCEPTION__ - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) - sip.setapi('QTextStream', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except ImportError: import io # __IGNORE_WARNING__ basestring = str -import sip try: + import sip sip.setdestroyonexit(False) except AttributeError: pass @@ -37,8 +33,7 @@ import time import logging -from PyQt4.QtCore import qWarning, QLibraryInfo, QTimer -from PyQt4.QtGui import QApplication +from PyQt5.QtCore import qWarning, QLibraryInfo, QTimer, QCoreApplication # some global variables needed to start the application args = None @@ -246,9 +241,9 @@ else: splash = SplashScreen() - # modify the executable search path for the PyQt4 installer + # modify the executable search path for the PyQt5 installer if Globals.isWindowsPlatform(): - pyqtDataDir = Globals.getPyQt4ModulesDirectory() + pyqtDataDir = Globals.getPyQt5ModulesDirectory() if os.path.exists(os.path.join(pyqtDataDir, "bin")): path = os.path.join(pyqtDataDir, "bin") + \ os.pathsep + os.environ["PATH"] @@ -283,13 +278,13 @@ # Load translation files and install them loc = Startup.loadTranslators(qt4TransDir, app, ("qscintilla",)) - splash.showMessage(QApplication.translate("eric5", "Starting...")) + splash.showMessage(QCoreApplication.translate("eric5", "Starting...")) # We can only import these after creating the E5Application because they # make Qt calls that need the E5Application to exist. from UI.UserInterface import UserInterface splash.showMessage( - QApplication.translate("eric5", "Generating Main Window...")) + QCoreApplication.translate("eric5", "Generating Main Window...")) try: mainWindow = UserInterface(app, loc, splash, pluginFile, noopen, restartArgs)
--- a/eric5_api.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_api.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_compare.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_compare.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_configure.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_configure.py Sun Jun 29 20:13:56 2014 +0200 @@ -12,9 +12,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_diff.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_diff.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_doc.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_doc.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass @@ -269,7 +266,7 @@ usage() if qtHelpCreation: - from PyQt4.QtCore import QCoreApplication + from PyQt5.QtCore import QCoreApplication app = QCoreApplication(sys.argv) # __IGNORE_WARNING__ input = output = 0
--- a/eric5_editor.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_editor.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_iconeditor.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_iconeditor.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_plugininstall.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_plugininstall.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_pluginrepository.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_pluginrepository.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_pluginuninstall.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_pluginuninstall.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_qregexp.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_qregexp.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_qregularexpression.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_qregularexpression.py Sun Jun 29 20:13:56 2014 +0200 @@ -15,10 +15,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) - sip.setapi('QTextStream', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_re.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_re.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_snap.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_snap.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_sqlbrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_sqlbrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,9 +13,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_tray.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_tray.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_trpreviewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_trpreviewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_uipreviewer.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_uipreviewer.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_unittest.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_unittest.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,9 +14,6 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass
--- a/eric5_webbrowser.py Sun Jun 29 14:00:30 2014 +0200 +++ b/eric5_webbrowser.py Sun Jun 29 20:13:56 2014 +0200 @@ -14,14 +14,12 @@ from __future__ import unicode_literals try: # Only for Py2 - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) import Utilities.compatibility_fixes # __IGNORE_WARNING__ except (ImportError): pass try: + import sip sip.setdestroyonexit(False) except AttributeError: pass
--- a/install-i18n.py Sun Jun 29 14:00:30 2014 +0200 +++ b/install-i18n.py Sun Jun 29 20:13:56 2014 +0200 @@ -16,7 +16,7 @@ import shutil import glob -from PyQt4.QtCore import QDir +from PyQt5.QtCore import QDir try: from eric5config import getConfig @@ -43,7 +43,7 @@ try: return QDir.toNativeSeparators(hp) except AttributeError: - return QDir.convertSeparators(hp) + return QDir.toNativeSeparators(hp) # Define the globals. progName = None
--- a/install.py Sun Jun 29 14:00:30 2014 +0200 +++ b/install.py Sun Jun 29 20:13:56 2014 +0200 @@ -13,10 +13,6 @@ from __future__ import print_function try: import cStringIO as io - import sip - sip.setapi('QString', 2) - sip.setapi('QVariant', 2) - sip.setapi('QTextStream', 2) except (ImportError): import io # __IGNORE_WARNING__ @@ -55,25 +51,25 @@ # Define blacklisted versions of the prerequisites BlackLists = { "sip": ["4.11", "4.12.3"], - "PyQt4": ["4.7.5"], + "PyQt5": ["4.7.5"], "QScintilla2": [], } PlatformsBlackLists = { "windows": { "sip": [], - "PyQt4": ["4.9.2", "4.9.3"], + "PyQt5": ["4.9.2", "4.9.3"], "QScintilla2": [], }, "linux": { "sip": [], - "PyQt4": [], + "PyQt5": [], "QScintilla2": [], }, "mac": { "sip": [], - "PyQt4": ["4.9.2", "4.9.3"], + "PyQt5": ["4.9.2", "4.9.3"], "QScintilla2": [], }, } @@ -186,13 +182,13 @@ modDir = distutils.sysconfig.get_python_lib(True) pyModDir = modDir - pyqtDataDir = os.path.join(modDir, "PyQt4") + pyqtDataDir = os.path.join(modDir, "PyQt5") if os.path.exists(os.path.join(pyqtDataDir, "qsci")): # it's the installer qtDataDir = pyqtDataDir else: try: - from PyQt4.QtCore import QLibraryInfo + from PyQt5.QtCore import QLibraryInfo qtDataDir = QLibraryInfo.location(QLibraryInfo.DataPath) except ImportError: qtDataDir = None @@ -944,25 +940,26 @@ exit(5) try: - from PyQt4.QtCore import qVersion + from PyQt5.QtCore import qVersion except ImportError as msg: - print('Sorry, please install PyQt4.') + print('Sorry, please install PyQt5.') print('Error: {0}'.format(msg)) exit(1) - print("Found PyQt4") + print("Found PyQt5") try: - from PyQt4 import Qsci # __IGNORE_WARNING__ + from PyQt5 import Qsci # __IGNORE_WARNING__ + except ImportError as msg: print("Sorry, please install QScintilla2 and") - print("its PyQt4 wrapper.") + print("its PyQt5 wrapper.") print('Error: {0}'.format(msg)) exit(1) print("Found QScintilla2") for impModule in [ - "PyQt4.QtGui", "PyQt4.QtNetwork", "PyQt4.QtSql", - "PyQt4.QtSvg", "PyQt4.QtWebKit", + "PyQt5.QtGui", "PyQt5.QtNetwork", "PyQt5.QtSql", + "PyQt5.QtSvg", "PyQt5.QtWebKit", ]: name = impModule.split(".")[1] modulesOK = True @@ -1021,7 +1018,7 @@ pass # check version of PyQt - from PyQt4.QtCore import PYQT_VERSION_STR + from PyQt5.QtCore import PYQT_VERSION_STR pyqtVersion = PYQT_VERSION_STR # always assume, that snapshots are new enough if "snapshot" not in pyqtVersion: @@ -1036,16 +1033,16 @@ ' a recent snapshot release.') exit(4) # check for blacklisted versions - for vers in BlackLists["PyQt4"] + PlatformBlackLists["PyQt4"]: + for vers in BlackLists["PyQt5"] + PlatformBlackLists["PyQt5"]: if vers == pyqtVersion: - print('Sorry, PyQt4 version {0} is not compatible with eric5.' + print('Sorry, PyQt5 version {0} is not compatible with eric5.' .format(vers)) print('Please install another version.') exit(4) print("PyQt Version: ", pyqtVersion) # check version of QScintilla - from PyQt4.Qsci import QSCINTILLA_VERSION_STR + from PyQt5.Qsci import QSCINTILLA_VERSION_STR scintillaVersion = QSCINTILLA_VERSION_STR # always assume, that snapshots are new enough if "snapshot" not in scintillaVersion: @@ -1079,9 +1076,9 @@ """ # __IGNORE_WARNING__ global sourceDir try: - from PyQt4.uic import compileUiDir + from PyQt5.uic import compileUiDir except ImportError: - from PyQt4.uic import compileUi + from PyQt5.uic import compileUi def compileUiDir(dir, recurse=False, # __IGNORE_WARNING__ map=None, **compileUi_args): @@ -1090,7 +1087,7 @@ directory tree. Note: This function is a modified version of the one found in - PyQt4. + PyQt5. @param dir Name of the directory to scan for files whose name ends with '.ui'. By default the generated Python module is created
