First Qt5 conversion commit

Replaced PyQt4 with PyQt5 and made all adjustments necessary to make
dupeGuru start up.

qt/base/app.py

@@ -9,8 +9,9 @@
 import sys
 import os.path as op
 
-from PyQt4.QtCore import QTimer, QObject, QCoreApplication, QUrl, QProcess, SIGNAL, pyqtSignal
-from PyQt4.QtGui import QDesktopServices, QFileDialog, QDialog, QMessageBox, QApplication
+from PyQt5.QtCore import QTimer, QObject, QCoreApplication, QUrl, QProcess, pyqtSignal
+from PyQt5.QtGui import QDesktopServices
+from PyQt5.QtWidgets import QApplication, QFileDialog, QDialog, QMessageBox
 
 from hscommon.trans import trget
 from hscommon.plat import ISLINUX
@@ -74,7 +75,7 @@ class DupeGuru(QObject):
         # In some circumstances, the nag is hidden by other window, which may make the user think
         # that the application haven't launched.
         QTimer.singleShot(0, self.finishedLaunching)
-        self.connect(QCoreApplication.instance(), SIGNAL('aboutToQuit()'), self.application_will_terminate)
+        QCoreApplication.instance().aboutToQuit.connect(self.application_will_terminate)
     
     def _setupActions(self):
         # Setup actions that are common to both the directory dialog and the results window.

qt/base/deletion_options.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QDialog, QVBoxLayout, QLabel, QCheckBox, QDialogButtonBox
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QDialog, QVBoxLayout, QLabel, QCheckBox, QDialogButtonBox
 
 from hscommon.trans import trget
 from qtlib.radio_box import RadioBox

qt/base/details_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QDialog
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QDialog
 
 from .details_table import DetailsModel
 
@@ -42,5 +42,6 @@ class DetailsDialog(QDialog):
     
     #--- model --> view
     def refresh(self):
-        self.tableModel.reset()
+        self.tableModel.beginResetModel()
+        self.tableModel.endResetModel()
     

qt/base/details_table.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt, SIGNAL, QAbstractTableModel
-from PyQt4.QtGui import QHeaderView, QTableView
+from PyQt5.QtCore import Qt, QAbstractTableModel
+from PyQt5.QtWidgets import QHeaderView, QTableView
 
 from hscommon.trans import trget
 
@@ -55,9 +55,9 @@ class DetailsTable(QTableView):
         hheader.setHighlightSections(False)
         hheader.setStretchLastSection(False)
         hheader.resizeSection(0, 100)
-        hheader.setResizeMode(0, QHeaderView.Fixed)
-        hheader.setResizeMode(1, QHeaderView.Stretch)
-        hheader.setResizeMode(2, QHeaderView.Stretch)
+        hheader.setSectionResizeMode(0, QHeaderView.Fixed)
+        hheader.setSectionResizeMode(1, QHeaderView.Stretch)
+        hheader.setSectionResizeMode(2, QHeaderView.Stretch)
         vheader = self.verticalHeader()
         vheader.setVisible(False)
         vheader.setDefaultSectionSize(18)

qt/base/directories_dialog.py

@@ -6,10 +6,11 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import QRect
-from PyQt4.QtGui import (QWidget, QFileDialog, QHeaderView, QVBoxLayout, QHBoxLayout, QTreeView,
-    QAbstractItemView, QSpacerItem, QSizePolicy, QPushButton, QApplication, QMainWindow, QMenuBar,
-    QMenu, QIcon, QPixmap, QLabel)
+from PyQt5.QtCore import QRect
+from PyQt5.QtWidgets import (QWidget, QFileDialog, QHeaderView, QVBoxLayout, QHBoxLayout, QTreeView,
+    QAbstractItemView, QSpacerItem, QSizePolicy, QPushButton, QMainWindow, QMenuBar, QMenu, QLabel,
+    QApplication)
+from PyQt5.QtGui import QPixmap, QIcon
 
 from hscommon.trans import trget
 from qtlib.recent import Recent
@@ -149,8 +150,8 @@ class DirectoriesDialog(QMainWindow):
     def _setupColumns(self):
         header = self.treeView.header()
         header.setStretchLastSection(False)
-        header.setResizeMode(0, QHeaderView.Stretch)
-        header.setResizeMode(1, QHeaderView.Fixed)
+        header.setSectionResizeMode(0, QHeaderView.Stretch)
+        header.setSectionResizeMode(1, QHeaderView.Fixed)
         header.resizeSection(1, 100)
     
     def _updateAddButton(self):

qt/base/directories_model.py

@@ -8,9 +8,10 @@
 
 import urllib.parse
 
