Merge pull request #3497 from ferdnyc/emojis-mods2

Overhaul of models, views, data management

Author: jonoomph

src/classes/app.py

@@ -243,7 +243,7 @@ def __init__(self, *args, mode=None):
             else:
                 # Apply the default settings and Auto import media file
                 self.project.load("")
-                self.window.filesTreeView.add_file(path)
+                self.window.filesView.add_file(path)
         else:
             # Recover backup file (this can't happen until after the Main Window has completely loaded)
             self.window.RecoverBackup.emit()

src/classes/info.py

@@ -85,6 +85,9 @@
 # Blender minimum version required (a string value)
 BLENDER_MIN_VERSION = "2.80"
 
+# Data-model debugging enabler
+MODEL_TEST = False
+
 # Languages
 CMDLINE_LANGUAGE = None
 CURRENT_LANGUAGE = 'en_US'

src/launch.py

@@ -59,18 +59,21 @@ def main():
 
     parser = argparse.ArgumentParser(description = 'OpenShot version ' + info.SETUP['version'])
     parser.add_argument('-l', '--lang', action='store',
-                        help='language code for interface (overrides '
-                        'preferences and system environment)')
+        help='language code for interface (overrides '
+             'preferences and system environment)')
     parser.add_argument('--list-languages', dest='list_languages',
-                        action='store_true', help='List all language '
-                        'codes supported by OpenShot')
-    parser.add_argument('--path', dest='py_path',
-                        action='append',
-                        help='Additional locations to search for modules '
-                        '(PYTHONPATH). Can be used multiple times.')
+        action='store_true',
+        help='List all language codes supported by OpenShot')
+    parser.add_argument('--path', dest='py_path', action='append',
+        help='Additional locations to search for modules '
+              '(PYTHONPATH). Can be used multiple times.')
+    parser.add_argument('--test-models', dest='modeltest',
+       action='store_true',
+       help="Load Qt's QAbstractItemModelTester into data models "
+       '(requires Qt 5.11+)')
     parser.add_argument('-V', '--version', action='store_true')
     parser.add_argument('remain', nargs=argparse.REMAINDER,
-                        help=argparse.SUPPRESS)
+       help=argparse.SUPPRESS)
 
     args = parser.parse_args()
 
@@ -98,6 +101,12 @@ def main():
                     print("Bad path {}: {}".format(p, ex))
                     continue
 
+    if args.modeltest:
+        info.MODEL_TEST = True
+        # Set default logging rules, if the user didn't
+        if os.getenv('QT_LOGGING_RULES') is None:
+            os.putenv('QT_LOGGING_RULES', 'qt.modeltest.debug=true')
+
     if args.lang:
         if args.lang in info.SUPPORTED_LANGUAGES:
             info.CMDLINE_LANGUAGE = args.lang

src/windows/animated_title.py

@@ -40,12 +40,10 @@
 from PyQt5.QtGui import QIcon, QStandardItemModel, QStandardItem
 from PyQt5.QtWidgets import *
 from PyQt5 import uic
-import openshot  # Python module for libopenshot (required video editing module installed separately)
 
 from classes import info, ui_util, settings, qt_types, updates
 from classes.app import get_app
 from classes.logger import log
-from classes.query import File
 from classes.metrics import *
 from windows.views.blender_listview import BlenderListView
 
@@ -80,8 +78,8 @@ def __init__(self):
         self.buttonBox.addButton(self.btnCancel, QDialogButtonBox.RejectRole)
 
         # Add blender treeview
-        self.blenderTreeView = BlenderListView(self)
-        self.verticalLayout.addWidget(self.blenderTreeView)
+        self.blenderView = BlenderListView(self)
+        self.verticalLayout.addWidget(self.blenderView)
 
         # Init variables
         self.unique_folder_name = str(uuid.uuid1())
@@ -97,73 +95,33 @@ def accept(self):
         """ Start rendering animation, but don't close window """
 
         # Render
-        self.blenderTreeView.Render()
+        self.blenderView.Render()
 
     def close(self):
         """ Actually close window and accept dialog """
 
         # Re-enable interface
-        self.blenderTreeView.enable_interface()
+        self.blenderView.enable_interface()
 
         # Accept dialog
-        super(AnimatedTitle, self).accept()
+        super().accept()
 
     def closeEvent(self, event):
 
         # Stop threads
-        self.blenderTreeView.background.quit()
+        self.blenderView.background.quit()
 
         # Re-enable interface
-        self.blenderTreeView.enable_interface()
+        self.blenderView.enable_interface()
 
     def reject(self):
 
         # Stop threads
-        self.blenderTreeView.Cancel()
-        self.blenderTreeView.background.quit()
+        self.blenderView.Cancel()
+        self.blenderView.background.quit()
 
         # Cancel dialog
-        super(AnimatedTitle, self).reject()
-
-    def add_file(self, filepath):
-        """ Add an animation to the project file tree """
-        filename = os.path.basename(filepath)
-
-        # Add file into project
-        app = get_app()
-        _ = get_app()._tr
-
-        # Check for this path in our existing project data
-        file = File.get(path=filepath)
-
-        # If this file is already found, exit
-        if file:
-            return
-
-        # Get the JSON for the clip's internal reader
-        try:
-            # Open image sequence in FFmpegReader
-            reader = openshot.FFmpegReader(filepath)
-            reader.Open()
-
-            # Serialize JSON for the reader
-            file_data = json.loads(reader.Json())
-
-            # Set media type
-            file_data["media_type"] = "video"
-
-            # Save new file to the project data
-            file = File()
-            file.data = file_data
-            file.save()
-            return True
-
-        except:
-            # Handle exception
-            msg = QMessageBox()
-            msg.setText(_("{} is not a valid video, audio, or image file.".format(filename)))
-            msg.exec_()
-            return False
+        super().reject()
 
     def clear_effect_controls(self):
         """ Clear all child widgets used for settings """