Merge branch 'develop' into emojis

# Conflicts: # src/windows/views/files_treeview.py
OpenShot · May 18, 2020 · 30d1a2a · 30d1a2a
2 parents be3c280 + 06196de
commit 30d1a2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/windows/main_window.py b/src/windows/main_window.py
@@ -2810,6 +2810,8 @@ def __init__(self, mode=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:

diff --git a/src/windows/views/files_treeview.py b/src/windows/views/files_treeview.py
@@ -74,6 +74,7 @@ def contextMenuEvent(self, event):
 
         menu.addAction(self.win.actionImportFiles)
         menu.addAction(self.win.actionThumbnailView)
+
         if self.selected:
             # If file selected, show file related options
             menu.addSeparator()