-from PyQt4.QtCore import pyqtSignal, Qt, QRect, QUrl, QModelIndex
-from PyQt4.QtGui import (QComboBox, QStyledItemDelegate, QApplication, QBrush, QStyle,
-    QStyleOptionComboBox, QStyleOptionViewItemV4, QItemSelection)
+from PyQt5.QtCore import pyqtSignal, Qt, QRect, QUrl, QModelIndex, QItemSelection
+from PyQt5.QtWidgets import (QComboBox, QStyledItemDelegate, QStyle, QStyleOptionComboBox,
+    QStyleOptionViewItem, QApplication)
+from PyQt5.QtGui import QBrush
 
 from hscommon.trans import trget
 from qtlib.tree_model import RefNode, TreeModel
@@ -29,7 +30,7 @@ class DirectoriesDelegate(QStyledItemDelegate):
     def paint(self, painter, option, index):
         self.initStyleOption(option, index)
         # No idea why, but this cast is required if we want to have access to the V4 valuess
-        option = QStyleOptionViewItemV4(option)
+        option = QStyleOptionViewItem(option)
         if (index.column() == 1) and (option.state & QStyle.State_Selected):
             cboption = QStyleOptionComboBox()
             cboption.rect = option.rect

qt/base/ignore_list_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import QDialog, QVBoxLayout, QPushButton, QTableView, QAbstractItemView
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QDialog, QVBoxLayout, QPushButton, QTableView, QAbstractItemView
 
 from hscommon.trans import trget
 from qtlib.util import horizontalWrap

qt/base/preferences.py

@@ -6,7 +6,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtGui import QApplication
+from PyQt5.QtWidgets import QApplication
 
 from hscommon import trans
 from qtlib.preferences import Preferences as PreferencesBase

