Add image comparison features to details dialog

* Add splitter in order to hide the details table.
* Add a toolbar to the Details Dialog window to allow for better image
comparisons: zoom in/out, swap pixmaps in place, best-fit-to-viewport.
Scrollbars and viewports are synchronized.

.gitignore

@@ -22,4 +22,6 @@ cocoa/autogen
 
 *.pyd
 *.exe
-*.spec
+*.spec
+
+.vscode

qt/details_dialog.py

@@ -7,12 +7,12 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QDialog
+from PyQt5.QtWidgets import QMainWindow
 
 from .details_table import DetailsModel
 
 
-class DetailsDialog(QDialog):
+class DetailsDialog(QMainWindow):
     def __init__(self, parent, app, **kwargs):
         super().__init__(parent, Qt.Tool, **kwargs)
         self.app = app

qt/details_table.py

@@ -7,7 +7,7 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from PyQt5.QtCore import Qt, QAbstractTableModel
-from PyQt5.QtWidgets import QHeaderView, QTableView
+from PyQt5.QtWidgets import QHeaderView, QTableView, QAbstractItemView
 
 from hscommon.trans import trget
 
@@ -51,9 +51,11 @@ class DetailsTable(QTableView):
         QTableView.__init__(self, *args)
         self.setAlternatingRowColors(True)
         self.setSelectionBehavior(QTableView.SelectRows)
+        self.setSelectionMode(QTableView.SingleSelection)
         self.setShowGrid(False)
         self.setWordWrap(False)
 
+
     def setModel(self, model):
         QTableView.setModel(self, model)
         # The model needs to be set to set header stuff
@@ -61,7 +63,7 @@ class DetailsTable(QTableView):
         hheader.setHighlightSections(False)
         hheader.setStretchLastSection(False)
         hheader.resizeSection(0, 100)
-        hheader.setSectionResizeMode(0, QHeaderView.Fixed)
+        hheader.setSectionResizeMode(0, QHeaderView.Interactive)
         hheader.setSectionResizeMode(1, QHeaderView.Stretch)
         hheader.setSectionResizeMode(2, QHeaderView.Stretch)
         vheader = self.verticalHeader()

qt/pe/details_dialog.py

@@ -5,109 +5,119 @@
 # http://www.gnu.org/licenses/gpl-3.0.html
 
 from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import QPixmap
 from PyQt5.QtWidgets import (
-    QVBoxLayout,
+    QAbstractItemView, QSizePolicy, QGridLayout, QSplitter, QFrame)
-    QAbstractItemView,
-    QHBoxLayout,
-    QLabel,
-    QSizePolicy,
-)
 
 from hscommon.trans import trget
 from ..details_dialog import DetailsDialog as DetailsDialogBase
 from ..details_table import DetailsTable
-
+from .image_viewer import (
+    ViewerToolBar, ScrollAreaImageViewer, ScrollAreaController)
 tr = trget("ui")
 
 
 class DetailsDialog(DetailsDialogBase):
     def __init__(self, parent, app):
-        DetailsDialogBase.__init__(self, parent, app)
+        self.vController = None
-        self.selectedPixmap = None
+        super().__init__(parent, app)
-        self.referencePixmap = None
 
     def _setupUi(self):
         self.setWindowTitle(tr("Details"))
-        self.resize(502, 295)
+        self.resize(502, 502)
         self.setMinimumSize(QSize(250, 250))
-        self.verticalLayout = QVBoxLayout(self)
+        self.splitter = QSplitter(Qt.Vertical, self)
-        self.verticalLayout.setSpacing(0)
+        self.setCentralWidget(self.splitter)
-        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.topFrame = QFrame()
-        self.horizontalLayout = QHBoxLayout()
+        self.topFrame.setFrameShape(QFrame.StyledPanel)
-        self.horizontalLayout.setSpacing(4)
+        self.horizontalLayout = QGridLayout()
-        self.selectedImage = QLabel(self)
+        # Minimum width for the toolbar in the middle:
-        sizePolicy = QSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored)
+        self.horizontalLayout.setColumnMinimumWidth(1, 10)
-        sizePolicy.setHorizontalStretch(0)
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
-        sizePolicy.setVerticalStretch(0)
+        self.horizontalLayout.setColumnStretch(0, 32)
-        sizePolicy.setHeightForWidth(
+        # Smaller value for the toolbar in the middle to avoid excessive resize
-            self.selectedImage.sizePolicy().hasHeightForWidth()
+        self.horizontalLayout.setColumnStretch(1, 2)
-        )
+        self.horizontalLayout.setColumnStretch(2, 32)
-        self.selectedImage.setSizePolicy(sizePolicy)
+        # This avoids toolbar getting incorrectly partially hidden when window resizes
-        self.selectedImage.setScaledContents(False)
+        self.horizontalLayout.setRowStretch(0, 1)
-        self.selectedImage.setAlignment(Qt.AlignCenter)
+        self.horizontalLayout.setRowStretch(1, 24)
-        self.horizontalLayout.addWidget(self.selectedImage)
+        self.horizontalLayout.setRowStretch(2, 1)
-        self.referenceImage = QLabel(self)
+        self.horizontalLayout.setSpacing(1)  # probably not important
-        sizePolicy = QSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored)
+
-        sizePolicy.setHorizontalStretch(0)
+        self.selectedImageViewer = ScrollAreaImageViewer(self, "selectedImage")
-        sizePolicy.setVerticalStretch(0)
+        self.horizontalLayout.addWidget(self.selectedImageViewer, 0, 0, 3, 1)
-        sizePolicy.setHeightForWidth(
+        # Use a specific type of controller depending on the underlying viewer type
-            self.referenceImage.sizePolicy().hasHeightForWidth()
+        self.vController = ScrollAreaController(self)
-        )
+
-        self.referenceImage.setSizePolicy(sizePolicy)
+        self.verticalToolBar = ViewerToolBar(self, self.vController)
-        self.referenceImage.setAlignment(Qt.AlignCenter)
+        self.verticalToolBar.setOrientation(Qt.Orientation(Qt.Vertical))
-        self.horizontalLayout.addWidget(self.referenceImage)
+        self.horizontalLayout.addWidget(self.verticalToolBar, 1, 1, 1, 1, Qt.AlignCenter)
-        self.verticalLayout.addLayout(self.horizontalLayout)
+
+        self.referenceImageViewer = ScrollAreaImageViewer(self, "referenceImage")
+        self.horizontalLayout.addWidget(self.referenceImageViewer, 0, 2, 3, 1)
+        self.topFrame.setLayout(self.horizontalLayout)
+        self.splitter.addWidget(self.topFrame)
+        self.splitter.setStretchFactor(0, 8)
+
         self.tableView = DetailsTable(self)
