Merge branch 'emojis' into emojis-mods2

Author: ferdnyc

src/classes/info.py

@@ -79,6 +79,9 @@
       "email": "[email protected]",
       "website": "http://openshot.org/developers/jonathan"}
 
+# Desktop launcher ID, for Linux
+DESKTOP_ID = "org.openshot.OpenShot.desktop"
+
 # Blender minimum version required (a string value)
 BLENDER_MIN_VERSION = "2.80"
 

src/classes/json_data.py

@@ -39,7 +39,7 @@
 from classes.app import get_app
 
 # Compiled path regex
-path_regex = re.compile(r'\"(image|path)\":.*?\"(.*?)\"')
+path_regex = re.compile(r'"(image|path)"\s*:\s*"(.*?)"')
 path_context = {}
 
 

src/classes/project_data.py

@@ -280,21 +280,26 @@ def new(self):
         # Loop through profiles
         for profile_folder in [info.USER_PROFILES_PATH, info.PROFILES_PATH]:
             for file in os.listdir(profile_folder):
-                # Load Profile and append description
                 profile_path = os.path.join(profile_folder, file)
-                profile = openshot.Profile(profile_path)
-
-                if default_profile == profile.info.description:
-                    log.info("Setting default profile to %s" % profile.info.description)
-
-                    # Update default profile
-                    self._data["profile"] = profile.info.description
-                    self._data["width"] = profile.info.width
-                    self._data["height"] = profile.info.height
-                    self._data["fps"] = {"num": profile.info.fps.num, "den": profile.info.fps.den}
-                    self._data["display_ratio"] = {"num": profile.info.display_ratio.num, "den": profile.info.display_ratio.den}
-                    self._data["pixel_ratio"] = {"num": profile.info.pixel_ratio.num, "den": profile.info.pixel_ratio.den}
-                    break
+                try:
+                    # Load Profile and append description
+                    profile = openshot.Profile(profile_path)
+
+                    if default_profile == profile.info.description:
+                        log.info("Setting default profile to %s" % profile.info.description)
+
+                        # Update default profile
+                        self._data["profile"] = profile.info.description
+                        self._data["width"] = profile.info.width
+                        self._data["height"] = profile.info.height
+                        self._data["fps"] = {"num": profile.info.fps.num, "den": profile.info.fps.den}
+                        self._data["display_ratio"] = {"num": profile.info.display_ratio.num, "den": profile.info.display_ratio.den}
+                        self._data["pixel_ratio"] = {"num": profile.info.pixel_ratio.num, "den": profile.info.pixel_ratio.den}
+                        break
+
+                except RuntimeError as e:
+                    # This exception occurs when there's a problem parsing the Profile file - display a message and continue
+                    log.error("Failed to parse file '%s' as a profile: %s" % (profile_path, e))
 
         # Get the default audio settings for the timeline (and preview playback)
         default_sample_rate = int(s.get("default-samplerate"))

src/windows/export.py

@@ -1336,13 +1336,50 @@ def actionAddMarker_trigger(self, event):
         marker.data = {"position": position, "icon": "blue.png"}
         marker.save()
 
-    def actionPreviousMarker_trigger(self, event):
-        log.info("actionPreviousMarker_trigger")
 
