Release 3.1.0

installer/build-mac-dmg.sh

@@ -42,6 +42,9 @@ mv "$OS_PATH/MacOS/qt.conf" "$OS_PATH/Resources/qt.conf"; ln -s "../Resources/qt
 mv "$OS_PATH/MacOS/openshot-qt.hqx" "$OS_PATH/Resources/openshot-qt.hqx"; ln -s "../Resources/openshot-qt.hqx" "$OS_PATH/MacOS/openshot-qt.hqx";
 mv "$OS_PATH/MacOS/lib/launch.py" "$OS_PATH/Resources/launch.py"; ln -s "../../Resources/launch.py" "$OS_PATH/MacOS/lib/launch.py";
 
+echo "Symlink lib folder into Resources - needed to find lib/babl-ext at runtime"
+ln -s "../MacOS/lib" "$OS_PATH/Resources/lib";
+
 echo "Fix permissions inside MacOS folder (all everyone to read and execute all the files inside this *.app bundle)"
 chmod -R a+rx "$OS_PATH/"*
 

installer/fix_qt5_rpath.py

@@ -25,7 +25,7 @@ def fix_rpath(PATH):
            relative_path = os.path.relpath(root, PATH)
 
            # Skip common file extensions (speed things up)
-           if os.path.splitext(file_path)[-1] in non_executables or basename.startswith("."):
+           if os.path.splitext(file_path)[-1] in non_executables or basename.startswith(".") or "profiles" in file_path:
                continue
 
            # Build exe path (relative from the app dir)
@@ -35,15 +35,13 @@ def fix_rpath(PATH):
 
            # Change ID path of library files
            # Sometimes, the ID has an absolute path or invalid @rpath embedded in it, which breaks our frozen exe
-           print ("ID: %s: install_name_tool %s -id %s" % (basename, file_path, executable_path))
            call(["install_name_tool", file_path, "-id", executable_path])
 
            # Loop through all dependencies of each library/executable
            raw_output = subprocess.Popen(["oTool", "-L", file_path], stdout=subprocess.PIPE).communicate()[0].decode('utf-8')
            for output in raw_output.split("\n")[1:-1]:
                if output and "is not an object file" not in output and ".o):" not in output:
                    dependency_path = output.split('\t')[1].split(' ')[0]
-                   dependency_version = output.split('\t')[1].split(' (')[1].replace(')', '')
                    dependency_base_path, dependency_name = os.path.split(dependency_path)
 
                    # If @rpath or /usr/local found in dependency path, update with @executable_path instead
@@ -52,7 +50,6 @@ def fix_rpath(PATH):
                        if not os.path.exists(os.path.join(PATH, dependency_name)):
                            print("ERROR: /usr/local PATH not found in EXE folder: %s" % dependency_path)
                        else:
-                           print('-- Dependency: %s: install_name_tool "%s" -change "%s" "%s"' % (dependency_name, file_path, dependency_path, dependency_exe_path))
                            call(["install_name_tool", file_path, "-change", dependency_path, dependency_exe_path])
 
 

src/blender/scripts/blinds.py.in

@@ -143,7 +143,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/blur.py.in

@@ -140,7 +140,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/colors.py.in

@@ -193,7 +193,7 @@ render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 render.frame_map_old = 1
 render.frame_map_new = length_multiplier
 

src/blender/scripts/dissolve.py.in

@@ -292,7 +292,7 @@ bpy.ops.ptcache.free_bake_all()
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 render.frame_map_old = 1
 render.frame_map_new = length_multiplier
 

src/blender/scripts/earth.py.in

@@ -339,7 +339,7 @@ render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 render.frame_map_old = 1
 render.frame_map_new = length_multiplier
 

src/blender/scripts/explode.py.in

@@ -240,7 +240,7 @@ bpy.ops.ptcache.free_bake_all()
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 render.frame_map_old = 1
 render.frame_map_new = length_multiplier
 

src/blender/scripts/fly_by_1.py.in

@@ -134,7 +134,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/fly_by_two_titles.py.in

@@ -143,7 +143,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/glare.py.in

@@ -138,7 +138,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/glass_slider.py.in

@@ -165,7 +165,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/lens_flare.py.in

@@ -135,7 +135,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/magic_wand.py.in

@@ -147,7 +147,7 @@ bpy.ops.ptcache.free_bake_all()
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 render.frame_map_old = 1
 render.frame_map_new = length_multiplier
 

src/blender/scripts/neon_curves.py.in

@@ -152,7 +152,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/picture_frames_4.py.in

@@ -169,7 +169,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/rotate_360.py.in

@@ -134,7 +134,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/slide_left_to_right.py.in

@@ -134,7 +134,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/snow.py.in

@@ -108,7 +108,7 @@ bpy.ops.ptcache.free_bake_all()
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/spacemovie_intro.py.in

@@ -120,7 +120,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/wireframe_text.py.in

@@ -144,7 +144,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/blender/scripts/zoom_clapboard.py.in

@@ -136,7 +136,7 @@ bpy.context.scene.render.resolution_percentage = params["resolution_percentage"]
 
 # Animation Speed (use Blender's time remapping to slow or speed up animation)
 length_multiplier = round(params["length_multiplier"])  # time remapping multiplier
-new_length = round(params["end_frame"]) * length_multiplier  # new length (in frames)
+new_length = params["end_frame"] * length_multiplier  # new length (in frames)
 bpy.context.scene.render.frame_map_old = 1
 bpy.context.scene.render.frame_map_new = length_multiplier
 

src/classes/app.py

@@ -137,7 +137,7 @@ def __init__(self, *args, **kwargs):
         # Set location of OpenShot program (for libopenshot)
         openshot.Settings.Instance().PATH_OPENSHOT_INSTALL = info.PATH
 
-        # Set BABL extensions path (for windows)
+        # Set BABL extensions path
         babl_ext_path = os.path.join(info.PATH, "lib", "babl-ext")
         log.info(f"checking babl_ext_path: {babl_ext_path}")
         if os.path.exists(babl_ext_path):

src/classes/info.py

@@ -28,9 +28,9 @@
 import os
 from time import strftime
 
-VERSION = "3.0.0"
-MINIMUM_LIBOPENSHOT_VERSION = "0.3.0"
-DATE = "20221201000000"
+VERSION = "3.1.0"
+MINIMUM_LIBOPENSHOT_VERSION = "0.3.1"
+DATE = "20230321000000"
 NAME = "openshot-qt"
 PRODUCT_NAME = "OpenShot Video Editor"
 GPL_VERSION = "3"

src/classes/timeline.py

@@ -120,14 +120,16 @@ def MaxSizeChangedCB(self, new_size):
             log.info('Waiting for main window to initialize before calling SetMaxSize')
             time.sleep(0.5)
 
-        log.info("Adjusting max size of preview image: %s" % new_size)
+        # Increase based on DPI
+        new_size *= self.window.devicePixelRatioF()
 
-        # Clear timeline preview cache (since our video size has changed)
-        self.timeline.ClearAllCache()
+        log.info("Adjusting max size of preview image: %s" % new_size)
 
         # Set new max video size (Based on preview widget size and display scaling)
-        scale = self.window.devicePixelRatioF()
-        self.timeline.SetMaxSize(round(new_size.width() * scale), round(new_size.height() * scale))
+        self.timeline.SetMaxSize(new_size.width(), new_size.height())
+
+        # Clear timeline preview cache (since our video size has changed)
+        self.timeline.ClearAllCache(True)
 
         # Refresh current frame (since the entire timeline was updated)
         self.window.refreshFrameSignal.emit()