@@ -1,7 +1,7 @@

 <services>

    <service name="obs_scm">

        <param name="filename">flowblade</param>

-       <param name="revision">1342c4ccd2ccdf338f775f0117f01b6cf79c3b3f</param>

+       <param name="revision">afe12336f1e731f1269726afe77699ecabfea474</param>

        <param name="scm">git</param>

        <param name="submodules">disable</param>

        <param name="url">https://github.com/jliljebl/flowblade.git</param>

​

@@ -2,7 +2,7 @@

 !Flowblade(flowblade-trunk/Flowblade/res/darktheme/header_text.png "Flowblade")

-**New release 2.18 available. See release notes here,(./flowblade-trunk/docs/RELEASE_NOTES.md)**

+**New release 2.20 available. See release notes here,(./flowblade-trunk/docs/RELEASE_NOTES.md)**

 1. Introduction(https://github.com/jliljebl/flowblade#introduction)

 2. Features(https://github.com/jliljebl/flowblade#features)

@@ -18,12 +18,14 @@

 **--- FIX FOR NON_WORKING VIDEO PREVIEW ISSUE ---**

-**Start application from terminal with command:**

+**Fix is to update to the latest version 2.20.**

+

+**If not possible, or start application from terminal with command below:**

 ```

 SDL12COMPAT_NO_QUIT_VIDEO=1 GDK_BACKEND=x11 SDL_VIDEODRIVER=x11  /usr/bin/flowblade 

 ```

-**More info on Issue here: Issue #1134(https://github.com/jliljebl/flowblade/issues/1134)**

+**Current Fedora 42 package is also broken and the command above needs to used to run the application.**

 **--- FIX FOR NON_WORKING VIDEO PREVIEW ISSUE ---**

@@ -77,7 +79,7 @@

 # Releases

-**Latest release:** Flowblade Movie Editor 2.16 was released in May 2024.

+**Latest release:** Flowblade Movie Editor 2.20 was released in March 2025.

 # Installing Flowblade

​

@@ -0,0 +1,559 @@

+"""

+    Flowblade Movie Editor is a nonlinear video editor.

+    Copyright 2025 Janne Liljeblad.

+

+    This file is part of Flowblade Movie Editor <https://github.com/jliljebl/flowblade/>.

+

+    Flowblade Movie Editor is free software: you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation, either version 3 of the License, or

+    (at your option) any later version.

+

+    Flowblade Movie Editor is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.

+"""

+

+from gi.repository import Gtk

+

+import math

+

+import appconsts

+import dialogutils

+

+

+M_PI = math.pi

+M_PI_2 = math.pi * 2.0

+

+ease_in = 0

+ease_out = 1

+ease_inout = 2

+

+

+KEYFRAME_TYPES =  \

+    appconsts.KEYFRAME_LINEAR,

+    appconsts.KEYFRAME_SMOOTH,

+    appconsts.KEYFRAME_DISCRETE,

+    appconsts.KEYFRAME_SMOOTH_NATURAL,

+    appconsts.KEYFRAME_SMOOTH_TIGHT,

+    appconsts.KEYFRAME_SINUSOIDAL_IN,

+    appconsts.KEYFRAME_SINUSOIDAL_OUT,

+    appconsts.KEYFRAME_SINUSOIDAL_IN_OUT,

+    appconsts.KEYFRAME_QUADRATIC_IN,

+    appconsts.KEYFRAME_QUADRATIC_OUT,

+    appconsts.KEYFRAME_QUADRATIC_IN_OUT,

+    appconsts.KEYFRAME_CUBIC_IN,

+    appconsts.KEYFRAME_CUBIC_OUT,

+    appconsts.KEYFRAME_CUBIC_IN_OUT,

+    appconsts.KEYFRAME_QUARTIC_IN,

+    appconsts.KEYFRAME_QUARTIC_OUT,

+    appconsts.KEYFRAME_QUARTIC_IN_OUT,

+    appconsts.KEYFRAME_QUINTIC_IN,

+    appconsts.KEYFRAME_QUINTIC_OUT,

+    appconsts.KEYFRAME_QUINTIC_IN_OUT,

+    appconsts.KEYFRAME_EXPONENTIAL_IN,

+    appconsts.KEYFRAME_EXPONENTIAL_OUT,

+    appconsts.KEYFRAME_EXPONENTIAL_IN_OUT,

+    appconsts.KEYFRAME_CIRCULAR_IN,

+    appconsts.KEYFRAME_CIRCULAR_OUT,

+    appconsts.KEYFRAME_CIRCULAR_IN_OUT,

+    appconsts.KEYFRAME_BACK_IN,

+    appconsts.KEYFRAME_BACK_OUT,

+    appconsts.KEYFRAME_BACK_IN_OUT,

+    appconsts.KEYFRAME_ELASTIC_IN,

+    appconsts.KEYFRAME_ELASTIC_OUT,

+    appconsts.KEYFRAME_ELASTIC_IN_OUT,

+    appconsts.KEYFRAME_BOUNCE_IN,

+    appconsts.KEYFRAME_BOUNCE_OUT,

+    appconsts.KEYFRAME_BOUNCE_IN_OUT

+

+KEYFRAME_EQ_STRS =  \

+    appconsts.KEYFRAME_LINEAR_EQUALS_STR, 

+    appconsts.KEYFRAME_SMOOTH_EQUALS_STR,

+    appconsts.KEYFRAME_DISCRETE_EQUALS_STR, 

+    appconsts.KEYFRAME_SMOOTH_NATURAL_EQUALS_STR, 

+    appconsts.KEYFRAME_SMOOTH_TIGHT_EQUALS_STR,

+    appconsts.KEYFRAME_SINUSOIDAL_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_SINUSOIDAL_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_SINUSOIDAL_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_QUADRATIC_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_QUADRATIC_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_QUADRATIC_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_CUBIC_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_CUBIC_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_CUBIC_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_QUARTIC_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_QUARTIC_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_QUARTIC_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_QUINTIC_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_QUINTIC_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_QUINTIC_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_EXPONENTIAL_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_EXPONENTIAL_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_EXPONENTIAL_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_CIRCULAR_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_CIRCULAR_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_CIRCULAR_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_BACK_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_BACK_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_BACK_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_ELASTIC_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_ELASTIC_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_ELASTIC_IN_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_BOUNCE_IN_EQUALS_STR, 

+    appconsts.KEYFRAME_BOUNCE_OUT_EQUALS_STR, 

+    appconsts.KEYFRAME_BOUNCE_IN_OUT_EQUALS_STR

+

+EFFECT_KEYFRAME_TYPES =  \

+    appconsts.KEYFRAME_BACK_IN,

+    appconsts.KEYFRAME_BACK_OUT,

+    appconsts.KEYFRAME_BACK_IN_OUT,

+    appconsts.KEYFRAME_ELASTIC_IN,

+    appconsts.KEYFRAME_ELASTIC_OUT,

+    appconsts.KEYFRAME_ELASTIC_IN_OUT,

+    appconsts.KEYFRAME_BOUNCE_IN,

+    appconsts.KEYFRAME_BOUNCE_OUT,

+    appconsts.KEYFRAME_BOUNCE_IN_OUT,

+    appconsts.KEYFRAME_SINUSOIDAL_IN,

+    appconsts.KEYFRAME_SINUSOIDAL_OUT,

+    appconsts.KEYFRAME_SINUSOIDAL_IN_OUT,

+

+SMOOTH_EXTENDED_KEYFRAME_TYPES =  \

+    appconsts.KEYFRAME_SMOOTH_NATURAL,

+    appconsts.KEYFRAME_SMOOTH_TIGHT,

+    appconsts.KEYFRAME_QUADRATIC_IN,

+    appconsts.KEYFRAME_QUADRATIC_OUT,

+    appconsts.KEYFRAME_QUADRATIC_IN_OUT,

+    appconsts.KEYFRAME_CUBIC_IN,

+    appconsts.KEYFRAME_CUBIC_OUT,

+    appconsts.KEYFRAME_CUBIC_IN_OUT,

+    appconsts.KEYFRAME_QUARTIC_IN,

+    appconsts.KEYFRAME_QUARTIC_OUT,

+    appconsts.KEYFRAME_QUARTIC_IN_OUT,

+    appconsts.KEYFRAME_QUINTIC_IN,

+    appconsts.KEYFRAME_QUINTIC_OUT,

+    appconsts.KEYFRAME_QUINTIC_IN_OUT,

+    appconsts.KEYFRAME_EXPONENTIAL_IN,

+    appconsts.KEYFRAME_EXPONENTIAL_OUT,

+    appconsts.KEYFRAME_EXPONENTIAL_IN_OUT,

+    appconsts.KEYFRAME_CIRCULAR_IN,

+    appconsts.KEYFRAME_CIRCULAR_OUT,

+    appconsts.KEYFRAME_CIRCULAR_IN_OUT

+

+CATMILL_ROM_TYPES =  \

+    appconsts.KEYFRAME_SMOOTH,

+    appconsts.KEYFRAME_DISCRETE,

+    appconsts.KEYFRAME_SMOOTH_NATURAL,

+    appconsts.KEYFRAME_SMOOTH_TIGHT

+

+POWER_TYPES =  \

+    appconsts.KEYFRAME_QUADRATIC_IN,

+    appconsts.KEYFRAME_QUADRATIC_OUT,

+    appconsts.KEYFRAME_QUADRATIC_IN_OUT,

+    appconsts.KEYFRAME_CUBIC_IN,

+    appconsts.KEYFRAME_CUBIC_OUT,

+    appconsts.KEYFRAME_CUBIC_IN_OUT,

+    appconsts.KEYFRAME_QUARTIC_IN,

+    appconsts.KEYFRAME_QUARTIC_OUT,

+    appconsts.KEYFRAME_QUARTIC_IN_OUT,

+    appconsts.KEYFRAME_QUINTIC_IN,

+    appconsts.KEYFRAME_QUINTIC_OUT,

+    appconsts.KEYFRAME_QUINTIC_IN_OUT

+

+# Keyframe type -> eq str 

+TYPE_TO_EQ_STRING = None # filled on init

+# Keyframe type -> eq str 

+EQ_STRING_TO_TYPE = None # filled on init

+# Keyframe type -> translated name

+TYPE_TO_NAME = None  # filled on init

+

+

+# ------------------------------------------------------- interface

+def init():

+    global TYPE_TO_EQ_STRING, EQ_STRING_TO_TYPE, TYPE_TO_NAME

+    

+    TYPE_TO_EQ_STRING = {}

+    for type_id, eq_str in zip(KEYFRAME_TYPES, KEYFRAME_EQ_STRS):

+        TYPE_TO_EQ_STRINGtype_id = eq_str

+     

+    EQ_STRING_TO_TYPE = {}

+    for type_id, eq_str in zip(KEYFRAME_TYPES, KEYFRAME_EQ_STRS):

+        EQ_STRING_TO_TYPEeq_str = type_id

+    

+    

+    names =  \

+        _("Linear"),

+        _("Smooth"),

+        _("Discrete"),

+        _("Smooth Natural"),

+        _("Smooth Tight"),

+        _("Sinusoidal In"),

+        _("Sinusoidal Out"),

+        _("Sinusoidal In Out"),

+        _("Quadratic In"),

+        _("Quadratic Out"),

+        _("Quadratic In Out"),

​

@@ -51,6 +51,7 @@

 import sys

 import time

+import animatedvalue

 import appconsts

 import audiomonitoring

 import audiowaveformrenderer

@@ -144,8 +145,6 @@

 loaded_autosave_file = None

 recovery_in_progress = False

-splash_screen = None

-splash_timeout_id = -1

 exit_timeout_id = -1

 window_resize_id = -1

 window_state_id = -1

@@ -157,6 +156,7 @@

 assoc_file_path = None

 assoc_timeout_id = None

+

 def main(root_path):

     """

     Called at application start.

@@ -231,7 +231,10 @@

         shortcuts.load_shortcut_files()

         shortcuts.load_shortcuts()

         shortcutsquickeffects.load_shortcuts()

-        

+

+        # We have translations in data structs and need some initing.

+        animatedvalue.init()

+

         # The test for len != 4 is to make sure that if we change the number of values below the prefs are reset to the correct list

         # So when we add or remove a value, make sure we also change the len test

         # Only use positive numbers.

@@ -302,10 +305,6 @@

         # We need to test which GPU render options work after profiles are inited because

         # we do the test by doing test renders.

         rendergputest.test_gpu_rendering_options(render.update_encoding_selector)

-

-        # Splash screen

-        if editorpersistance.prefs.display_splash_screen == True: 

-            show_splash_screen()

         # Save assoc file path if found in arguments.

         global assoc_file_path

@@ -389,12 +388,6 @@

         # Get existing autosave files

         autosave_files = get_autosave_files()

-        # Show splash

-        if ((editorpersistance.prefs.display_splash_screen == True) and len(autosave_files) == 0):

-            global splash_timeout_id

-            splash_timeout_id = GLib.timeout_add(2600, destroy_splash_screen)

-            splash_screen.show_all()

-

         appconsts.SAVEFILE_VERSION = projectdata.SAVEFILE_VERSION # THIS IS A QUESTIONABLE IDEA TO SIMPLIFY IMPORTS, NOT DRY. WHEN DOING TOOLS THAT RUN IN ANOTHER PROCESSES AND SAVE PROJECTS, THIS LINE NEEDS TO BE THERE ALSO.

         # Every running instance has unique autosave file which is deleted at exit

@@ -906,27 +899,6 @@

     persistance.save_project(editorstate.PROJECT(), autosave_file)

     return True

-# ------------------------------------------------- splash screen

-def show_splash_screen():

-    global splash_screen

-    splash_screen = Gtk.Window(Gtk.WindowType.TOPLEVEL)

-    splash_screen.set_border_width(0)

-    splash_screen.set_decorated(False)

-    splash_screen.set_position(Gtk.WindowPosition.CENTER)

-    img = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "flowblade_splash_black_small.png")

-

-    splash_screen.add(img)

-    splash_screen.set_size_request(598, 258) # Smaller then img.

-

-    splash_screen.set_resizable(False)

-

-    while(GLib.MainContext.default ().pending()):

-        GLib.MainContext.default().iteration(False) # GLib.MainContext to replace this

-

-def destroy_splash_screen():

-    splash_screen.destroy()

-    GLib.source_remove(splash_timeout_id)

-

 # ------------------------------------------------------- disk cache size check

 def check_disk_cache_size():

     GLib.source_remove(disk_cache_timeout_id)

​

@@ -200,12 +200,6 @@

 TRIM_VIEW_SINGLE = 1

 TRIM_VIEW_OFF = 2

-# Midbar layout

-MIDBAR_TC_LEFT = 0

-MIDBAR_TC_CENTER = 1

-MIDBAR_COMPONENTS_CENTERED = 2

-MIDBAR_TC_FREE = 3 # DEPRECATED, all layouts now have configurable buttons.

-

 # Windows mode

 SINGLE_WINDOW = 1

 TWO_WINDOWS = 2

@@ -334,6 +328,7 @@

 PANEL_PLACEMENT_TOP_ROW_PROJECT_DEFAULT = 5

 PANEL_PLACEMENT_NOT_VISIBLE = 6

 PANEL_PLACEMENT_TWO_WINDOWS_MEDIA_PANEL_POS = 7

+PANEL_PLACEMENT_RIGHT_COLUMN = 8

 # Panels

 PANEL_MEDIA = 0

@@ -351,10 +346,75 @@

 KEYFRAME_LINEAR = 0

 KEYFRAME_SMOOTH = 1

 KEYFRAME_DISCRETE = 2

-

+KEYFRAME_SMOOTH_NATURAL = 3

+KEYFRAME_SMOOTH_TIGHT = 4

+KEYFRAME_SINUSOIDAL_IN = 5

+KEYFRAME_SINUSOIDAL_OUT = 6

+KEYFRAME_SINUSOIDAL_IN_OUT = 7

+KEYFRAME_QUADRATIC_IN = 8

+KEYFRAME_QUADRATIC_OUT = 9

+KEYFRAME_QUADRATIC_IN_OUT = 10

+KEYFRAME_CUBIC_IN = 11

+KEYFRAME_CUBIC_OUT = 12

+KEYFRAME_CUBIC_IN_OUT = 13

+KEYFRAME_QUARTIC_IN = 14

+KEYFRAME_QUARTIC_OUT = 15

+KEYFRAME_QUARTIC_IN_OUT = 16

+KEYFRAME_QUINTIC_IN = 17

+KEYFRAME_QUINTIC_OUT = 18

+KEYFRAME_QUINTIC_IN_OUT = 19

+KEYFRAME_EXPONENTIAL_IN = 20

+KEYFRAME_EXPONENTIAL_OUT = 21

+KEYFRAME_EXPONENTIAL_IN_OUT = 22

+KEYFRAME_CIRCULAR_IN = 23

+KEYFRAME_CIRCULAR_OUT = 24

+KEYFRAME_CIRCULAR_IN_OUT = 25

+KEYFRAME_BACK_IN = 26

+KEYFRAME_BACK_OUT = 27

+KEYFRAME_BACK_IN_OUT = 28

+KEYFRAME_ELASTIC_IN = 29

+KEYFRAME_ELASTIC_OUT = 30

+KEYFRAME_ELASTIC_IN_OUT = 31

+KEYFRAME_BOUNCE_IN = 32

+KEYFRAME_BOUNCE_OUT = 33

+KEYFRAME_BOUNCE_IN_OUT = 34

+

+# MLT Keyframe type identifiers in equals signs"

 KEYFRAME_LINEAR_EQUALS_STR = "="

 KEYFRAME_SMOOTH_EQUALS_STR = "~="

 KEYFRAME_DISCRETE_EQUALS_STR = "|="

+KEYFRAME_SMOOTH_NATURAL_EQUALS_STR = "$="

+KEYFRAME_SMOOTH_TIGHT_EQUALS_STR = "-="

+KEYFRAME_SINUSOIDAL_IN_EQUALS_STR = "a="

+KEYFRAME_SINUSOIDAL_OUT_EQUALS_STR = "b="

+KEYFRAME_SINUSOIDAL_IN_OUT_EQUALS_STR = "c="

+KEYFRAME_QUADRATIC_IN_EQUALS_STR = "d="

+KEYFRAME_QUADRATIC_OUT_EQUALS_STR = "e="

+KEYFRAME_QUADRATIC_IN_OUT_EQUALS_STR = "f="

+KEYFRAME_CUBIC_IN_EQUALS_STR = "g="

+KEYFRAME_CUBIC_OUT_EQUALS_STR = "h="

+KEYFRAME_CUBIC_IN_OUT_EQUALS_STR = "i="

+KEYFRAME_QUARTIC_IN_EQUALS_STR = "j="

+KEYFRAME_QUARTIC_OUT_EQUALS_STR = "k="

+KEYFRAME_QUARTIC_IN_OUT_EQUALS_STR = "l="

+KEYFRAME_QUINTIC_IN_EQUALS_STR = "m="

+KEYFRAME_QUINTIC_OUT_EQUALS_STR = "n="

+KEYFRAME_QUINTIC_IN_OUT_EQUALS_STR = "o="

+KEYFRAME_EXPONENTIAL_IN_EQUALS_STR = "p="

+KEYFRAME_EXPONENTIAL_OUT_EQUALS_STR = "q="

+KEYFRAME_EXPONENTIAL_IN_OUT_EQUALS_STR = "r=" 

+KEYFRAME_CIRCULAR_IN_EQUALS_STR = "s="

+KEYFRAME_CIRCULAR_OUT_EQUALS_STR = "t="

+KEYFRAME_CIRCULAR_IN_OUT_EQUALS_STR = "u="

+KEYFRAME_BACK_IN_EQUALS_STR = "v="

+KEYFRAME_BACK_OUT_EQUALS_STR = "w="

+KEYFRAME_BACK_IN_OUT_EQUALS_STR = "x="

+KEYFRAME_ELASTIC_IN_EQUALS_STR = "y="

+KEYFRAME_ELASTIC_OUT_EQUALS_STR = "z="

+KEYFRAME_ELASTIC_IN_OUT_EQUALS_STR = "A="

+KEYFRAME_BOUNCE_IN_EQUALS_STR = "B="

+KEYFRAME_BOUNCE_OUT_EQUALS_STR = "C="

+KEYFRAME_BOUNCE_IN_OUT_EQUALS_STR = "D="

 # Multi edit panel display options.

 EDIT_MULTI_EMPTY = "edit_multi_empty"

​

@@ -685,7 +685,7 @@

         self.meter.set_height(h - self.H_CUT)

-        cr.set_source_rgb(0.0, 0.0, 0.0)

+        cr.set_source_rgb(0.15, 0.15, 0.15)

         cr.fill_preserve()

         cr.rectangle(0, 0, w, h)

         cr.fill()

​

@@ -283,7 +283,6 @@

         return False

-

     def get_possible_locked_track(self):

         for selection in self.track_selections:

             if current_sequence().tracksselection.track_id.edit_freedom == appconsts.LOCKED:

@@ -291,6 +290,47 @@

         return None

+    def get_center_most_sync_track(self):

+        center_most = -1

+        old_center_most = -1

+        center_track_selection = None

+        for track_selection in self.track_selections:

+            center_most = self.get_more_sync_center_most_track(center_most, track_selection.track_id)

+            if center_most != old_center_most:

+                center_track_selection = track_selection

+            old_center_most = center_most

+        return (current_sequence().trackscenter_most, center_track_selection)

+

+    def get_more_sync_center_most_track(self, current_track, test_track):

+        """

+        Video tracks ore considered more center then audio, 

+        and otherwise we pick the track closest to V1 in GUI.

+        """

+        if current_track == -1:

+            return test_track

+        

+        current_track_object = current_sequence().trackscurrent_track

+        test_track_object = current_sequence().trackstest_track

+        

+        if test_track_object.type == appconsts.VIDEO:

+            if current_track_object.type == appconsts.AUDIO:

+                return test_track

+            

+            if test_track < current_track:

+                return test_track

+            else:

+                return current_track

+        else:

+            if current_track_object.type == appconsts.VIDEO:

+                return current_track

+

+            if test_track > current_track:

+                return test_track

+            else:

+                return current_track

+                

+        

+

 class BoxTrackSelection:

     """

     This class collects data on track's Box selected clips.

@@ -372,6 +412,13 @@

         return False

+    def clip_in_selection(self, clip):

+        clip_index =  current_sequence().tracksself.track_id.clips.index(clip)

+        if clip_index >= self.selected_range_in and clip_index <= self.selected_range_out:

+            return True

+        

+        return False

+

 def box_selection_splice_out():

     global box_selection_data, edit_data

​

@@ -92,13 +92,8 @@

         self.filter_object = filter_object

         self.filter_stack = filter_stack

-        if editorpersistance.prefs.icons_scale == appconsts.ICONS_SCALE_DEFAULT:

-            w=22

-            h=22

-        else:

-            w=44

-            h=44

-            

+        w=22

+        h=22

         surface = guiutils.get_cairo_image("filter_save")

         save_button = guicomponents.PressLaunch(self.save_pressed, surface, w, h)

         save_button.widget.set_tooltip_markup(_("Save effect values"))

@@ -202,17 +197,35 @@

 class FilterHeaderRow:

-    def __init__(self, filter_object):

+    def __init__(self, filter_object, stack_item):

         name = translations.get_filter_name(filter_object.info.name)

         self.filter_name_label = Gtk.Label(label= "<b>" + name + "</b>")

         self.filter_name_label.set_use_markup(True)

         self.icon = Gtk.Image.new_from_pixbuf(filter_object.info.get_icon())

+        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "trash.png")

+        trash_button = guicomponents.PressLaunch(stack_item.trash_pressed, surface, w=22, h=22)

+        

+        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filters_up_arrow.png")

+        up_button = guicomponents.PressLaunch(stack_item.up_pressed, surface, w=10, h=22)

+        up_button.surface_x = 0

+        up_button.widget.set_margin_right(2)

+

+        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filters_down_arrow.png")

+        down_button = guicomponents.PressLaunch(stack_item.down_pressed, surface, w=10, h=22)

+        down_button.surface_x = 0

+        down_button.surface_y = 10

+        

+        

         hbox = Gtk.HBox(False, 0)

+        hbox.pack_start(stack_item.active_check, False, False, 0)

         hbox.pack_start(guiutils.pad_label(4,5), False, False, 0)

         hbox.pack_start(self.icon, False, False, 0)

         hbox.pack_start(self.filter_name_label, False, False, 0)

         hbox.pack_start(Gtk.Label(), True, True, 0)

+        hbox.pack_start(up_button.widget, False, False, 0)

+        hbox.pack_start(down_button.widget, False, False, 0)

+        hbox.pack_start(trash_button.widget, False, False, 0)

         self.widget = hbox

@@ -220,61 +233,29 @@

     def __init__(self, filter_object, edit_panel, filter_stack):

         self.filter_object = filter_object

-        self.filter_header_row = FilterHeaderRow(filter_object)

+

+        self.active_check = Gtk.CheckButton()

+        self.active_check.set_active(self.filter_object.active)

+        self.active_check.connect("toggled", self.toggle_filter_active)

+

+        self.active_check.set_margin_left(2)

+        self.filter_header_row = FilterHeaderRow(filter_object, self)

         self.edit_panel = edit_panel

         self.edit_panel_frame = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0)

         self.edit_panel_frame.add(edit_panel)

         self.filter_stack = filter_stack