-        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Maximum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.tableView.sizePolicy().hasHeightForWidth())
         self.tableView.setSizePolicy(sizePolicy)
-        self.tableView.setMinimumSize(QSize(0, 188))
+        # self.tableView.setMinimumSize(QSize(0, 190))
-        self.tableView.setMaximumSize(QSize(16777215, 190))
+        # self.tableView.setMaximumSize(QSize(16777215, 190))
         self.tableView.setAlternatingRowColors(True)
         self.tableView.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.tableView.setShowGrid(False)
-        self.verticalLayout.addWidget(self.tableView)
+        self.splitter.addWidget(self.tableView)
+        self.splitter.setStretchFactor(1, 1)
+        # Late population needed here for connections to the toolbar
+        self.vController.setupViewers(
+            self.selectedImageViewer, self.referenceImageViewer)
 
     def _update(self):
+        if self.vController is None:  # Not yet constructed!
+            return
         if not self.app.model.selected_dupes:
+            # No item from the model, disable and clear everything.
+            self.vController.resetViewersState()
             return
         dupe = self.app.model.selected_dupes[0]
         group = self.app.model.results.get_group_of_duplicate(dupe)
         ref = group.ref
 
-        self.selectedPixmap = QPixmap(str(dupe.path))
+        self.vController.updateView(ref, dupe, group)
-        if ref is dupe:
-            self.referencePixmap = None
-        else:
-            self.referencePixmap = QPixmap(str(ref.path))
-        self._updateImages()
-
-    def _updateImages(self):
-        if self.selectedPixmap is not None:
-            target_size = self.selectedImage.size()
-            scaledPixmap = self.selectedPixmap.scaled(
-                target_size, Qt.KeepAspectRatio, Qt.SmoothTransformation
-            )
-            self.selectedImage.setPixmap(scaledPixmap)
-        else:
-            self.selectedImage.setPixmap(QPixmap())
-        if self.referencePixmap is not None:
-            target_size = self.referenceImage.size()
-            scaledPixmap = self.referencePixmap.scaled(
-                target_size, Qt.KeepAspectRatio, Qt.SmoothTransformation
-            )
-            self.referenceImage.setPixmap(scaledPixmap)
-        else:
-            self.referenceImage.setPixmap(QPixmap())
 
     # --- Override
     def resizeEvent(self, event):
-        self._updateImages()
+        # HACK referenceViewer might be 1 pixel shorter in width
+        # due to the toolbar in the middle keeping the same width,
+        # so resizing in the GridLayout's engine leads to not enough space
+        # left for the panel on the right.
+        # This ensures same size while shrinking at least:
+        self.horizontalLayout.setColumnMinimumWidth(
+            0, self.selectedImageViewer.size().width())
+        self.horizontalLayout.setColumnMinimumWidth(
+            2, self.selectedImageViewer.size().width())
+        # This works when expanding but it's ugly:
+        if self.selectedImageViewer.size().width() > self.referenceImageViewer.size().width():
+            # print(f"""Before selected size: {self.selectedImageViewer.size()}\n""",
+            #       f"""Before reference size: {self.referenceImageViewer.size()}""")
+            self.selectedImageViewer.resize(self.referenceImageViewer.size())
+            # print(f"""After selected size: {self.selectedImageViewer.size()}\n""",
+            #       f"""After reference size: {self.referenceImageViewer.size()}""")
+
+        if self.vController is None or not self.vController.bestFit:
+            return
+        # Only update the scaled down pixmaps
+        self.vController.updateBothImages()
 
     def show(self):
+        # Compute the maximum size the table view can reach
+        # Assuming all rows below headers have the same height
+        self.tableView.setMaximumHeight(
+            self.tableView.rowHeight(1)
+            * self.tableModel.model.row_count()
+            + self.tableView.verticalHeader().sectionSize(0))
         DetailsDialogBase.show(self)
         self._update()