-        # Calculate current position (in seconds)
-        fps = get_app().project.get("fps")
-        fps_float = float(fps["num"]) / float(fps["den"])
-        current_position = (self.preview_thread.current_frame - 1) / fps_float
+    def findAllMarkerPositions(self):
+        """Build and return a list of all seekable locations for the currently-selected timeline elements"""
+
+        def getTimelineObjectPositions(obj):
+            """ Add boundaries & all keyframes of a timeline object (clip, transition...) to all_marker_positions """
+            positions = []
+
+            fps = get_app().project.get("fps")
+            fps_float = float(fps["num"]) / float(fps["den"])
+
+            clip_start_time = obj.data["position"]
+            clip_orig_time = clip_start_time - obj.data["start"]
+            clip_stop_time = clip_orig_time + obj.data["end"]
+
+            # add clip boundaries
+            positions.append(clip_start_time)
+            positions.append(clip_stop_time)
+
+            # add all keyframes
+            for property in obj.data :
+                try :
+                    for point in obj.data[property]["Points"] :
+                        keyframe_time = (point["co"]["X"]-1)/fps_float - obj.data["start"] + obj.data["position"]
+                        if keyframe_time > clip_start_time and keyframe_time < clip_stop_time :
+                            positions.append(keyframe_time)
+                except (TypeError, KeyError):
+                    pass
+
+
+            # Add all Effect keyframes
+            if "effects" in obj.data:
+                for effect_data in obj.data["effects"]:
+                    for property in effect_data:
+                        try:
+                            for point in effect_data[property]["Points"]:
+                                keyframe_time = (point["co"]["X"]-1)/fps_float + clip_orig_time
+                                if keyframe_time > clip_start_time and keyframe_time < clip_stop_time:
+                                    positions.append(keyframe_time)
+                        except (TypeError, KeyError):
+                            pass
+
+            return positions
+
         all_marker_positions = []
 
         # Get list of marker and important positions (like selected clip bounds)
@@ -1354,16 +1391,28 @@ def actionPreviousMarker_trigger(self, event):
             # Get selected object
             selected_clip = Clip.get(id=clip_id)
             if selected_clip:
-                all_marker_positions.append(selected_clip.data["position"])
-                all_marker_positions.append(selected_clip.data["position"] + (selected_clip.data["end"] - selected_clip.data["start"]))
+                all_marker_positions.extend(getTimelineObjectPositions(selected_clip))
 
         # Loop through selected transitions (and add key positions)
         for tran_id in self.selected_transitions:
             # Get selected object
             selected_tran = Transition.get(id=tran_id)
             if selected_tran:
-                all_marker_positions.append(selected_tran.data["position"])
-                all_marker_positions.append(selected_tran.data["position"] + (selected_tran.data["end"] - selected_tran.data["start"]))
+                all_marker_positions.extend(getTimelineObjectPositions(selected_tran))
+
+        # remove duplicates
+        all_marker_positions = list(set(all_marker_positions))
+
+        return all_marker_positions
+
+    def actionPreviousMarker_trigger(self, event):
+        log.info("actionPreviousMarker_trigger")
+
+        # Calculate current position (in seconds)
+        fps = get_app().project.get("fps")
+        fps_float = float(fps["num"]) / float(fps["den"])
+        current_position = (self.preview_thread.current_frame - 1) / fps_float
+        all_marker_positions = self.findAllMarkerPositions()
 
         # Loop through all markers, and find the closest one to the left
         closest_position = None
@@ -1395,27 +1444,7 @@ def actionNextMarker_trigger(self, event):
         fps = get_app().project.get("fps")
         fps_float = float(fps["num"]) / float(fps["den"])
         current_position = (self.preview_thread.current_frame - 1) / fps_float
-        all_marker_positions = []
-
-        # Get list of marker and important positions (like selected clip bounds)
-        for marker in Marker.filter():
-            all_marker_positions.append(marker.data["position"])
-
-        # Loop through selected clips (and add key positions)
-        for clip_id in self.selected_clips:
-            # Get selected object
-            selected_clip = Clip.get(id=clip_id)
-            if selected_clip:
-                all_marker_positions.append(selected_clip.data["position"])
-                all_marker_positions.append(selected_clip.data["position"] + (selected_clip.data["end"] - selected_clip.data["start"]))
-
-        # Loop through selected transitions (and add key positions)
-        for tran_id in self.selected_transitions:
-            # Get selected object
-            selected_tran = Transition.get(id=tran_id)
-            if selected_tran:
-                all_marker_positions.append(selected_tran.data["position"])
-                all_marker_positions.append(selected_tran.data["position"] + (selected_tran.data["end"] - selected_tran.data["start"]))
+        all_marker_positions = self.findAllMarkerPositions()
 
         # Loop through all markers, and find the closest one to the right
         closest_position = None
@@ -2005,18 +2034,13 @@ def resize_contents(self):
 
     def getDocks(self):
         """ Get a list of all dockable widgets """