-        self.expander = Gtk.Expander()

+        self.expander = Expander()

         self.expander.set_label_widget(self.filter_header_row.widget)

         self.expander.add(self.edit_panel_frame)

-        self.expander.set_label_fill(True)

         self.expander_frame = Gtk.Box.new(Gtk.Orientation.VERTICAL, 0)

-        self.expander_frame.add(self.expander)

+        self.expander_frame.add(self.expander.widget)

         guiutils.set_margins(self.expander_frame, 2, 0, 0, 0)

-        self.active_check = Gtk.CheckButton()

-        self.active_check.set_active(self.filter_object.active)

-        self.active_check.connect("toggled", self.toggle_filter_active)

-        guiutils.set_margins(self.active_check, 4, 0, 0, 0)

-

-        self.active_check_vbox = Gtk.VBox(False, 0)

-        self.active_check_vbox.pack_start(self.active_check, False, False, 0)

-        self.active_check_vbox.pack_start(Gtk.Label(), True, True, 0)

-

-        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "trash.png")

-        trash_button = guicomponents.PressLaunch(self.trash_pressed, surface, w=22, h=22)

-        

-        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filters_up_arrow.png")

-        up_button = guicomponents.PressLaunch(self.up_pressed, surface, w=10, h=22)

-        up_button.surface_x = 0

