Merge branch 'develop' into blender-2.8-support

OpenShot · Aug 2, 2019 · e945479 · e945479
2 parents d48ae1b + 4dbf589
commit e945479
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/classes/project_data.py b/src/classes/project_data.py
@@ -49,10 +49,6 @@ def __init__(self):
         self.data_type = "project data"  # Used in error messages
         self.default_project_filepath = os.path.join(info.PATH, 'settings', '_default.project')
 
-        # Always set, in case the user creates the file mid-session
-        if info.USER_DEFAULT_PROJECT:
-            self.user_project_filepath = info.USER_DEFAULT_PROJECT
-
         # Set default filepath to user's home folder
         self.current_filepath = None
 
@@ -257,20 +253,17 @@ def new(self):
         import openshot
 
         # Try to load user default project
-        if os.path.exists(self.user_project_filepath):
+        if os.path.exists(info.USER_DEFAULT_PROJECT):
             try:
-                self._data = self.read_from_file(self.user_project_filepath)
+                self._data = self.read_from_file(info.USER_DEFAULT_PROJECT)
             except (FileNotFoundError, PermissionError) as ex:
-                log.warning("Unable to load defaults from {}: {}".format(
-                    new_project_file, ex))
+                log.warning("Unable to load user project defaults from {}: {}".format(info.USER_DEFAULT_PROJECT, ex))
             except Exception:
                 raise
             else:
-                log.info("Loaded user project defaults from {}".format(
-                    self.user_project_filepath))
-
-        # Fall back to OpenShot defaults, if user defaults didn't load
-        if not self._data:
+                log.info("Loaded user project defaults from {}".format(info.USER_DEFAULT_PROJECT))
+        else:
+            # Fall back to OpenShot defaults, if user defaults didn't load
             self._data = self.read_from_file(self.default_project_filepath)
 
         self.current_filepath = None

diff --git a/src/windows/main_window.py b/src/windows/main_window.py
@@ -754,6 +754,9 @@ def actionPreferences_trigger(self, event):
         ui_util.setup_icon(self, self.actionPlay, "actionPlay", "media-playback-start")
         self.actionPlay.setChecked(False)
 
+        # Set cursor to waiting
+        get_app().setOverrideCursor(QCursor(Qt.WaitCursor))
+
         # Show dialog
         from windows.preferences import Preferences
         win = Preferences()
@@ -768,6 +771,9 @@ def actionPreferences_trigger(self, event):
         s = settings.get_settings()
         s.save()
 
+        # Restore normal cursor
+        get_app().restoreOverrideCursor()
+
     def actionFilesShowAll_trigger(self, event):
         self.filesTreeView.refresh_view()
 

diff --git a/src/windows/preferences.py b/src/windows/preferences.py
@@ -90,6 +90,9 @@ def __init__(self):
         # Populate preferences
         self.Populate()
 
+        # Restore normal cursor
+        get_app().restoreOverrideCursor()
+
     def txtSearch_changed(self):
         """textChanged event handler for search box"""
         log.info("Search for %s" % self.txtSearch.text())