Convert transitions to no longer delete widgets, but rather create both with a shared model, and toggle visibility to the user.

Author: jonoomph

src/windows/main_window.py

@@ -83,6 +83,7 @@ class MainWindow(QMainWindow, updates.UpdateWatcher):
     previewFrameSignal = pyqtSignal(int)
     refreshFrameSignal = pyqtSignal()
     refreshFilesSignal = pyqtSignal()
+    refreshTransitionsSignal = pyqtSignal()
     LoadFileSignal = pyqtSignal(str)
     PlaySignal = pyqtSignal(int)
     PauseSignal = pyqtSignal()
@@ -822,10 +823,10 @@ def actionFilesShowImage_trigger(self, event):
         self.refreshFilesSignal.emit()
 
     def actionTransitionsShowAll_trigger(self, event):
-        self.transitionsTreeView.refresh_view()
+        self.refreshTransitionsSignal.emit()
 
     def actionTransitionsShowCommon_trigger(self, event):
-        self.transitionsTreeView.refresh_view()
+        self.refreshTransitionsSignal.emit()
 
     def actionHelpContents_trigger(self, event):
         try:
@@ -1834,11 +1835,9 @@ def actionDetailsView_trigger(self, event):
         # Transitions
         elif app.context_menu_object == "transitions":
             s.set("transitions_view", "details")
-            self.tabTransitions.layout().removeWidget(self.transitionsTreeView)
-            self.transitionsTreeView.deleteLater()
-            self.transitionsTreeView = None
-            self.transitionsTreeView = TransitionsTreeView(self.transition_model)
-            self.tabTransitions.layout().addWidget(self.transitionsTreeView)
+            self.transitionsListView.hide()
+            self.transitionsTreeView.show()
+            self.transitionsTreeView.clearSelection()
 
         # Effects
         elif app.context_menu_object == "effects":
@@ -1859,18 +1858,16 @@ def actionThumbnailView_trigger(self, event):
         # Files
         if app.context_menu_object == "files":
             s.set("file_view", "thumbnail")
+            self.filesTreeView.hide()
             self.filesListView.show()
             self.filesListView.clearSelection()
-            self.filesTreeView.hide()
 
         # Transitions
         elif app.context_menu_object == "transitions":
             s.set("transitions_view", "thumbnail")
-            self.tabTransitions.layout().removeWidget(self.transitionsTreeView)
-            self.transitionsTreeView.deleteLater()
-            self.transitionsTreeView = None
-            self.transitionsTreeView = TransitionsListView(self.transition_model)
-            self.tabTransitions.layout().addWidget(self.transitionsTreeView)
+            self.transitionsTreeView.hide()
+            self.transitionsListView.show()
+            self.transitionsListView.clearSelection()
 
         # Effects
         elif app.context_menu_object == "effects":
@@ -2540,8 +2537,8 @@ def __init__(self, mode=None):
         self.tabFiles.layout().insertWidget(-1, self.filesTreeView)
         self.tabFiles.layout().insertWidget(-1, self.filesListView)
         if s.get("file_view") == "details":
-            self.filesTreeView.show()
             self.filesListView.hide()
+            self.filesTreeView.show()
             self.filesTreeView.setFocus()
         else:
             self.filesTreeView.hide()
@@ -2550,11 +2547,18 @@ def __init__(self, mode=None):
 
         # Setup transitions tree
         self.transition_model = TransitionsModel()
+        self.transitionsTreeView = TransitionsTreeView(self.transition_model)
+        self.transitionsListView = TransitionsListView(self.transition_model)
+        self.tabTransitions.layout().insertWidget(-1, self.transitionsTreeView)
+        self.tabTransitions.layout().insertWidget(-1, self.transitionsListView)
         if s.get("transitions_view") == "details":
-            self.transitionsTreeView = TransitionsTreeView(self.transition_model)
+            self.transitionsListView.hide()
+            self.transitionsTreeView.show()
+            self.transitionsTreeView.setFocus()
         else:
-            self.transitionsTreeView = TransitionsListView(self.transition_model)
-        self.tabTransitions.layout().addWidget(self.transitionsTreeView)
+            self.transitionsTreeView.hide()
+            self.transitionsListView.show()
+            self.transitionsListView.setFocus()
 
         # Setup effects tree
         self.effects_model = EffectsModel()

src/windows/models/files_model.py

@@ -246,7 +246,7 @@ def update_model(self, clear=True, delete_file_id=None):
             # Refresh view and filters (to hide or show this new item)
             get_app().window.resize_contents()
 
-        # Emit signal
+        # Emit signal when model is updated
         self.model.ModelRefreshed.emit()
 
     def __init__(self, *args):

src/windows/models/transition_model.py

@@ -27,7 +27,7 @@
 
 import os
 
-from PyQt5.QtCore import QMimeData, Qt, QSortFilterProxyModel
+from PyQt5.QtCore import QMimeData, Qt, QSortFilterProxyModel, pyqtSignal
 from PyQt5.QtGui import *
 from PyQt5.QtWidgets import QMessageBox
 import openshot  # Python module for libopenshot (required video editing module installed separately)
@@ -39,6 +39,8 @@
 import json
 
 class TransitionStandardItemModel(QStandardItemModel):
+    ModelRefreshed = pyqtSignal()
+
     def __init__(self, parent=None):
         QStandardItemModel.__init__(self)
 
@@ -216,6 +218,9 @@ def update_model(self, clear=True):
                     self.model.appendRow(row)
                     self.model_paths[path] = path
 
+        # Emit signal when model is updated
+        self.model.ModelRefreshed.emit()
+
     def __init__(self, *args):
 
         # Create standard model

src/windows/views/transitions_listview.py

@@ -114,3 +114,4 @@ def __init__(self, model):
         # setup filter events
         app = get_app()
         app.window.transitionsFilter.textChanged.connect(self.filter_changed)
+        app.window.refreshTransitionsSignal.connect(self.refresh_view)

src/windows/views/transitions_treeview.py

@@ -72,6 +72,13 @@ def refresh_view(self):
         self.proxy_model.setFilterCaseSensitivity(Qt.CaseInsensitive)
         self.proxy_model.sort(Qt.AscendingOrder)
 
+    def refresh_columns(self):
+        """Resize and hide certain columns"""
+        if type(self) == TransitionsTreeView:
+            # Only execute when the treeview is active
+            self.hideColumn(2)
+            self.hideColumn(3)
+
     def __init__(self, model):
         # Invoke parent init
         QTreeView.__init__(self)
@@ -95,20 +102,21 @@ def __init__(self, model):
         self.setDropIndicatorShown(True)
 
         # Setup header columns
-        self.setModel(self.transition_model.model)
+        self.setModel(self.proxy_model)
         self.setIconSize(QSize(75, 62))
         self.setIndentation(0)
         self.setSelectionBehavior(QTreeView.SelectRows)
         self.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.setWordWrap(True)
         self.setStyleSheet('QTreeView::item { padding-top: 2px; }')
+        self.transition_model.model.ModelRefreshed.connect(self.refresh_columns)
 
         # Load initial transition model data
         self.transition_model.update_model()
-        self.hideColumn(2)
-        self.hideColumn(3)
+        self.refresh_columns()
 
         # setup filter events
         app = get_app()
         app.window.transitionsFilter.textChanged.connect(self.filter_changed)
+        app.window.refreshTransitionsSignal.connect(self.refresh_view)