-

-        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filters_down_arrow.png")

-        down_button = guicomponents.PressLaunch(self.down_pressed, surface, w=10, h=22)

-        down_button.surface_x = 0

-        down_button.surface_y = 10

-        

-        self.trash_vbox = Gtk.VBox(False, 0)

-        self.trash_vbox.pack_start(trash_button.widget, False, False, 0)

-        self.trash_vbox.pack_start(Gtk.Label(), True, True, 0)

-

-        self.up_vbox = Gtk.VBox(False, 0)

-        self.up_vbox.pack_start(up_button.widget, False, False, 0)

-        self.up_vbox.pack_start(Gtk.Label(), True, True, 0)

-

-        self.down_vbox = Gtk.VBox(False, 0)

-        self.down_vbox.pack_start(down_button.widget, False, False, 0)

-        self.down_vbox.pack_start(Gtk.Label(), True, True, 0)

-        

         self.widget = Gtk.HBox(False, 0)

-        self.widget.pack_start(self.active_check_vbox, False, False, 0)

         self.widget.pack_start(self.expander_frame, True, True, 0)

-        self.widget.pack_start(self.trash_vbox, False, False, 0)

-        self.widget.pack_start(self.up_vbox, False, False, 0)

-        self.widget.pack_start(self.down_vbox, False, False, 0)

         self.widget.pack_start(guiutils.pad_label(10,2), False, False, 0)

         self.widget.show_all()

