core/pe/matchblock.py

@@ -254,7 +254,6 @@ def getmatches(pictures, cache_path, threshold, match_scaled=False, j=job.nulljo
             ref.dimensions  # pre-read dimensions for display in results
             other.dimensions
             result.append(get_match(ref, other, percentage))
-    pool.join()
     return result
 
 

qt/app.py

@@ -283,7 +283,6 @@ class DupeGuru(QObject):
             self.resultWindow.close()
             self.resultWindow.setParent(None)
         self.resultWindow = ResultWindow(self.directories_dialog, self)
-        self.directories_dialog._updateActionsState()
         self.details_dialog = self._get_details_dialog_class()(self.resultWindow, self)
 
     def show_results_window(self):

qt/details_table.py

@@ -8,13 +8,12 @@
 
 from PyQt5.QtCore import Qt, QAbstractTableModel
 from PyQt5.QtWidgets import QHeaderView, QTableView
-from PyQt5.QtGui import QFont, QBrush, QColor
 
 from hscommon.trans import trget
 
 tr = trget("ui")
 
-HEADER = [tr("Selected"), tr("Reference")]
+HEADER = [tr("Attribute"), tr("Selected"), tr("Reference")]
 
 
 class DetailsModel(QAbstractTableModel):
@@ -28,27 +27,11 @@ class DetailsModel(QAbstractTableModel):
     def data(self, index, role):
         if not index.isValid():
             return None
-        # Skip first value "Attribute"
+        if role != Qt.DisplayRole:
-        column = index.column() + 1
+            return None
+        column = index.column()
         row = index.row()
-
+        return self.model.row(row)[column]
-        ignored_fields = ["Dupe Count"]
-        if (self.model.row(row)[0] in ignored_fields
-                or self.model.row(row)[1] == "---"
-                or self.model.row(row)[2] == "---"):
-            if role != Qt.DisplayRole:
-                return None
-            return self.model.row(row)[column]
-
-        if role == Qt.DisplayRole:
-            return self.model.row(row)[column]
-        if role == Qt.ForegroundRole and self.model.row(row)[1] != self.model.row(row)[2]:
-            return QBrush(QColor(250, 20, 20))  # red
-        if role == Qt.FontRole and self.model.row(row)[1] != self.model.row(row)[2]:
-            font = QFont(self.model.view.font())  # or simply QFont()
-            font.setBold(True)
-            return font
-        return None  # QVariant()
 
     def headerData(self, section, orientation, role):
         if (
@@ -57,13 +40,6 @@ class DetailsModel(QAbstractTableModel):
             and section < len(HEADER)
         ):
             return HEADER[section]
-        elif (
-            orientation == Qt.Vertical
-            and role == Qt.DisplayRole
-            and section < self.model.row_count()
-        ):
-            # Read "Attribute" cell for horizontal header
-            return self.model.row(section)[0]
         return None
 
     def rowCount(self, parent):
@@ -75,10 +51,8 @@ class DetailsTable(QTableView):
         QTableView.__init__(self, *args)
         self.setAlternatingRowColors(True)
         self.setSelectionBehavior(QTableView.SelectRows)
-        self.setSelectionMode(QTableView.NoSelection)
         self.setShowGrid(False)
         self.setWordWrap(False)
-        self.setCornerButtonEnabled(False)
 
     def setModel(self, model):
         QTableView.setModel(self, model)
@@ -87,12 +61,9 @@ class DetailsTable(QTableView):
         hheader.setHighlightSections(False)
         hheader.setStretchLastSection(False)
         hheader.resizeSection(0, 100)
-        hheader.setSectionResizeMode(0, QHeaderView.Stretch)
+        hheader.setSectionResizeMode(0, QHeaderView.Fixed)
         hheader.setSectionResizeMode(1, QHeaderView.Stretch)
+        hheader.setSectionResizeMode(2, QHeaderView.Stretch)
         vheader = self.verticalHeader()
-        vheader.setVisible(True)
+        vheader.setVisible(False)
         vheader.setDefaultSectionSize(18)
-        # hardcoded value above is not ideal, perhaps resize to contents first?
-        # vheader.setSectionResizeMode(QHeaderView.ResizeToContents)
-        vheader.setSectionResizeMode(QHeaderView.Fixed)
-        vheader.setSectionsMovable(True)