Merge pull request #3481 from ferdnyc/file-selection

files views: Fix updateSelection()

Author: ferdnyc

src/windows/views/files_listview.py

@@ -53,7 +53,7 @@ def updateSelection(self):
         selected_items = [m.itemFromIndex(x) for x in self.selectionModel().selectedIndexes()]
 
         # Track selected file ids on main window
-        self.win.selected_files = [x.text() for x in self.selected_items if x.column() == 5]
+        self.win.selected_files = [x.text() for x in selected_items if x.column() == 5]
 
     def contextMenuEvent(self, event):
 
@@ -118,7 +118,6 @@ def startDrag(self, supportedActions):
         # Start drag operation
         drag = QDrag(self)
         drag.setMimeData(self.files_model.model.mimeData(self.selectionModel().selectedIndexes()))
-        # drag.setPixmap(QIcon.fromTheme('document-new').pixmap(QSize(self.drag_item_size,self.drag_item_size)))
         drag.setPixmap(icon.pixmap(QSize(self.drag_item_size, self.drag_item_size)))
         drag.setHotSpot(QPoint(self.drag_item_size / 2, self.drag_item_size / 2))
         drag.exec_()
@@ -320,30 +319,35 @@ def prepare_for_delete(self):
 
     def __init__(self, *args):
         # Invoke parent init
-        QListView.__init__(self, *args)
+        super().__init__(*args)
 
         # Get a reference to the window object
         self.win = get_app().window
 
         # Get Model data
         self.files_model = FilesModel()
+        self.setModel(self.files_model.model)
+
+        # Keep track of mouse press start position to determine when to start drag
         self.setAcceptDrops(True)
         self.setDragEnabled(True)
         self.setDropIndicatorShown(True)
         self.ignore_image_sequence_paths = []
 
-        # Setup header columns
-        self.setModel(self.files_model.model)
+        # Setup header columns and layout
         self.setIconSize(QSize(131, 108))
         self.setGridSize(QSize(102, 92))
         self.setViewMode(QListView.IconMode)
         self.setResizeMode(QListView.Adjust)
-        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
-        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+
         self.setUniformItemSizes(True)
+        self.setStyleSheet('QListView::item { padding-top: 2px; }')
+
         self.setWordWrap(False)
         self.setTextElideMode(Qt.ElideRight)
-        self.setStyleSheet('QListView::item { padding-top: 2px; }')
+
+        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        self.setSelectionBehavior(QAbstractItemView.SelectRows)
 
         # Refresh view
         self.refresh_view()
@@ -352,4 +356,3 @@ def __init__(self, *args):
         app = get_app()
         app.window.filesFilter.textChanged.connect(self.filter_changed)
         self.selectionModel().selectionChanged.connect(self.updateSelection)
-

src/windows/views/files_treeview.py

@@ -52,10 +52,10 @@ class FilesTreeView(QTreeView):
     def updateSelection(self):
         # Track selected items
         m = self.files_model.model
-        self.selected_items = [m.itemFromIndex(x) for x in self.selectionModel().selectedIndexes()]
+        selected_items = [m.itemFromIndex(x) for x in self.selectionModel().selectedIndexes()]
 
         # Track selected file ids on main window
-        self.win.selected_files = [x.text() for x in self.selected_items if x.column() == 5]
+        self.win.selected_files = [x.text() for x in selected_items if x.column() == 5]
 
     def contextMenuEvent(self, event):
 
@@ -367,35 +367,39 @@ def prepare_for_delete(self):
         """Remove signal handlers and prepare for deletion"""
         try:
             self.files_model.model.ModelRefreshed.disconnect()
-        except:
+        except Exception:
             pass
 
     def __init__(self, *args):
         # Invoke parent init
-        QTreeView.__init__(self, *args)
+        super().__init__(*args)
 
         # Get a reference to the window object
         self.win = get_app().window
 
         # Get Model data
         self.files_model = FilesModel()
+        self.setModel(self.files_model.model)
 
         # Keep track of mouse press start position to determine when to start drag
         self.setAcceptDrops(True)
         self.setDragEnabled(True)
         self.setDropIndicatorShown(True)
         self.ignore_image_sequence_paths = []
 
-        # Setup header columns
-        self.setModel(self.files_model.model)
+        # Setup header columns and layout
         self.setIconSize(QSize(75, 62))
         self.setIndentation(0)
-        self.setSelectionBehavior(QTreeView.SelectRows)
-        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+        self.setStyleSheet('QTreeView::item { padding-top: 2px; }')
+
         self.setWordWrap(False)
         self.setTextElideMode(Qt.ElideRight)
-        self.setStyleSheet('QTreeView::item { padding-top: 2px; }')
+
+        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
+        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+
         self.files_model.model.ModelRefreshed.connect(self.refresh_columns)
 
         # Refresh view
@@ -407,4 +411,3 @@ def __init__(self, *args):
         app.window.filesFilter.textChanged.connect(self.filter_changed)
         self.files_model.model.itemChanged.connect(self.value_updated)
         self.selectionModel().selectionChanged.connect(self.updateSelection)
-