@@ -436,6 +417,74 @@

         stack_item = self.filter_stackexpanded_index

         stack_item.expander.set_expanded(True)

+class Expander:

+    

+    def __init__(self):

+        self.widget = Gtk.VBox(False, 0) 

+        self.label = None

+        self.child = None

+        self.expanded = True

+        

+        self.label_box = Gtk.HBox(False, 0) 

+        self.child_box = Gtk.VBox(False, 0) 

+

+        self.arrow_box = Gtk.EventBox() 

+        self.arrow_box.connect('button-release-event', self._toggle_expand)

+        

+        self.img_unexpanded = Gtk.Image.new_from_icon_name("pan-end-symbolic", Gtk.IconSize.BUTTON)

+        self.img_expanded = Gtk.Image.new_from_icon_name("pan-down-symbolic", Gtk.IconSize.BUTTON)

+        self.arrow_box.add(self.img_expanded)

+        

+        self.widget.pack_start(self.label_box, False, False, 0)

+        self.widget.pack_start(self.child_box, True, True, 0)

+        

+    def set_label_widget(self, label_widget):

+        self.label = label_widget

+        self._update_label_row()

+        self.widget.queue_draw()

+

+    def _update_label_row(self):

+        # Remove panels from box

+        children = self.label_box.get_children()