-        return [self.dockFiles,
-                self.dockTransitions,
-                self.dockEffects,
-                self.dockEmojis,
-                self.dockVideo,
-                self.dockProperties,
-                self.dockTimeline]
+        return self.findChildren(QDockWidget)
 
     def removeDocks(self):
         """ Remove all dockable widgets on main screen """
         for dock in self.getDocks():
-            self.removeDockWidget(dock)
+            if self.dockWidgetArea(dock) != Qt.NoDockWidgetArea:
+                self.removeDockWidget(dock)
 
     def addDocks(self, docks, area):
         """ Add all dockable widgets to the same dock area on the main screen """
@@ -2026,7 +2050,8 @@ def addDocks(self, docks, area):
     def floatDocks(self, is_floating):
         """ Float or Un-Float all dockable widgets above main screen """
         for dock in self.getDocks():
-            dock.setFloating(is_floating)
+            if self.dockWidgetArea(dock) != Qt.NoDockWidgetArea:
+                dock.setFloating(is_floating)
 
     def showDocks(self, docks):
         """ Show all dockable widgets on the main screen """
@@ -2038,20 +2063,17 @@ def showDocks(self, docks):
     def freezeDocks(self):
         """ Freeze all dockable widgets on the main screen (prevent them being closed, floated, or moved) """
         for dock in self.getDocks():
-            dock.setFeatures(QDockWidget.NoDockWidgetFeatures)
+            if self.dockWidgetArea(dock) != Qt.NoDockWidgetArea:
+                dock.setFeatures(QDockWidget.NoDockWidgetFeatures)
 
     def unFreezeDocks(self):
         """ Un-freeze all dockable widgets on the main screen (allow them to be closed, floated, or moved, as appropriate) """
         for dock in self.getDocks():
-            if dock is self.dockTimeline:
-                dock.setFeatures(QDockWidget.DockWidgetFloatable | QDockWidget.DockWidgetMovable)
-            else:
-                dock.setFeatures(QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable | QDockWidget.DockWidgetMovable)
-
-    def hideDocks(self):
-        """ Hide all dockable widgets on the main screen """
-        for dock in self.getDocks():
-            dock.hide()
+            if self.dockWidgetArea(dock) != Qt.NoDockWidgetArea:
+                if dock is self.dockTimeline:
+                    dock.setFeatures(QDockWidget.DockWidgetFloatable | QDockWidget.DockWidgetMovable)
+                else:
+                    dock.setFeatures(QDockWidget.DockWidgetClosable | QDockWidget.DockWidgetFloatable | QDockWidget.DockWidgetMovable)
 
     def actionSimple_View_trigger(self, event):
         """ Switch to the default / simple view  """
@@ -2490,15 +2512,15 @@ def resizeEvent(self, event):
     def showEvent(self, event):
         """ Have any child windows follow main-window state """
         QMainWindow.showEvent(self, event)
-        for child in self.findChildren(QDockWidget):
+        for child in self.getDocks():
             if child.isFloating() and child.isEnabled():
                 child.raise_()
                 child.show()
 
     def hideEvent(self, event):
         """ Have any child windows hide with main window """
         QMainWindow.hideEvent(self, event)
-        for child in self.findChildren(QDockWidget):
+        for child in self.getDocks():
             if child.isFloating() and child.isVisible():
                 child.hide()
 
@@ -2558,34 +2580,21 @@ def InitCacheSettings(self):
         self.cache_object = new_cache_object
 
     def FrameExported(self, title_message, start_frame, end_frame, current_frame):
-        """Connect to Unity launcher (for Linux)"""
+        """Update progress in Unity Launcher (if connected)"""
         try:
-            if sys.platform == "linux" and self.has_launcher:
-                if not self.unity_launchers:
-                    # Get launcher only once
-                    import gi
-                    gi.require_version('Unity', '7.0')
-                    from gi.repository import Unity
-                    self.unity_launchers.append(Unity.LauncherEntry.get_for_desktop_id("openshot-qt.desktop"))
-                    self.unity_launchers.append(Unity.LauncherEntry.get_for_desktop_id("appimagekit-openshot-qt.desktop"))
-
-                # Set progress and show progress bar
-                for launcher in self.unity_launchers:
-                    launcher.set_property("progress", current_frame / (end_frame - start_frame))
-                    launcher.set_property("progress_visible", True)
-
+            # Set progress and show progress bar
+            self.unity_launcher.set_property("progress", current_frame / (end_frame - start_frame))
+            self.unity_launcher.set_property("progress_visible", True)
         except Exception:
             # Just ignore