qt/base/preferences_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import SIGNAL, Qt, QSize
-from PyQt4.QtGui import (QDialog, QDialogButtonBox, QVBoxLayout, QHBoxLayout, QLabel, QComboBox,
+from PyQt5.QtCore import Qt, QSize
+from PyQt5.QtWidgets import (QDialog, QDialogButtonBox, QVBoxLayout, QHBoxLayout, QLabel, QComboBox,
     QSlider, QSizePolicy, QSpacerItem, QCheckBox, QLineEdit, QMessageBox, QSpinBox)
 
 from hscommon.plat import ISOSX, ISLINUX
@@ -26,8 +26,8 @@ class PreferencesDialogBase(QDialog):
         self.app = app
         self._setupUi()
         
-        self.connect(self.filterHardnessSlider, SIGNAL("valueChanged(int)"), self.filterHardnessLabel.setNum)
-        self.connect(self.buttonBox, SIGNAL('clicked(QAbstractButton*)'), self.buttonClicked)
+        self.filterHardnessSlider.valueChanged['int'].connect(self.filterHardnessLabel.setNum)
+        self.buttonBox.clicked['QAbstractButton*'].connect(self.buttonClicked)
         self.buttonBox.accepted.connect(self.accept)
         self.buttonBox.rejected.connect(self.reject)
     

qt/base/prioritize_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt, QMimeData, QByteArray
-from PyQt4.QtGui import (QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QComboBox, QListView,
+from PyQt5.QtCore import Qt, QMimeData, QByteArray
+from PyQt5.QtWidgets import (QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QComboBox, QListView,
     QDialogButtonBox, QAbstractItemView, QLabel, QStyle, QSplitter, QWidget, QSizePolicy)
 
 from hscommon.trans import trget

qt/base/problem_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt
-from PyQt4.QtGui import (QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QSpacerItem, QSizePolicy,
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import (QDialog, QVBoxLayout, QHBoxLayout, QPushButton, QSpacerItem, QSizePolicy,
     QLabel, QTableView, QAbstractItemView, QApplication)
 
 from hscommon.trans import trget

qt/base/result_window.py

@@ -6,9 +6,9 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt, QUrl, QRect
-from PyQt4.QtGui import (QMainWindow, QMenu, QLabel, QDesktopServices, QFileDialog, QMenuBar,
-    QWidget, QVBoxLayout, QAbstractItemView, QStatusBar, QDialog, QAction, QPushButton, QCheckBox)
+from PyQt5.QtCore import Qt, QRect
+from PyQt5.QtWidgets import (QMainWindow, QMenu, QLabel, QFileDialog, QMenuBar, QWidget,
+    QVBoxLayout, QAbstractItemView, QStatusBar, QDialog, QAction, QPushButton, QCheckBox)
 
 from hscommon.trans import trget
 from qtlib.util import moveToScreenCenter, horizontalWrap, createActions
@@ -164,7 +164,7 @@ class ResultWindow(QMainWindow):
         self.resize(630, 514)
         self.centralwidget = QWidget(self)
         self.verticalLayout = QVBoxLayout(self.centralwidget)
-        self.verticalLayout.setMargin(0)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setSpacing(0)
         self.actionsButton = QPushButton(tr("Actions"))
         self.detailsButton = QPushButton(tr("Details"))
@@ -183,7 +183,7 @@ class ResultWindow(QMainWindow):
         self.resultsView.verticalHeader().setVisible(False)
         h = self.resultsView.horizontalHeader()
         h.setHighlightSections(False)
-        h.setMovable(True)
+        h.setSectionsMovable(True)
         h.setStretchLastSection(False)
         h.setDefaultAlignment(Qt.AlignLeft)
         self.verticalLayout.addWidget(self.resultsView)

qt/base/results_model.py

@@ -6,8 +6,9 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt, pyqtSignal
-from PyQt4.QtGui import QBrush, QFont, QFontMetrics, QTableView, QColor
+from PyQt5.QtCore import Qt, pyqtSignal
+from PyQt5.QtGui import QBrush, QFont, QFontMetrics, QColor
+from PyQt5.QtWidgets import QTableView
 
 from qtlib.table import Table
 

qt/me/details_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import QSize
-from PyQt4.QtGui import QVBoxLayout, QAbstractItemView
+from PyQt5.QtCore import QSize
+from PyQt5.QtGui import QVBoxLayout, QAbstractItemView
 
 from hscommon.trans import trget
 from ..base.details_dialog import DetailsDialog as DetailsDialogBase

qt/me/preferences_dialog.py

@@ -7,8 +7,8 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 import sys
-from PyQt4.QtCore import QSize
-from PyQt4.QtGui import (QVBoxLayout, QHBoxLayout, QLabel, QSizePolicy, QSpacerItem, QWidget,
+from PyQt5.QtCore import QSize
+from PyQt5.QtWidgets import (QVBoxLayout, QHBoxLayout, QLabel, QSizePolicy, QSpacerItem, QWidget,
     QApplication)
 
 from hscommon.trans import trget

qt/pe/app.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from PyQt4.QtGui import QImage, QImageReader, QTransform
+from PyQt5.QtGui import QImage, QImageReader, QTransform
 
 from core_pe import __appname__
 from core_pe.photo import Photo as PhotoBase

qt/pe/details_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import Qt, QSize
-from PyQt4.QtGui import QVBoxLayout, QAbstractItemView, QHBoxLayout, QLabel, QSizePolicy, QPixmap
+from PyQt5.QtCore import Qt, QSize
+from PyQt5.QtGui import QVBoxLayout, QAbstractItemView, QHBoxLayout, QLabel, QSizePolicy, QPixmap
 
 from hscommon.trans import trget
 from ..base.details_dialog import DetailsDialog as DetailsDialogBase

qt/pe/preferences_dialog.py

@@ -7,7 +7,7 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 import sys
-from PyQt4.QtGui import QApplication
+from PyQt5.QtWidgets import QApplication
 
 from hscommon.trans import trget
 from core.scanner import ScanType

qt/pe/result_window.py

@@ -6,7 +6,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtGui import QMessageBox, QAction
+from PyQt5.QtGui import QMessageBox, QAction
 
 from hscommon.trans import trget
 from ..base.result_window import ResultWindow as ResultWindowBase

qt/run_template.py

@@ -8,8 +8,9 @@
 import sys
 import os.path as op
 
-from PyQt4.QtCore import QCoreApplication, QSettings
-from PyQt4.QtGui import QApplication, QIcon, QPixmap
+from PyQt5.QtCore import QCoreApplication, QSettings
+from PyQt5.QtGui import QIcon, QPixmap
+from PyQt5.QtWidgets import QApplication
 
 from hscommon.plat import ISWINDOWS
 from hscommon.trans import install_gettext_trans_under_qt

qt/se/details_dialog.py

@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/bsd_license
 
-from PyQt4.QtCore import QSize
-from PyQt4.QtGui import QVBoxLayout, QAbstractItemView
+from PyQt5.QtCore import QSize
+from PyQt5.QtWidgets import QVBoxLayout, QAbstractItemView
 
 from hscommon.trans import trget
 from ..base.details_dialog import DetailsDialog as DetailsDialogBase
@@ -22,7 +22,7 @@ class DetailsDialog(DetailsDialogBase):
         self.setMinimumSize(QSize(200, 0))
         self.verticalLayout = QVBoxLayout(self)
         self.verticalLayout.setSpacing(0)
-        self.verticalLayout.setMargin(0)
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.tableView = DetailsTable(self)
         self.tableView.setAlternatingRowColors(True)
         self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows)

qt/se/preferences_dialog.py

@@ -7,8 +7,8 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 import sys
-from PyQt4.QtCore import QSize
-from PyQt4.QtGui import (QVBoxLayout, QHBoxLayout, QLabel, QSizePolicy, QSpacerItem, QWidget,
+from PyQt5.QtCore import QSize
+from PyQt5.QtWidgets import (QVBoxLayout, QHBoxLayout, QLabel, QSizePolicy, QSpacerItem, QWidget,
     QLineEdit, QApplication)
 
 from hscommon.plat import ISWINDOWS, ISLINUX