Merge branch 'develop' into drop-accept

.github/stale.yml

@@ -0,0 +1,30 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 180
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 10
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - enhancement
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Thank you so much for submitting an issue to help improve OpenShot Video Editor. We are sorry about this, but this particular issue has gone unnoticed for quite some time. To help keep the OpenShot GitHub Issue Tracker organized and focused, we must ensure that every issue is correctly labelled and triaged, to get the proper attention.
+
+  This issue will be closed, as it meets the following criteria:
+  - No activity in the past 180 days
+  - No one is assigned to this issue
+
+  We'd like to ask you to help us out and determine whether this issue should be reopened.
+  - If this issue is reporting a bug, please can you attempt to reproduce on the [latest daily build](https://www.openshot.org/download/#daily) to help us to understand whether the bug still needs our attention.
+  - If this issue is proposing a new feature, please can you verify whether the feature proposal is still relevant.
+
+  Thanks again for your help!
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+# Only close issues
+only: issues
+# Don't close issues which are assigned to somebody
+exemptAssignees: true

installer/build-server.py

@@ -354,19 +354,19 @@ def parse_version_info(version_path):
         with open(desk_in, "r") as inf, open(desk_out, "w") as outf:
             for line in inf:
                 if line.startswith("Exec="):
-                    outf.write("Exec=openshot-qt.wrapper %F\n")
+                    outf.write("Exec=openshot-qt-launch.wrapper %F\n")
                 else:
                     outf.write(line)
 
         # Copy desktop integration wrapper (prompts users to install shortcut)
         launcher_path = os.path.join(app_dir_path, "usr", "bin", "openshot-qt-launch")
         os.rename(os.path.join(app_dir_path, "usr", "bin", "launch-linux.sh"), launcher_path)
-        desktop_wrapper = os.path.join(app_dir_path, "usr", "bin", "openshot-qt.wrapper")
+        desktop_wrapper = os.path.join(app_dir_path, "usr", "bin", "openshot-qt-launch.wrapper")
         shutil.copyfile("/home/ubuntu/apps/AppImageKit/desktopintegration", desktop_wrapper)
 
-        # Create symlink for AppRun
+        # Create AppRun.64 file (the real one)
         app_run_path = os.path.join(app_dir_path, "AppRun")
-        os.symlink(os.path.relpath(launcher_path, app_dir_path), app_run_path)
+        shutil.copyfile("/home/ubuntu/apps/AppImageKit/AppRun", app_run_path)
 
         # Add execute bit to file mode for AppRun and scripts
         st = os.stat(app_run_path)

src/settings/_default.settings

@@ -939,7 +939,7 @@
     "type": "text"
   },
   {
-    "value": false,
+    "value": true,
     "title": "Auto-Transform Selection",
     "type": "bool",
     "category": "General",

src/windows/models/properties_model.py

@@ -102,7 +102,7 @@ def update_item_timeout(self):
                 self.selected.append((c, item_type))
 
         if item_type == "transition":
-            t = get_app().window.timeline_sync.timeline.GetTimelineEffect(item_id)
+            t = get_app().window.timeline_sync.timeline.GetEffect(item_id)
             if t:
                 # Append to selected items
                 self.selected.append((t, item_type))

src/windows/views/blender_listview.py

@@ -497,8 +497,8 @@ def error_with_blender(self, version=None, worker_message=None):
             error_message = _("Error Output:\n{}").format(worker_message)
             log.error("Blender error: {}".format(worker_message))
 
-        msg = QMessageBox()
-        msg.setText(_("""
+        QMessageBox.critical(self, error_message,
+            _("""
 Blender, the free open source 3D content creation suite, is required for this action. (http://www.blender.org)
 
 Please check the preferences in OpenShot and be sure the Blender executable is correct.
@@ -509,10 +509,9 @@ def error_with_blender(self, version=None, worker_message=None):
 {}""").format(info.BLENDER_MIN_VERSION,
               s.get("blender_command"),
               error_message))
-        msg.exec_()
 
-        # Enable the Render button again
-        self.end_processing()
+        # Close the blender interface
+        self.win.close()
 
     def inject_params(self, source_path, out_path, frame=None):
         # determine if this is 'preview' mode?
@@ -767,14 +766,12 @@ def blender_version_check(self):
             self.process.kill()
             self.blender_error_nodata.emit()
             return False
-        except subprocess.SubprocessError:
+        except Exception:
             # Error running command.  Most likely the blender executable path in
             # the settings is incorrect, or is not a supported Blender version
+            log.error("Version check exception", exc_info=1)
             self.blender_error_nodata.emit()
             return False
-        except Exception:
-            log.error("Version check exception", exc_info=1)
-            return
 
         ver_string = out.decode('utf-8')
         log.debug("Blender output:\n%s", ver_string)
@@ -836,6 +833,7 @@ def Render(self):
         _ = get_app()._tr
 
         if not self.version and not self.blender_version_check():
+            self.finished.emit()
             return
 
         self.command_output = ""