-            self.has_launcher = False
+            pass
 
     def ExportFinished(self, path):
-        """Export has completed"""
+        """Show completion in Unity Launcher (if connected)"""
         try:
-            if sys.platform == "linux" and self.has_launcher:
-                for launcher in self.unity_launchers:
-                    # Set progress on Unity launcher and hide progress bar
-                    launcher.set_property("progress", 0.0)
-                    launcher.set_property("progress_visible", False)
+            # Set progress on Unity launcher and hide progress bar
+            self.unity_launcher.set_property("progress", 0.0)
+            self.unity_launcher.set_property("progress_visible", False)
         except Exception:
             pass
 
@@ -2843,11 +2852,20 @@ def __init__(self, mode=None):
         self.tutorial_manager = TutorialManager(self)
 
         # Connect to Unity DBus signal (if linux)
-        if sys.platform == "linux":
-            self.unity_launchers = []
-            self.has_launcher = True
-            self.ExportFrame.connect(self.FrameExported)
-            self.ExportEnded.connect(self.ExportFinished)
+        self.unity_launcher = None
+        if "linux" in sys.platform:
+            try:
+                # Get connection to Unity Launcher
+                import gi
+                gi.require_version('Unity', '7.0')
+                from gi.repository import Unity
+                self.unity_launcher = Unity.LauncherEntry.get_for_desktop_id(info.DESKTOP_ID)
+            except Exception:
+                # Guess we're not on Ubuntu
+                pass
+            else:
+                self.ExportFrame.connect(self.FrameExported)
+                self.ExportEnded.connect(self.ExportFinished)
 
         # Save settings
         s.save()

src/windows/main_window.py

@@ -72,15 +72,20 @@ def __init__(self):
         self.profile_paths = {}
         for profile_folder in [info.USER_PROFILES_PATH, info.PROFILES_PATH]:
             for file in os.listdir(profile_folder):
-                # Load Profile
                 profile_path = os.path.join(profile_folder, file)
-                profile = openshot.Profile(profile_path)
-
-                # Add description of Profile to list
-                profile_name = "%s (%sx%s)" % (profile.info.description, profile.info.width, profile.info.height)
-                self.profile_names.append(profile_name)
-                self.profile_paths[profile_name] = profile_path
-
+                try:
+                    # Load Profile
+                    profile = openshot.Profile(profile_path)
+
+                    # Add description of Profile to list
+                    profile_name = "%s (%sx%s)" % (profile.info.description, profile.info.width, profile.info.height)
+                    self.profile_names.append(profile_name)
+                    self.profile_paths[profile_name] = profile_path
+                
+                except RuntimeError as e:
+                    # This exception occurs when there's a problem parsing the Profile file - display a message and continue
+                    log.error("Failed to parse file '%s' as a profile: %s" % (profile_path, e))
+                    
         # Sort list
         self.profile_names.sort()
 

src/windows/profile.py

@@ -894,10 +894,10 @@
      <normaloff>:/icons/Humanity/actions/16/go-first.svg</normaloff>:/icons/Humanity/actions/16/go-first.svg</iconset>
    </property>
    <property name="text">
-    <string>Previous Marker</string>
+    <string>Previous Key Point</string>
    </property>
    <property name="toolTip">
-    <string>Previous Marker</string>
+    <string>Previous Key Point</string>
    </property>
   </action>
   <action name="actionNextMarker">
@@ -906,10 +906,10 @@
      <normaloff>:/icons/Humanity/actions/16/go-last.svg</normaloff>:/icons/Humanity/actions/16/go-last.svg</iconset>
    </property>
    <property name="text">
-    <string>Next Marker</string>
+    <string>Next Key Point</string>
    </property>
    <property name="toolTip">
-    <string>Next Marker</string>
+    <string>Next Key Point</string>
    </property>
   </action>
   <action name="actionCenterOnPlayhead">