+        for child in children:

+            self.label_box.remove(child)

+        self.arrow_box.remove(self.arrow_box.get_child())

+        if self.expanded == True:

+            self.arrow_box.add(self.img_expanded)

+        else:

+            self.arrow_box.add(self.img_unexpanded)

+        self.arrow_box.show_all()

+

+        self.label_box.pack_start(self.arrow_box, False, False, 0)

+        self.label_box.pack_start(self.label, True, True, 0)

+

+    def add(self, child_widget):

+        self.child = child_widget

+        self._update_child_row()

+        self.widget.queue_draw()

+

+    def _update_child_row(self):

+        children = self.child_box.get_children()

+        for child in children:

+            self.child_box.remove(child)

+        

+        if self.expanded == True:

+            self.child_box.pack_start(self.child, False, False, 0)

+

+    def set_expanded(self, expanded):

+        self.expanded = expanded

+        self._update_label_row()

+        self._update_child_row()

+

+    def get_expanded(self):

+        return self.expanded

+

+    def _toggle_expand(self, widget, event):

+        self.expanded = not self.expanded

+        self._update_label_row()

+        self._update_child_row()

+        

+

 # -------------------------------------------------------------- GUI INIT

 def get_clip_effects_editor_info_row():

     _create_widgets()

​

@@ -166,7 +166,13 @@

         bound_end = from_clip_end

     else:

         bound_end = to_clip_end

