mirror of
https://github.com/arsenetar/dupeguru.git
synced 2026-01-22 06:37:17 +00:00
More cleanups
- Cleanup columns.py and tables - Other misc cleanups - Remove text_field.py from qtlib as it is not used - Remove unused variables from image_viewer method
This commit is contained in:
@@ -201,16 +201,12 @@ class BaseController(QObject):
|
||||
# the SelectedImageViewer widget sometimes ends up being bigger
|
||||
# than the ReferenceImageViewer by one pixel, which distorts the
|
||||
# scaled down pixmap for the reference, hence we'll reuse its size here.
|
||||
selected_size = self._updateImage(
|
||||
self.selectedPixmap, self.scaledSelectedPixmap, self.selectedViewer, None, same_group
|
||||
)
|
||||
self._updateImage(
|
||||
self.referencePixmap, self.scaledReferencePixmap, self.referenceViewer, selected_size, same_group
|
||||
)
|
||||
self._updateImage(self.selectedPixmap, self.selectedViewer, same_group)
|
||||
self._updateImage(self.referencePixmap, self.referenceViewer, same_group)
|
||||
if ignore_update:
|
||||
self.selectedViewer.ignore_signal = False
|
||||
|
||||
def _updateImage(self, pixmap, scaledpixmap, viewer, target_size=None, same_group=False):
|
||||
def _updateImage(self, pixmap, viewer, same_group=False):
|
||||
# WARNING this is called on every resize event, might need to split
|
||||
# into a separate function depending on the implementation used
|
||||
if pixmap.isNull():
|
||||
@@ -340,8 +336,8 @@ class BaseController(QObject):
|
||||
self.selectedViewer.resetCenter()
|
||||
self.referenceViewer.resetCenter()
|
||||
|
||||
target_size = self._updateImage(self.selectedPixmap, self.scaledSelectedPixmap, self.selectedViewer, None, True)
|
||||
self._updateImage(self.referencePixmap, self.scaledReferencePixmap, self.referenceViewer, target_size, True)
|
||||
self._updateImage(self.selectedPixmap, self.selectedViewer, True)
|
||||
self._updateImage(self.referencePixmap, self.referenceViewer, True)
|
||||
self.centerViews()
|
||||
|
||||
self.parent.verticalToolBar.buttonZoomIn.setEnabled(False)
|
||||
|
||||
@@ -10,14 +10,14 @@ from ..results_model import ResultsModel as ResultsModelBase
|
||||
|
||||
class ResultsModel(ResultsModelBase):
|
||||
COLUMNS = [
|
||||
Column("marked", defaultWidth=30),
|
||||
Column("name", defaultWidth=200),
|
||||
Column("folder_path", defaultWidth=180),
|
||||
Column("size", defaultWidth=60),
|
||||
Column("extension", defaultWidth=40),
|
||||
Column("dimensions", defaultWidth=100),
|
||||
Column("exif_timestamp", defaultWidth=120),
|
||||
Column("mtime", defaultWidth=120),
|
||||
Column("percentage", defaultWidth=60),
|
||||
Column("dupe_count", defaultWidth=80),
|
||||
Column("marked", default_width=30),
|
||||
Column("name", default_width=200),
|
||||
Column("folder_path", default_width=180),
|
||||
Column("size", default_width=60),
|
||||
Column("extension", default_width=40),
|
||||
Column("dimensions", default_width=100),
|
||||
Column("exif_timestamp", default_width=120),
|
||||
Column("mtime", default_width=120),
|
||||
Column("percentage", default_width=60),
|
||||
Column("dupe_count", default_width=80),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user