Sun, 29 Jun 2014 20:13:56 +0200
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\