-            

+    

+    if editing_clip_end == True and bound_end > to_clip_end:

+        bound_end = to_clip_end

+        

+    if editing_clip_end == False and bound_start < from_clip_start:

+        bound_start = from_clip_start

+        

     global _enter_mode, _enter_draw_func, _edit_data

     _enter_mode = editorstate.edit_mode

@@ -329,7 +335,7 @@

     clip_index = _edit_data"clip_index"

     editing_clip_end = _edit_data"editing_clip_end" 

-    from_clip, to_clip = _get_from_clip_and_to_clip(editing_clip_end,  track, clip_index)

+    from_clip, to_clip = _get_from_clip_and_to_clip(editing_clip_end, track, clip_index)

     non_edit_side_blank = False

     if (_edit_data"editing_clip_end" == False) and (track.clipsclip_index - 1.is_blanck_clip == True):

@@ -337,12 +343,38 @@

     elif (_edit_data"editing_clip_end" == True) and (track.clipsclip_index + 1.is_blanck_clip == True):

         non_edit_side_blank = True

+    # If drag covers adjacent clip fully we need to use different edit actions.

+    if editing_clip_end == True and frame == _edit_data"bound_end":

+        data = {"track":track,

+                "clip":to_clip,

+                "index":clip_index + 1}

+                

