Simplify Unity Launcher logic

- Only try to connect to launcher one time, during `__init__()`
- Don't even connect slots if there's no launcher (removes need to
  receive signal every frame, just to ignore it 99% of the time)
- We only have one desktop ID now (AppImage uses same), so no looping
- Store ID in `info.DESKTOP_ID` rather than hardcoding

Author: ferdnyc

src/classes/info.py

@@ -45,7 +45,7 @@
 BACKUP_PATH = os.path.join(USER_PATH)
 BLENDER_PATH = os.path.join(USER_PATH, "blender")
 ASSETS_PATH = os.path.join(USER_PATH, "assets")
-RESOURCES_PATH =  os.path.join(PATH, "resources")
+RESOURCES_PATH = os.path.join(PATH, "resources")
 THUMBNAIL_PATH = os.path.join(USER_PATH, "thumbnail")
 CACHE_PATH = os.path.join(USER_PATH, "cache")
 PREVIEW_CACHE_PATH = os.path.join(USER_PATH, "preview-cache")
@@ -68,22 +68,25 @@
 # names of all contributors, using "u" for unicode encoding
 JT = {"name": u"Jonathan Thomas", "email": "[email protected]", "website":"http://openshot.org/developers/jonathan"}
 
+# Desktop launcher ID, for Linux
+DESKTOP_ID = "org.openshot.OpenShot.desktop"
+
 # Languages
 CMDLINE_LANGUAGE = None
 CURRENT_LANGUAGE = 'en_US'
 SUPPORTED_LANGUAGES = ['en_US']
 
 try:
     from language import openshot_lang
-    language_path=":/locale/"
+    language_path = ":/locale/"
 except ImportError:
-    language_path=os.path.join(PATH, 'language')
+    language_path = os.path.join(PATH, 'language')
     print("Compiled translation resources missing!")
     print("Loading translations from: {}".format(language_path))
 
 # Compile language list from :/locale resource
 langdir = QDir(language_path)
-langs = langdir.entryList(['OpenShot.*.qm'], QDir.NoDotAndDotDot|QDir.Files,
+langs = langdir.entryList(['OpenShot.*.qm'], QDir.NoDotAndDotDot | QDir.Files,
                           sort=QDir.Name)
 for trpath in langs:
     SUPPORTED_LANGUAGES.append(trpath.split('.')[1])

src/windows/main_window.py

@@ -2105,7 +2105,7 @@ def load_settings(self):
 
         # Load Recent Projects
         self.load_recent_menu()
-        
+
         # The method restoreState restores the visibility of the toolBar,
         # but does not set the correct flag in the actionView_Toolbar.
         self.actionView_Toolbar.setChecked(self.toolBar.isVisibleTo(self))
@@ -2391,33 +2391,22 @@ 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
-                    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)
-
-        except:
+            # 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)
-        except:
+            # 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
 
     def transformTriggered(self, clip_id):
@@ -2642,11 +2631,18 @@ 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
+                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()