+        action = edit.cover_delete_fade_out(data) # action was created for another edit but works here too.

+        action.do_edit()

+        

+        _exit_clip_end_drag()

+        updater.repaint_tline()

+        return

+    elif editing_clip_end == False and frame == _edit_data"bound_start":

+        data = {"track":track,

+                "clip":from_clip,

+                "index":clip_index - 1}

+                

+        action = edit.cover_delete_fade_in(data) # action was created for another edit but works here too.

+        action.do_edit()

+        

+        _exit_clip_end_drag()

+        updater.repaint_tline()

+        return

+        

     # Code here thinks "clip_index" is always index of trimmed clip,

     # but we are using existing edit.tworoll_trim_action() code to do the edit, and 

     # that assumes index to be between clips.

     if editing_clip_end == True:

         clip_index += 1

+

+

     # Get edit data

     delta = frame - _edit_data"edit_frame"

     data = {"track":track,

​

@@ -460,16 +460,7 @@

 def _mute_clip(data):

     clip, track, item_id, item_data = data

-    set_clip_muted = item_data

-

-    if set_clip_muted == True:

-        data = {"clip":clip}

-        action = edit.mute_clip(data)

-        action.do_edit()

-    else:# then we're sitting clip unmuted

-        data = {"clip":clip}

-        action = edit.unmute_clip(data)

-        action.do_edit()

+    tlineaction.do_mute_clip(clip, item_data)

 def _delete_clip(data):

     tlineaction.splice_out_button_pressed()

@@ -520,26 +511,8 @@

 def _set_length(data):

     clip, track, item_id, item_data = data

-    dialogs.clip_length_change_dialog(_change_clip_length_dialog_callback, clip, track)

-

-def _change_clip_length_dialog_callback(dialog, response_id, clip, track, length_changer):

-    if response_id != Gtk.ResponseType.ACCEPT:

-        dialog.destroy()

-        return

+    tlineaction.set_length(clip, track)

-    length = length_changer.get_length()

-    index = track.clips.index(clip)

-    

-    dialog.destroy()

-    

-    data = {"track":track,

-            "clip":clip,

-            "index":index,

-            "length":length}

-            

-    action = edit.set_clip_length_action(data)

-    action.do_edit()

-                

 def _stretch_next(data):

     clip, track, item_id, item_data = data

     try:

​

@@ -201,7 +201,7 @@

         # Remove all but first keyframe

         for i in range(0, len(keyframes) - 1):

             keyframes.pop(1)

-        # Now this the same action as addin default keyframe on creation

+        # Now this the same action as adding default keyframe on creation

         keyframes = _add_default_fade_in(keyframe_property, property_klass, keyframes, fade_in_length)

     # Case keyframes exists after fade in length

     else:

​

@@ -115,7 +115,7 @@

 def render_tline_generator_clip(clip, callback):

     action_object = containeractions.get_action_object(clip.container_data)

-    action_object.set_video_endoding(None, callback, True) # All generator tline rendering goes via render settins and continues from given callback.

+    action_object.set_video_endoding(None, callback, True) # All generator tline rendering goes via render settings and continues from given callback.

 def render_full_media(data):

     clip, track, item_id, item_data = data

​

@@ -470,8 +470,6 @@

     dialog.connect('response', callback, data, length_spin, name_entry)

     dialog.show_all()

-

-

 def export_xml_dialog(callback, project_name):

     _export_file_name_dialog(callback, project_name, _("Export Project as XML to"))

@@ -600,7 +598,7 @@

     # Application tab

     img = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")

     flow_label = Gtk.Label(label="Flowblade Movie Editor")

-    ver_label = Gtk.Label(label="2.20")

+    ver_label = Gtk.Label(label="2.22")

     janne_label = Gtk.Label(label="Copyright 2024 Janne Liljeblad and contributors.")

     page_label = Gtk.Label(label=_("Project page:") + " " + "<a href=\"https://github.com/jliljebl/flowblade\">https://github.com/jliljebl/flowblade</a>")

     page_label.set_use_markup(True)

​

@@ -1276,7 +1276,7 @@

         comp.move(-self.delta)

-# This exists to avoid hitting object being mappingproxy when doing __dict__.update

+# This exists to avoid hitting object being mapping proxy when doing __dict__.update

 class DummyOverWriteMove:

     def __init__(self, move_data):

         # Grabs data as object members.

@@ -2729,6 +2729,48 @@

         resync.clip_added_to_timeline(child_clip, self.child_track)

+# -------------------------------------------- SET BOX SELECTION SYNC

+"orig_sync_data", "new_sync_data"

+def set_box_selection_sync_action(data):

+    return EditAction(_set_box_selection_sync_undo, _set_box_selection_sync_redo, data)

+

+def _set_box_selection_sync_undo(self):

+    for track_orig_sync_data in self.orig_sync_data:

+        track_selection, track_sync_data = track_orig_sync_data

+        child_track = current_sequence().trackstrack_selection.track_id

+

+        for clip in track_sync_data.keys():

+            resync.clip_removed_from_timeline(clip)

+            try:

+                # "orig_sync_data" created in resync.get_track_all_resync_action_data()

+                sync_data = track_sync_dataclip

+                clip.sync_data = sync_data

+            except:

+                pass

+                

+            resync.clip_added_to_timeline(clip, child_track)

+

+def _set_box_selection_sync_redo(self):

+    for track_new_sync_data in self.new_sync_data:

+        track_selection, sync_data = track_new_sync_data

+        child_track = current_sequence().trackstrack_selection.track_id

+

+        for clip in sync_data.keys():

+            resync.clip_removed_from_timeline(clip)

+            try:

+                # "new_sync_data" created in resync.get_track_all_resync_action_data()

+                pos_offset, parent_clip, parent_track = sync_dataclip

+                

+                clip.sync_data = SyncData()

+                clip.sync_data.pos_offset = pos_offset

+                clip.sync_data.master_clip = parent_clip

+                clip.sync_data.master_clip_track = parent_track

+                clip.sync_data.sync_state = appconsts.SYNC_CORRECT

+            except:

+                pass

+                

+            resync.clip_added_to_timeline(clip, child_track)

+        

 # -------------------------------------------- CLEAR TRACK SYNC

 "child_track", "orig_sync_data"

 def clear_track_sync_action(data):

​

@@ -107,8 +107,8 @@

 }

 AVAILABLE_PANEL_POSITIONS_OPTIONS = { \

-    appconsts.PANEL_MEDIA: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT, appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_LEFT_COLUMN, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT,

-    appconsts.PANEL_MULTI_EDIT: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT,  appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_LEFT_COLUMN, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT,

+    appconsts.PANEL_MEDIA: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT, appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_LEFT_COLUMN, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT, appconsts.PANEL_PLACEMENT_RIGHT_COLUMN,

+    appconsts.PANEL_MULTI_EDIT: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT,  appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_LEFT_COLUMN, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT, appconsts.PANEL_PLACEMENT_RIGHT_COLUMN,

     appconsts.PANEL_RANGE_LOG: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT, appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_RIGHT,

     appconsts.PANEL_RENDERING: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT, appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_RIGHT,

     appconsts.PANEL_JOBS: appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT, appconsts.PANEL_PLACEMENT_TOP_ROW_RIGHT, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT, appconsts.PANEL_PLACEMENT_BOTTOM_ROW_RIGHT,

@@ -143,7 +143,8 @@

     appconsts.PANEL_PLACEMENT_LEFT_COLUMN: DOWN,

     appconsts.PANEL_PLACEMENT_BOTTOM_ROW_LEFT: UP,

     appconsts.PANEL_PLACEMENT_BOTTOM_ROW_RIGHT: UP,

-    appconsts.PANEL_PLACEMENT_TOP_ROW_PROJECT_DEFAULT: DOWN

+    appconsts.PANEL_PLACEMENT_TOP_ROW_PROJECT_DEFAULT: DOWN,

+    appconsts.PANEL_PLACEMENT_RIGHT_COLUMN: DOWN

 }

 # Saved data struct holding panel positions information.

@@ -172,7 +173,7 @@

     if panel_positioning_available() == False or _panel_positions == None \

        or not (appconsts.PANEL_PLACEMENT_TOP_ROW_DEFAULT in _panel_positions.values()):

         _panel_positions = copy.deepcopy(DEFAULT_PANEL_POSITIONS)

-        if editorstate.SCREEN_WIDTH < 1439:

+        if editorstate.SCREEN_WIDTH < 1500: