Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 16

_service Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/1-10-timeline_match_frame.jpg Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/1-10_dual_monitor.jpg Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/1-10_monitor_match_frame.jpg Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/1-10_trimview.jpg Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/COMPOSITING_2.md Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Flowblade - Patch for 694 - Big Buttons.pdf Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Flowblade-Patch-PlayPause.pdf Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Flowblade-Patch-Shortcuts.pdf Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/PYTHON_3_PORT_INFO.md Deleted

@@ -1,25 +0,0 @@
-# PYTHON 3 STATUS OF DEPENDENCIES
-
-tl;dr: All dependencies are Python 3 compatible although __python-mlt__ might not be adequately tested.
-
-| **Ubuntu package name** | **Description** | **Python 3 available** |
-|:-------------------------------|:----------------|:--------------|
-| python-gi | GTK3 Python bindings | **YES, python3-gi**  |
-| python-mlt | MLT python bindings, this pulls in MLT | **YES** |
-| python-dbus | dbus python bindings | **YES, python3-dbus** |
-| libmlt-data | Some image and text resources for MLT |**NOT PYTHON** |
-| frei0r-plugins | Additional video filters | **NOT PYTHON** |
-| swh-plugins | Additional audio filters | **NOT PYTHON**  |
-| python-gi-cairo | Gi Cairo bindings | **YES, python3-gi-cairo** |
-| python-numpy | Math and arrays library |  **YES** |
-| python-pil | PIL image manipulation library | **YES, python-pil is Pillow fork and should work** |
-| librsvg2-common | svg support | **NOT PYTHON**  |
-| gmic | framework for image processing | **NOT PYTHON**  |
-| gir1.2-glib-2.0 | Glib | **YES, this is same for Python 3 and used by python3-gi package**|
-| gir1.2-gtk-3.0 | Gtk toolkit | **YES, this is same for Python 3 and used by python3-gi package** |
-| gir1.2-pango-1.0 | Pango text lib | **YES, this is same for Python 3 and used by python3-gi package** |
-| gir1.2-gdkpixbuf-2.0 | Image support | **YES, this is same for Python 3 and used by python3-gi package** |
-
-
-# PYTHON 3 STATUS OF THIS REPO
-flake8(http://flake8.pycqa.org) flags 61 files as containing __E999 SyntaxError: invalid syntax__ (`flake8 . --select=E999`)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/REFERENCE_GUIDE_OLD.md Deleted

@@ -1,686 +0,0 @@
-**Flowblade Movie Editor Reference Guide**
-
-
-!http://sites.google.com/site/phantom2dsite/Home/flowblade.png(http://sites.google.com/site/phantom2dsite/Home/flowblade.png)
-
-**Updated last 17.6.2014 for version 0.14**
-
-
-
-
----
-
-# Introduction #
-
-Flowblade Movie Editor is a **multitrack non-linear video editor** for Linux.
-
-With Flowblade Movie Editor you can compose movies from video clips, audio clips and graphics files. Clips can be cut at the desired frames, filters can be added to clips, and you can create multilayer composite images using compositor objects.
-
-In Flowblade  clips are usually automatically placed tightly after the previous clip - or between two existing clips - when they
-are inserted on the timeline. Edits are fine tuned by trimming in and out points of clips, or by cutting and deleting parts of clips.
-
-
-
-!http://sites.google.com/site/phantom2dsite/Home/flowbladeappicon.png(http://sites.google.com/site/phantom2dsite/Home/flowbladeappicon.png)
-
----
-
-# Basic Editing #
-
-This section describes the minimal workflow for making a movie using only a single track. Full editing workflow is described in detail in the later sections.
-
-
-## Creating a New Project ##
-  * Menu: Select **File -> New** from menu.
-  * Keyboard Shortcut: Press **Control+N**.
-
-Flowblade Movie Editor saves work in project files.
-A project contains one or more Sequences of edited media and a collection of Media Files stored in Bins.
-
-There are two parameters that can be selected for a new project:
-
-  1. **Project Profile** Project Profile determines frame rate per second, image size in pixels and pixel aspect ratio.
-  1. **Tracks count** Select the number of video and audio tracks that are used in the project. This can be changed later, but the operation destroys the Undo / Redo stack and all the Timeline Clips that do not fit in the newly created version of the Sequence.
-
-Video material is internally scaled to profile dimensions, so selecting Project Profile with smaller pixel dimensions than the rendered output leads to decreased quality.
-
-Flowblade Movie Editor handles image data internally as YUV420 frames, so the encoding associated with a given profile has no affect on quality before rendering.
-
-For **best possible quality** the **input material, Project Profile and Rendering Profile** should **all have the same pixel dimensions** and pixel aspect ratio**.**
-
-## Adding and removing new Sequences ##
-A Project contains one or more Sequences. Use **Add** and **Delete** buttons in the **Project** tab **Sequences** panel. All Sequences use the same Profile.
-
-When creating a new Sequence, you can choose the number of Tracks in the Sequence. This can be changed later, but the operation destroys the Undo / Redo stack and all the Timeline Clips that do not fit in the newly created version of the Sequence.
-
-
-## Working with Media Files ##
-
-Flowblade Movie Editor holds files in **Media** tab. Files are listed in unnamed table that displays contents of the currently selected Bin. Bins are listed in the **Bins** table.
-
-**Opening Media Files**
-  * Press **Add** button above the unnamed Bin contents table in the **Media** tab.
-  * Use dialog to find and select files.
-  * Files are displayed in untitled contents table with thumbnails.
-  * Note that creating thumbnails for many simultaneously opened files will take some time.
-
-
-## Project Media: Absolute and relative paths ##
-
-
-
-  * Flowblade **saves references** to media files used in a project as **absolute paths**.
-  * If a media is **not found on load**, Flowblade attempts to find a media file **with the same name in subfolders relative to project file.**
-  * **If all media used by a project is saved in subfolders** relative to project file, **project file and media can moved as a unit** and the project will load successfully after data is copied to a different place
-  * **Rendered files** like transitions **are saved by default in a hidden folder**. Render target folder needs to be set in a project files subfolder when working if these are desired to be movable also.
-  * Menu item **File->Save Backup Snapshot...** saves project file, all media and rendered files in a single folder that can saved as unit and and project can always be loaded using this data
-  * **Load order** between absolute and relative paths can be set in preferences window
-  * **Media Relinker** tool can be used to fix problems that may occur
-
-_**NOTE:** Information given here only applies to version 0.18 and above._
-
-## Working with Bins ##
-**Adding a Bin**: Press **Add** button above Bins table.
-
-**Deleting a Bin**: Press **Delete** button in above Bins table.
-Bin must be empty before removing. A project must always have at least one Bin.
-
-**Renaming a Bin**: Double click on the Bin name.
-
-**Moving files to another Bin**: Select one or more files in the unnamed table. While holding down the **Left mouse** button after last selection drag files on
-top of a Bin in the Bins table.
-
-
-## Using Timeline ##
-
-**Scrolling Timeline**:
-  * Press and Drag **Scrollbar** below Timeline
-  * Scroll **Mouse Middle** button + **CTRL** key while on top of Timeline
-
-**Zooming Timeline**:
-  * Click **Zoom In**, **Zoom Out** or **Zoom Length** buttons.
-  * Scroll **Mouse Middle** button on top of Timeline
-
-**Changing Current Frame**:
-  * Drag with **Right Mouse** button starting from  an empty space in the Timeline.
-  * Drag with **Left Mouse** button on the Frame Scale.
-  * Drag with **Left Mouse** on the Monitor Position Bar.
-  * Click **Left Arrow** key or **Right Arrow** key to move to next or previous frame.
-  * Click **Up Arrow** key or **Down Arrow** key to move to next or previous cut on topmost active track.
-  * Click **Next** or **Prev** button in Monitor Buttons area to move to next or previous frame.
-
-**Changing Current Frame when Clip is displayed on Monitor**:
-  * Drag with **Left Mouse** on the Monitor Position Bar.
-  * Click **Left Arrow** key or **Right Arrow** key to move to next or previous frame.
-  * Click **Up Arrow** key or **Down Arrow** key to move to next or previous of the following: Mark In/Mark Out/Start/End
-  * Click **Next** or **Prev** button in Monitor Buttons area to move to next or previous frame.
-
-**Switching between Timeline and Clip Display**:
-  * Click **Timeline/Clip** button in Monitor Buttons area.
-  * Drag Media File on top of **Monitor** to display Clip.
-
-_**Track switches**_
-
-!http://sites.google.com/site/phantom2dsite/Home/tracks_column.png(http://sites.google.com/site/phantom2dsite/Home/tracks_column.png)
-
-**Setting Active Tracks**:
-  * Click **Track Active Switch** on the right side of Tracks Column area.
-
-**Effects of Track Active State**;
-  * Cuts are only performed on active Tracks.
-  * Inserting Media File that is currently displayed in Monitor using **Insert From Monitor, Append From Monitor** or **3-Point Overwrite** buttons places clip on the top most active Track indicated by arrow icon.
-
-**Selecting single clip**:
-  * Click on a clip with **Left Mouse** button.
-
-**Selecting multiple clips on the same track**:
-  * Click on a clip with **Left Mouse** button.
-  * Click on another clip on the same track with **Control + Left Mouse** button.
-  * All clips between clicked clips will be selected.
-  * **There is no box selection or any other means of selecting clips from different Tracks at the same time.**
-
-**De-selecting all clips**
-  * Click on Timeline area background.
-
-## Adding clips to Sequence ##
-
-**Drag'n'Drop**
-  * Press on a Media File in **Media** tab and drag it on top of the track you want to place it on.
-  * Clip will be inserted on the track at the nearest cut.
-
-**From Monitor**
-  1. Open clip in Monitor by either:
-    * double clicking on thumbnail icon,
-    * dragging Media File on top of Monitor or
-    * selecting **Open in Clip Monitor** item from **Right Mouse** context menu.
-  1. Select insert range
-    * Use **Mark In** and **Mark Out** buttons to select range.
-    * Use **I** an **O** keys to set to select range.
-    * If range is not set, then the full clip length will be inserted.
-  1. Press **Insert From Monitor** button
-    * Clip will be inserted on the first active track at the cut nearest of the currently displayed frame. First active track is marked by down arrow in the track Active Switch.
-
-
-## Editing Clips on Timeline ##
-Once you have placed clips on the Timeline to form a Sequence, you will probably need to refine the cuts between clips.
-
-**Trimming Clips**
-Use Trim Tool(FlowbladeReference#Trim_Tool.md), Roll Tool(FlowbladeReference#Roll_Tool.md) or  Slip Tool(FlowbladeReference#Slip_Tool.md)
-
-
-**Moving Clips**
-Use Insert Tool(FlowbladeReference#Insert_Tool.md) or Overwrite Tool(FlowbladeReference#Overwrite_Tool.md)
-
-**Cutting Clips**
-  1. Select cut frame
-    * Cut is always made before currently displayed frame on all active tracks.
-    * If you wish to cut off piece from start of the clip, drag Current Frame Pointer to the first frame you wish to have displayed after cut clip piece is removed.
-    * If you wish to cut off piece from end of the clip, drag Current Frame Pointer to the last frame you wish to have displayed, and then move one frame forward.
-  1. Cut clip
-    * Press **Cut** button or press **X** on the keyboard.
-  1. Select and delete cut clip piece
-    * Click on the cut clip piece and either press **Delete** key or **Splice Out** button of **Lift** button.
-
-**Use Keyboard Shortcuts!** It is much faster to use **X** key to cut clips and **Delete** key to splice out clips than it is to use buttons for the same operations.
-
-## Rendering Movie ##
-
-### Selecting Parameters ###
-  * **Folder File Select** button will select folder to place the output file in.
-  * **Name** entry widget provides means to set the name of the output file.
-  * Use **Encoding Format** and untitled **Quality** drop down menus make to select the type of file to be rendered.
-
-### Rendering output ###
-  1. Press **Render** Button to begin rendering.
-  1. A Render Window will open displaying information on file path of render file, estimated time left, render time and a Progress bar widget.
-  1. After rendering is complete, Render Window will close automatically.
-
-!http://sites.google.com/site/phantom2dsite/Home/flowbladeappicon.png(http://sites.google.com/site/phantom2dsite/Home/flowbladeappicon.png)
-

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/SDL_2_AND_MLT_6_6_0.md Deleted

@@ -1,16 +0,0 @@
-# Flowblade, SDL 2 and MLT 6.6.0 and later
-
-**MLT 6.6.0 and later need to be compiled with SDL 1.2 support for Flowblade to work.**
-
-**Updating to MLT 6.6.0 from 6.5.0 version fixes startup crashes.**
-
-There were some developments with Flowblade, SDL and MLT from autumn 2017 onwards, here are the main points:
-
-1. All releases of MLT up until 6.4.1 used SDL 1.2 in "sdl" module for Flowblade related video display.
-2. Autumn 2017 MLT 6.5.0 switched to using SDL 2.0 in module "sdl". This broke Flowblade video display.
-3. SDL 2.0 dropped YUV overlay API used by Flowblade video display consumer, and SDL 2.0 does not provide similar functionality.
-4. For release 6.6.0 MLT switched to having two SDL related modules: "sdl" and "sdl2".
-5. The "sdl" module uses SDL 1.2 and this module needs to be compiled into MLT 6.6.0 for Flowblade to work.
-6. Both "sdl" and "sdl2" modules can be compiled into MLT 6.6.0
-
-An example of switches for compiling MLT with SDL 1.2 support can be found in this Flatpak definition file: https://github.com/flathub/io.github.jliljebl.Flowblade/blob/master/io.github.jliljebl.Flowblade.json

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Screenshot-2-0.png Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Screenshot_Play_Pause_Preferences.png Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Screenshot_Play_Pause_button.png Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Screenshot_THEME_FLOWBLADE_GRAY.png Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Screenshot_THEME_FLOWBLADE_NEUTRAL.png Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Wave Form Renderer termination upon Exit.txt Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/google_group_logo.xcf Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/running_flowblade_2-4.md Deleted

_service:obs_scm:flowblade-2.22.1.1.obscpio/README.md -> _service:obs_scm:flowblade-2.24.obscpio/README.md Changed

@@ -1,8 +1,9 @@
 
 
+
 !Flowblade(flowblade-trunk/Flowblade/res/darktheme/header_text.png "Flowblade")
 
-**New release 2.20 available. See release notes here,(./flowblade-trunk/docs/RELEASE_NOTES.md)**
+**New release 2.22 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,14 +19,13 @@
 
 **--- FIX FOR NON_WORKING VIDEO PREVIEW ISSUE ---**
 
-**Fix is to update to the latest version 2.20.**
+**Fix is to update to the latest version 2.22.**
 
-**If not possible, or start application from terminal with command below:**
+**If not possible start application from terminal with command below:**
 
 ```
 SDL12COMPAT_NO_QUIT_VIDEO=1 GDK_BACKEND=x11 SDL_VIDEODRIVER=x11  /usr/bin/flowblade 
 ```
-**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 ---**
 
@@ -79,7 +79,7 @@
 
 # Releases
 
-**Latest release:** Flowblade Movie Editor 2.20 was released in March 2025.
+**Latest release:** Flowblade Movie Editor 2.22 was released in June 2025.
 
 # Installing Flowblade

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/app.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/app.py Changed

@@ -74,7 +74,9 @@
 import editorpersistance
 import editorstate
 import editorwindow
+import glassbuttons
 import gmic
+import gtkevents
 import gui
 import guicomponents
 import guipopoverclip
@@ -82,6 +84,7 @@
 import keyevents
 import keyframeeditor
 import keyframeeditcanvas
+import keygtkactions
 import kftoolmode
 import medialinker
 import medialog
@@ -147,7 +150,7 @@
 
 exit_timeout_id = -1
 window_resize_id = -1
-window_state_id = -1
+window_state_id = -1 # TODO: get rid of this
 resize_timeout_id = -1
 monitor_resize_id = -1
 
@@ -352,6 +355,9 @@
         # Create main window and make widgeta available from gui.py.
         create_gui()
 
+        # These need widget objects to exist to build ata structures
+        keygtkactions.init()
+
         # Inits widgets with project data.
         init_project_gui()
 
@@ -382,7 +388,8 @@
         # Connect listener for this now that the tline panel size allocation is sure to be available.
         global window_resize_id, window_state_id, monitor_resize_id
         window_resize_id = gui.editor_window.window.connect("size-allocate", lambda w, e:updater.window_resized())
-        window_state_id = gui.editor_window.window.connect("window-state-event", lambda w, e:updater.window_resized())
+        if mltplayer.get_sdl_consumer_version() == mltplayer.SDL_1: # Delete when everyone is on mlt 7.30 or moving to Gtk4.
+            window_state_id = gui.editor_window.window.connect("window-state-event", lambda w, e:updater.window_resized())
         monitor_resize_id = gui.tline_display.connect("size-allocate", lambda w, e:tline_display_resized())
 
         # Get existing autosave files
@@ -501,6 +508,7 @@
     databridge.trimmodes_submode_is_keyb_edit_on = trimmodes.submode_is_keyb_edit_on
     databridge.snapping_get_snapping_on = snapping.get_snapping_on
     databridge.usbhid_get_usb_hid_device_config_metadata_list = usbhid.get_usb_hid_device_config_metadata_list
+    databridge.glass_buttons_default_focus_group_has_focus = glassbuttons.default_focus_group_has_focus
 
     # Set callbacks for undo/redo ops.
     undo.set_post_undo_redo_callback(modesetting.set_post_undo_redo_edit_mode)
@@ -565,10 +573,11 @@
     gui.pos_bar.set_dark_bg_color()
     
     # Connect window global key listener.
+    #gui.global_key_controller_1 = gtkevents.KeyPressEventAdapter(gui.editor_window.window, keyevents.key_down, user_data=None, capture=True)
     gui.editor_window.window.connect("key-press-event", keyevents.key_down)
     if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
         gui.editor_window.window2.connect("key-press-event", keyevents.key_down)
-
+    
     # Give undo a reference to uimanager for menuitem state changes.
     undo.set_menu_items(gui.editor_window.uimanager)
     
@@ -703,7 +712,8 @@
 def open_project(new_project):
     stop_autosave()
     gui.editor_window.window.handler_block(window_resize_id)
-    gui.editor_window.window.handler_block(window_state_id)
+    if mltplayer.get_sdl_consumer_version() == mltplayer.SDL_1: # TODO: get rid of this
+        gui.editor_window.window.handler_block(window_state_id)
 
     audiomonitoring.close_audio_monitor()
     audiowaveformrenderer.clear_cache()
@@ -750,7 +760,8 @@
     updater.set_timeline_height()
 
     gui.editor_window.window.handler_unblock(window_resize_id)
-    gui.editor_window.window.handler_unblock(window_state_id)
+    if mltplayer.get_sdl_consumer_version() == mltplayer.SDL_1: # TODO: get rid of this
+        gui.editor_window.window.handler_unblock(window_state_id)
 
     global resize_timeout_id
     resize_timeout_id = GLib.timeout_add(500, _do_window_resized_update)
@@ -765,7 +776,7 @@
     updater.window_resized()
     
 def change_current_sequence(index):
-    edit.do_gui_update = False  # This should not be necessary but we are doing this signal intention that GUI updates are disabled
+    edit.do_gui_update = False  # This should not be necessary but we are doing this signal intention that GUI updates are disabled.
     
     stop_autosave()
     editorstate.project.c_seq = editorstate.project.sequencesindex

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/appconsts.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/appconsts.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/audiomonitoring.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/audiomonitoring.py Changed

@@ -42,6 +42,7 @@
 
 import appconsts
 import cairoarea
+import gtkbuilder
 import editorstate
 import mltrefhold
 import guiutils
@@ -77,7 +78,7 @@
 # Colors
 METER_BG_COLOR = (0.15, 0.15, 0.15)
 OVERLAY_COLOR = (0.70, 0.70, 0.70)
-CHANNEL_ID_COLOR = (0.06, 0.34, 0.66)
+CHANNEL_ID_COLOR = (0.66, 0.66, 0.66)
 
 # Color gradient used to draw "LED" colors
 rr, rg, rb = utils.get_cairo_color_tuple_255_rgb(219, 69, 69)
@@ -315,17 +316,26 @@
 return audio_level_filter
 
 def _audio_monitor_update(data):
- # 'data' is not used here. 
- # This is called holding Gdk lock so we can do Gtk updates.
+ # 'data' is not used here, we get that from GLib.timeout_add used to implement ticker.
 if _monitor_window == None and _master_volume_meter == None:
 return
 
+ try:
+ seq = editorstate.current_sequence()
+ frame = editorstate.PLAYER().current_frame()
+ except:
+ return #this can get attempted before all data available
+ 
 global _audio_levels
 _audio_levels = 
+ 
 for i in range(0, len(_level_filters)):
 audio_level_filter = _level_filtersi
 l_val = _get_channel_value(audio_level_filter, LEFT_CHANNEL)
 r_val = _get_channel_value(audio_level_filter, RIGHT_CHANNEL)
+ track_len = seq.tracksi.get_length() # is this O(n) for clips in MLT?
+ if i > 1 and track_len < frame:
+ l_val = r_val = 0.0
 _audio_levels.append((l_val, r_val))
 
 if _monitor_window != None:
@@ -444,12 +454,10 @@
 
 def display_value(self, cr, x, value_left, value_right, grad):
 cr.set_source(grad)
- cr.set_dash(DASHES, 0) 
 cr.set_line_width(self.meter_width)
 self.left_channel.display_value(cr, x + self.x_pad_l, value_left)
 
 cr.set_source(grad)
- cr.set_dash(DASHES, 0) 
 cr.set_line_width(self.meter_width)
 self.right_channel.display_value(cr, x + self.x_pad_r, value_right)
 
@@ -588,8 +596,7 @@
 self.pan_slider.connect("value-changed", self.pan_changed)
 
 self.pan_button = Gtk.ToggleButton()
- surface = guiutils.get_cairo_image("pan_track")
- self.pan_button.set_image(Gtk.Image.new_from_surface (surface))
+ gtkbuilder.button_set_image(self.pan_button, "pan_track")
 self.pan_button.connect("toggled", self.pan_active_toggled)
 
 label = guiutils.bold_label(name)
@@ -661,7 +668,7 @@
 self.GRAD_CUT = 37
 self.top_pad = 14
 
- self.meter = AudioMeter(METER_HEIGHT + 40)
+ self.meter = AudioMeter(100)
 self.meter.x_pad_l = 6
 self.meter.x_pad_r = 14
 self.meter.right_channel.draw_dB = True
@@ -674,7 +681,7 @@
 w = SLOT_W - 40
 h = METER_SLOT_H + 2 + 40
 self.canvas = cairoarea.CairoDrawableArea2( w,
- h, 
+ 100, 
 self._draw)
 
 self.widget = Gtk.VBox(False, 0)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/audiowaveformrenderer.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/audiowaveformrenderer.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/boxmove.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/boxmove.py Changed

@@ -43,6 +43,14 @@
 box_selection_data = None
 edit_data = None
 
+def clear_data_and_tline_data():
+ # These need to cleared when box tool is activated
+ global box_selection_data, edit_data
+ box_selection_data = None
+ edit_data = None
+
+ tlinewidgets.set_edit_mode_data(None)
+ 
 def get_selection_data():
 return box_selection_data
 
@@ -219,7 +227,8 @@
 track_compositors = current_sequence().get_track_compositors(i)
 for comp in track_compositors:
 if comp.clip_in >= start_frame and comp.clip_out < end_frame:
- self.selected_compositors.append(comp)
+ if not(comp.clip_in == 0 and comp.clip_out == 0):
+ self.selected_compositors.append(comp)
 
 # Get BoxTrackSelection objects
 for i in range(track_bottom_index + 1, track_top_index):
@@ -333,9 +342,13 @@
 
 class BoxTrackSelection:
 """
- This class collects data on track's Box selected clips.
+ This class collects data on track's box selection clips.
 """
 def __init__(self, i, start_frame, end_frame):
+ # These two are used when creating box selection compound clips but not when doing box selection move edits. 
+ self.start_frame = start_frame
+ self.end_frame = end_frame
+ 
 self.track_id = i
 self.selected_range_in = -1
 self.selected_range_out = -1 # inclusive
@@ -385,7 +398,7 @@
 break
 self.selected_range_in = blanks_stripped_start
 if self.selected_range_in > self.selected_range_out:
- return # the 1 cli in selection range is blank
+ return # the only clip in selection range is blank
 
 # Drop blanks from end
 blanks_stripped_end = self.selected_range_out

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/cairoarea.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/cairoarea.py Changed

@@ -26,6 +26,8 @@
 from gi.repository import Gtk
 from gi.repository import Gdk
 
+import gtkevents
+
 bg_color = None
 
 
@@ -50,14 +52,33 @@
         self._draw_func = func_draw
         self.connect('draw', self._draw_event)
 
-        self.connect('button-press-event', self._button_press_event)
-        self.connect('button-release-event', self._button_release_event)
-        self.connect('motion-notify-event', self._motion_notify_event)
-        self.connect('enter-notify-event', self._enter_notify_event)
-        self.connect('leave-notify-event', self._leave_notify_event)
-        self.connect("scroll-event", self._mouse_scroll_event)
+        #self.connect('button-press-event', self._button_press_event)
+        self.press_controller = Gtk.GestureMultiPress(widget=self)
+        self.press_controller.set_button(0)
+        self.press_controller.connect("pressed", self._button_press_event)
+        
+        #self.connect('button-release-event', self._button_release_event)
+        self.release_controller = Gtk.GestureMultiPress(widget=self)
+        self.release_controller.connect("released", self._button_release_event)
+
+        #self.connect('motion-notify-event', self._motion_notify_event)
+        self.motion_controller = Gtk.EventControllerMotion(widget=self)
+        self.motion_controller.connect("motion", self._motion_notify_event)
 
-        # Signal handler funcs. These are monkeypatched as needed on codes sites
+        #self.connect('enter-notify-event', self._enter_notify_event)
+        self.enter_controller = Gtk.EventControllerMotion(widget=self)
+        self.enter_controller.connect("enter", self._enter_notify_event)
+        
+        #self.connect('leave-notify-event', self._leave_notify_event)
+        self.leave_controller = Gtk.EventControllerMotion(widget=self)
+        self.leave_controller.connect("leave", self._leave_notify_event)
+         
+        #self.connect("scroll-event", self._mouse_scroll_event)
+        self.scroll_controller = Gtk.EventControllerScroll(widget=self)
+        self.scroll_controller.set_flags(Gtk.EventControllerScrollFlags.BOTH_AXES)
+        self.scroll_controller.connect("scroll", self._mouse_scroll_event)
+ 
+        # Signal handler funcs. These are monkeypatched as needed on use sites
         # that create the objects.
         self.press_func = self._press
         self.release_func = self._release
@@ -86,38 +107,46 @@
     # These pass on events to handler functions that 
     # are by default the noop functions here, but are monkeypatched 
     # at creation sites as needed. 
-    def _button_press_event(self, widget, event):
+    def _button_press_event(self, event, n_press, x, y):    
+        gdk_event = gtkevents.ButtonEvent(n_press, x, y)
+        
         if self.grab_focus_on_press:
             self.grab_focus()
-        self.press_func(event)
-
+        self.press_func(gdk_event)
+        
         return False
 
-    def _button_release_event(self,  widget, event):
-        self.release_func(event)
+    def _button_release_event(self, event, n_press, x, y):
+        gdk_event = gtkevents.ButtonEvent(n_press, x, y)
+        self.release_func(gdk_event)
 
         return False
 
-    def _motion_notify_event(self, widget, event):
-        if event.is_hint:
-            window, x, y, state = event.window.get_pointer()
-        else:
-            x = event.x
-            y = event.y
-            state = event.get_state()
-
+    def _motion_notify_event(self, event, x, y):
+        gdk_event = gtkevents.SimpleStateEvent()
+        state = gdk_event.get_state()
         self.motion_notify_func(x, y, state)
 
-    def _enter_notify_event(self, widget, event):
-        self.enter_notify_func(event)
-        
-    def _leave_notify_event(self, widget, event):
-        self.leave_notify_func(event)
+    def _enter_notify_event(self, event, a, b):
+        gdk_event = gtkevents.SimpleStateEvent()
+        self.enter_notify_func(gdk_event)
         
-    def _mouse_scroll_event(self, widget, event):
+    def _leave_notify_event(self, event):
+        try:
+            gdk_event = gtkevents.SimpleStateEvent()
+            self.leave_notify_func(gdk_event)
+        except:
+            # On start-up this one some times fails once for un-known reason.
+            # We keep printing info on it but won't attemp any fixes for now. 
+            print("Failed to create gtkevents.SimpleStateEvent for a leave notify event.")
+
+    def _mouse_scroll_event(self, scroll_event, dx, dy):
         if self.mouse_scroll_func == None:
             return
-        self.mouse_scroll_func(event)
+
+        gdk_event = gtkevents.ScrollEvent(dx, dy) # This wont be needed as such for Gtk4 which has get_current_event_state()
+
+        self.mouse_scroll_func(gdk_event)
 
     # ------------------------------------------------------- Noop funcs for unhandled events
     def _press(self, event):

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/clipeffectseditor.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/clipeffectseditor.py Changed

@@ -39,10 +39,12 @@
 from editorstate import PLAYER
 from editorstate import current_sequence
 import extraeditors
+import gtkbuilder
 import gui
 import guicomponents
 import guipopover
 import guiutils
+import keygtkactions
 import mltfilters
 import propertyedit
 import propertyeditorbuilder
@@ -397,7 +399,7 @@
         for i in range(0, len(self.filter_stack)):
             stack_item = self.filter_stacki
             stack_item.expander.set_expanded(expanded)
-            
+
     def get_expanded(self):
         state_list = 
         for stack_item in self.filter_stack:
@@ -427,13 +429,11 @@
         
         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.arrow_box = gtkbuilder.EventBox(self.img_expanded, 'button-release-event', self._toggle_expand)
         
         self.widget.pack_start(self.label_box, False, False, 0)
         self.widget.pack_start(self.child_box, True, True, 0)
@@ -505,9 +505,8 @@
     widgets.clip_info = guicomponents.ClipInfoPanel()
     
     widgets.value_edit_box = Gtk.VBox()
-    widgets.value_edit_frame = Gtk.Frame()
+    widgets.value_edit_frame = Gtk.Alignment.new(0.5, 0, 1, 1)
     widgets.value_edit_frame.add(widgets.value_edit_box)
-    
     widgets.hamburger_launcher = guicomponents.HamburgerPressLaunch(_hamburger_launch_pressed)
     widgets.hamburger_launcher.do_popover_callback = True
     guiutils.set_margins(widgets.hamburger_launcher.widget, 6, 8, 1, 0)
@@ -519,6 +518,9 @@
     guiutils.set_margins(widgets.filter_add_launch.widget, 6, 8, 1, 0)
     
 # ------------------------------------------------------------------- interface
+def get_stack():
+    return _filter_stack
+    
 def set_clip(clip, track, clip_index, show_tab=True):
     """
     Sets clip being edited and inits gui.
@@ -602,6 +604,7 @@
 
     _add_filter_from_effect_select_panel(row_index, group_index)
 
+"""
 def add_currently_selected_effect():
     # Currently selected in effect select panel, not here.
     treeselection = gui.effect_select_list_view.treeview.get_selection()
@@ -611,6 +614,7 @@
     group_index = gui.effect_select_combo_box.get_active()
 
     _add_filter_from_effect_select_panel(row_index, group_index)
+"""
 
 def get_currently_selected_filter_info():
     # Currently selected in effect select panel, not here.
@@ -628,6 +632,8 @@
     group_name, filters_array = mltfilters.groupsgroup_index
     filter_info = filters_arrayrow_index
 
+    expanded_panels = _filter_stack.get_expanded()
+
     data = {"clip":_filter_stack.clip, 
             "filter_info":filter_info,
             "filter_edit_done_func":filter_edit_done_stack_update}
@@ -640,6 +646,9 @@
     clip, track, clip_index = _filter_stack.get_clip_data()
     set_clip(clip, track, clip_index)
 
+    expanded_panels.append(True)
+    _filter_stack.set_expanded(expanded_panels)
+
     updater.repaint_tline()
 
 def clear_clip():
@@ -687,7 +696,6 @@
     global widgets
     widgets.value_edit_frame.remove(widgets.value_edit_box)
     widgets.value_edit_frame.add(scroll_window)
-
     widgets.value_edit_box = scroll_window
 
 def _alpha_filter_add_maybe_info(filter_info):
@@ -839,11 +847,13 @@
                 or (editor_type == propertyeditorbuilder.KEYFRAME_EDITOR_CLIP_FADE_FILTER)):
                     keyframe_editor_widgets.append(editor_row)
                     filter_keyframe_editor_widgets.append(editor_row)
-
+                    keygtkactions.connect_filter_widget(editor_row)
+                
             # if slider property is being edited as keyrame property
             if hasattr(editor_row, "is_kf_editor"):
                 keyframe_editor_widgets.append(editor_row)
                 filter_keyframe_editor_widgets.append(editor_row)
+                keygtkactions.connect_filter_widget(editor_row)
 
             vbox.pack_start(editor_row, False, False, 0)
             if not hasattr(editor_row, "no_separator"):
@@ -879,6 +889,7 @@
                 # editor_row is just Gtk.VBox.
                 keyframe_editor_widgets.append(editor_row.kf_edit_geom_editor)
                 filter_keyframe_editor_widgets.append(editor_row.kf_edit_geom_editor)
+                keygtkactions.connect_filter_widget(editor_row.kf_edit_geom_editor)
     else:
         vbox.pack_start(Gtk.Label(label=_("No editable parameters")), True, True, 0)
     vbox.show_all()
@@ -888,18 +899,18 @@
 def show_text_in_edit_area(text):
     vbox = Gtk.VBox(False, 0)
 
-    filler = Gtk.EventBox()
-    filler.add(Gtk.Label())
+    filler = Gtk.Stack()  
+    filler.add_named(Gtk.Label(), "filler")
     vbox.pack_start(filler, True, True, 0)
     
     info = Gtk.Label(label=text)
     info.set_sensitive(False)
-    filler = Gtk.EventBox()
-    filler.add(info)
+    filler = Gtk.Stack()  
+    filler.add_named(info, "filler")
     vbox.pack_start(filler, False, False, 0)
     
-    filler = Gtk.EventBox()
-    filler.add(Gtk.Label())
+    filler = Gtk.Stack()  
+    filler.add_named(Gtk.Label(), "filler")
     vbox.pack_start(filler, True, True, 0)
 
     vbox.show_all()
@@ -1042,6 +1053,8 @@
     clip, track, item_id, item_data = data
     x, filter_info = item_data
 
+    expanded_panels = _filter_stack.get_expanded()
+
     action = get_filter_add_action(filter_info, clip)
     set_stack_update_blocked() # We update stack on set_clip below
     action.do_edit()
@@ -1050,7 +1063,8 @@
     # (re)open clip in editor.
     index = track.clips.index(clip)
     set_clip(clip, track, index)
-    set_filter_item_expanded(len(clip.filters) - 1)
+    expanded_panels.append(True)
+    _filter_stack.set_expanded(expanded_panels)
     
 def _save_effect_values_dialog_callback(dialog, response_id, filter_object):
     if response_id == Gtk.ResponseType.ACCEPT:

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/clipenddragmode.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/clipenddragmode.py Changed

@@ -25,6 +25,7 @@
 from gi.repository import Gdk
 
 import appconsts
+import dualsynctrim
 import gui
 import edit
 from editorstate import current_sequence
@@ -113,10 +114,14 @@
 _edit_data"orig_in" = cut_frame - 1
 _edit_data"orig_out" = cut_frame + (clip.clip_out - clip.clip_in)
 _edit_data"submode" = _submode
+ _edit_data"cut_frame" = cut_frame
+
+ dualsynctrim.set_child_clip_end_drag_data(_edit_data, clip)
 
 _enter_mouse_drag_edit(editing_clip_end)
 
 def _init_overwrite_drag(clip, clip_index, track, frame, cut_frame):
+
 global _submode
 _submode = OVERWRITE_DRAG
 
@@ -156,12 +161,12 @@
 to_clip_end = track.clip_start(clip_index) + to_clip.clip_length()
 from_clip_start = track.clip_start(clip_index - 1)
 from_clip_end = track.clip_start(clip_index - 1) - from_clip.clip_in + from_clip.get_length() 
- 
- if to_clip_start > from_clip_start:
+ 
+ if to_clip_start > from_clip_start and to_clip.is_blanck_clip == False:
 bound_start = to_clip_start
- else:
+ else: 
 bound_start = from_clip_start
- 
+
 if from_clip_end < to_clip_end:
 bound_end = from_clip_end
 else:
@@ -172,6 +177,9 @@
 
 if editing_clip_end == False and bound_start < from_clip_start:
 bound_start = from_clip_start
+
+ if to_clip_start > from_clip_start and from_clip.is_blanck_clip == True:
+ bound_start = to_clip_start
 
 global _enter_mode, _enter_draw_func, _edit_data
 
@@ -179,7 +187,7 @@
 editorstate.edit_mode = editorstate.CLIP_END_DRAG
 
 _enter_draw_func = tlinewidgets.canvas_widget.edit_mode_overlay_draw_func
-
+ 
 _edit_data = {}
 _edit_data"track" = track
 _edit_data"clip_index" = clip_index
@@ -237,7 +245,6 @@
 else:
 _do_overwrite_trim(x, y, frame, state)
 
-
 def _do_insert_trim(x, y, frame, state):
 frame = _legalize_frame(frame)
 _edit_data"frame" = frame
@@ -273,7 +280,7 @@
 updater.repaint_tline()
 return
 
- # next clip is not blank or last clip
+ # clip end trim if next clip is not blank or next xlip is last clip
 if ((clip_index == len(track.clips) - 1) or 
 (track.clipsclip_index + 1.is_blanck_clip == False)):
 data = {"track":track,
@@ -281,8 +288,19 @@
 "clip":clip,
 "delta":delta}
 action = edit.trim_last_clip_end_action(data)
- action.do_edit()
- else: # next clip is blank
+ 
+ if _edit_data"child_clip_trim_data" == None:
+ action.do_edit()
+ else:
+ sync_trim_action = dualsynctrim.get_one_roll_sync_edit(_edit_data, delta, dualsynctrim.ONE_ROLL_TRIM_END)
+ if sync_trim_action != None:
+ actions = action, sync_trim_action
+ consolidated_action = edit.ConsolidatedEditAction(actions)
+ consolidated_action.do_consolidated_edit()
+ else:
+ action.do_edit()
+ 
+ else: # clip end trim next clip is blank
 blank_clip = track.clipsclip_index + 1
 blank_clip_length = blank_clip.clip_length()
 data = {"track":track,
@@ -292,10 +310,20 @@
 "delta":delta}
 if delta < blank_clip_length: # partial blank overwrite
 action = edit.clip_end_drag_on_blank_action(data)
- action.do_edit()
 else: # full blank replace
 action = edit.clip_end_drag_replace_blank_action(data)
+
+ if _edit_data"child_clip_trim_data" == None:
 action.do_edit()
+ else:
+ sync_trim_action = dualsynctrim.get_one_roll_sync_edit(_edit_data, delta, dualsynctrim.ONE_ROLL_TRIM_END)
+ if sync_trim_action != None:
+ actions = action, sync_trim_action
+ consolidated_action = edit.ConsolidatedEditAction(actions)
+ consolidated_action.do_consolidated_edit()
+ else:
+ action.do_edit()
+ 
 else:# Dragging clip start
 delta = frame - orig_in - 1 # -1 because..uhh..inclusive exclusive something something
 # prev clip is not blank or first clip
@@ -306,7 +334,16 @@
 "clip":clip,
 "delta":delta}
 action = edit.trim_start_action(data)
- action.do_edit()
+ if _edit_data"child_clip_trim_data" == None:
+ action.do_edit()
+ else:
+ sync_trim_action = dualsynctrim.get_one_roll_sync_edit(_edit_data, delta, dualsynctrim.ONE_ROLL_TRIM_START)
+ if sync_trim_action != None:
+ actions = action, sync_trim_action
+ consolidated_action = edit.ConsolidatedEditAction(actions)
+ consolidated_action.do_consolidated_edit()
+ else:
+ action.do_edit()
 else: # prev clip is blank
 blank_clip = track.clipsclip_index - 1
 blank_clip_length = blank_clip.clip_length()
@@ -317,10 +354,30 @@
 "delta":delta}
 if -delta < blank_clip_length: # partial blank overwrite
 action = edit.clip_start_drag_on_blank_action(data)
- action.do_edit()
 else: # full blank replace
 action = edit.clip_start_drag_replace_blank_action(data)
+
+ if _edit_data"child_clip_trim_data" == None:
 action.do_edit()
+ else:
+ data = {"track":track,
+ "index":clip_index,
+ "from_clip":blank_clip,
+ "to_clip":clip,
+ "delta":delta,
+ "edit_done_callback": None, # we don't do callback needing this
+ "cut_frame": _edit_data"cut_frame",
+ "to_side_being_edited":None, # we don't do callback needing this
+ "non_edit_side_blank":True,
+ "first_do":False} # no callback
+
+ sync_trim_action = dualsynctrim.get_two_roll_sync_edits(data)
+ if sync_trim_action != None:
+ actions = action, sync_trim_action0
+ consolidated_action = edit.ConsolidatedEditAction(actions)
+ consolidated_action.do_consolidated_edit()
+ else:
+ action.do_edit()
 
 _exit_clip_end_drag()
 
@@ -328,7 +385,6 @@
 
 def _do_overwrite_trim(x, y, frame, state):
 frame = _legalize_frame(frame)
-
 updater.repaint_tline()
 
 track = _edit_data"track"
@@ -336,7 +392,6 @@
 editing_clip_end = _edit_data"editing_clip_end" 
 
 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):
 non_edit_side_blank = True
@@ -344,7 +399,11 @@
 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":
+ from_clip_start = track.clip_start(track.clips.index(from_clip)) - from_clip.clip_in
+ to_clip_end = track.clip_start(track.clips.index(to_clip)) + to_clip.clip_length()
+
+ if editing_clip_end == True and frame == _edit_data"bound_end" and frame == to_clip_end:
+ 
 data = {"track":track,
 "clip":to_clip,
 "index":clip_index + 1}
@@ -355,7 +414,7 @@

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/clipmenuaction.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/clipmenuaction.py Changed

@@ -179,8 +179,13 @@
     if media_file == None and clip.container_data != None:
         media_file = PROJECT().get_media_file_for_container_data(clip.container_data)
 
-    media_file.mark_in = clip.clip_in
-    media_file.mark_out = clip.clip_out
+    try:
+        media_file.mark_in = clip.clip_in
+        media_file.mark_out = clip.clip_out
+    except:
+        # This fails for color clips and the correct fix is quite involved so this was added as temp for 2.24
+        return
+
     updater.set_and_display_monitor_media_file(media_file)
     gui.pos_bar.widget.grab_focus()
 
@@ -262,6 +267,11 @@
     clip, track, item_id, filter_info = data
     clip, track, x = _popover_clip_data 
 
+    if clipeffectseditor.get_stack() != None and clip == clipeffectseditor.get_stack().clip:
+        expanded_panels = clipeffectseditor.get_stack().get_expanded()
+    else:
+        expanded_panels = None
+
     action = clipeffectseditor.get_filter_add_action(filter_info, clip)
     clipeffectseditor.set_stack_update_blocked() # We update stack on set_clip below
     action.do_edit()
@@ -271,7 +281,12 @@
     frame = tlinewidgets.get_frame(x)
     index = track.get_clip_index_at(frame)
     clipeffectseditor.set_clip(clip, track, index)
-    clipeffectseditor.set_filter_item_expanded(len(clip.filters) - 1)
+
+    if expanded_panels != None:
+        expanded_panels.append(True)
+        clipeffectseditor.get_stack().set_expanded(expanded_panels)
+    else:
+        clipeffectseditor.set_filter_item_expanded(len(clip.filters) - 1)
 
 def _add_filter_multi(data):
     clip, track, item_id, item_data = data
@@ -992,15 +1007,24 @@
     new_clip.container_data.rendered_media_range_out = -1
     new_clip.container_data.unrendered_length = new_clip.get_length() - 1
     new_clip.link_seq_data = copy.deepcopy(clip.link_seq_data)
-    
+
+    # Handle possibly changed sequence length.
+    # If new clip out not in available media area,
+    # simply use full length of new media.
+    new_clip.clip_in = clip.clip_in
+    new_clip.clip_out = clip.clip_out
+    if clip.get_length() > new_clip.get_length():
+        if clip.clip_out > new_clip.get_length() - 1:
+            new_clip.clip_in = 0
+            new_clip.clip_out =  new_clip.get_length() - 1
     clip_index = track.clips.index(clip)
-    
+
     data = {"old_clip":clip,
             "new_clip":new_clip,
             "track":track,
             "index":clip_index, 
-            "clip_in":clip.clip_in, 
-            "clip_out":clip.clip_out}
+            "clip_in":new_clip.clip_in, 
+            "clip_out":new_clip.clip_out}
     action = edit.clip_replace(data)
     action.do_edit()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/compositeeditor.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/compositeeditor.py Changed

@@ -40,6 +40,7 @@
 from editorstate import current_sequence
 from editorstate import PROJECT
 import keyframeeditor
+import keygtkactions
 import mlttransitions
 import propertyeditorbuilder
 import propertyedit
@@ -164,8 +165,8 @@
     # Case: Empty edit frame
     global compositor
     if compositor == None:
-        filler = Gtk.EventBox()
-        filler.add(Gtk.Label())
+        filler = Gtk.Stack() 
+        filler.add_named(Gtk.Label(), "filler")
         vbox.pack_start(filler, True, True, 0)
 
         if current_sequence().compositing_mode != appconsts.COMPOSITING_MODE_STANDARD_FULL_TRACK:
@@ -176,12 +177,12 @@
             info.set_justify(Gtk.Justification.CENTER)
             info.set_sensitive(False)
         
-        filler = Gtk.EventBox()
-        filler.add(info)
+        filler = Gtk.Stack()
+        filler.add_named(info, "filler")
         vbox.pack_start(filler, False, False, 0)
         
-        filler = Gtk.EventBox()
-        filler.add(Gtk.Label())
+        filler = Gtk.Stack()
+        filler.add_named(Gtk.Label(), "filler")
         vbox.pack_start(filler, True, True, 0)
         vbox.show_all()
 
@@ -253,7 +254,7 @@
             or (editor_type == propertyeditorbuilder.GEOMETRY_EDITOR)
             or (editor_type == propertyeditorbuilder.ROTATION_GEOMETRY_EDITOR_BUILDER)):
                 keyframe_editor_widgets.append(editor_row)
-    
+                keygtkactions.connect_compositor_widget(editor_row)
     # Add pad label after possibly adding blend mode editor.
     if blend_added == False:
         target_row.pack_start(Gtk.Label(), True, True, 0)
@@ -266,6 +267,7 @@
         # because one editor sets values for multiple EditableProperty objects
         if editor_row.__class__ == keyframeeditor.RotatingGeometryEditor:
             keyframe_editor_widgets.append(editor_row)
+            keygtkactions.connect_compositor_widget(editor_row)
         vbox.pack_start(editor_row, False, False, 0)
         vbox.pack_start(guicomponents.EditorSeparator().widget, False, False, 0)

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/copypaste.py Added

@@ -0,0 +1,125 @@
+
+"""
+ 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 Gdk, Gtk
+
+import appconsts
+import clipeffectseditor
+import compositeeditor
+import editorstate
+import gui
+import projectaction
+import tlineaction
+
+
+# ----------------------------------------------------------------------- COPY PASTE ACTION FORWARDING
+def cut_action():
+ if gui.timeline_has_focus() == False:
+ # Try to cut text to clipboard because user pressed CTRL + X.
+ if gui.media_list_view.widget.get_focus_child() != None:
+ projectaction.cut_media_files()
+ return True
+ 
+ # Try to extract text to clipboard because user pressed CTRL + C.
+ copy_source = gui.editor_window.window.get_focus()
+ try:
+ display = Gdk.Display.get_default()
+ cb = Gtk.Clipboard.get_default(display)
+ copy_source.get_buffer().cut_clipboard(cb, True)
+ return True
+ except:# selected widget was not a Gtk.Editable that can provide text to clipboard.
+ return False
+ else:
+ tlineaction.do_timeline_objects_copy(False)
+ return True
+ 
+def copy_action():
+ if gui.timeline_has_focus() == False:
+ filter_kf_editor = _get_focus_keyframe_editor(clipeffectseditor.keyframe_editor_widgets)
+ geom_kf_editor = _get_focus_keyframe_editor(compositeeditor.keyframe_editor_widgets)
+ if filter_kf_editor != None:
+ value = filter_kf_editor.get_copy_kf_value()
+ save_data = (appconsts.COPY_PASTE_KEYFRAME_EDITOR_KF_DATA, (value, filter_kf_editor))
+ editorstate.set_copy_paste_objects(save_data) 
+ return True
+ elif geom_kf_editor != None:
+ value = geom_kf_editor.get_copy_kf_value() 
+ save_data = (appconsts.COPY_PASTE_GEOMETRY_EDITOR_KF_DATA, (value, geom_kf_editor))
+ editorstate.set_copy_paste_objects(save_data)
+ return True
+ else:
+ # Try to extract text to clipboard because user pressed CTRL + C.
+ copy_source = gui.editor_window.window.get_focus()
+ try:
+ display = Gdk.Display.get_default()
+ cb = Gtk.Clipboard.get_default (display)
+ copy_source.get_buffer().copy_clipboard(cb)
+ return True
+ except:# selected widget was not a Gtk.Editable that can provide text to clipboard.
+ return False
+ else:
+ tlineaction.do_timeline_objects_copy()
+ return True
+
+def paste_action():
+ if gui.timeline_has_focus() == False:
+ copy_paste_object = editorstate.get_copy_paste_objects()
+ if copy_paste_object == None:
+ _attempt_default_paste()
+ return False
+ data_type, paste_data = editorstate.get_copy_paste_objects()
+ if data_type == appconsts.COPY_PASTE_KEYFRAME_EDITOR_KF_DATA:
+ value, kf_editor = paste_data
+ kf_editor.paste_kf_value(value)
+ return True
+ 
+ elif data_type == appconsts.COPY_PASTE_GEOMETRY_EDITOR_KF_DATA:
+ value, geom_editor = paste_data
+ geom_editor.paste_kf_value(value)
+ return True
+ elif data_type == appconsts.CUT_PASTE_MEDIA_ITEMS:
+ projectaction.paste_media_files()
+ return True
+ 
+ return False
+ else:
+ tlineaction.do_timeline_objects_paste()
+ _attempt_default_paste()
+ return True
+
+def _attempt_default_paste():
+ # Try to extract text to clipboard because user pressed CTRL + C.
+ paste_target = gui.editor_window.window.get_focus()
+ try:
+ display = Gdk.Display.get_default()
+ clipboard = Gtk.Clipboard.get_default(display)
+ paste_target.get_buffer().paste_clipboard(clipboard, None, True)
+ return True
+ except:# selected widget cannot be pasted into
+ return False
+
+def _get_focus_keyframe_editor(keyframe_editor_widgets):
+ if keyframe_editor_widgets == None:
+ return None
+ for kfeditor in keyframe_editor_widgets:
+ if kfeditor.get_focus_child() != None:
+ return kfeditor
+ return None
+

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/databridge.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/databridge.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/dialogs.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/dialogs.py Changed

@@ -598,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.22.1")
+ ver_label = Gtk.Label(label="2.24")
 janne_label = Gtk.Label(label="Copyright 2025 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)
@@ -624,11 +624,8 @@
 up_label = Gtk.Label(label=_("Upstream:"))
 up_projs = Gtk.Label(label="MLT")
 up_projs2 = Gtk.Label(label="FFMpeg, Frei0r, LADSPA, Cairo, Gnome, Linux")
- tools_label = Gtk.Label(label=_("Tools:"))
- tools_list = Gtk.Label(label="Geany, Inkscape, Gimp, ack-grep")
 
 up_label.modify_font(Pango.FontDescription("sans bold 12"))
- tools_label.modify_font(Pango.FontDescription("sans bold 12"))
 
 vbox2 = Gtk.VBox(False, 4)
 vbox2.pack_start(guiutils.get_pad_label(30, 12), False, False, 0)
@@ -636,9 +633,6 @@
 vbox2.pack_start(up_projs, False, False, 0)
 vbox2.pack_start(up_projs2, False, False, 0)
 vbox2.pack_start(guiutils.get_pad_label(30, 22), False, False, 0)
- vbox2.pack_start(tools_label, False, False, 0)
- vbox2.pack_start(tools_list, False, False, 0)
- vbox2.pack_start(guiutils.get_pad_label(30, 22), False, False, 0)
 vbox2.pack_start(Gtk.Label(), True, True, 0)
 
 alignment2 = dialogutils.get_default_alignment(vbox2)
@@ -1808,7 +1802,7 @@
 (_("Cancel"), Gtk.ResponseType.REJECT,
 _("Change Compositing Mode"), Gtk.ResponseType.ACCEPT))
 
- primary_txt = _("Changing Compositing Mode destroys current Compositors and undo stack")
+ primary_txt = _("Changing Compositing Mode destroys current Compositors and undo stack!")
 secondary_txt = _("This operation cannot be undone. Are you sure you wish to proceed?")
 warning_panel = dialogutils.get_warning_message_dialog_panel(primary_txt, secondary_txt, is_info=False, alternative_icon=None, panels=None)
 
@@ -1971,8 +1965,32 @@
 
 dialogutils.panel_ok_cancel_dialog(title, panel, accept_text, callback, (sequences_combo, selection_data))
 
-
 def show_cyclic_error():
 primary_txt = _("Cyclic relation detected!")
 secondary_txt = _("Edit would create a cyclink linked sequence relation and was cancelled!")
 dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window)
+
+def get_duplicate_sequence_dialog():
+ dialog = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+ dialog.set_title(_("Duplicating Sequence"))
+
+ progress_bar = Gtk.ProgressBar()
+ progress_bar.set_fraction(0.2)
+ progress_bar.set_pulse_step(0.1)
+ progress_bar.set_margin_bottom(24)
+ progress_bar.set_margin_top(24)
+ 
+ progress_vbox = Gtk.VBox(False, 2)
+ progress_vbox.pack_start(progress_bar, False, False, 0)
+
+ alignment = guiutils.set_margins(progress_vbox, 12, 12, 12, 12)
+
+ dialog.add(alignment)
+ dialog.set_default_size(500, 70)
+ dialog.set_position(Gtk.WindowPosition.CENTER)
+ dialog.show_all()
+
+ pulse_runner = guiutils.PulseEvent(progress_bar)
+ dialog.pulse_runner = pulse_runner
+ 
+ return dialog

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/dialogutils.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/dialogutils.py Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/dualsynctrim.py Added

@@ -0,0 +1,294 @@
+"""
+ Flowblade Movie Editor is a nonlinear video editor.
+ Copyright 2012 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/>.
+"""
+
+import appconsts
+import edit
+import resync
+import editorpersistance
+
+
+ONE_ROLL_TRIM_LAST_END = 0
+ONE_ROLL_TRIM_START = 1
+ONE_ROLL_TRIM_END = 2
+
+
+def set_child_clip_trim_data(edit_data, edit_tool):
+ if edit_data"to_side_being_edited" == True:
+ parent_clip = edit_data"to_clip"
+ else:
+ parent_clip = edit_data"from_clip"
+ 
+ _set_child_clip_data(edit_data, parent_clip)
+
+def set_child_clip_end_drag_data(edit_data, parent_clip):
+ _set_child_clip_data(edit_data, parent_clip)
+ 
+def _set_child_clip_data(edit_data, parent_clip):
+ child_clip_sync_items = resync.get_child_clips(parent_clip)
+
+ if editorpersistance.prefs.auto_sync_single_childs_on_trim == False:
+ edit_data"child_clip_trim_data" = None
+ return
+
+ if child_clip_sync_items == None:
+ edit_data"child_clip_trim_data" = None
+ return
+ 
+ if len(child_clip_sync_items) > 1:
+ edit_data"child_clip_trim_data" = None
+ # TODO: We dont dual trim when clip has multiple children. Set flag for info window.
+ return
+
+ edit_data"child_clip_trim_data" = child_clip_sync_items0
+
+def get_one_roll_sync_edit(edit_data, delta, trim_type):
+ if edit_data"child_clip_trim_data" == None:
+ return None
+
+ if editorpersistance.prefs.auto_sync_single_childs_on_trim == False:
+ return None
+ 
+ child_clip, child_track = edit_data"child_clip_trim_data"
+
+ if trim_type == ONE_ROLL_TRIM_LAST_END:
+ if delta > 0 and child_clip.get_length() - child_clip.clip_out < delta:
+ return None
+ if delta < 0 and child_clip.clip_out - child_clip.clip_in < abs(delta):
+ return None
+ if delta == 0:
+ return None
+
+ data = {"track":child_track,
+ "index":child_track.clips.index(child_clip),
+ "clip":child_clip,
+ "delta":delta,
+ "undo_done_callback":None,
+ "first_do":False}
+ action = edit.trim_last_clip_end_action(data)
+ return action
+
+ elif trim_type == ONE_ROLL_TRIM_START:
+ if delta > 0 and child_clip.clip_out - child_clip.clip_in < delta:
+ return None
+ if delta < 0 and child_clip.clip_in < abs(delta):
+ return None
+ if delta == 0:
+ return None
+ data = {"track":child_track,
+ "index":child_track.clips.index(child_clip),
+ "clip":child_clip,
+ "delta":delta,
+ "undo_done_callback":None,
+ "first_do":False}
+ action = edit.trim_start_action(data)
+ return action
+
+ elif trim_type == ONE_ROLL_TRIM_END:
+ if delta > 0 and child_clip.get_length() - child_clip.clip_out < delta:
+ return None
+ if delta < 0 and child_clip.clip_out - child_clip.clip_in < abs(delta):
+ return None
+ if delta == 0:
+ return None
+ data = {"track":child_track,
+ "index":child_track.clips.index(child_clip),
+ "clip":child_clip,
+ "delta":delta,
+ "undo_done_callback":None,
+ "first_do":False}
+ action = edit.trim_end_action(data)
+ return action
+ return None
+
+def get_two_roll_sync_edits(edit_data):
+ if editorpersistance.prefs.auto_sync_single_childs_on_trim == False:
+ return None
+ 
+ delta = edit_data"delta"
+ from_clip_sync_items = resync.get_child_clips(edit_data"from_clip")
+
+ if from_clip_sync_items == None or len(from_clip_sync_items) > 1:
+ from_clip = from_track = None
+ else:
+ from_clip, from_track = from_clip_sync_items0
+ from_index = from_track.clips.index(from_clip) 
+
+ to_clip_sync_items = resync.get_child_clips(edit_data"to_clip")
+
+ if to_clip_sync_items == None or len(to_clip_sync_items) > 1:
+ to_clip = to_track = None
+ else:
+ to_clip, to_track = to_clip_sync_items0
+ to_index = to_track.clips.index(to_clip)
+ 
+ 
+ # CASE: to and from clip on same track immediately one after another
+ if to_track != None and from_track != None and to_track == from_track and to_index == from_index + 1:
+ data = {"track":to_track,
+ "index":to_index,
+ "from_clip":from_clip,
+ "to_clip":to_clip,
+ "delta":edit_data"delta",
+ "edit_done_callback": None, # we don't do callback needing this
+ "cut_frame": edit_data"cut_frame",
+ "to_side_being_edited":None, # we don't do callback needing this
+ "non_edit_side_blank":False,
+ "first_do":False} # no callback
+
+ sync_trim_legal = check_two_roll_trim_lagality(data)
+ if sync_trim_legal == False:
+ return None
+
+ action = edit.tworoll_trim_action(data)
+ return action
+ 
+ actions = 
+ 
+ if from_clip != None:
+ if from_index + 1 < len(from_track.clips):
+ to_clip_one = from_track.clipsfrom_index + 1
+ non_edit_side_blank = (to_clip_one.is_blank == True)
+ data = {"track":from_track,
+ "index":from_index + 1,
+ "from_clip":from_clip,
+ "to_clip":to_clip_one,
+ "delta":edit_data"delta",
+ "edit_done_callback": None, # we don't do the callback needing this
+ "cut_frame": edit_data"cut_frame",
+ "to_side_being_edited":None, # we don't do the callback needing this
+ "non_edit_side_blank":non_edit_side_blank,
+ "first_do":False} # no callback
+ 
+ if check_two_roll_trim_lagality(data) == True:
+ action = edit.tworoll_trim_action(data)
+ actions.append(action)
+ else:
+ do_edit = True
+ if delta > 0 and from_clip.get_length() - from_clip.clip_out < delta:
+ do_edit = False
+ if delta < 0 and from_clip.clip_out - from_clip.clip_in < abs(delta):
+ do_edit = False
+ if delta == 0:
+ do_edit = False
+ 
+ if do_edit == True:
+ data = {"track":from_track,
+ "index":from_index,
+ "clip":from_clip,
+ "delta":delta,
+ "undo_done_callback":None,
+ "first_do":False}
+ action = edit.trim_last_clip_end_action(data)
+ actions.append(action)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/edit.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/edit.py Changed

@@ -28,6 +28,7 @@
 import copy
 
 import appconsts
+import boxmove
 import clipeffectseditor
 import compositeeditor
 import containeractions
@@ -366,9 +367,12 @@
         undo.force_revert_if_cyclic_seq_links(PROJECT())
         
     def undo(self):
+        resync.start_edit()
+        
         PLAYER().stop_playback()
 
         movemodes.clear_selected_clips()  # selection not valid after change in sequence
+        
         _remove_trailing_blanks_undo(self)
         _consolidate_all_blanks_undo(self)
     
@@ -377,11 +381,16 @@
         _remove_all_trailing_blanks(None)
 
         resync.calculate_and_set_child_clip_sync_states()
+
+        boxmove.clear_data_and_tline_data()
         
         if do_gui_update:
             self._update_gui()
-            
+
+        
     def redo(self):
+        resync.start_edit()
+        
         PLAYER().stop_playback()
 
         movemodes.clear_selected_clips() # selection is not valid after a change in sequence
@@ -392,11 +401,13 @@
         _remove_trailing_blanks_redo(self)
 
         resync.calculate_and_set_child_clip_sync_states()
-                
+
+        boxmove.clear_data_and_tline_data()
+        
         # Update GUI.
         if do_gui_update:
             self._update_gui()
-        
+
     def _update_gui(self): # This is copied with small modifications into projectaction.py for sequence imports, update there too if needed.
         updater.update_tline_scrollbar() # Slider needs to adjust to possibly new program length.
                                          # This REPAINTS TIMELINE as a side effect.
@@ -446,7 +457,12 @@
         #    .exit_active_trimmode_on_edit
         #    .turn_on_stop_for_edit
         # same for all the consolidated edits for this to work reliably.
-        if self.edit_actions0.exit_active_trimmode_on_edit:
+        try:
+            if self.edit_actions0.exit_active_trimmode_on_edit:
+                trimmodes.set_no_edit_trim_mode()
+        except:
+            # If ALL actions are callables then they don't have 
+            # edit action property and we assume that 'exit_active_trimmode_on_edit' is True.
             trimmodes.set_no_edit_trim_mode()
 
         # We only do one gui update.
@@ -467,6 +483,7 @@
                 old_index = self.edit_actions.index(edit_action)
                 self.edit_actionsold_index = new_edit_action
                 edit_action = new_edit_action
+                edit_action.is_part_of_consolidated_group = True
 
             # Enable GUI update for last action.
             if edit_action is self.edit_actionslen(self.edit_actions) - 1:
@@ -849,7 +866,7 @@
     # Remove and replace
     self.clips = 
     for i in range(self.in_index, self.out_index + 1): # + 1 == out_index inclusive
-        removed_clip = _remove_clip(self.track, i)
+        removed_clip = _remove_clip(self.track, self.in_index)
         self.clips.append(removed_clip)
 
     _insert_clip(self.track, self.clip, self.in_index, self.clip_in, self.clip_out)
@@ -1665,6 +1682,8 @@
     tracks = current_sequence().tracks
 
     applied_delta = self.edit_delta
+    if reverse_comp_delta:
+        applied_delta = -applied_delta
         
     for i in range(1, len(tracks) - 1):
         if not track_movedi - 1:
@@ -1672,6 +1691,7 @@
         if self.track.id == i:
             continue
 
+        
         track = tracksi
         edit_op = self.multi_data.track_edit_opsi - 1        
         trim_blank_index = self.multi_data.trim_blank_indexesi - 1
@@ -2430,23 +2450,26 @@
     _do_clip_mute(self.parent_clip, filter)
     
 #----------------- AUDIO SPLICE SYNCHED
-# "parent_clip", "audio_clip", "track", "to_track"
+# "parent_clip", "audio_clip",  "over_in", "over_out", "track", "to_track"
 def audio_synched_splice_action(data):
     action = EditAction(_audio_synched_splice_undo, _audio_synched_splice_redo, data)
     return action
 
 def _audio_synched_splice_undo(self):
     to_track = self.to_track
-
-    # Remove add audio clip
+    
+    # Remove added audio clip
     in_index = to_track.get_clip_index_at(self.over_in)
     _remove_clip(to_track, in_index)
         
     # Fix in clip and remove cut created clip if in was cut
     if self.in_clip_out != -1:
         in_clip = _remove_clip(to_track, in_index - 1)
-        _insert_clip(to_track, in_clip, in_index - 1,
-                     in_clip.clip_in, self.in_clip_out)
+        if in_clip.is_blanck_clip != True:
+            _insert_clip(to_track, in_clip, in_index - 1,
+                        in_clip.clip_in, self.in_clip_out)
+        else: # blanks can't be resized, so must put in new blank
+            _insert_blank(to_track, in_index - 1, self.in_clip_out - in_clip.clip_in + 1)
         self.removed_clips.pop(0)
 
     # Fix out clip and remove cut created clip if out was cut
@@ -2457,8 +2480,11 @@
         try:
             out_clip = _remove_clip(to_track, in_index)
             if len(self.removed_clips) > 0: # If overwrite was done inside single clip everything is already in order
-                _insert_clip(to_track, out_clip, in_index,
-                         self.out_clip_in, out_clip.clip_out)
+                if out_clip.is_blanck_clip != True:
+                    _insert_clip(to_track, out_clip, in_index,
+                             self.out_clip_in, out_clip.clip_out)
+                else:
+                    _insert_blank(to_track, in_index, out_clip.clip_out - self.out_clip_in + 1)
                 self.removed_clips.pop(-1) 
         except:
             pass
@@ -2466,8 +2492,11 @@
     # Put back old clips
     for i in range(0, len(self.removed_clips)):
         clip = self.removed_clipsi
-        _insert_clip(to_track, clip, in_index + i, clip.clip_in,
+        if clip.is_blanck_clip != True:
+            _insert_clip(to_track, clip, in_index + i, clip.clip_in,
                      clip.clip_out)
+        else:
+            _insert_blank(to_track, in_index + i,  clip.clip_out - clip.clip_in + 1)
 
     _do_clip_unmute(self.parent_clip)
     
@@ -2478,7 +2507,7 @@
 
     # Clear resync data
     resync.clip_sync_cleared(child_clip)
-
+    
 def _audio_synched_splice_redo(self):
     # Get shorter name for readability
     to_track = self.to_track
@@ -2491,11 +2520,11 @@
     else:
         self.starts_after_end = False
 
-    # Cut at in frame of overwrite range. 
+    # Cut at in frame of overwrite range.
     clip_in, clip_out = _overwrite_cut_track(to_track, self.over_in)
     self.in_clip_out = clip_out
 
-    # Cut at out frame of overwrite range 
+    # Cut at out frame of overwrite range
     if to_track.get_length() > self.over_out:
         clip_in, clip_out = _overwrite_cut_track(to_track, self.over_out)
         self.out_clip_in = clip_in
@@ -2537,7 +2566,7 @@
     child_clip.sync_data.sync_state = appconsts.SYNC_CORRECT
 
     resync.clip_added_to_timeline(child_clip, child_track)
-
+    
 # ------------------------------------------------- RESYNC CLIP
 # "clips"
 def resync_clip_action(data):
@@ -2993,24 +3022,6 @@
     _insert_clip(self.track, self.clip, self.index, 
                  self.clip_in,  self.clip_in + self.blank_length - 1)
 
-# ---------------------------------------- CONSOLIDATE SELECTED BLANKS
-# "track","index"

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/editevent.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/editevent.py Changed

@@ -369,27 +369,6 @@
 trimmodes.set_no_edit_trim_mode()
 PLAYER().seek_frame(frame)
 return
- # LEFT BUTTON: Select new trimmed clip in active one roll trim mode	with sensitive cursor.
- elif (event.button == 1 and EDIT_MODE() == editorstate.ONE_ROLL_TRIM):	
- track = tlinewidgets.get_track(event.y)	
- if track == None:	
- modesetting.set_default_edit_mode(True)	
- return	
- success = trimmodes.set_oneroll_mode(track, frame)	
- if not success:
- modesetting.set_default_edit_mode(True)	
- return	
-
- if trimmodes.edit_data"to_side_being_edited" == True:	
- pointer_context = appconsts.POINTER_CONTEXT_TRIM_LEFT	
- else:	
- pointer_context = appconsts.POINTER_CONTEXT_TRIM_RIGHT	
- gui.editor_window.tline_cursor_manager.set_tline_cursor_to_context(pointer_context)	
- gui.editor_window.tline_cursor_manager.set_tool_selector_to_mode()	
- if not editorpersistance.prefs.quick_enter_trims:	
- editorstate.timeline_mouse_disabled = True	
- else:	
- trimmodes.oneroll_trim_move(event.x, event.y, frame, None)
 elif event.button == 2:
 updater.zoom_project_length()
 # LEFT BUTTON: Handle left mouse button edits by passing event to current edit mode
@@ -502,7 +481,12 @@
 selected_track_before = movemodes.selected_track
 selected_in_before = movemodes.selected_range_in
 selected_out_before = movemodes.selected_range_out
- 
+
+ if clipeffectseditor.get_stack() != None and clip == clipeffectseditor.get_stack().clip:
+ expanded_panels = clipeffectseditor.get_stack().get_expanded()
+ else:
+ expanded_panels = None
+ 
 # Effect dropped on selected range, add to all in range.
 if selected_in_before != -1 and selected_track_before == track.id and ((selected_in_before <= index) and (selected_out_before >= index)):
 actions = 
@@ -529,7 +513,12 @@
 action.do_edit()
 
 clipeffectseditor.set_clip(clip, track, index)
- clipeffectseditor.set_filter_item_expanded(len(clip.filters) - 1)
+
+ if expanded_panels != None:
+ expanded_panels.append(True)
+ clipeffectseditor.get_stack().set_expanded(expanded_panels)
+ else:
+ clipeffectseditor.set_filter_item_expanded(len(clip.filters) - 1)
 
 def tline_media_drop(drag_data, x, y, use_marks=False):
 # drag_data not used unless we which later to enable dropping multiple media items.
@@ -691,24 +680,15 @@
 ONE_ROLL_TRIM_FUNCS = trimmodes.oneroll_trim_press, 
 trimmodes.oneroll_trim_move,
 trimmodes.oneroll_trim_release
-ONE_ROLL_TRIM_NO_EDIT_FUNCS = modesetting.oneroll_trim_no_edit_press, 
- modesetting.oneroll_trim_no_edit_move,
- modesetting.oneroll_trim_no_edit_release
 TWO_ROLL_TRIM_FUNCS = trimmodes.tworoll_trim_press,
 trimmodes.tworoll_trim_move,
 trimmodes.tworoll_trim_release
-TWO_ROLL_TRIM_NO_EDIT_FUNCS = modesetting.tworoll_trim_no_edit_press,
- modesetting.tworoll_trim_no_edit_move,
- modesetting.tworoll_trim_no_edit_release
 COMPOSITOR_EDIT_FUNCS = compositormodes.mouse_press,
 compositormodes.mouse_move,
 compositormodes.mouse_release
 SLIDE_TRIM_FUNCS = trimmodes.slide_trim_press,
 trimmodes.slide_trim_move,
 trimmodes.slide_trim_release
-SLIDE_TRIM_NO_EDIT_FUNCS = modesetting.slide_trim_no_edit_press,
- modesetting.slide_trim_no_edit_move,
- modesetting.slide_trim_no_edit_release
 MULTI_MOVE_FUNCS = multimovemode.mouse_press,
 multimovemode.mouse_move,
 multimovemode.mouse_release
@@ -732,10 +712,7 @@
 editorstate.ONE_ROLL_TRIM:ONE_ROLL_TRIM_FUNCS,
 editorstate.TWO_ROLL_TRIM:TWO_ROLL_TRIM_FUNCS,
 editorstate.COMPOSITOR_EDIT:COMPOSITOR_EDIT_FUNCS,
- editorstate.ONE_ROLL_TRIM_NO_EDIT:ONE_ROLL_TRIM_NO_EDIT_FUNCS,
- editorstate.TWO_ROLL_TRIM_NO_EDIT:TWO_ROLL_TRIM_NO_EDIT_FUNCS,
 editorstate.SLIDE_TRIM:SLIDE_TRIM_FUNCS,
- editorstate.SLIDE_TRIM_NO_EDIT:SLIDE_TRIM_NO_EDIT_FUNCS,
 editorstate.MULTI_MOVE:MULTI_MOVE_FUNCS,
 editorstate.CLIP_END_DRAG:CLIP_END_DRAG_FUNCS,
 editorstate.CUT:CUT_FUNCS,

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/editorlayout.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/editorlayout.py Changed

@@ -379,6 +379,7 @@
 
 def _create_notebook(position, editor_window):
     notebook = Gtk.Notebook()
+    gui.apply_widget_css_class(notebook, "notebook-side-borders", "notebook-side-borders-class.css")
     panels = _get_position_panels(position)
     panel_widgets = _get_panels_widgets_dict(editor_window)
     for panel_id in panels:
@@ -646,6 +647,9 @@
     top_row_min_width = get_top_row_minimum_width()
     bottom_row_min_width = get_bottom_row_minimum_width()
 
+    middle_bar_required = gui.editor_window.get_middlebar_required_width()
+    middle_bar_w, h = gui.editor_window.edit_buttons_row.get_preferred_width()
+
     if top_row_min_width > editorstate.SCREEN_WIDTH or bottom_row_min_width > editorstate.SCREEN_WIDTH:
         primary_txt = _("Custom layout does not fit on screen!") 
         
@@ -709,7 +713,6 @@
     panel_widgets = _get_panels_widgets_dict(gui.editor_window)
     panel_widget = panel_widgetspanel_id
     notebook = _position_notebooksposition
-    
     if notebook != None:
         # Determine position in notebook.
         insert_index = _get_insert_index(panel_widget, notebook)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/editorpersistance.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/editorpersistance.py Changed

@@ -194,7 +194,7 @@
     ffwd_rev_shift_spin, ffwd_rev_caps_spin, follow_move_range, loop_clips = playback_prefs_widgets
     
     force_language_combo, window_mode_combo, full_names, tracks_combo, project_panel_width_spin, \
-    edit_panel_width_spin, media_panel_width_spin, layout_monitor, filter_select_width_spin = view_prefs_widgets
+    edit_panel_width_spin, media_panel_width_spin, layout_monitor, filter_select_width_spin, show_bins_and_seqs_titles = view_prefs_widgets
 
     perf_render_threads, perf_drop_frames = performance_widgets
 
@@ -226,6 +226,7 @@
     prefs.perf_render_threads = int(perf_render_threads.get_adjustment().get_value())
     prefs.perf_drop_frames = perf_drop_frames.get_active()
     prefs.show_full_file_names = full_names.get_active()
+    prefs.show_bins_and_sequences_titles = show_bins_and_seqs_titles.get_active()
     prefs.center_on_arrow_move = auto_center_on_updown.get_active()
     prefs.tracks_scale = tracks_combo.get_active()
     prefs.playback_follow_move_tline_range = follow_move_range.get_active()
@@ -387,3 +388,8 @@
         self.show_sync = True
         self.wide_multitrim_slip = False
         self.disable_drag_when_selected = True
+        self.show_waveform_in_monitor = True
+        self.auto_sync_single_childs_on_trim = True
+        self.audio_master_position_is_top_row = True
+        self.close_titler_on_save = False
+        self.show_bins_and_sequences_titles = True
\ No newline at end of file

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/editorstate.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/editorstate.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/editorwindow.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/editorwindow.py Changed

@@ -34,6 +34,7 @@
 import clipmenuaction
 import compositeeditor
 import containerclip
+import copypaste
 import dialogs
 import dialogutils
 import dnd
@@ -55,6 +56,7 @@
 import mediaplugin
 import menuactions
 import middlebar
+import mltplayer
 import modesetting
 import monitorevent
 import monitorwidget
@@ -92,20 +94,6 @@
 DARK_BG_COLOR = (0.223, 0.247, 0.247, 1.0)
 
 
-def _b(button, icon, remove_relief=False):
- button.set_image(icon)
- button.set_property("can-focus", False)
- if remove_relief:
- button.set_relief(Gtk.ReliefStyle.NONE)
-
-def _toggle_image_switch(widget, icons):
- not_pressed, pressed = icons
- if widget.get_active() == True:
- widget.set_image(pressed)
- else:
- widget.set_image(not_pressed)
-
-
 class EditorWindow:
 
 def __init__(self):
@@ -115,7 +103,7 @@
 # Create window(s)
 self.window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL)
 self.window.set_icon_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")
- self.window.set_border_width(5)
+ self.window.set_border_width(0)
 
 self.window2 = None
 if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
@@ -128,7 +116,10 @@
 self.window.connect("delete-event", lambda w, e:callbackbridge.app_shutdown())
 
 # Player consumer has to be stopped and started when window resized
- self.window.connect("window-state-event", lambda w, e:updater.refresh_player(e))
+ if mltplayer.get_sdl_consumer_version() == mltplayer.SDL_1: # Delete when everyone is on mlt 7.30 or moving to Gtk4.
+ self.window.connect("window-state-event", lambda w, e:updater.refresh_player(e))
+
+ self.audio_master_meter = None
 
 # Init application main menu.
 self.ui = Gtk.UIManager()
@@ -136,7 +127,7 @@
 
 # Create all panels and gui components.
 self._init_gui_components()
- 
+
 # Create timeline comnponents and panels.
 self._init_tline()
 
@@ -226,21 +217,17 @@
 else:
 menubar_box.pack_start(self.menubar, False, False, 0)
 
- monitor_source_box = Gtk.HBox(False, 0)
- monitor_source_box.pack_start(Gtk.Label(), True, True, 0)
+ project_info_box = Gtk.HBox(False, 0)
+ project_info_box.pack_start(Gtk.Label(), True, True, 0)
 monitor_desc_panel = projectinfogui.get_top_level_project_info_panel()
 self.monitor_desc_label = projectinfogui.widgets.monitor_desc_label
- monitor_source_box.pack_start(monitor_desc_panel, False, False, 0)
- monitor_source_box.pack_start(Gtk.Label(), True, True, 0)
+ project_info_box.pack_start(monitor_desc_panel, False, False, 0)
+ project_info_box.pack_start(Gtk.Label(), True, True, 0)
+
+ layout_widgets = self.tools_buttons.widget, guiutils.pad_label(24,2), self.fullscreen_press.widget, guiutils.pad_label(6,2), self.layout_press.widget
+ layout_controls_box = guiutils.get_right_justified_box(layout_widgets)
+ layout_controls_box.set_margin_right(6)
 
- tline_info_box = Gtk.HBox(False, 0) 
- tline_info_box.pack_start(Gtk.Label(), True, True, 0)
- tline_info_box.pack_start(self.monitor_tc_info.monitor_source, False, False, 0)
- tline_info_box.pack_start(self.monitor_tc_info.monitor_tc, False, False, 0)
- tline_info_box.pack_start(guiutils.pad_label(12, 2), False, False, 0)
- tline_info_box.pack_start(self.monitor_tc_info.widget, False, False, 0)
- guiutils.set_margins(tline_info_box, 0, 0, 0, 10)
- 
 if editorstate.SCREEN_WIDTH > 1550:
 menu_vbox = Gtk.HBox(True, 0)
 else:
@@ -250,22 +237,17 @@
 
 if editorpersistance.prefs.global_layout == appconsts.SINGLE_WINDOW:
 if editorstate.screen_size_small_width() == False:
- menu_vbox.pack_start(monitor_source_box, True, True, 0)
+ menu_vbox.pack_start(project_info_box, True, True, 0)
 else:
 menu_vbox.pack_start(guiutils.pad_label(24, 2), False, False, 0)
- menu_vbox.pack_start(monitor_source_box, False, False, 0)
+ menu_vbox.pack_start(project_info_box, False, False, 0)
 menu_vbox.pack_start(guiutils.pad_label(40, 2), False, False, 0)
- menu_vbox.pack_start(tline_info_box, True, True, 0)
- menu_vbox.override_background_color(Gtk.StateFlags.NORMAL, gui.get_mid_neutral_color())
+ menu_vbox.pack_start(layout_controls_box, True, True, 0)
 else:
- menubar_box.pack_start(guiutils.pad_label(8, 2), False, False, 0)
- 
- self.top_row_window_2 = Gtk.HBox(False, 0)
- self.top_row_window_2.pack_start(monitor_source_box, False, False, 0)
- self.top_row_window_2.pack_start(Gtk.Label(), True, True, 0)
- self.top_row_window_2.pack_start(tline_info_box, False, False, 0)
- monitor_source_box.set_margin_bottom(4)
- tline_info_box.set_margin_bottom(9)
+ menu_vbox.pack_start(project_info_box, True, True, 0)
+ menu_vbox.pack_start(layout_controls_box, True, True, 0)
+ tline_info_box = self._get_monitor_info_box()
+ self.top_row_window_2 = tline_info_box #Gtk.HBox(False, 0)
 
 # Pane
 pane = Gtk.VBox(False, 1)
@@ -282,7 +264,8 @@
 self.bin_list_view = guicomponents.BinTreeView(
 projectaction.bin_selection_changed,
 projectaction.bin_name_edited,
- projectaction.bins_panel_popup_requested)
+ projectaction.bins_panel_popup_requested,
+ projectaction.media_panel_to_front)
 dnd.connect_bin_tree_view(self.bin_list_view.treeview, projectaction.move_files_to_bin)
 self.bin_list_view.set_property("can-focus", True)
 
@@ -328,18 +311,20 @@
 # Effects edit panel
 info_row = clipeffectseditor.get_clip_effects_editor_info_row() 
 effects_editor_panel = guiutils.set_margins(clipeffectseditor.widgets.value_edit_frame, 4, 0, 4, 0)
-
 effects_vbox = Gtk.VBox()
 effects_vbox.pack_start(effects_editor_panel, True, True, 0)
 effects_vbox.pack_start(info_row, False, False, 0)
 
+
 if not(editorstate.SCREEN_HEIGHT < 1023):
 self.effects_panel = guiutils.set_margins(effects_vbox, 8, 0, 7, 2)
 else:
 self.effects_panel = effects_vbox
 
+ gui.apply_widget_css_class(self.effects_panel, "dark-bg", "dark-bg-class.css")
+
 # Effects select panel
- effect_select_panel, effect_select_list_view, effect_select_combo_box = panels.get_effect_selection_panel(clipeffectseditor.effect_select_row_double_clicked)
+ effect_select_panel, effect_select_list_view, effect_select_combo_box = panels.get_effect_selection_panel(clipeffectseditor.effect_select_row_double_clicked)
 self.effect_select_panel = effect_select_panel
 self.effect_select_list_view = effect_select_list_view
 self.effect_select_combo_box = effect_select_combo_box
@@ -376,11 +361,12 @@
 # Multi empty panel
 multi_empty_vbox = Gtk.VBox(False, 0)
 multi_empty_vbox.pack_start(Gtk.Label(), True, True, 0)
- no_target = Gtk.Label(label=_("No Edit Target."))
+ no_target = Gtk.Label(label=_("No Edit Target.")) 
 no_target.set_sensitive(False)
 multi_empty_vbox.pack_start(no_target, False, False, 0)
 multi_empty_vbox.pack_start(Gtk.Label(), True, True, 0)
- 
+ gui.apply_widget_css_class(multi_empty_vbox, "dark-bg", "dark-bg-class.css")
+ 
 # Multi edit panel
 self.edit_multi = guicomponents.EditMultiStack()
 self.edit_multi.add_named(multi_empty_vbox, appconsts.EDIT_MULTI_EMPTY)
@@ -388,7 +374,7 @@
 self.edit_multi.add_named(compositors_panel, appconsts.EDIT_MULTI_COMPOSITORS)
 self.edit_multi.add_named(mediaplugins_panel, appconsts.EDIT_MULTI_PLUGINS)
 self.edit_multi.set_visible_child_name(appconsts.EDIT_MULTI_EMPTY)
- 
+ gui.apply_widget_css_class(self.edit_multi.widget, "dark-bg", "dark-bg-class.css")
 # Render panel
 try:
 render.create_widgets()
@@ -452,7 +438,7 @@
 top_project_vbox.pack_start(self.bins_panel, True, True, 0)
 top_project_vbox.pack_start(seq_panel, True, True, 0)
 
- self.top_project_panel = guiutils.set_margins(top_project_vbox, 4, 4, 0, 4)
+ self.top_project_panel = guiutils.set_margins(top_project_vbox, 0, 0, 0, 0)
 self.project_panel = None
 else:
 # Notebook project panel for smallest screens
@@ -488,8 +474,6 @@
 self.edit_buttons_frame.add(self.edit_buttons_row)
 guiutils.set_margins(self.edit_buttons_frame, 1, 0, 0, 0)
 
- self.edit_buttons_frame.override_background_color(Gtk.StateFlags.NORMAL, gui.get_mid_neutral_color())
- 
 # Position bar and decorative frame for it

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/glassbuttons.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/glassbuttons.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/gtkbuilder.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/gtkbuilder.py Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/gtkevents.py Added

@@ -0,0 +1,100 @@
+"""
+ 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, Gdk
+ 
+
+class SimpleStateEvent:
+ 
+ def __init__(self):
+ self.event = Gtk.get_current_event()
+ unknow_val, self.state = self.event.get_state()
+ 
+ def get_state(self):
+ return self.state
+
+ def get_gdk_event(self):
+ return self.event
+
+class ScrollEvent:
+ 
+ def __init__(self, dx, dy):
+ if dy == -1.0:
+ self.direction = Gdk.ScrollDirection.UP
+ elif dy == 1.0:
+ self.direction = Gdk.ScrollDirection.DOWN
+ elif dx == 1.0:
+ self.direction = Gdk.ScrollDirection.RIGHT
+ else:
+ self.direction = Gdk.ScrollDirection.LEFT
+
+ event = Gtk.get_current_event()
+ unknow_val, self.state = event.get_state()
+ 
+ def get_state(self):
+ return self.state
+
+
+class ButtonEvent:
+ 
+ def __init__(self, n_press, x, y):
+ 
+ self.x = x
+ self.y = y 
+ self.n_press = n_press
+
+ event = Gtk.get_current_event()
+ unknown_val, self.state = event.get_state()
+ 
+ self.type = event.type
+ self.button = event.button.button
+
+ def get_state(self):
+ return self.state
+
+class KeyPressEvent:
+
+ def __init__(self, event, keyval, keycode, state):
+ #event
+ self.keyval = keyval
+ self.keycode = keycode
+ self.state = state
+ 
+ def get_state(self):
+ return self.state
+
+class KeyPressEventAdapter:
+ 
+ def __init__(self, widget, callback, user_data=None, capture=False):
+ self.controller = Gtk.EventControllerKey.new(widget)
+ if capture != False:
+ self.controller.set_propagation_phase(Gtk.PropagationPhase.CAPTURE)
+ self.controller.connect("key-pressed", self.pressed_event)
+ self.widget = widget
+ self.callback = callback
+ self.user_data = user_data 
+ 
+ def pressed_event(self, event, keyval, keycode, state):
+ gdk_event = KeyPressEvent(event, keyval, keycode, state)
+ if self.user_data == None:
+ self.callback(self.widget, gdk_event)
+ else:
+ self.callback(self.widget, gdk_event, *user_data)
+

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/gui.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/gui.py Changed

@@ -24,6 +24,7 @@
 
 from gi.repository import Gtk, Gdk, GdkPixbuf
 
+import databridge
 import respaths
 
 
@@ -65,6 +66,8 @@
 comp_mode_launcher = None
 monitor_widget = None
 monitor_switch = None
+monitor_waveform_display = None
+
 # indexes match editmode values in editorstate.py
 notebook_buttons = None
 
@@ -93,7 +96,7 @@
     tline_column, play_b, effect_select_list_view, effect_select_combo_box, \
     project_info_vbox, big_tc, editmenu, notebook_buttons, tline_left_corner, \
     monitor_widget, bin_panel, monitor_switch, comp_mode_launcher, tline_render_strip, \
-    tline_cursor_manager
+    tline_cursor_manager, monitor_waveform_display
 
     editor_window = new_editor_window
 
@@ -109,7 +112,8 @@
 
     monitor_widget = editor_window.monitor_widget
     monitor_switch = editor_window.monitor_switch
-    
+    monitor_waveform_display = monitor_widget.waveform_display
+     
     tline_display = editor_window.tline_display
     tline_scale = editor_window.tline_scale
     tline_canvas = editor_window.tline_canvas
@@ -229,3 +233,14 @@
     group_icons"Blend" = GdkPixbuf.Pixbuf.new_from_file(respaths.IMAGE_PATH + "blend_filter.png")
 
     return group_icons
+
+def timeline_has_focus(): # copied from keyevents.by. maybe put in utils?
+    if(tline_canvas.widget.is_focus()
+       or tline_column.widget.is_focus()
+       or editor_window.tool_selector.widget.is_focus()
+       or (pos_bar.widget.is_focus() and timeline_visible())
+       or tline_scale.widget.is_focus()
+       or databridge.glass_buttons_default_focus_group_has_focus()):
+        return True
+
+    return False
\ No newline at end of file

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/guicomponents.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/guicomponents.py Changed

@@ -46,6 +46,7 @@
 from editorstate import current_bin
 from editorstate import PROJECT
 from editorstate import PLAYER
+import gtkbuilder
 import gui
 import guiutils
 import mltprofiles
@@ -326,10 +327,11 @@
     Middle column expands.
     """
 
-    def __init__(self, bin_selection_cb, bin_name_edit_cb, bins_popup_cb):
+    def __init__(self, bin_selection_cb, bin_name_edit_cb, bins_popup_cb, button_press_cb):
         GObject.GObject.__init__(self)
 
         self.bins_popup_cb = bins_popup_cb
+        self.button_press_cb = button_press_cb
 
        # Datamodel: icon, text, text (folder, name, item count)
         self.storemodel = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str)
@@ -402,8 +404,8 @@
     def _button_press_event(self, widget, event):
         if event.button == 3:
             self.bins_popup_cb(widget, event)
-
-
+        elif event.button == 1:
+            self.button_press_cb()
 
 # ------------------------------------------------- item lists
 class ImageTextImageListView(Gtk.VBox):
@@ -493,13 +495,14 @@
         self.arrow_path = respaths.IMAGE_PATH + "filter_save.png"
         
         # Set sequence name editable and connect 'edited' signal
+        self.icon_rend_1.props.xpad = 3
         self.text_rend_1.set_property("editable", True)
         self.text_rend_1.connect("edited",
                                  seq_name_edited_cb,
                                  (self.storemodel, 1))
 
         self.scroll.connect('button-press-event', self._button_press_event)
-        
+
     def fill_data_model(self):
         """
         Creates displayed data.
@@ -1333,13 +1336,10 @@
             self.widget.pack_start(filler, False, False, 0)
             self.row_widgets.append(filler)
             
-            info = Gtk.Label(label=_("Right Click to Add Media."))
-            info.set_sensitive(False)
-            dnd.connect_media_drop_widget(info)
-            filler = self._get_empty_filler(info)
-            self.widget.pack_start(filler, False, False, 0)
-            self.row_widgets.append(filler)
-            
+            self.add_info_text_row(_("Right Click to Add Media."))
+            self.add_info_text_row(_("\nRight Click on Timeline Clips, Media Items or"))
+            self.add_info_text_row(_("Tracks Column to access related features."))
+
             filler = self._get_empty_filler()
             dnd.connect_media_drop_widget(filler)
             self.row_widgets.append(filler)
@@ -1419,15 +1419,20 @@
         self.widget.show_all()
 
     def _get_empty_filler(self, widget=None):
-        filler = Gtk.EventBox()
-        filler.connect("button-press-event", lambda w,e: self.empty_pressed(w,e))
         if widget == None:
-            filler.add(Gtk.Label())
+            filler = gtkbuilder.EventBox(Gtk.Label(), "button-press-event", self.empty_pressed)
         else:
-            filler.add(widget)
+            filler = gtkbuilder.EventBox(widget, "button-press-event", self.empty_pressed)
         return filler
 
-
+    def add_info_text_row(self, txt):
+        info = Gtk.Label(label=txt)
+        info.set_sensitive(False)
+        dnd.connect_media_drop_widget(info)
+        filler = self._get_empty_filler(info)
+        self.widget.pack_start(filler, False, False, 0)
+        self.row_widgets.append(filler)
+            
 class MediaObjectWidget:
 
     def __init__(self, media_file, panel, selected_callback, release_callback, indicator_icon, is_selected_test):
@@ -1510,7 +1515,7 @@
         elif self.media_file.rating == appconsts.MEDIA_FILE_BAD:
             info_color = (0.85, 0.25, 0.25)
         if self.media_file.rating != appconsts.MEDIA_FILE_UNRATED:
-            cr.set_line_width(3.0)
+            cr.set_line_width(9.5)
             cr.set_source_rgb(*info_color)
             cr.move_to(0, h - 9.5)
             cr.line_to(w, h - 9.5)
@@ -1864,7 +1869,7 @@
         self.widget = cairoarea.CairoDrawableArea2( 140,
                                                     22,
                                                     self._draw)
-        self.font_desc = Pango.FontDescription("Bitstream Vera Sans Mono Condensed "+ str(15))
+        self.font_desc = Pango.FontDescription("Bitstream Vera Sans Mono Condensed " + str(15))
         
         # Draw consts
         x = 2
@@ -2093,8 +2098,8 @@
 
         self.marks_tc_display = MonitorInfoDisplay()
 
-        self.widget = Gtk.HBox()
-        self.widget.pack_start(self.marks_tc_display.widget, False, False, 0)
+        self.widget = self.marks_tc_display.widget # Gtk.HBox()
+        #self.widget.pack_start(self.marks_tc_display.widget, False, False, 0)
 
     def set_source_name(self, source_name):
         self.monitor_source.set_text(source_name)
@@ -2126,6 +2131,10 @@
         self.in_zeros_overlay = ""
         self.out_zeros_overlay = ""
         self.len_zeros_overlay = ""
+
+        self.mark_in_empty = True
+        self.mark_out_empty = True
+        self.len_empty = True
         
         # Draw consts
         x = 2
@@ -2161,23 +2170,29 @@
         if mark_in != -1:
             mark_in_info = utils.get_tc_string(mark_in)
             self.in_zeros_overlay = utils.get_tc_zeros_overlay_fine_grained(mark_in)
+            self.mark_in_empty = False
         else:
-            mark_in_info = " - - : - - : - - : - - "
+            mark_in_info = " - - : - - : - - : - -"
+            self.mark_in_empty = True
         self.in_str = mark_in_info
         
         if mark_out != -1:
             mark_out_info = utils.get_tc_string(mark_out)
             self.out_zeros_overlay = utils.get_tc_zeros_overlay_fine_grained(mark_out)
+            self.mark_out_empty = False
         else:
             mark_out_info =  " - - : - - : - - : - - "
+            self.mark_out_empty = True
         self.out_str = mark_out_info
 
         range_len = mark_out - mark_in + 1 # +1, out incl.
         if mark_in != -1 and mark_out != -1:
             range_info = utils.get_tc_string(range_len)
             self.len_zeros_overlay = utils.get_tc_zeros_overlay_fine_grained(range_len)
+            self.len_empty = False
         else:
             range_info =  " - - : - - : - - : - - "
+            self.len_empty = True
         self.len_str = range_info
 
     def _draw(self, event, cr, allocation):
@@ -2195,12 +2210,13 @@
         cr.set_source_surface(self.marks_length_img, 205, 5)
         cr.paint()
         
+        is_tc = True
         # Tc Texts
-        self.draw_tc(cr, self.in_str, 21, 2, True)
+        self.draw_tc(cr, self.in_str, 21, 2, not self.mark_in_empty)
         self.draw_tc(cr, self.in_zeros_overlay, 21, 2, False)
-        self.draw_tc(cr, self.out_str, 118, 2, True)
+        self.draw_tc(cr, self.out_str, 118, 2, not self.mark_out_empty)
         self.draw_tc(cr, self.out_zeros_overlay, 118, 2, False)
-        self.draw_tc(cr, self.len_str, 218, 2, True)
+        self.draw_tc(cr, self.len_str, 218, 2, not self.len_empty)
         self.draw_tc(cr, self.len_zeros_overlay, 218, 2, False)
 
     def draw_tc(self, cr, tc_text, x, y, is_tc):
@@ -2681,7 +2697,7 @@
 
 class MonitorSwitch:
     def __init__(self, callback):
-        self.WIDTH = 76
+        self.WIDTH = 94
         self.HEIGHT = 10
         
         self.press_fix = 6 # we don't get want to divide press exactly half, timeline gets more
@@ -2712,13 +2728,17 @@
             tline_draw_surface = self.tline_surface 
             clip_draw_surface = self.clip_active_surface
             
-        def_off = 10
+        def_off = 14
         y_off_tline = 3
         y_off_clip = 4
         mid_gap = 10
         y_off_tline = -1
         y_off_clip = 0

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/guipopover.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/guipopover.py Changed

@@ -286,8 +286,8 @@
             
         properties_section = Gio.Menu.new()
 
-        
-        add_menu_action_check(properties_section, _("Show Synch Relations"), "midbar.sync.showsync", editorpersistance.prefs.show_sync, "showsync", properties_set_callback)
+        add_menu_action_check(properties_section, _("Auto Sync Trim Single Childs"), "midbar.sync.autotrimsingle", editorpersistance.prefs.auto_sync_single_childs_on_trim, "autotrimsingle", properties_set_callback)
+        add_menu_action_check(properties_section, _("Show Sync Relations"), "midbar.sync.showsync", editorpersistance.prefs.show_sync, "showsync", properties_set_callback)
         _sync_menu.append_section(None, properties_section)
 
         mirror_section = Gio.Menu.new()
@@ -394,6 +394,7 @@
 
     section2 = Gio.Menu.new()
     add_menu_action(section2, _("Add Generator..."), "mediapanel.addgenerator", "add generator", callback)
+    add_menu_action(section2, _("Add Title..."), "mediapanel.addtitle", "add title", callback)
     add_menu_action(section2, _("Add Color Clip..."), "mediapanel.addcolorclip", "add color clip", callback)
     _media_panel_menu.append_section(None, section2)
     
@@ -462,7 +463,7 @@
 
     _trimview_popover = new_popover(widget, _trimview_menu, launcher)
 
-def monitor_view_popupmenu_show(launcher, widget, callback, callback_opacity):
+def monitor_view_popupmenu_show(launcher, widget, callback, callback_opacity, waveform_callback):
     global _monitorview_popover, _monitorview_menu, _opacity_section, _opacity_submenu
 
     if _monitorview_menu == None:
@@ -476,6 +477,11 @@
         add_menu_action_all_items_radio(view_section, items_data, "monitor.viewimage", active_index, callback)
         _monitorview_menu.append_section(None, view_section)
 
+        #checked_state = editorpersistance.prefs.show_waveform_in_monitor
+        #waveform_section =  Gio.Menu.new()
+        #add_menu_action_check(waveform_section, _("Show Clip Audio Waveform In Monitor"), "monitor.audiowaveform", checked_state, "monitor_waveform", waveform_callback)
+        #_monitorview_menu.append_section(None, waveform_section)
+        
         _opacity_section = menu_clear_or_create(_opacity_section)
         _opacity_submenu = menu_clear_or_create(_opacity_submenu)
         items_data = ( _("100%"), "3"), ( _("80%"), "4"), ( _("50%"), "5"), ( _("20%"), "6")

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/guiutils.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/guiutils.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/jobs.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/jobs.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/keyevents.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/keyevents.py Changed

@@ -44,6 +44,7 @@
 import modesetting
 import monitorevent
 import movemodes
+import multitrimmode
 import shortcuts
 import shortcutsquickeffects
 import syncsplitevent
@@ -97,10 +98,12 @@
 
 # ------------------------------------- keyboard events
 def key_down(widget, event):
+    
+    #print (_get_shortcut_action(event))
+    
     """
     Global key press listener.
     """
-
     # Handle ESCAPE.
     if event.keyval == Gdk.KEY_Escape:
         if editorstate.current_is_move_mode() == False:
@@ -115,19 +118,6 @@
     if render.widgets.file_panel.movie_name.has_focus():
         return False
 
-    # Compositor editors keyevents
-    was_handled = _handle_geometry_editor_keys(event)
-    if was_handled:
-        # Stop widget focus from travelling if arrow key pressed.
-        gui.editor_window.window.emit_stop_by_name("key_press_event")
-        return True
-
-    was_handled = _handle_effects_editor_keys(event)
-    if was_handled:
-        # Stop widget focus from travelling if arrow key pressed
-        gui.editor_window.window.emit_stop_by_name("key_press_event")
-        return True
-
     # If timeline widgets are in focus timeline keyevents are available.
     if _timeline_has_focus():
         was_handled = _handle_tline_key_event(event)
@@ -151,38 +141,13 @@
     # Pressing timeline button obviously leaves user expecting
     # to have focus in timeline.
     if gui.monitor_switch.widget.has_focus() and timeline_visible():
-        _handle_tline_key_event(event)
-        return True
+        was_handled = _handle_tline_key_event(event)
+        return was_handled
 
-    # Events that are available when monitor displays clip.
-    if gui.monitor_switch.widget.has_focus() and (not timeline_visible()):
-        _handle_clip_key_event(event)
-        return True
-    # Events that are available when monitor displays clip
-    if gui.pos_bar.widget.is_focus() and (not timeline_visible()):
-        _handle_clip_key_event(event)
-        return True
-        
     #  Handle non-timeline delete.
     if event.keyval == Gdk.KEY_Delete:
         return _handle_delete()
 
-    # Home
-    if event.keyval == Gdk.KEY_Home:
-        if PLAYER().is_playing():
-            monitorevent.stop_pressed()
-        PLAYER().seek_frame(0)
-        _move_to_beginning()
-        return True
-
-    # End
-    if event.keyval == Gdk.KEY_End:
-        if PLAYER().is_playing():
-            monitorevent.stop_pressed()
-        PLAYER().seek_end()
-        _move_to_end()
-        return True
-
     # Select all with CTRL + A in media panel.
     if event.keyval == Gdk.KEY_a:
         if (event.get_state() & Gdk.ModifierType.CONTROL_MASK):
@@ -195,6 +160,7 @@
         return True
 
     # Key event was not handled here.
+    #print(_get_shortcut_action(event), " not handled")
     return False
     
 def _timeline_has_focus():
@@ -219,319 +185,14 @@
     tool_was_selected = workflow.tline_tool_keyboard_selected(event)
     if tool_was_selected == True:
         return True
-    
-
-    action = _get_shortcut_action(event)
-    prefs = editorpersistance.prefs
-
-
-    if action == 'mark_in':
-        monitorevent.mark_in_pressed()
-        return True
-    if action == 'to_mark_in':
-        monitorevent.to_mark_in_pressed()
-        return True
-    if action == 'zoom_out':
-        updater.zoom_out()
-    if action == 'zoom_in':
-        updater.zoom_in()
-    if action == 'mark_out':
-        monitorevent.mark_out_pressed()
-        return True
-    if action == 'to_mark_out':
-        monitorevent.to_mark_out_pressed()
-        return True
-    if action == 'clear_mark_in':
-        targetactions.clear_mark_in()
-        return True
-    if action == 'clear_mark_out':
-        targetactions.clear_mark_out()
-        return True
-    if action == 'clear_io_marks':
-        monitorevent.marks_clear_pressed()
-        return True
-    if action == 'play':
-        targetactions.play()
-        return True
-    if action == 'stop':
-        targetactions.stop()
-        return True
-    if action == 'play_pause':
-        if PLAYER().is_playing():
-            monitorevent.stop_pressed()
-        else:
-            monitorevent.play_pressed()
-        return True
-    if action == 'play_pause_loop_marks':
-        if PLAYER().is_playing():
-            monitorevent.stop_pressed()
-        else:
-            monitorevent.start_marks_looping()
-        return True
-    if action == 'display_clip_in_monitor':
-        targetactions.display_clip_in_monitor()
-        return True
-    if action == 'display_sequence_in_monitor':
-        targetactions.display_sequence_in_monitor()
-        return True
-    if action == 'switch_monitor':
-        updater.switch_monitor_display()
-        return True
-    if action == 'add_marker':
-        tlineaction.add_marker()
-        return True    
-    if action == 'cut':
-        tlineaction.cut_pressed()
-        return True
-    if action == 'cut_all':
-        tlineaction.cut_all_pressed()
-        return True
-    if action == 'sequence_split':
-        tlineaction.sequence_split_pressed()
-        return True
-    if action == 'log_range':
-        medialog.log_range_clicked()
-        return True
-    if action == 'toggle_ripple':
-        gui.editor_window.toggle_trim_ripple_mode()
-        return True
-    if action == 'select_next':
-        monitorevent.select_next_clip_for_filter_edit()
-        return True
-    if action == 'select_prev':
-        monitorevent.select_prev_clip_for_filter_edit()
-        return True
-    if action == 'trim_start':
-        tlineaction.trim_start_pressed()
-        return True
-    if action == 'trim_end':
-        tlineaction.trim_end_pressed()
-        return True
-    if action == 'monitor_show_video':
-        tlineaction.set_monitor_display_mode(appconsts.PROGRAM_OUT_MODE)
-        return True
-    if action == 'monitor_show_scope':
-        tlineaction.set_monitor_display_mode(appconsts.VECTORSCOPE_MODE)
-        return True
-    if action == 'monitor_show_rgb':
-        tlineaction.set_monitor_display_mode(appconsts.RGB_PARADE_MODE)
-        return True
-    if action == 'set_length':
-        tlineaction.set_length_from_keyevent()
-    if action == 'clear_sync_relation':
-        syncsplitevent.clear_sync_relation_from_keyevent()
-    if action == 'toggle_audio_mute':
-        tlineaction.mute_clip_from_keyevent()
-    if action == 'set_sync_relation':
-        syncsplitevent.init_select_master_clip_from_keyevent()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/keyframeeditor.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/keyframeeditor.py Changed

@@ -38,6 +38,7 @@
 import cairoarea
 import callbackbridge
 import compositorfades
+import copypaste
 import dialogutils
 from editorstate import PLAYER
 from editorstate import current_sequence
@@ -855,19 +856,22 @@
 
 # Position entry
 self.kf_pos_label = Gtk.Label()
- self.modify_font(Pango.FontDescription("light 8"))
+ self.modify_font(Pango.FontDescription("normal 9"))
 self.kf_pos_label.set_text("0")
 self.kf_pos_label.set_size_request(70, 10)
 self.kf_info_label = Gtk.Label()
- self.kf_info_label.set_text("1/1")
- 
+ self.kf_info_label.set_markup("1 / 1")
+ self.kf_info_label.set_size_request(40, 10)
+ 
 # Build row
 if centered_buttons:
 self.pack_start(Gtk.Label(), True, True, 0)
 
 if show_hamburger:
 self.pack_start(self.hamburger_menu.widget, False, False, 0)
- self.pack_start(guiutils.pad_label(8,4), False, False, 0)
+ self.pack_start(guiutils.pad_label(6,4), False, False, 0)
+ self.pack_start(self.kf_info_label, False, False, 0)
+ self.pack_start(guiutils.pad_label(6,4), False, False, 0)
 self.pack_start(self.add_button, False, False, 0)
 self.pack_start(self.delete_button, False, False, 0)
 self.pack_start(self.prev_kf_button, False, False, 0)
@@ -884,21 +888,19 @@
 self.pack_start(Gtk.Label(), True, True, 0)
 else:
 pass
- 
- self.pack_start(self.kf_info_label, False, False, 0)
- 
+
 if centered_buttons:
 self.pack_start(Gtk.Label(), True, True, 0)
 else:
 self.pack_start(guiutils.get_pad_label(1, 10), False, False, 0)
- 
+
 def set_frame(self, frame):
 frame_str = utils.get_tc_string(frame)
 self.kf_pos_label.set_text(frame_str)
 
 def set_kf_info(self, info):
 active_index, total = info
- self.kf_info_label.set_text(str(active_index + 1) + "/" + str(total))
+ self.kf_info_label.set_markup("" + str(active_index + 1) + " / " + str(total))
 
 def set_buttons_sensitive(self, sensitive):
 self.add_button.set_sensitive(sensitive)
@@ -1267,9 +1269,9 @@
 self.clip_editor.set_active_kf_type(kf_type)
 except:
 if msg == "copykf":
- keyevents.copy_action()
+ copypaste.copy_action()
 elif msg == "pastekf":
- keyevents.paste_action()
+ copypaste.paste_action()
 elif msg == "clonekfnext":
 self.clip_editor.clone_value_from_next()
 elif msg == "clonekfprev":
@@ -1754,9 +1756,9 @@
 self._center_horizontal()
 self._center_vertical()
 elif msg == "copykf":
- keyevents.copy_action()
+ copypaste.copy_action()
 elif msg == "pastekf":
- keyevents.paste_action()
+ copypaste.paste_action()
 elif msg == "clonekfnext":
 self._clone_value_from_next()
 elif msg == "clonekfprev":
@@ -1845,8 +1847,8 @@
 def mouse_scroll_down(self):
 view_size_index = self.geom_buttons_row.size_select.get_active()
 view_size_index = view_size_index + 1
- if view_size_index > 2:
- view_size_index = 2
+ if view_size_index > 3:
+ view_size_index = 3
 self.geom_buttons_row.size_select.set_active(view_size_index)
 
 def _hamburger_pressed(self, launcher, widget, event, data):
@@ -1900,8 +1902,8 @@
 action_section = Gio.Menu.new()
 guipopover.add_menu_action(action_section, _("Center Horizontal"), "keyframes.hcenterkftwo", "hcenter", self._menu_item_activated)
 guipopover.add_menu_action(action_section, _("Center Vertical"), "keyframes.vcenterkftwo", "vcenter", self._menu_item_activated)
- guipopover.add_menu_action(action_section, _("Reset"), "keyframes.resetkftwo", "reset", self._menu_item_activated)
- guipopover.add_menu_action(action_section, _("Reset Geometry"), "keyframes.ratiokftwo", "ratio", self._menu_item_activated)
+ guipopover.add_menu_action(action_section, _("Reset Geometry"), "keyframes.resetkftwo", "reset", self._menu_item_activated)
+ guipopover.add_menu_action(action_section, _("Reset Aspect Ratio"), "keyframes.ratiokftwo", "ratio", self._menu_item_activated)
 _kf_menu.append_section(None, action_section)
 
 _kf_popover = guipopover.new_popover(widget, _kf_menu, launcher)
@@ -2446,8 +2448,8 @@
 def mouse_scroll_down(self):
 view_size_index = self.geom_buttons_row.size_select.get_active()
 view_size_index = view_size_index + 1
- if view_size_index > 2:
- view_size_index = 2
+ if view_size_index > 3:
+ view_size_index = 3
 self.geom_buttons_row.size_select.set_active(view_size_index)
 
 def _hamburger_pressed(self, launcher, widget, event, data):
@@ -2474,8 +2476,8 @@
 action_section = Gio.Menu.new()
 guipopover.add_menu_action(action_section, _("Center Horizontal"), "keyframes.hcenterkffive", "hcenter", self._menu_item_activated)
 guipopover.add_menu_action(action_section, _("Center Vertical"), "keyframes.vcenterkffive", "vcenter", self._menu_item_activated)
- guipopover.add_menu_action(action_section, _("Reset"), "keyframes.resetkffive", "reset", self._menu_item_activated)
- guipopover.add_menu_action(action_section, _("Reset Geometry"), "keyframes.ratiokffive", "ratio", self._menu_item_activated)
+ guipopover.add_menu_action(action_section, _("Reset Geometry"), "keyframes.resetkffive", "reset", self._menu_item_activated)
+ guipopover.add_menu_action(action_section, _("Reset Aspect Ratio"), "keyframes.ratiokffive", "ratio", self._menu_item_activated)
 _kf_menu.append_section(None, action_section)
 
 motion_section = Gio.Menu.new()
@@ -2548,9 +2550,9 @@
 self.update_editor_view_with_frame(frame)
 self.update_property_value()
 elif msg == "copykf":
- keyevents.copy_action()
+ copypaste.copy_action()
 elif msg == "pastekf":
- keyevents.paste_action()
+ copypaste.paste_action()
 elif msg == "add_movement":
 self._show_add_movement_dialog()
 
@@ -2705,8 +2707,8 @@
 def mouse_scroll_down(self):
 view_size_index = self.geom_buttons_row.size_select.get_active()
 view_size_index = view_size_index + 1
- if view_size_index > 2:
- view_size_index = 2
+ if view_size_index > 3:
+ view_size_index = 3
 self.geom_buttons_row.size_select.set_active(view_size_index)

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/keygtkactions.py Added

@@ -0,0 +1,410 @@
+"""
+ 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 Gdk
+
+import appconsts
+import clipeffectseditor
+import compositeeditor
+import compositormodes
+import editorpersistance
+import editorstate
+from editorstate import PLAYER
+from editorstate import current_sequence
+import gui
+import keyframeeditor
+import kftoolmode
+import medialog
+import monitorevent
+import movemodes
+import multitrimmode
+import projectaction
+import shortcuts
+import syncsplitevent
+import tlineaction
+import tlinewidgets
+import trackaction
+import trimmodes
+import updater
+
+# Widget names for action target setting and look up.
+SEQUENCE_LIST_VIEW = "sequencelistview"
+BIN_LIST_VIEW = "binlistview"
+LOG_LIST_VIEW = "loglistview"
+TLINE_CANVAS = "tlinecanvas"
+TLINE_TRACK_COLUMN = "tlinetrackcolumn"
+TLINE_SCALE = "tlinescale"
+POS_BAR = "posbar"
+TLINE_LEFT_CORNER = "tlineleftcorner"
+TLINE_SCROLL = "tlinescroll"
+TLINE_MONITOR_DISPLAY = "tlinemonitordisplay"
+TLINE_ALL = TLINE_CANVAS, TLINE_TRACK_COLUMN, TLINE_SCALE, TLINE_LEFT_CORNER, TLINE_SCROLL, TLINE_MONITOR_DISPLAY
+MONITOR_SWITCH = "monitorswitch"
+MONITOR_WAVEFORM_DISPLAY = "monitorwaveformdisplay"
+MONITOR_ALL = MONITOR_SWITCH, MONITOR_WAVEFORM_DISPLAY, POS_BAR
+MIDDLE_BUTTONS_1 = "midbar_b_1"
+MIDDLE_BUTTONS_2 = "midbar_b_2"
+MIDDLE_BUTTONS_3 = "midbar_b_3"
+MIDDLE_BUTTONS_4 = "midbar_b_4"
+MIDDLE_BUTTONS_5 = "midbar_b_5"
+MIDDLE_BUTTONS_6 = "midbar_b_6"
+MIDDLEBAR_BUTTONS = MIDDLE_BUTTONS_1, MIDDLE_BUTTONS_2, MIDDLE_BUTTONS_3, MIDDLE_BUTTONS_4, MIDDLE_BUTTONS_5, MIDDLE_BUTTONS_6
+TLINE_MONITOR_ALL = TLINE_ALL + MONITOR_ALL + MIDDLEBAR_BUTTONS
+
+# widget name -> widget object
+_widgets = {}
+# widget -> ShortCutController object
+_controllers = {}
+
+
+def init():
+ # Build _widgets data struct with live objects.
+ global _widgets
+ _widgets = {TLINE_CANVAS: gui.tline_canvas.widget,
+ TLINE_TRACK_COLUMN: gui.tline_column.widget,
+ TLINE_SCALE: gui.tline_scale.widget,
+ POS_BAR: gui.pos_bar.widget,
+ TLINE_LEFT_CORNER: gui.tline_left_corner.widget,
+ TLINE_SCROLL: gui.tline_scroll,
+ TLINE_MONITOR_DISPLAY: gui.tline_display,
+ MONITOR_SWITCH: gui.monitor_switch.widget,
+ MONITOR_WAVEFORM_DISPLAY: gui.monitor_waveform_display.widget,
+ SEQUENCE_LIST_VIEW: gui.sequence_list_view,
+ BIN_LIST_VIEW: gui.bin_list_view, 
+ LOG_LIST_VIEW: gui.editor_window.media_log_events_list_view,
+ MIDDLE_BUTTONS_1: gui.editor_window.zoom_buttons.widget,
+ MIDDLE_BUTTONS_2: gui.editor_window.edit_buttons.widget,
+ MIDDLE_BUTTONS_3: gui.editor_window.edit_buttons_3.widget, 
+ MIDDLE_BUTTONS_4: gui.editor_window.edit_buttons_2.widget, 
+ MIDDLE_BUTTONS_5: gui.editor_window.monitor_insert_buttons.widget, 
+ MIDDLE_BUTTONS_6: gui.editor_window.undo_redo.widget}
+
+ # Create actions
+ _create_action("mark_in", monitorevent.mark_in_pressed, TLINE_MONITOR_ALL)
+ _create_action("to_mark_in", monitorevent.to_mark_in_pressed, TLINE_MONITOR_ALL)
+ _create_action("mark_out", monitorevent.mark_out_pressed, TLINE_MONITOR_ALL)
+ _create_action("to_mark_out", monitorevent.to_mark_out_pressed, TLINE_MONITOR_ALL)
+ _create_action("clear_io_marks", monitorevent.marks_clear_pressed, TLINE_MONITOR_ALL)
+ _create_action("zoom_out", updater.zoom_out, TLINE_MONITOR_ALL)
+ _create_action("zoom_in", updater.zoom_in, TLINE_MONITOR_ALL)
+ _create_action("switch_monitor", updater.switch_monitor_display, TLINE_MONITOR_ALL)
+ _create_action("add_marker", tlineaction.add_marker, TLINE_MONITOR_ALL)
+ _create_action("cut", tlineaction.cut_pressed, TLINE_ALL)
+ _create_action("cut_all", tlineaction.cut_all_pressed, TLINE_ALL)
+ _create_action("log_range", medialog.log_range_clicked, TLINE_MONITOR_ALL)
+ _create_action("set_length", tlineaction.set_length_from_keyevent, TLINE_ALL)
+ _create_action("insert", tlineaction.insert_button_pressed, TLINE_MONITOR_ALL)
+ _create_action("append", tlineaction.append_button_pressed, TLINE_MONITOR_ALL)
+ _create_action("3_point_overwrite", tlineaction.three_point_overwrite_pressed, TLINE_MONITOR_ALL)
+ _create_action("overwrite_range", tlineaction.range_overwrite_pressed, TLINE_MONITOR_ALL)
+ _create_action("trim_start", tlineaction.trim_start_pressed, TLINE_ALL)
+ _create_action("trim_end", tlineaction.trim_end_pressed, TLINE_ALL)
+ _create_action("toggle_audio_mute", tlineaction.mute_clip_from_keyevent, TLINE_ALL)
+ _create_action("nudge_back", lambda: movemodes.nudge_selection(-1), TLINE_ALL)
+ _create_action("nudge_forward", lambda: movemodes.nudge_selection(1), TLINE_ALL)
+ _create_action("nudge_back_10", lambda: movemodes.nudge_selection(-10), TLINE_ALL)
+ _create_action("nudge_forward_10", lambda: movemodes.nudge_selection(10), TLINE_ALL)
+ _create_action("select_next", monitorevent.select_next_clip_for_filter_edit, TLINE_MONITOR_ALL)
+ _create_action("select_prev", monitorevent.select_prev_clip_for_filter_edit, TLINE_MONITOR_ALL)
+ _create_action("toggle_track_output", trackaction.toggle_track_output, TLINE_ALL)
+ _create_action("split_selected", tlineaction.split_audio_synched_button_pressed, TLINE_ALL)
+ _create_action("set_sync_relation", syncsplitevent.init_select_master_clip_from_keyevent, TLINE_ALL)
+ _create_action("clear_sync_relation", syncsplitevent.clear_sync_relation_from_keyevent, TLINE_ALL)
+ _create_action("slower", monitorevent.j_pressed, TLINE_MONITOR_ALL)
+ _create_action("stop", monitorevent.k_pressed, TLINE_MONITOR_ALL)
+ _create_action("faster", monitorevent.l_pressed, TLINE_MONITOR_ALL)
+ _create_action("play_pause", _play_pause_action, TLINE_MONITOR_ALL)
+ _create_action("prev_frame", _prev_frame_action, TLINE_MONITOR_ALL, True)
+ _create_action("next_frame", _next_frame_action, TLINE_MONITOR_ALL, True)
+ _create_action("next_cut", _next_cut_action, TLINE_MONITOR_ALL)
+ _create_action("prev_cut", _prev_cut_action, TLINE_MONITOR_ALL)
+ _create_action("enter_edit", _enter_edit_action, TLINE_ALL)
+ _create_action("delete", _tline_delete_action, TLINE_ALL)
+ _create_action("lift", tlineaction.lift_button_pressed, TLINE_ALL) 
+ _create_action("play_pause_loop_marks", _play_pause_loop_marks_action, TLINE_MONITOR_ALL)
+ _create_action("to_start", _to_start_action, TLINE_MONITOR_ALL)
+ _create_action("to_end", _to_end_action, TLINE_MONITOR_ALL)
+ _create_action("delete", _delete_sequence_action, SEQUENCE_LIST_VIEW)
+ _create_action("delete", _delete_bin_action, BIN_LIST_VIEW)
+ _create_action("delete", _delete_log_action, LOG_LIST_VIEW)
+ _create_action("append_from_bin", projectaction.append_selected_media_clips_into_timeline, TLINE_MONITOR_ALL)
+ _create_action("resync", tlineaction.resync_track_button_pressed, TLINE_MONITOR_ALL) # Currently menu global gets to this firsts.
+ _create_action("monitor_show_video", lambda: tlineaction.set_monitor_display_mode(appconsts.PROGRAM_OUT_MODE), TLINE_MONITOR_ALL)
+ _create_action("monitor_show_scope", lambda: tlineaction.set_monitor_display_mode(appconsts.VECTORSCOPE_MODE), TLINE_MONITOR_ALL)
+ _create_action("monitor_show_rgb", lambda: tlineaction.set_monitor_display_mode(appconsts.RGB_PARADE_MODE), TLINE_MONITOR_ALL)
+ _create_action("mark_selection_range", monitorevent.mark_selection_range_pressed, TLINE_MONITOR_ALL)
+
+def _create_action(action, press_func, widget_list, pass_event=False):
+ for widget_id in widget_list:
+ widget = _widgetswidget_id
+ #print(widget_id)
+ if widget in _controllers:
+ _controllerswidget.add_shortcut(action, press_func, pass_event)
+ else:
+ #print("ShortCutController")
+ _controllerswidget = ShortCutController(widget)
+ _controllerswidget.add_shortcut(action, press_func, pass_event)
+
+
+class ShortCutController:
+ def __init__(self, widget):
+ self.shortcuts = {}
+ self.widget = widget
+ self.widget.connect("key-press-event", lambda w, e: self._short_cut_handler(e))
+ 
+ def add_shortcut(self, action, press_func, pass_event):
+ self.shortcutsaction = (press_func, pass_event)
+ 
+ def _short_cut_handler(self, event):
+ action = shortcuts.get_shortcut_action(event)
+ #print("ShortCutController: ", action)
+ try:
+ press_func, pass_event = self.shortcutsaction
+ if pass_event == False:
+ press_func()
+ else:
+ press_func(event)
+ return True
+ except KeyError:
+ return False
+
+ 
+# --------------------------------------------------------- effect editors
+def connect_filter_widget(widget):
+ widget.connect("key-press-event", _filter_widget_keypress_handler)
+ children = widget.get_children()
+ for child in children:
+ child.connect("key-press-event", _filter_widget_keypress_handler)
+ 
+def _filter_widget_keypress_handler(widget, event):
+ action = shortcuts.get_shortcut_action(event)
+ focus_editor = _get_focus_keyframe_editor(clipeffectseditor.keyframe_editor_widgets)
+
+ if focus_editor != None:

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,154 +17,154 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr ""
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr ""
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr ""
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr ""
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr ""
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr ""
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr ""
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr ""
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr ""
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr ""
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr ""
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr ""
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr ""
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr ""
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
 "as the missing profile. "
 msgstr ""
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373
 msgid "Opening files with unknown extensions refused!"
 msgstr ""
 
-#: projectaction.py:371
+#: projectaction.py:374
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -172,110 +172,110 @@
 "\n"

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2021-02-28 16:18+0100\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -19,130 +19,130 @@
 "X-Language: cs_CZ\n"
 "X-Source-Language: C\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Žádné automatické ukládání"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 minutu"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 minuty"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 minut"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Příliš malá obrazovka pro tento program."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Nejmenší rozměry obrazovky pro tento program jsou 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Rozměry vaší obrazovky jsou "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Program nelze spustit z důvodu chyby v inicializaci složky XDG."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 "Flowblade ve verzi 2.6 (nebo novější) vyžaduje ke svému běhu MLT ve verzi "
 "6.18"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Verze MLT: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Pro běh Flowblade nainstalujte MLT 6.18 nebo novější."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Projekt předtím byl uložen"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Uložte projekt před zavřením pomocí Soubor → Uložit."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Otevírá se"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Položka záznamů chybí!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Cesta k chybějící položce:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Relativní hledání pro nahrazovací soubor v podsložkách souboru s projektem "
 "se nezdařilo."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Pro nahrání projektu budete potřebovat:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Otevřít projekt v nástroji pro nové odkazování na záznamy pro svázání "
 "záznamů s novými soubory, nebo"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Umístěte falešný soubor s přesně stejným názvem a cestou na pevný disk"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Otevřít projekt v nástroji pro odkazování záznamů"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Profil s popisem: „"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "“ nebyl při nahrávání nalezen!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -152,22 +152,22 @@
 "popisem\n"
 "jako má chybějící profil. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr "Uživatelské profily lze vytvářet vybráním Úpravy → Správce profilů."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr "Otevírání animovaného souboru .gif bylo odmítnuto!"
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 "Flowblade nepodporuje zobrazování animovaných souborů GIF jako předmětů "
 "záznamů.\n"
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
@@ -175,11 +175,11 @@
 "Možným řešením je vykreslení GIF do sledu snímků a\n"
 "otevřít jej jako položku záznamu."
 
-#: projectaction.py:370

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2014-11-23 14:22+0100\n"
 "Last-Translator: Martin Wielebinski <blueray.mw@gmail.com>\n"
 "Language-Team: German\n"
@@ -20,126 +20,126 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Kein Auto-Save"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr ""
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Zu kleiner Bildschirm für diese Applikation."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Minimale Auflösung für diese Applikation ist 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Ihre Auflösung beträgt "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Kann Applikation wegen XDG-Ordner-Fehler nicht starten."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Flowblade Version 2.6 (und folgende) benötigt MLT ab Version 6.18"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Ihre MLT-Version ist: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Installieren Sie MLT 6.18 oder höher, um Flowblade zu nutzen."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Projekt wurde noch nicht gesichert"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Projekt vor dem Schließen sichern mit 'Datei -> Sichern als...'."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Öffnen"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Mediendatei fehlt!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Pfad der fehlenden Datei:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "Suche nach Ersatzdatei in Unterordnern des Projekts fehlgeschlagen."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Um das Projekt zu laden müssen Sie entweder:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Das 'Medien-Link'-Werkzeug nutzen, um Medien mit neuen Dateien zu "
 "verknüpfen, oder"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "eine Ersatz-Datei mit gleichem Namen und Pfad anlegen"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Öffne das Projekt im 'Medien-Link' Werkzeug"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Profil mit Beschreibung: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' wurde beim Laden nicht gefunden!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -149,21 +149,21 @@
 "Parametern\n"
 "wie im fehlenden Profil angelegt wird. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Nutzerprofile können unter 'Bearbeiten->Profil-Manager' angelegt werden."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr "Öffnen einer animierten GIF-Datei verweigert!"
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr "Flowblade unterstützt keine animierten GIF-Dateien als Medien.\n"
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
@@ -171,11 +171,11 @@
 "Zur Umgehung kann man ein GIF in eine Filmsequenz verwandeln und\n"
 "diese als Medium verwenden."
 
-#: projectaction.py:370
+#: projectaction.py:373
 msgid "Opening files with unknown extensions refused!"
 msgstr ""
 
-#: projectaction.py:371

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2024-08-12 13:54+0200\n"
 "Last-Translator: David Gámiz Jiménez <david.gamiz@gmail.com>\n"
 "Language-Team: David Gamiz Jimenez\n"
@@ -18,27 +18,27 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.4.3\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Sin guardado automático"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 min"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 minutos"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 minutos"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr "¡La ubicación de la carpeta de datos XDG ha cambiado!"
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
@@ -51,7 +51,7 @@
 "porque el valor de la variable Inicio de datos XDG ha cambiado.\n"
 "\n"
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
@@ -61,7 +61,7 @@
 "Los proyectos existentes con datos de proyecto guardados en el Almacén de "
 "datos XDG predeterminado seguirán funcionando.\n"
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
@@ -71,67 +71,67 @@
 "proyectos tendrán datos guardados en la ubicación especificada por la nueva "
 "variable de valor XDG Data Home."
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "La pantalla es demasiado pequeña para esta aplicación."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr ""
 "La dimensión de pantalla mínima para esta aplicación es de 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Las dimensiones de su pantalla son "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Cannot launch application because XDG folders init error."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Versión de MLT: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Install MLT 6.18 or higher to run Flowblade."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "El proyecto no se ha salvado antes"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Salvar el proyecto en un Archivo -> Salvar como antes de cerrar."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Abriendo"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "¡Falta un recurso multimedia!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Ruta del activo faltante:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Error en la búsqueda relativa del archivo de reemplazo en las subcarpetas "
 "del archivo del proyecto."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Para cargar el proyecto necesitarás:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
@@ -140,24 +140,24 @@
 "herramienta 'Media Relinker' para volver a vincular los recursos multimedia "
 "a nuevos archivos, o"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr ""
 "Coloque un archivo con exactamente el mismo nombre y ruta en el disco duro"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Abrir proyecto en la herramienta Media Relinker"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Perfil con descripción: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' ¡No se encontró en la carga!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -167,24 +167,24 @@
 "la misma descripción\n"
 "que el perfil faltante. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Los perfiles de usuario se pueden crear seleccionando 'Editar->Administrador "
 "de perfiles'."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr "¡Se rechazó la apertura del archivo .gif animado!"
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 "Flowblade no admite la visualización de archivos GIF animados como objetos "
 "multimedia.\n"
 
-#: projectaction.py:366
+#: projectaction.py:369

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2020-12-14 14:52+0100\n"
 "Last-Translator: Jean-Paul Favier <favijep@laposte.net>\n"
 "Language-Team: French\n"
@@ -22,109 +22,109 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.3\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Pas de sauvegarde automatique"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr ""
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Votre écran est trop petit pour cette application."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "La résolution minimum pour cet application est de 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Votre résolution actuelle est "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 "Ne peut pas lancer l'application à cause d'une erreur d'initialisation des "
 "dossiers XDG."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Flowblade version 2.6 ou supérieure demande MLT version 6.18"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Version MLT : "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Installez MLT 6.18 ou supérieure pour lancer Flowblade."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Le projet n'a jamais été sauvegardé"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 "Avant de fermer, sauvegardez le projet avec Menu Fichier -> "
 "Enregistrer sous."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Ouverture"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Le média est absent !"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Chemin du média manquant :"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Échec de la recherche du chemin relatif pour le fichier de remplacement dans "
 "les sous-dossiers du fichier projet."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Pour charger le projet vous avez besoin soit :"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
@@ -132,54 +132,54 @@
 "médias manquants\n"
 "ou"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr ""
 "De placer un fichier au nom et chemin identiques sur votre unité de stockage"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Ouvrir le projet dans l'outil Remplacement de médias"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Description : '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "'n'a pas été trouvé au chargement !"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
 "as the missing profile. "
 msgstr ""
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2017-03-24 08:40+0100\n"
 "Last-Translator: Péter Gábor <ptrg@freemail.hu>\n"
 "Language-Team: \n"
@@ -17,131 +17,131 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Nincs automatikus mentés"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 perc"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 perc"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 perc"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Túl kicsi a képernyő az alkalmazás számára."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "A minimális képernyőfelbontás ezen alkalmazás számára 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Az ön képernyőjének felbontása "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1031
+#: app.py:1042
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "MLT változat: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "A projekt korábban még nem volt mentve"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 "Mentse a projektet a Fájl -> Mentés másként menüpont használatával mielőtt "
 "bezárná."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Megnyitás"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Hiányzó média összetevő!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "A hiányzó média összetevő útvonala:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "A keresés a relatív útvonalakon a projekt almappáiban nem járt sikerrel."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "A projekt betöltéséhez szükség van a következők valamelyikére:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Projekt megnyitása a 'Média újracsatoló' eszközben a média összetevők "
 "újracsatolásához, vagy"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr ""
 "Helyezzen el egy fájlt teljesen megegyező névvel és útvonallal a meghajtón"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Projekt megnyitása a 'Média újracsatoló' eszközben"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "A profil ezzel a leírással: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' nem volt a megtalálható betöltés során!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -151,32 +151,32 @@
 "tartalmazó\n"
 "felhasználói profil létrehozása után."
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Felhasználói profilok létrehozhatók a 'Szerkesztés -> Profilkezelő' "
 "használatával."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Floblade Italian Translation 0.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2020-29-02 21:24+0200\n"
 "Last-Translator: Albano Battistella <albano_battistella@hotmail.com>\n"
 "Language-Team: Italiano\n"
@@ -20,128 +20,128 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.2.1\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Nessuno salvataggio automatico"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 min"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 min"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 min"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Lo schermo è troppo piccolo per questa applicazione."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "La risoluzione minima per questa applicazione è 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "La risoluzione corrente è "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1031
+#: app.py:1042
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "Versione MLT: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Il progetto non è mai stato salvato"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Salva il progetto da File -> Salva con nome prima di chiudere."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Apertura"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "File multimediale mancante!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Percorso del file mancante:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Non ho trovato nessun file sostitutivo nelle sottocartelle del progetto."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Per caricare il progetto è necessario:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Aprire il progetto in 'Media Relinker' per ricreare i collegamenti ai file "
 "multimediali, oppure"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Creare un file con lo stesso nome e percorso nel disco fisso"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Apri il progetto con Media Relinker"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Descrizione: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' non è stato trovato!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -151,31 +151,31 @@
 "la stessa descrizione\n"
 "del profilo mancante. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "I profili utente possono essere creati da 'Modifica->Gestione Profili'."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373
 msgid "Opening files with unknown extensions refused!"
 msgstr ""
 
-#: projectaction.py:371

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2024-08-27 10:29+0200\n"
 "Last-Translator: Stanislaw Polak <polak@agh.edu.pl>\n"
 "Language-Team: Polish\n"
@@ -18,27 +18,27 @@
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 3.4.4\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Brak autozapisu"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr ""
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr ""
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr "Zmieniła się lokalizacja folderu danych XDG!"
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
@@ -47,7 +47,7 @@
 "Lokalizacja Domyślnego magazynu danych XDG uległa zmianie, ponieważ "
 "zmieniła się wartość zmiennej XDG Data Home.\n"
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
@@ -55,7 +55,7 @@
 "Istniejące projekty z danymi projektu zapisanymi w Domyślnym magazynie "
 "danych XDG będą nadal działać,\n"
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
@@ -63,92 +63,92 @@
 "ale nowe projekty będą miały dane zapisane w lokalizacji określonej przez "
 "nową wartość zmiennej XDG Data Home."
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Zbyt mały ekran dla tej aplikacji."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Minimalne wymiary ekranu dla tej aplikacji to 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Wymiary twojego ekranu to "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 "Nie można uruchomić aplikacji, ponieważ wystąpił błąd inicjalizacji folderów "
 "XDG."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 "Flowblade w wersji 2.6 (lub nowszej) wymaga do działania MLT w wersji 6.18"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Twoja wersja MLT to: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Zainstaluj MLT 6.18 lub nowszy, aby uruchomić Flowblade."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Projekt nie został wcześniej zapisany"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Przed zamknięciem, zapisz projekt za pomocą Plik -> Zapisz jako."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Otwieranie"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Brak zasobów multimedialnych!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Ścieżka brakującego zasobu:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Względne wyszukiwanie plików zastępczych w podfolderach pliku projektu nie "
 "powiodło się."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Aby załadować projekt, musisz również:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Otwórz projekt w narzędziu 'Relinker Multimediów', aby powiązać zasoby "
 "multimedialne z nowymi plikami, lub"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Umieść plik o tej samej nazwie i ścieżce na dysku twardym"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Otwórz projekt w narzędziu Relinker Multimediów"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Profil z Opisem: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' nie został znaleziony podczas ładowania!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -158,23 +158,23 @@
 "dokładnie tym samym opisem \n"
 "jak w przypadku brakującego profilu. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Profile Użytkowników można tworzyć, wybierając 'Edytuj -> Manager Profili'."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr "Odmówiono otwarcia animowanego pliku .gif!"
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 "Flowblade nie obsługuje wyświetlania animowanych plików GIF jako obiektów "
 "multimedialnych.\n"
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Flowblade\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2023-06-20 15:06+0300\n"
 "Last-Translator: Смольянинов Николай <smolianinow.colya2016@yandex.ru>\n"
 "Language-Team: ru\n"
@@ -19,128 +19,128 @@
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Без автосохранения"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "каждую минуту"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "каждые 2 минуты"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "каждые 5 минут"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Недостаточное разрешение экрана."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Минимальное разрешение экрана должно быть не ниже 1152 х 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Разрешение вашего экрана "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Не удалось запустить приложение из-за ошибки инициализации папок XDG."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Для запуска Flowblade 2.6 (или выше) требуется версия MLT не ниже 6.18"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Ваша версия MLT: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Установите MLT 6.18 или выше для запуска Flowblade."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Проект не был сохранён"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Открытие"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Медиафайлы потеряны!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Путь к потерянному файлу:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Не удалось найти медиафайл по относительному пути во вложенных папках "
 "проекта для его замены."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Для загрузки проекта выполните одно из действий:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Откройте проект в «Перелинковщике медиа», чтобы повторно связать пути с "
 "новыми файлами"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Расположите файл по тому же пути и с тем же именем"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Открыть проект в Перелинковщике медиа"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Профиль с описанием: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' не найден при загрузке!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -150,23 +150,23 @@
 "были\n"
 "в потерянном профиле. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Пользовательские профили создаются через меню «Правка ⇨ Менеджер профилей»."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr "Открытие анимированного файла .gif невозможно!"
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 "Flowblade не поддерживает отображение анимированных файлов GIF\n"
 "в качестве медиаобъектов.\n"
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
@@ -174,11 +174,11 @@
 "Возможный обходной путь — это преобразование GIF в видеоряд\n"
 "и его открытие в качестве мультимедийного элемента."
 
-#: projectaction.py:370
+#: projectaction.py:373

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/tr/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/tr/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/tr/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/tr/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2021-04-04 15:07+0300\n"
 "Last-Translator: \n"
 "Language-Team: Türkçe\n"
@@ -18,129 +18,129 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Otomatik Kaydetme Yok"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 dakika"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 dakika"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 dakika"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Bu uygulama için çok küçük bir ekran."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Bu uygulama için Minimum ekran boyutları şunlardır 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Ekran boyutlarınız aşağıdaki gibidir "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr "XDG klasörleri başlangıç hatası nedeniyle uygulama başlatılamıyor."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 "Flowblade sürüm 2.6 (veya üstü) çalıştırmak için MLT sürüm 6.18 gerektirir"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "MLT sürümünüz şu şekildedir: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Flowblade çalıştırmak için MLT 6.18 veya daha yükseğini yükleyin."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Proje daha önce kaydedilmedi"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Projeyi dosyaya kaydedin -> kapatmadan önce Farklı Kaydet."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Açılan"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Ortam varlığı kayıptı!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Eksik varlığın yolu:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Proje dosyasının alt klasörlerinde yedek dosya için ilgili arama başarısız "
 "oldu."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Projeyi yüklemek için şunlardan birine ihtiyacınız olacak:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Medya varlıklarını yeni dosyalara yeniden bağlamak için 'Ortam Bağlama' "
 "aracında projeyi açın veya"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Sabit sürücüye aynı ad ve yola sahip bir dosya yerleştirin"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Projeyi Ortam Bağlama aracında aç"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Profil ile birlikte Tanımı: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' yük bulunamadı!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -150,23 +150,23 @@
 " sahip bir kullanıcı profili oluşturarak projeyi yüklemek mümkün\n"
 "kayıp profil olarak. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Kullanıcı Profilleri 'Düzenle->Profil Yöneticisi' seçerek oluşturulabilir."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr "Açılış animasyonlu .gif dosyası reddedildi!"
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 "Flowblade animasyonlu GIF dosyalarını ortam nesneleri olarak görüntülemeyi "
 "desteklemiyor.\n"
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
@@ -174,11 +174,11 @@
 "Olası bir geçici çözüm, GIF ortamını bir çerçeve dizisine dönüştürün ve\n"
 "bunu bir ortam öğesi olarak açın."
 
-#: projectaction.py:370

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/uk/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/uk/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/uk/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/uk/LC_MESSAGES/flowblade.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2021-01-15 21:19+0300\n"
 "Last-Translator: Микита Бесчастний <micitabesh1992@rambler.ua>\n"
 "Language-Team: \n"
@@ -19,127 +19,127 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "Без автозбереження"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 мін"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 мін"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 мін"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "Занадто маленький екран для цього додатка."
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Мінімальні розміри екрана для цієї програми - 1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "Ваші розміри екрана "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 "Програму не можна запустити, оскільки сталася помилка ініціалізації папки "
 "XDG."
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Flowblade версії 2.6 (або пізнішої) вимагає запуску MLT версії 6.18"
 
-#: app.py:1031
+#: app.py:1042
 msgid "Your MLT version is: "
 msgstr "Ваша версія MLT: "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Встановіть MLT 6.18 або вище для запуску Flowblade."
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "Проект раніше не зберігався"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "Перед закриттям збережіть проект через Файл -> Зберегти як."
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "Відкривається"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "Медіа-ресурс відсутній!"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "Шлях відсутнього ресурсу:"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "Помилка відносного пошуку файлів заміни у підпапках файлу проекту."
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "Для завантаження проекту вам потрібно:"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Відкрийте проект у Media Relinker, щоб пов’язати медіа з новими файлами, або"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Помістіть файл з тим самим іменем та шляхом на жорсткий диск"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "Відкрийте проект у Media Relinker"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "Профіль із описом: '"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "'не знайдено під час завантаження!"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -149,32 +149,32 @@
 "описом\n"
 "що стосується відсутнього профілю. "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Профілі користувачів можна створити, вибравши \"Редагувати -> Менеджер "
 "профілів\"."
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373
 msgid "Opening files with unknown extensions refused!"
 msgstr ""
 
-#: projectaction.py:371

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2017-04-15 18:47+0800\n"
 "Last-Translator: wu <laowudebox@126.com>\n"
 "Language-Team: Language LANGUAGE\n"
@@ -16,125 +16,125 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "无自动保存"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 min"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 min"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 min"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "对于这个应用，画面太小。"
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "对于这个应用，最小画面尺寸是1152 x 768.\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "你的画面尺寸是 "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1031
+#: app.py:1042
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "MLT 版本 "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "项目还未被保存过"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "在关闭之前通过菜单 文件 -> 另存为 保存项目"
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "正在打开"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "有用的媒体已丢失"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "已丢失的有用东西的路径"
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "在失败项目文件的子文件夹中搜索相关代替文件"
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "加载你将会需要的另一个项目"
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr "在媒体重新链接器工具中打开项目以便重新连接相关媒体到新文件，或者"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "放置一个名字和路径完全相同的的文件到硬盘上"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "在媒体重新链接器工具中打开项目"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "带有描述的配置文件"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "未找到加载内容"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -143,30 +143,30 @@
 "通过准确地创建一个用户配置文件来加载项目相同的描述\n"
 "作为已丢失的配置文件。 "
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr "用户配置文件可以通过选择“配置文件管理器”来创建"
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373
 msgid "Opening files with unknown extensions refused!"
 msgstr ""
 
-#: projectaction.py:371
+#: projectaction.py:374
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/zh_TW/LC_MESSAGES/flowblade.mo -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/zh_TW/LC_MESSAGES/flowblade.mo Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/locale/zh_TW/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/locale/zh_TW/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-06 10:43+0300\n"
+"POT-Creation-Date: 2025-12-05 16:57+0200\n"
 "PO-Revision-Date: 2018-12-31 10:20+0800\n"
 "Last-Translator: Steve Nian <sdnian@gmail.com>\n"
 "Language-Team: Chinese (traditional)\n"
@@ -16,125 +16,125 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.py:243
+#: app.py:246
 msgid "No Autosave"
 msgstr "不要自動保存"
 
-#: app.py:243
+#: app.py:246
 msgid "1 min"
 msgstr "1 分鐘"
 
-#: app.py:243
+#: app.py:246
 msgid "2 min"
 msgstr "2 分鐘"
 
-#: app.py:243
+#: app.py:246
 msgid "5 min"
 msgstr "5 分鐘"
 
-#: app.py:917
+#: app.py:928
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:918
+#: app.py:929
 msgid ""
 "Location of Default XDG Data Store has changed because value of "
 "XDG Data Home variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:919
+#: app.py:930
 msgid ""
 "Existing Projects with project data saved in Default XDG Data Store "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:920
+#: app.py:931
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value XDG Data Home variable ."
 msgstr ""
 
-#: app.py:1005
+#: app.py:1016
 msgid "Too small screen for this application."
 msgstr "畫面太小無法執行此應用程式"
 
-#: app.py:1007
+#: app.py:1018
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "此應用程式的最小螢幕解析度為 1152 x 768。\n"
 
-#: app.py:1008
+#: app.py:1019
 msgid "Your screen dimensions are "
 msgstr "你的螢幕解析度是 "
 
-#: app.py:1019
+#: app.py:1030
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1030
+#: app.py:1041
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1031
+#: app.py:1042
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "MLT 版本： "
 
-#: app.py:1031
+#: app.py:1042
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1105 projectaction.py:559 projectaction.py:761
+#: app.py:1116 projectaction.py:562 projectaction.py:764
 msgid "Project has not been saved previously"
 msgstr "先前的專案尚未儲存"
 
-#: app.py:1106 projectaction.py:560 projectaction.py:762
+#: app.py:1117 projectaction.py:563 projectaction.py:765
 msgid "Save project with File -> Save As before closing."
 msgstr "在結束之前，從 檔案 -> 另存新檔 來儲存專案。"
 
-#: projectaction.py:151
+#: projectaction.py:154
 msgid "Opening"
 msgstr "開啟中"
 
-#: projectaction.py:230
+#: projectaction.py:233
 msgid "Media asset was missing!"
 msgstr "媒體資產遺失！"
 
-#: projectaction.py:231
+#: projectaction.py:234
 msgid "Path of missing asset:"
 msgstr "遺失資產的路徑："
 
-#: projectaction.py:232
+#: projectaction.py:235
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "在專案檔案的子資料夾中相對尋找替代檔案失敗。"
 
-#: projectaction.py:233
+#: projectaction.py:236
 msgid "To load the project you will need to either:"
 msgstr "載入專案，您將需要："
 
-#: projectaction.py:234
+#: projectaction.py:237
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr "在 '媒體重新連接器' 工具中開啟專案來重新連結媒體資產到新的檔案，或"
 
-#: projectaction.py:235
+#: projectaction.py:238
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "在硬碟中的相同路徑放一個相同名稱的檔案"
 
-#: projectaction.py:236
+#: projectaction.py:239
 msgid "Open project in Media Relinker tool"
 msgstr "在媒體重新連接器工具開啟專案"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "Profile with Description: '"
 msgstr "載入專案描述： ''"
 
-#: projectaction.py:255
+#: projectaction.py:258
 msgid "' was not found on load!"
 msgstr "' 時未發現！"
 
-#: projectaction.py:256
+#: projectaction.py:259
 msgid ""
 "It is possible to load the project by creating a User Profile with exactly "
 "the same Description\n"
@@ -143,30 +143,30 @@
 "可以通過建立與遺失的專案完全相同描述的使用者檔案\n"
 "來載入專案。"
 
-#: projectaction.py:257
+#: projectaction.py:260
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr "使用者設定檔可以藉由 '編輯 -> 設定檔管理員' 來創建。"
 
-#: projectaction.py:364
+#: projectaction.py:367
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:365
+#: projectaction.py:368
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:369
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:370
+#: projectaction.py:373
 msgid "Opening files with unknown extensions refused!"
 msgstr ""
 
-#: projectaction.py:371
+#: projectaction.py:374
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/medialinker.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/medialinker.py Changed

@@ -53,6 +53,7 @@
 import mltinit
 import patternproducer
 import persistance
+import persistancecompat
 import projectdata
 import propertyparse
 import respaths
@@ -82,10 +83,29 @@
     def run(self):
         persistance.show_messages = False
         project = persistance.load_project(self.filename, False, True)
-        
+
+        # Fix backwards compatibility.
+        for seq in project.sequences:
+            persistancecompat.FIX_MISSING_SEQUENCE_ATTRS(seq)
+            persistancecompat.FIX_DEPRECATED_SEQUENCE_COMPOSITING_MODE(seq)
+            persistancecompat.FIX_FULLTRACK_COMPOSITING_MODE_COMPOSITORS(seq)
+            for track in seq.tracks:
+                persistancecompat.FIX_MISSING_TRACK_ATTRS(track)
+                for clip in track.clips:
+                    persistancecompat.FIX_MISSING_CLIP_ATTRS(clip)
+                    for filter in clip.filters:
+                        persistancecompat.FIX_MISSING_FILTER_ATTRS(filter)
+            for compositor in seq.compositors:
+                    persistancecompat.FIX_MISSING_COMPOSITOR_ATTRS(compositor)
+        for bin in project.bins:
+            persistancecompat.FIX_MISSING_BIN_ATTRS(bin)
+        for k, media_file in project.media_files.items():
+            persistancecompat.FIX_MISSING_MEDIA_FILE_ATTRS(media_file)
+
         global target_project
         target_project = project
         target_project.c_seq = project.sequencestarget_project.c_seq_index
+
         _update_media_assets()
 
         GLib.idle_add(self._load_done_update)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/medialog.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/medialog.py Changed

@@ -35,6 +35,8 @@
 import guicomponents
 import guipopover
 import guiutils
+import gtkevents
+import gtkbuilder
 import editorpersistance # Aug-2019 - SvdB - BB
 import editorstate
 from editorstate import PROJECT
@@ -543,6 +545,7 @@
         tree_sel = self.treeview.get_selection()
         tree_sel.set_mode(Gtk.SelectionMode.MULTIPLE)
         self.treeview.connect("button-press-event", log_list_view_button_press)
+        #gtkevents.connect(self.treeview, "button-press-event-button3", log_list_view_button_press)
         self.treeview.connect("row-activated", display_log_clip_double_click_listener)
                               
         # Column views
@@ -681,11 +684,11 @@
     star_not_active_label.set_from_file(respaths.IMAGE_PATH + guiutils.get_image_name("star_not_active"))
 
     star_button = Gtk.Button()
-    star_button.set_image(guiutils.get_image("star"))
+    gtkbuilder.button_set_image(star_button, "star")
     star_button.connect("clicked", lambda w: media_log_star_button_pressed())
 
     no_star_button = Gtk.Button()
-    no_star_button.set_image(guiutils.get_image("star_not_active"))
+    gtkbuilder.button_set_image(no_star_button, "star_not_active")
     no_star_button.connect("clicked", lambda w: media_log_no_star_button_pressed())
 
     widgets.group_box = Gtk.HBox()
@@ -708,22 +711,22 @@
     row1.pack_start(Gtk.Label(), True, True, 0)
 
     widgets.log_range = Gtk.Button()
-    widgets.log_range.set_image(guiutils.get_image("log_range"))
+    gtkbuilder.button_set_image(widgets.log_range, "log_range")
     widgets.log_range.set_size_request(80, 30)
     widgets.log_range.connect("clicked", lambda w:log_range_clicked())
 
     delete_button = Gtk.Button()
-    delete_button.set_image(guiutils.get_image("delete_log_range"))
+    gtkbuilder.button_set_image(delete_button, "delete_log_range")
     delete_button.set_size_request(80, 30)
     delete_button.connect("clicked", lambda w:delete_selected())
 
     insert_displayed = Gtk.Button()
-    insert_displayed.set_image(guiutils.get_image("insert_media_log"))
+    gtkbuilder.button_set_image(insert_displayed, "insert_media_log")
     insert_displayed.set_size_request(80, 22)
     insert_displayed.connect("clicked", lambda w:insert_selected_log_events())
 
     append_displayed = Gtk.Button()
-    append_displayed.set_image(guiutils.get_image("append_media_log"))
+    gtkbuilder.button_set_image(append_displayed, "append_media_log")
     append_displayed.set_size_request(80, 22)
     append_displayed.connect("clicked", lambda w:append_log_events())

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/middlebar.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/middlebar.py Changed

@@ -137,7 +137,8 @@
 def _create_buttons(editor_window):
 
     editor_window.big_TC = Gtk.Stack()
-    editor_window.big_TC.set_margin_top(5)
+    editor_window.big_TC.set_margin_top(4)
+    editor_window.big_TC.set_margin_bottom(1)
     tc_disp = guicomponents.BigTCDisplay()
     tc_entry = guicomponents.BigTCEntry()
     tc_disp.widget.show()
@@ -204,7 +205,7 @@
     editor_window.monitor_insert_buttons.add_button(guiutils.get_cairo_image("overwrite_clip"), tlineaction.three_point_overwrite_pressed)
     editor_window.monitor_insert_buttons.add_button(guiutils.get_cairo_image("insert_clip"), tlineaction.insert_button_pressed)
     editor_window.monitor_insert_buttons.add_button(guiutils.get_cairo_image("append_clip"), tlineaction.append_button_pressed)
-    tooltips = _("Overwrite Range"), _("Overwrite Clip - T"), _("Insert Clip - Y"), _("Append Clip - U")
+    tooltips = _("Overwrite Range"), _("Overwrite Selected Clip/s - T"), _("Insert Clip - Y"), _("Append Clip - U")
     tooltip_runner = glassbuttons.TooltipRunner(editor_window.monitor_insert_buttons, tooltips)
     editor_window.monitor_insert_buttons.no_decorations = no_decorations
     editor_window.monitor_insert_buttons.show_prelight_icons()
@@ -244,8 +245,7 @@
     global w
     w = window
 
-    buttons_row.pack_start(guiutils.get_pad_label(7, MIDDLE_ROW_HEIGHT), False, True, 0) 
-    buttons_row.pack_start(guiutils.get_pad_label(7, MIDDLE_ROW_HEIGHT), False, True, 0) #### NOTE!!!!!! THIS DETERMINES THE HEIGHT OF MIDDLE ROW
+    buttons_row.pack_start(guiutils.get_pad_label(0, MIDDLE_ROW_HEIGHT), False, True, 0) #### NOTE!!!!!! THIS DETERMINES THE HEIGHT OF MIDDLE ROW
     if editorpersistance.prefs.tools_selection == appconsts.TOOL_SELECTOR_IS_MENU:
         buttons_row.pack_start(w.tool_selector.widget, False, True, 0)
             
@@ -274,12 +274,53 @@
     buttons_row.pack_start(get_buttons_group(5), False, True, 0)
     buttons_row.pack_start(Gtk.Label(), True, True, 0)
 
-    buttons_row.pack_start(window.tools_buttons.widget, False, False, 0)
-    buttons_row.pack_start(guiutils.pad_label(12,2), False, False, 0)
-    buttons_row.pack_start(window.fullscreen_press.widget, False, False, 0)
     buttons_row.pack_start(guiutils.pad_label(6,2), False, False, 0)
-    buttons_row.pack_start(window.layout_press.widget, False, False, 0)
 
+def get_required_width():
+
+    w_tot = 0
+    wid, h = w.tool_selector.widget.get_preferred_width()
+    w_tot += int(wid)
+
+    if editorstate.screen_size_small_width() == False:
+        pad_w = 24
+    else:
+        pad_w = 5
+
+    wid, h = get_buttons_group(0).get_preferred_width()
+    w_tot += int(wid)
+    w_tot += pad_w
+
+    wid, h = get_buttons_group(1).get_preferred_width()
+    w_tot += int(wid)
+    w_tot += pad_w
+
+    wid, h = get_buttons_group(2).get_preferred_width()
+    w_tot += int(wid)
+    w_tot += pad_w
+
+    wid, h = get_buttons_group(3).get_preferred_width()
+    w_tot += int(wid)
+    w_tot += pad_w
+
+    wid, h = get_buttons_group(4).get_preferred_width()
+    w_tot += int(wid)
+    w_tot += pad_w
+
+    wid, h = get_buttons_group(5).get_preferred_width()
+    w_tot += int(wid)
+
+    wid, h = w.tools_buttons.widget.get_preferred_width()
+    w_tot += int(wid)
+    wid, h = w.fullscreen_press.widget.get_preferred_width()
+    w_tot += int(wid)
+    wid, h = w.layout_press.widget.get_preferred_width()
+    w_tot += int(wid)
+    w_tot += 24   
+    w_tot += 6
+
+    return w_tot
+    
 def _get_zoom_buttons_panel():    
     return w.zoom_buttons.widget
 
@@ -298,17 +339,6 @@
 def _get_monitor_insert_buttons():
     return w.monitor_insert_buttons.widget
 
-"""
-def _get_tools_buttons():
-    return w.tools_buttons.widget
-"""
-
-def _b(button, icon, remove_relief=False):
-    button.set_image(icon)
-    button.set_property("can-focus",  False)
-    if remove_relief:
-        button.set_relief(Gtk.ReliefStyle.NONE)
-
 def _clear_container(cont):
     children = cont.get_children()
     for child in children:

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/mltfilters.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/mltfilters.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/modesetting.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/modesetting.py Changed

@@ -51,24 +51,11 @@
     """
     Going to clip monitor exits active trimodes into non active trimmodes.
     """
-    if EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
-        oneroll_trim_no_edit_init()
-    elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:
-        pass
-    elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
-        tworoll_trim_no_edit_init()
-    elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM_NO_EDIT:
-        pass
-    else:
-        gui.editor_window.tline_cursor_manager.set_default_edit_tool()
-        
-    gui.editor_window.tline_cursor_manager.set_tool_selector_to_mode()
+    gui.editor_window.tline_cursor_manager.set_default_edit_tool()
 
 def set_post_undo_redo_edit_mode():
-    if EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
-        oneroll_trim_no_edit_init()
-    if EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
-        tworoll_trim_no_edit_init()
+    if EDIT_MODE() == editorstate.ONE_ROLL_TRIM or EDIT_MODE() == editorstate.TWO_ROLL_TRIM or EDIT_MODE() == editorstate.SLIDE_TRIM:
+        modesetting.set_default_edit_mode()
 
 def stop_looping():
     # Stop trim mode looping using trimmodes.py methods for it
@@ -106,23 +93,6 @@
 
     _set_move_mode()
 
-"""
-def box_mode_pressed():
-
-    stop_looping()
-    current_sequence().clear_hidden_track()
-    
-    # Box tool is implemented as sub mode of OVERWRITE_MOVE
-    editorstate.edit_mode = editorstate.OVERWRITE_MOVE
-    editorstate.overwrite_mode_box = True
-    boxmove.clear_data()
-    boxmove.entered_from_overwrite = False
-            
-    tlinewidgets.set_edit_mode(None, None) # these get set later for box move
-        
-    _set_move_mode()
-"""
-
 def multi_mode_pressed():
     """
     User selects Spacer tool.
@@ -142,41 +112,6 @@
     updater.repaint_tline()
 
 # -------------------------------------------------------------- one roll trim
-def oneroll_trim_no_edit_init():
-    """
-    This mode is entered and this method is called when:
-    - user first selects trim tool
-    - user does cut(X) action while in trim mode
-    - user clicks empty and preference is to keep using trim tool (to not exit to INSERT_MOVE)
-    """
-    stop_looping()
-    editorstate.edit_mode = editorstate.ONE_ROLL_TRIM_NO_EDIT
-    gui.editor_window.tline_cursor_manager.set_cursor_to_mode()
-    tlinewidgets.set_edit_mode(None, None) # No overlays are drawn in this edit mode
-    movemodes.clear_selected_clips() # Entering trim edit mode clears selection 
-    updater.set_trim_mode_gui()
-
-def oneroll_trim_no_edit_press(event, frame):
-    """
-    Mouse press while in ONE_ROLL_TRIM_NO_EDIT attempts to init edit and 
-    move to ONE_ROLL_TRIM mode.
-    """
-    success = oneroll_trim_mode_init(event.x, event.y)
-    if success:
-        trimmodes.oneroll_trim_move(event.x, event.y, frame, None)
-        trimmodes.submode = trimmodes.MOUSE_EDIT_ON
-        # additional mouse move and release handled at trimmodes because successful init editorstate.edit_mode = editorstate.ONE_ROLL_TRIM
-    else:
-        set_default_edit_mode(True)
-
-def oneroll_trim_no_edit_move(x, y, frame, state):
-    # Only presses are handled in ONE_ROLL_TRIM_NO_EDIT mode
-    pass
-
-def oneroll_trim_no_edit_release(x, y, frame, state):
-    # Only presses are handled in ONE_ROLL_TRIM_NO_EDIT mode
-    pass
-
 def oneroll_trim_mode_init(x, y):
     """
     User enters ONE_ROLL_TRIM mode from ONE_ROLL_TRIM_NO_EDIT 
@@ -194,34 +129,11 @@
     # init mode
     press_frame = tlinewidgets.get_frame(x)
     trimmodes.set_exit_mode_func = set_default_edit_mode
-    trimmodes.set_no_edit_mode_func = oneroll_trim_no_edit_init
+    trimmodes.set_no_edit_mode_func = set_default_edit_mode
     success = trimmodes.set_oneroll_mode(track, press_frame)
     return success
 
 # --------------------------------------------------------- two roll trim
-def tworoll_trim_no_edit_init():
-    stop_looping()
-    editorstate.edit_mode = editorstate.TWO_ROLL_TRIM_NO_EDIT
-    gui.editor_window.tline_cursor_manager.set_cursor_to_mode()
-    tlinewidgets.set_edit_mode(None, None) # No overlays are drawn in this edit mode
-    movemodes.clear_selected_clips() # Entering trim edit mode clears selection 
-    updater.set_trim_mode_gui()
-
-def tworoll_trim_no_edit_press(event, frame):
-    success = tworoll_trim_mode_init(event.x, event.y)
-    if success:
-        trimmodes.tworoll_trim_move(event.x, event.y, frame, None)
-        trimmodes.submode = trimmodes.MOUSE_EDIT_ON
-        # additional mouse move and release handled at trimmodes because successful init editorstate.edit_mode = editorstate.TWO_ROLL_TRIM
-    else:
-        set_default_edit_mode(True)
-
-def tworoll_trim_no_edit_move(x, y, frame, state):
-    pass
-
-def tworoll_trim_no_edit_release(x, y, frame, state):
-    pass
-    
 def tworoll_trim_mode_init(x, y):
     """
     User selects two roll mode
@@ -238,34 +150,11 @@
 
     press_frame = tlinewidgets.get_frame(x)
     trimmodes.set_exit_mode_func = set_default_edit_mode
-    trimmodes.set_no_edit_mode_func = tworoll_trim_no_edit_init
+    trimmodes.set_no_edit_mode_func = set_default_edit_mode
     success = trimmodes.set_tworoll_mode(track, press_frame)
     return success
 
 # ----------------------------------------------------- slide trim
-def slide_trim_no_edit_init():
-    stop_looping()
-    editorstate.edit_mode = editorstate.SLIDE_TRIM_NO_EDIT
-    gui.editor_window.tline_cursor_manager.set_cursor_to_mode()
-    tlinewidgets.set_edit_mode(None, None) # No overlays are drawn in this edit mode
-    movemodes.clear_selected_clips() # Entering trim edit mode clears selection 
-    updater.set_trim_mode_gui()
-
-def slide_trim_no_edit_press(event, frame):
-    success = slide_trim_mode_init(event.x, event.y)
-    if success:
-        trimmodes.edit_data"press_start" = frame
-        trimmodes.slide_trim_move(event.x, event.y, frame, None)
-        trimmodes.submode = trimmodes.MOUSE_EDIT_ON
-    else:
-        set_default_edit_mode(True)
-    
-def slide_trim_no_edit_move(x, y, frame, state):
-    pass
-    
-def slide_trim_no_edit_release(x, y, frame, state):
-    pass
-
 def slide_trim_mode_init(x, y):
     """
     User selects two roll mode
@@ -282,7 +171,7 @@
 
     press_frame = tlinewidgets.get_frame(x)
     trimmodes.set_exit_mode_func = set_default_edit_mode
-    trimmodes.set_no_edit_mode_func = slide_trim_no_edit_init
+    trimmodes.set_no_edit_mode_func = set_default_edit_mode
     success = trimmodes.set_slide_mode(track, press_frame)
     return success

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/monitorevent.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/monitorevent.py Changed

@@ -23,6 +23,7 @@
 """
 
 import appconsts
+import boxmove
 import clipeffectseditor
 import dialogutils
 import editorpersistance
@@ -190,6 +191,21 @@
     _do_marks_update()
     updater.display_marks_tc()
 
+def mark_selection_range_pressed():
+    if movemodes.selected_track != -1:
+        mark_in = current_sequence().tracksmovemodes.selected_track.clip_start(movemodes.selected_range_in)
+        PLAYER().producer.mark_in = mark_in
+        out_clip = current_sequence().tracksmovemodes.selected_track.clipsmovemodes.selected_range_out
+        mark_out = current_sequence().tracksmovemodes.selected_track.clip_start(movemodes.selected_range_out) + out_clip.clip_length() - 1 
+        PLAYER().producer.mark_out = mark_out
+        _do_marks_update()
+        updater.display_marks_tc()    
+    elif boxmove.box_selection_data != None:
+        PLAYER().producer.mark_in = boxmove.box_selection_data.topleft_frame
+        PLAYER().producer.mark_out = boxmove.box_selection_data.topleft_frame + boxmove.box_selection_data.width_frames - 1
+        _do_marks_update()
+        updater.display_marks_tc()  
+
 def mark_in_clear_pressed():
     if timeline_visible():
         trimmodes.set_no_edit_trim_mode()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/monitorwidget.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/monitorwidget.py Changed

@@ -34,6 +34,7 @@
 import editorstate
 from editorstate import PLAYER
 from editorstate import PROJECT
+import positionbar
 import respaths
 import utils
 import userfolders
@@ -112,6 +113,8 @@
         black_box.add(Gtk.Label())
         self.monitor = black_box
 
+        self.waveform_display = positionbar.ClipWaveformArea()
+
         self.right_display = cairoarea.CairoDrawableArea2(1, 1, self._draw_match_frame_right, use_widget_bg=False)
         
         self.mid_row.pack_start(self.left_display, False, False,0)
@@ -127,6 +130,7 @@
         self.widget.pack_start(self.top_row, False, False,0)
         self.widget.pack_start(self.mid_row , True, True,0)
         self.widget.pack_start(self.bottom_row, False, False,0)
+        self.widget.pack_start(self.waveform_display.widget, False, False, 0)
 
         self.CLOSE_MATCH_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "close_match.png")
         self.PATTERN_PRODUCER_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "pattern_producer_trim_view.png")

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/movemodes.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/movemodes.py Changed

@@ -180,7 +180,7 @@
     if edit_data == None:
         # We now enter box mode.
         # NOTE: this was originally made to work only with OVERWRITE mode (MOVE tool), but we piggyback existing functionality
-        # to create different box selection functionality for INSERT tool.
+        # to create box selection for INSERT tool.
         editorstate.overwrite_mode_box = True
         boxmove.entered_from_overwrite = True
         boxmove.clear_data()
@@ -484,6 +484,8 @@
     if selected_track == -1:
         return
 
+    # TODO: check and exit all on going edits. 
+
     # Collect edit data
     track = current_sequence().tracksselected_track
     selection_in_frame = track.clip_start(selected_range_in)
@@ -772,7 +774,7 @@
     clips = 
     for i in range(selected_range_in, selected_range_out + 1):
         clips.append(track.clipsi)
-    dnd.start_tline_clips_out_drag(event, clips, gui.tline_canvas.widget)
+    dnd.start_tline_clips_out_drag(event.get_gdk_event(), clips, gui.tline_canvas.widget)
 
     # Update tlione gui
     updater.repaint_tline()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/multitrimmode.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/multitrimmode.py Changed

@@ -22,6 +22,9 @@
 Module handles Multitrim tool functionality. Individual trimmodes are implemented in trimmodes.py module.
 """
 
+import gi
+from gi.repository import Gdk # gi.require_version("Gdk X.0") needs to called?
+
 import appconsts
 import callbackbridge
 import editorstate
@@ -37,7 +40,7 @@
 
 # --------------------------------------------- mouse events
 def mouse_press(event, frame):
-    _enter_trim_mode_edit(event.x, event.y, frame)
+    _enter_trim_mode_edit(event.x, event.y, frame, event)
     if _mouse_edit_context == appconsts.POINTER_CONTEXT_NONE:
         callbackbridge.modesetting_set_default_edit_mode()
 
@@ -57,12 +60,12 @@
     y = editorstate.last_mouse_y
     frame = tlinewidgets.get_frame(x)
     
-    _enter_trim_mode_edit(x, y, frame)
+    _enter_trim_mode_edit(x, y, frame, None)
     trimmodes.submode = trimmodes.KEYB_EDIT_ON
     updater.repaint_tline()
 
 # ------------------------------------------------------- entering and exiting trims handling
-def _enter_trim_mode_edit(x, y, frame):
+def _enter_trim_mode_edit(x, y, frame, event):
     global _mouse_edit_context
     _mouse_edit_context = gui.tline_canvas.get_pointer_context(x, y)
     if _mouse_edit_context == appconsts.POINTER_CONTEXT_NONE:
@@ -72,7 +75,10 @@
     trimmodes.edit_complete_callback = _edit_completed
         
     if _mouse_edit_context == appconsts.POINTER_CONTEXT_TRIM_LEFT or _mouse_edit_context == appconsts.POINTER_CONTEXT_TRIM_RIGHT:
+        if event != None and (event.get_state() & Gdk.ModifierType.MOD1_MASK):
+            editorstate.trim_mode_ripple = True
         success = modesetting.oneroll_trim_mode_init(x, y)
+
         if not success:
             # this should not happen (because we have pointer context) but in case we somehow do hit this, lets just get back to MULTI_TRIM mode
             _edit_completed()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/panels.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/panels.py Changed

@@ -97,18 +97,23 @@
 panel = Gtk.VBox()
 panel.pack_start(bin_list_view, True, True, 0)
 
- hamburger = guicomponents.HamburgerPressLaunch(callback)
- hamburger.do_popover_callback = True
+ if editorpersistance.prefs.show_bins_and_sequences_titles == False:
+ return panel
+ else:
+ hamburger = guicomponents.HamburgerPressLaunch(callback)
+ hamburger.do_popover_callback = True
 
- return get_named_frame_with_hamburger(_("Bins"), panel, 0, 0, 0, 4, _("A Bin is a named collection of media."), hamburger.widget)
+ return get_named_frame_with_hamburger(_("Bins"), panel, 0, 0, 0, 2, _("A Bin is a named collection of media."), hamburger.widget)
 
 def get_sequences_panel(sequence_list_view, callback):
 panel = Gtk.VBox()
 panel.pack_start(sequence_list_view, True, True, 0)
-
- hamburger = guicomponents.HamburgerPressLaunch(callback)
 
- return get_named_frame_with_hamburger(_("Sequences"), panel, 0, 0, 0, 4, _("A Sequence is the full contents of the timeline creating a program, a movie."), hamburger.widget)
+ if editorpersistance.prefs.show_bins_and_sequences_titles == False:
+ return panel
+ else:
+ hamburger = guicomponents.HamburgerPressLaunch(callback)
+ return get_named_frame_with_hamburger(_("Sequences"), panel, 0, 0, 0, 2, _("A Sequence is the full contents of the timeline creating a program, a movie."), hamburger.widget)
 
 def _set_sensive_widgets(sensitive, list):
 for widget in list:
@@ -162,7 +167,7 @@
 frame.pack_start(label_box, False, False, 0)
 frame.pack_start(widget, True, True, 0)
 
- guiutils.set_margins(frame, 4, 4, 0, right_out_padding)
+ guiutils.set_margins(frame, 2, 0, 0, right_out_padding)
 
 return frame
 
@@ -514,20 +519,18 @@
 group_combo_box.connect("changed", 
 lambda w,e: _group_selection_changed(w, effects_list_view), 
 None)
-
- combo_row = Gtk.HBox(False, 2)
- combo_row.pack_start(group_combo_box, True, True, 0)
+ group_combo_box.set_margin_top(1)
 
 group_name, filters_array = mltfilters.groups0
 effects_list_view.fill_data_model(filters_array)
 effects_list_view.treeview.get_selection().select_path("0")
 effects_list_view.treeview.connect("row-activated", double_click_cb, group_combo_box)
 
- effects_vbox = Gtk.VBox(False, 2)
- effects_vbox.pack_start(combo_row, False, False, 0)
+ effects_vbox = Gtk.VBox(False, 0)
+ effects_vbox.pack_start(group_combo_box, False, False, 0)
 effects_vbox.pack_start(effects_list_view, True, True, 0)
 
- return (guiutils.set_margins(effects_vbox, 4, 4, 4, 4), effects_list_view, group_combo_box)
+ return (guiutils.set_margins(effects_vbox, 0, 1, 1, 1), effects_list_view, group_combo_box)
 
 def _group_selection_changed(group_combo, filters_list_view):
 group_name, filters_array = mltfilters.groupsgroup_combo.get_active()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/persistance.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/persistance.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/positionbar.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/positionbar.py Changed

@@ -28,8 +28,11 @@
 
 from gi.repository import Gdk
 
+import appconsts
+import audiowaveformrenderer
 from cairoarea import CairoDrawableArea2
 import callbackbridge
+import editorpersistance
 import editorstate
 import respaths
 
@@ -47,7 +50,8 @@
 DISABLED_BG_COLOR = (0.7, 0.7, 0.7)
 SELECTED_RANGE_COLOR = (0.85, 0.85, 0.85, 0.75)
 DARK_LINE_COLOR = (0.5, 0.5, 0.5)
-DARK_BG_COLOR = (0.24, 0.24, 0.24)
+DARK_BG_COLOR = (0.195, 0.195, 0.195)
+CLIP_BG_COLOR = (0.25, 0.25, 0.25)
 DARK_DISABLED_BG_COLOR = (0.1, 0.1, 0.1)
 DARK_SELECTED_RANGE_COLOR = (0.4, 0.4, 0.4)
 SPEED_TEST_COLOR = (0.5, 0.5, 0.5)
@@ -63,6 +67,13 @@
 PREVIEW_FRAME_COLOR = (0.8, 0.8, 0.9)
 PREVIEW_RANGE_COLOR = (0.4, 0.8, 0.4)
 
+WAVEFORM_AREA_WIDTH = 200 # Just used as an initial value > 0, no effect on window layout.
+WAVEFORM_AREA_HEIGHT = 30
+WAVEFORM_AREA_END_PAD = 0
+
+WAVEFORM_AREA_BG_COLOR = (0.4, 0.4, 0.4)
+
+
 class PositionBar:
 """
 GUI component used to set/display position in clip/timeline
@@ -78,12 +89,14 @@
 self._pos = END_PAD # in display pixels
 self.mark_in_norm = -1.0 # program length normalized
 self.mark_out_norm = -1.0
- self.disabled = False
+ self.disabled = False # Does not seem to be used, look to remove
 self.mouse_release_listener = None # when used in tools (Titler ate.) this used to update bg image
 self.mouse_press_listener = None # when used by scripttool.py this is used to stop playback
 
 self.handle_trimmodes = handle_trimmodes
 
+ self.clip_bg = False
+
 self.preview_frame = -1
 self.preview_range = None
 
@@ -107,6 +120,9 @@
 self._pos = self._get_panel_pos(norm_pos)
 self.widget.queue_draw()
 
+ def set_clip_bg(self, clip_bg):
+ self.clip_bg = clip_bg
+
 def update_display_from_producer(self, producer):
 self.producer = producer
 length = producer.get_length() # Get from MLT
@@ -151,8 +167,8 @@
 self.preview_range = None
 
 self.widget.queue_draw()
- 
- def set_dark_bg_color(self):
+ 
+ def set_dark_bg_color(self): # remove, were boing always with dark theme.
 global BG_COLOR
 BG_COLOR = DARK_BG_COLOR
 
@@ -181,13 +197,12 @@
 
 # Draw bb
 draw_color = BG_COLOR
+ if self.clip_bg:
+ draw_color = CLIP_BG_COLOR
 if self.disabled:
 draw_color = DISABLED_BG_COLOR
 cr.set_source_rgb(*draw_color)
 self._round_rect_path(cr)
- #cr.set_source_rgb(0,0,0)
- #cr.stroke()
- #cr.rectangle(0,0,w,h)
 cr.fill()
 
 # Draw selected area if marks set
@@ -396,3 +411,180 @@
 return float(self._pos - END_PAD) / \
 (self.widget.get_allocation().width - END_PAD * 2)
 
+
+class ClipWaveformArea:
+ """
+ GUI component used to set/display position in clip/timeline
+ """
+
+ def __init__(self):
+
+ self.widget = CairoDrawableArea2( WAVEFORM_AREA_WIDTH, 
+ WAVEFORM_AREA_HEIGHT, 
+ self._draw)
+
+ self._pos = WAVEFORM_AREA_END_PAD # in display pixels
+ 
+ self.widget.press_func = self._press_event
+ self.widget.motion_notify_func = self._motion_notify_event
+ self.widget.release_func = self._release_event
+
+ def set_listener(self, listener):
+ self.position_listener = listener
+
+ def set_normalized_pos(self, norm_pos):
+ """
+ Sets position in range 0 - 1
+ """
+ self._pos = self._get_panel_pos(norm_pos)
+ self.widget.queue_draw()
+
+ def update_display_from_producer(self, producer):
+ self.producer = producer
+ length = producer.get_length() # Get from MLT
+ self.length = length 
+ try:
+ frame_pos = producer.frame()
+ norm_pos = float(frame_pos) / length
+ self._pos = self._get_panel_pos(norm_pos)
+ except ZeroDivisionError:
+ self._pos = self._get_panel_pos(0)
+
+ self.widget.queue_draw()
+
+ def clear(self):
+ self.preview_frame = -1
+ self.preview_range = None
+
+ self.widget.queue_draw()
+
+ def _get_panel_pos(self, norm_pos):
+ return WAVEFORM_AREA_END_PAD + int(norm_pos * 
+ (self.widget.get_allocation().width - 2 * WAVEFORM_AREA_END_PAD))
+
+ def _draw(self, event, cr, allocation):
+ """
+ Callback for repaint from CairoDrawableArea.
+ We get cairo context and allocation.
+ """
+ try:
+ clip = self.producer
+ except:
+ return
+ 
+ x, y, w, h = allocation
+ cr.set_source_rgb(*WAVEFORM_AREA_BG_COLOR)
+ cr.stroke()
+ cr.rectangle(0,0,w,h)
+ cr.fill()
+
+ if clip.is_blanck_clip == False and clip.waveform_data == None and editorstate.display_all_audio_levels == True \
+ and clip.media_type != appconsts.IMAGE and clip.media_type != appconsts.IMAGE_SEQUENCE and clip.media_type != appconsts.PATTERN_PRODUCER:
+ clip.waveform_data = audiowaveformrenderer.get_waveform_data(clip)
+ 
+ if clip.waveform_data != None: 
+ r, g, b = WAVEFORM_AREA_BG_COLOR
+ cr.set_source_rgb(r * 1.9, g * 1.9, b * 1.9)
+
+ y_pad = 0
+ bar_height = h
+ 
+ # Draw all frames only if pixels per frame > 2, otherwise.
+ # draw only every other or fewer frames.
+ draw_pix_per_frame = self.length / w 
+ pix_per_frame = draw_pix_per_frame
+ 
+ if draw_pix_per_frame < 2:
+ draw_pix_per_frame = 2
+ step = int(2 // pix_per_frame)
+ if step < 1:
+ step = 1
+ else:
+ step = 1
+
+ # Draw all frames
+ draw_first = 0
+ draw_last = self.length - 1
+ media_start_pos_pix = 0
+ 
+ # Draw level bar for each frame in draw range.
+ for f in range(draw_first, draw_last, step):
+
+ try:
+ x = media_start_pos_pix + f * pix_per_frame
+ 
+ wh = bar_height * clip.waveform_dataf
+ if wh < 1:
+ wh = 1
+ cr.rectangle(x, y_pad + (bar_height - wh), draw_pix_per_frame, wh)
+ except:

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/preferenceswindow.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/preferenceswindow.py Changed

@@ -136,6 +136,8 @@
     disk_cache_warning_combo.append_text(_("500 MB"))
     disk_cache_warning_combo.append_text(_("1 GB"))
     disk_cache_warning_combo.append_text(_("2 GB"))
+    disk_cache_warning_combo.append_text(_("4 GB"))
+    disk_cache_warning_combo.append_text(_("8 GB"))
     disk_cache_warning_combo.set_active(prefs.disk_space_warning)
     
     # Layout
@@ -378,7 +380,10 @@
     media_panel_width_spin = Gtk.SpinButton.new_with_range(editorpersistance.MEDIA_PANEL_WIDTH_MIN, editorpersistance.MEDIA_PANEL_WIDTH_MAX, 1)
     media_panel_width_spin.set_adjustment(spin_adj)
     media_panel_width_spin.set_numeric(True)
-    
+
+    show_bin_and_seq_titles = Gtk.CheckButton()
+    show_bin_and_seq_titles.set_active(prefs.show_bins_and_sequences_titles)
+
     row00 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Application window mode:")), window_mode_combo, PREFERENCES_LEFT))
     row9 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Force Language:")), force_language_combo, PREFERENCES_LEFT))
     row6 = _row(guiutils.get_checkbox_row_box(show_full_file_names, Gtk.Label(label=_("Show Full File names"))))
@@ -389,12 +394,14 @@
     row12 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Project panel width:")), project_panel_width_spin, PREFERENCES_LEFT))
     row11 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Filter Select panel width:")), filter_select_width_spin, PREFERENCES_LEFT))
     row14 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Media panel width:")), media_panel_width_spin, PREFERENCES_LEFT))
-    
+    row15 = _row(guiutils.get_checkbox_row_box(show_bin_and_seq_titles, Gtk.Label(label=_("Show Bins And Sequences Area Titles"))))
+
     vbox = Gtk.VBox(False, 2)
     vbox.pack_start(row00, False, False, 0)
     vbox.pack_start(row10, False, False, 0)
     vbox.pack_start(row9, False, False, 0)
     vbox.pack_start(row6, False, False, 0)
+    vbox.pack_start(row15, False, False, 0)
     vbox.pack_start(row7, False, False, 0)
     vbox.pack_start(row14, False, False, 0)
     vbox.pack_start(row13, False, False, 0)
@@ -403,10 +410,10 @@
     vbox.pack_start(Gtk.Label(), True, True, 0)
     
     guiutils.set_margins(vbox, 12, 0, 12, 12)
-
+    
     return vbox, (force_language_combo, window_mode_combo, show_full_file_names,
                   tracks_combo, project_panel_width_spin, edit_panel_width_spin, media_panel_width_spin,
-                  layout_monitor, filter_select_width_spin)
+                  layout_monitor, filter_select_width_spin, show_bin_and_seq_titles)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/projectaction.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/projectaction.py Changed

@@ -49,6 +49,7 @@
 import audiowaveformrenderer
 import appconsts
 import batchrendering
+import boxmove
 import callbackbridge
 import clipeffectseditor
 import compositeeditor
@@ -62,6 +63,7 @@
 import guiutils
 import gtkbuilder
 import edit
+import editorlayout
 import editorstate
 from editorstate import current_sequence
 from editorstate import current_bin
@@ -91,6 +93,7 @@
 import renderconsumer
 import rendergui
 import sequence
+import titler
 import tlinewidgets
 import undo
 import updater
@@ -898,12 +901,9 @@
 return
 
 # We need to exit active trim modes or the hidden trim clip gets rendered.
- if EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
- modesetting.oneroll_trim_no_edit_init()
- elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
- modesetting.tworoll_trim_no_edit_init()
- elif EDIT_MODE() == editorstate.SLIDE_TRIM:
- modesetting.slide_trim_no_edit_init()
+ # Should only happend if mouse pressed down on trin and render started with kb shortcut.
+ if EDIT_MODE() == editorstate.ONE_ROLL_TRIM or EDIT_MODE() == editorstate.TWO_ROLL_TRIM or EDIT_MODE() == editorstate.SLIDE_TRIM:
+ modesetting.set_default_edit_mode()
 
 force_overwrite = False
 force_proxy = False
@@ -989,6 +989,7 @@
 secondary_txt = _("Error message: ") + str(e)
 dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window, is_info=False)
 return False
+ 
 else: # batch render item
 # Add item
 try:
@@ -1003,7 +1004,7 @@
 secondary_txt = _("Error message: ") + str(e)
 dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window, is_info=False)
 return False
- 
+
 # This puts existing rendered timeline segments back to be displayed.
 current_sequence().update_hidden_track_for_timeline_rendering()
 
@@ -1060,7 +1061,9 @@
 mediaplugin.show_add_media_plugin_window()
 elif msg == "add color clip":
 patternproducer.create_color_clip()
-
+ elif msg == "add title":
+ titler.show_titler()
+ 
 def media_panel_double_click(media_file):
 global _media_panel_double_click_counter
 _media_panel_double_click_counter += 1
@@ -1545,6 +1548,197 @@
 render_player = renderconsumer.XMLCompoundRenderPlayer(write_file, media_name, _xml_compound_render_done_callback, tractor, PROJECT())
 render_player.start()
 
+def create_box_compound_clip():
+ if boxmove.box_selection_data == None:
+ # info window no box selection?
+ return
+
+ # lets's just set something unique-ish 
+ default_name = _("selection_") + _get_compound_clip_default_name_date_str()
+ dialogs.compound_clip_name_dialog(_do_create_box_compound_clip, default_name, _("Save Selection Container Clip"))
+
+def _do_create_box_compound_clip(dialog, response_id, name_entry):
+ if response_id != Gtk.ResponseType.ACCEPT:
+ dialog.destroy()
+ return
+
+ media_name = name_entry.get_text()
+ 
+ # Create unique file path in hidden render folder
+ folder = userfolders.get_render_dir()
+ uuid_str = hashlib.md5(str(os.urandom(32)).encode('utf-8')).hexdigest()
+ write_file = folder + uuid_str + ".xml"
+
+ dialog.destroy()
+
+ box_data = boxmove.box_selection_data 
+ 
+ # Get audio tracks count.
+ audio_tracks = 0
+ for track_selection in box_data.track_selections:
+ if current_sequence().first_video_index > track_selection.track_id:
+ audio_tracks += 1
+
+ # Create tractor
+ tractor = mlt.Tractor()
+ multitrack = tractor.multitrack()
+
+ bg_track = mlt.Playlist(PROJECT().profile)
+ multitrack.connect(bg_track, 0)
+
+ trackindex = 1
+ for track_selection in box_data.track_selections:
+ track = mlt.Playlist(PROJECT().profile)
+ current_track = current_sequence().trackstrack_selection.track_id
+ multitrack.connect(track, trackindex)
+ if track_selection.range_frame_in == -1:
+ trackindex += 1
+ continue
+
+ # Put one blank in if needed
+ add_blank = 0 # We need this for insert blank index calculation below. 
+ if track_selection.start_frame < current_track.clip_start(track_selection.selected_range_in):
+ blank_len = current_track.clip_start(track_selection.selected_range_in) - track_selection.start_frame 
+ track.insert_blank(0, blank_len - 1) # end inclusive
+ add_blank = 1
+
+ # Create clone clips and fill track
+ for i in range(track_selection.selected_range_in, track_selection.selected_range_out + 1): # + 1 == selected_range_out inclusive
+ orig_clip = current_track.clipsi
+ if orig_clip.is_blanck_clip == False:
+ clip = current_sequence().create_clone_clip(orig_clip)
+ track.append(clip, clip.clip_in, clip.clip_out)
+ else:
+ track.insert_blank(i - track_selection.selected_range_in + add_blank, orig_clip.clip_out - orig_clip.clip_in + 1) # +1 end inclusive
+
+ # Audio mixing
+ transition = mlt.Transition(PROJECT().profile, "mix")
+ transition.set("a_track", int(0))
+ transition.set("b_track", int(trackindex))
+ transition.set("always_active", 1)
+ transition.set("combine", 1)
+ tractor.field().plant_transition(transition, int(0), int(i))
+
+ # Add full track compositors.
+ if current_sequence().first_video_index <= track_selection.track_id:
+ compositor = current_sequence().create_compositor("##blend")
+ a_track = audio_tracks + 1 # +1 for bg track
+ b_track = a_track + track_selection.track_id - current_sequence().first_video_index
+ compositor.transition.set_tracks(a_track, b_track)
+ compositor.set_in_and_out(-1, -1)
+ compositor.transition.mlt_transition.set("always_active", str(1))
+ compositor.origin_clip_id = -1
+
+ tractor.field().plant_transition( compositor.transition.mlt_transition, 
+ int(a_track), 
+ int(b_track))
+
+ trackindex += 1
+
+ # Render compound clip as MLT XML file
+ render_player = renderconsumer.XMLCompoundRenderPlayer(write_file, media_name, _xml_compound_render_done_callback, tractor, PROJECT())
+ render_player.start()
+
+def create_range_compound_clip():
+ # exit if no range available
+ if current_sequence().tractor.mark_in == -1 or current_sequence().tractor.mark_out == -1:
+ return
+
+ # lets's just set something unique-ish 
+ default_name = _("selection_") + _get_compound_clip_default_name_date_str()
+ dialogs.compound_clip_name_dialog(_do_create_range_compound_clip, default_name, _("Save Range Container Clip"))
+
+def _do_create_range_compound_clip(dialog, response_id, name_entry):
+ if response_id != Gtk.ResponseType.ACCEPT:
+ dialog.destroy()
+ return
+
+ media_name = name_entry.get_text()
+ 
+ # Create unique file path in hidden render folder
+ folder = userfolders.get_render_dir()
+ uuid_str = hashlib.md5(str(os.urandom(32)).encode('utf-8')).hexdigest()
+ write_file = folder + uuid_str + ".xml"
+
+ dialog.destroy()
+ 
+ # Get timeline frame range.
+ range_frame_in = current_sequence().tractor.mark_in 
+ range_frame_out = current_sequence().tractor.mark_out
+ 
+ # Create tractor and clones of all edit tracks + bg track. 
+ tractor = mlt.Tractor()
+ multitrack = tractor.multitrack()
+
+ bg_track = mlt.Playlist(PROJECT().profile)
+ multitrack.connect(bg_track, 0)
+ 
+ for i in range(1, len(current_sequence().tracks) - 1):
+ track = mlt.Playlist(PROJECT().profile)
+ orig_track = current_sequence().tracksi

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/projectdatavaultgui.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/projectdatavaultgui.py Changed

@@ -109,7 +109,7 @@
 def show_create_data_dialog(callback, data=None):
     label = Gtk.Label(label=_("Select Empty Folder to be added as Data Store"))
     
-    data_folder_button = Gtk.FileChooserButton(_("Select Folder"))
+    data_folder_button = gtkbuilder.get_file_chooser_button(_("Select Folder"))
     data_folder_button.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
     data_folder_button.set_current_folder(os.path.expanduser("~") + "/")
 
@@ -134,7 +134,7 @@
         widgets = (data_folder_button, name_entry)
     else:
         widgets = (data_folder_button, name_entry, data)
-    dialogutils.panel_ok_cancel_dialog(_("Create Data Store"), vbox, _("Create Data Store"), callback, widgets)
+    dialogutils.panel_ok_cancel_dialog_non_modal(_("Create Data Store"), vbox, _("Create Data Store"), callback, widgets)
 
 def get_current_vault_name():
     if PROJECT().vault_folder == projectdatavault.get_default_vault_folder():
@@ -590,7 +590,7 @@
     def connect_button_clicked(self):
         label = Gtk.Label(label=_("Select Folder With existing Data Store data"))
         
-        self.connect_data_folder_button = Gtk.FileChooserButton(_("Select Folder"))
+        self.connect_data_folder_button = gtkbuilder.get_file_chooser_button(_("Select Folder"))
         self.connect_data_folder_button.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
         self.connect_data_folder_button.set_current_folder(os.path.expanduser("~") + "/")
 
@@ -611,7 +611,7 @@
         vbox.pack_start(out_folder_row, False, False, 0)
         vbox.pack_start(name_row, False, False, 0)
 
-        dialogutils.panel_ok_cancel_dialog(_("Connect Data Store"), vbox, _("Connect Data Store"), self.connect_dialog_callback)
+        dialogutils.panel_ok_cancel_dialog_non_modal(_("Connect Data Store"), vbox, _("Connect Data Store"), self.connect_dialog_callback)
 
     def connect_dialog_callback(self, dialog, response):
         if response != Gtk.ResponseType.ACCEPT:
@@ -1008,7 +1008,11 @@
                 warnings_str += _get_warning_str(name, size_str)
             elif check_level == 3 and size > 1000000 * 2000:
                 warnings_str += _get_warning_str(name, size_str)
-        
+            elif check_level == 4 and size > 1000000 * 4000:
+                warnings_str += _get_warning_str(name, size_str)
+            elif check_level == 5 and size > 1000000 * 8000:
+                warnings_str += _get_warning_str(name, size_str)
+                
         if len(warnings_str) > 0:
             primary_txt = _("Data Store Size Exceeds Current Warning Level!")
             warnings_str += _("\nYou can either delete data in Disk Store or change warning level in") + "\n" + \

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/projectinfogui.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/projectinfogui.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/propertyeditorbuilder.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/propertyeditorbuilder.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/rendergui.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/rendergui.py Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/css3/dark-bg-class.css Added

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/css3/empty-panel-frame-class.css Added

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/css3/gtk-flowblade-dark.css -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/css3/gtk-flowblade-dark.css Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/css3/notebook-side-borders-class.css Added

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/css3/sass/_common.scss -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/css3/sass/_common.scss Changed

@@ -1734,9 +1734,9 @@
 //
 notebook {
   padding: 0;
-
-  &.frame {
-    border: 1px solid $borders_color;
+  
+    &.frame {
+    border: 0px solid transparent;
 
     > header {
       // ugly hack to hide the borders around the header
@@ -1749,22 +1749,22 @@
       &.top, &.bottom { padding-left: 0; padding-right: 0; }
       &.left, &.right { padding-top: 0; padding-bottom: 0; }
     }
-  }
+    }
 
-  > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
+    > stack:not(:only-child) { // the :not(:only-child) is for "hidden" notebooks
     background-color: $base_color;
-  }
+    }
 
-  > header {
+    > header {
     padding: 2px;
     background-color: $base_color;
 
-    &.top {    box-shadow: inset  0  -1px $borders_color; }
-    &.bottom { box-shadow: inset  0   1px $borders_color; }
-    &.right {  box-shadow: inset  1px 0   $borders_color; }
-    &.left {   box-shadow: inset -1px 0   $borders_color; }
+    &.top {    box-shadow: inset  0   0px $borders_color; }
+    &.bottom { box-shadow: inset  0   0px $borders_color; }
+    &.right {  box-shadow: inset  0   0px $borders_color; }
+    &.left {   box-shadow: inset  0   0px $borders_color; }
 
-  @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) {
+    @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) {
       // sizing and borders
       &.#{$_pos} {
         padding-#{$_bpos}: 0;
@@ -1866,6 +1866,7 @@
   }
 }
 
+
 //
 // Scrollbars
 //
@@ -2411,6 +2412,7 @@
 }
 
 scrolledwindow {
+        
   viewport.frame { // avoid double borders when viewport inside scrolled window
     border-style: none;
   }

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/clip_button.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/clip_button.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/clip_button_active.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/clip_button_active.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_label.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_label.png Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_to_xs.png Added

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_very_small.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_very_small.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_xs.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_xs.png Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_out_to_xs.png Added

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_out_xs.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_out_xs.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/program_view_2.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/program_view_2.png Changed

_service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/roto_box_mode.png Added

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/sequence.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/sequence.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/timeline_button.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/timeline_button.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/timeline_button_active.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/timeline_button_active.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/trim_view.png -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/darktheme/trim_view.png Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/help/advanced.html -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/help/advanced.html Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/help/container_clips.html -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/help/container_clips.html Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/help/edit_tools.html -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/help/edit_tools.html Changed

@@ -35,7 +35,7 @@
 
 
 <div class="note">
-Use Keyboard Shortcuts! It is much faster to use keys 1 - 6 to change tools. Note that keys 1-6 only change tools if timeline has keyboard focus. 
+Use Keyboard Shortcuts! It is much faster to use keys 1 - 6 to change tools. Note that keys 1-6 only change tools if timeline has keyboard focus. Click Left Mouse on timeline to give it keyboard focus.
 </div>
 
 
@@ -111,6 +111,12 @@
 
 </ol>
 
+Dual Sync Trimming
+<ol>
+<li> Check option Auto Sync Trim Single Childs</li>
+<li> When doing Clip End Drag Child Clip follows the legth change if it has enough media to do that.</li>
+<li> If Child Clip does not have enough media to apply the same edit it will remain unaffected.</li>
+</ol>
 
 <a id="insert"></a>
 <h3>Insert</h3>
@@ -194,7 +200,7 @@
 <a id="multitrim"></a>
 <h3>Multitrim</h3>
 
-Do Trim, Roll or Slip tool edits based on cursor position on timeline.
+Do Trim, Roll or Slip edits based on cursor position on timeline.
 
 <ol>
 
@@ -207,7 +213,29 @@
 </li>
 <li> Continue on to Left drag to complete the edit.</li>
 </ol>
- 
+
+<h4>Ripple Trim</h4>
+<ol>
+<li>Position cursor near clip end and keep Alt key down when pressing Left Mouse to start a Ripple Trim edit.</li>
+<li> Continue on to Left drag to complete the edit.</li>
+<li> Range of a Ripple Trim edit is limited in such a way that no clips on other tracks can overlap.</li>
+</ol>
+
+<h4>Keyboard Trimming</h4>
+<ol>
+<li> Position cursor to select a trim you wish to perform.</li>
+<li> Press Enter key to start keyboard edit.</li>
+<li> Use Left or Right Arrow Key to move edit point. Keep Control key down to move 10 frames on a single arrow key press.</li>
+<li> Press Enter to complete keyboard edit.</li>
+</ol>
+
+<h4>Dual Sync Trimming</h4>
+<ol>
+<li> Check option Auto Sync Trim Single Childs.</li>
+<li> When doing a trim Trim Child Clip follows trim if it has enough media to apply the same trim.</li>
+<li> If Child Clip does not have enough media to apply the same trim it will remain unaffected.</li>
+</ol>
+
 <h2>Other Tools</h2>
 
 <a id="cuttool"></a>

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/help/tools.html -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/help/tools.html Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/shortcuts/flowblade.xml -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/shortcuts/flowblade.xml Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/res/shortcuts/premiere.xml -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/res/shortcuts/premiere.xml Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/resync.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/resync.py Changed

@@ -32,20 +32,91 @@
 # After every edit sync states of all child clips is calculated, and it 
 # gets displayed to the user in the next timeline redraw using red, green and gray colors
 
-# Maps clip -> track
+# Maps child clip -> track
 sync_children = {}
 
+# Maps parent -> children list. Used to implement dual sync trim feature.
+sync_parents = {}
+
+# This is used to maintain sync_parents dict when edit is implemented
+# by removing and adding clip to timeline.
+edit_removed_parents = {}
+
 # ----------------------------------------- sync display updating
+
+def start_edit():
+    # Called ar beginning of every edit to clear list of parent to be restored to sync_parents
+    # list durinf edit.
+    global edit_removed_parents
+    edit_removed_parents = {}
+
 def clip_added_to_timeline(clip, track):
     if clip.sync_data != None:
         sync_childrenclip = track
 
+        if isinstance(clip.sync_data.master_clip, int): # loading at persistance.py calls this twice for sync clips.
+            return
+        if clip.sync_data.master_clip in sync_parents:
+            for child_clip in sync_parentsclip.sync_data.master_clip:
+                if child_clip == clip:
+                    return # Don't save same clip twice, we are using length of list to test if dual sync trim edit can be done.
+            sync_parentsclip.sync_data.master_clip.append(clip)
+        else:
+            sync_parentsclip.sync_data.master_clip = clip
+    
+    # Restore clip to sync_parents list if it was removed during edit.
+    try:
+        children = edit_removed_parentsclip
+        sync_parentsclip = children
+    except:
+        pass
+
 def clip_removed_from_timeline(clip):
+    # Maybe remove from sync children.
     try:
         sync_children.pop(clip)
     except KeyError:
         pass
 
+    # Maybe remove from sync parents but save data for the duration of redo or undo.
+    try:
+
+        if clip in sync_parents.keys():
+            edit_removed_parentsclip = sync_parentsclip
+        # Remove from parents dict.
+        sync_parents.pop(clip)
+    except KeyError:
+        pass
+
+    # Remove from parents child list and clear parent from parent list if
+    # no children remaining.
+    remove_list = 
+    for parent, child_list in sync_parents.items():
+        if clip in child_list:
+            child_list.remove(clip)
+            if len(child_list) == 0:
+                remove_list.append(parent)
+    for parent in remove_list:
+        sync_parents.pop(parent)
+
+def print_sync_parents():
+    print("---sync parents:")
+    for key, value in sync_parents.items():
+        print("parent", id(key))
+        for clip in value:
+            print("----", id(clip))
+
+def get_child_clips(clip):
+    try:
+        child_clip_list = sync_parentsclip
+        clips_with_tracks = 
+        for child_clip in child_clip_list:
+            child_clip_track = sync_childrenchild_clip
+            clips_with_tracks.append((child_clip, child_clip_track))
+            return clips_with_tracks
+    except KeyError:
+        return None
+
 def clip_sync_cleared(clip):
     # This and the method above are called for different purposes, so we'll 
     # keep them separate even though they do the same thing. (???)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/sequence.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/sequence.py Changed

@@ -682,6 +682,17 @@
 new_compositors.append(clone_compositor)
 self.compositors = new_compositors
 
+ def get_clone_compositors(self, track_delta, pos_delta=0):
+ # Used when cloning compositors to change track count by cloning sequence
+ clone_compositors = 
+ for compositor in self.compositors:
+ clone_compositor = self.create_compositor(compositor.type_id)
+ clone_compositor.clone_properties(compositor)
+ clone_compositor.set_in_and_out(compositor.clip_in + pos_delta, compositor.clip_out + pos_delta)
+ clone_compositor.transition.set_tracks(compositor.transition.a_track + track_delta, compositor.transition.b_track + track_delta)
+ clone_compositors.append(clone_compositor)
+ return clone_compositors
+
 def _create_and_plant_clone_compositor_for_sequnce_clone(self, old_compositor, track_delta): 
 # Create and plant new compositor
 compositor = self.create_compositor(old_compositor.type_id)
@@ -719,7 +730,6 @@
 self.compositors = 
 
 def add_full_track_compositors(self):
- #print("Adding full track compositors")
 
 for i in range(self.first_video_index, len(self.tracks) - 1):
 track = self.tracksi
@@ -736,7 +746,6 @@
 self.add_compositor(compositor)
 
 self.restack_compositors()
- #print("Adding full track compositors DONE")
 
 def get_compositor_for_destroy_id(self, destroy_id):
 for comp in self.compositors:
@@ -766,6 +775,11 @@
 if comp.transition.b_track == track_index:
 track_compositors.append(comp)
 return track_compositors
+
+ def print_compositors(self):
+ for comp in self.compositors:
+ print(comp.__dict__)
+ print(comp.transition.a_track, comp.transition.b_track)
 
 # -------------------------- monitor clip, trimming display, output mode and hidden track
 def display_monitor_clip(self, path, pattern_producer_data=None, ttl=None):
@@ -1030,6 +1044,46 @@
 
 return cut_frame
 
+ def find_next_mark_or_marker(self, tline_frame):
+ result_frame = -1
+ 
+ if self.tractor.mark_in > tline_frame:
+ result_frame = self.tractor.mark_in
+ if self.tractor.mark_out > tline_frame:
+ if result_frame == -1:
+ result_frame = self.tractor.mark_out
+ elif self.tractor.mark_out < result_frame:
+ result_frame = self.tractor.mark_out 
+ 
+ for name, frame in self.markers:
+ if frame > tline_frame:
+ if result_frame == -1:
+ result_frame = frame
+ elif frame < result_frame:
+ result_frame = frame
+ 
+ return result_frame
+
+ def find_prev_mark_or_marker(self, tline_frame):
+ result_frame = -1
+ 
+ if self.tractor.mark_in < tline_frame:
+ result_frame = self.tractor.mark_in
+ if self.tractor.mark_out < tline_frame:
+ if result_frame == -1:
+ result_frame = self.tractor.mark_out
+ elif self.tractor.mark_out > result_frame:
+ result_frame = self.tractor.mark_out 
+ 
+ for name, frame in self.markers:
+ if frame < tline_frame:
+ if result_frame == -1:
+ result_frame = frame
+ elif frame > result_frame:
+ result_frame = frame
+ 
+ return result_frame
+
 def find_parent_clip_for_clip_start(self, parent_track, clip_start_frame):
 parent_clip = None
 last_pos_diff = None
@@ -1305,7 +1359,7 @@
 
 return None
 
- # ----------------------------------- info pronts
+ # ----------------------------------- info prints
 def print_all(self):
 print("------------------------######")
 for i in range(0, len(self.tracks)):
@@ -1330,7 +1384,10 @@
 for i in range(0, track.count()):
 clip = track.get_clip(i)
 print(i, " in:", clip.get_in()," out:", clip.get_out())
-
+ 
+ print("print_track done")
+ 
+ 
 def print_compositors(self):
 for compositor in self.compositors:
 print("---")

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/shortcuts.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/shortcuts.py Changed

@@ -18,6 +18,9 @@
 along with Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.
 """
 
+
+from gi.repository import Gdk, Gtk
+
 # Apr-2017 - SvdB - Functions to scan available shortcut files, validate and load them
 import collections
 import os
@@ -49,6 +52,52 @@
 _gtk_mod_names = {}
 _editable = False
 
+
+
+# Copied from keyevents.py so that we are using same code to 
+def get_shortcut_action(event):
+ # Get the name of the key pressed.
+ key_name = Gdk.keyval_name(event.keyval).lower()
+
+ # Check if this key is in the dictionary.
+ state = event.get_state()
+ # Now we have a key and a key state we need to check if it is a shortcut.
+ # If it IS a shortcut we need to determine what action to take.
+ if key_name in _keyboard_actions:
+ # Now get the associated dictionary
+ _secondary_dict = _keyboard_actionskey_name
+ # In order to check for all available combinations of Ctrl+Alt etc (CTRL+ALT should be the same as ALT_CTRL)
+ # we do a SORT on the string. So both CTRL+ALT and ALT+CTRL will become +ACLLRTT and can be easily compared.
+ modifier = ""
+ if state & Gdk.ModifierType.CONTROL_MASK:
+ modifier = "CTRL"
+ if state & Gdk.ModifierType.MOD1_MASK:
+ if modifier != "":
+ modifier = modifier + "+"
+ modifier = modifier + "ALT"
+ if state & Gdk.ModifierType.SHIFT_MASK:
+ if modifier != "":
+ modifier = modifier + "+"
+ modifier = modifier + "SHIFT"
+ # CapsLock is used as an equivalent to SHIFT, here
+ if state & Gdk.ModifierType.LOCK_MASK:
+ if modifier != "":
+ modifier = modifier + "+"
+ modifier = modifier + "SHIFT"
+ # Set to None if no modifier found
+ if modifier == "":
+ modifier = 'None'
+ try:
+ action = _secondary_dict''.join(sorted(re.sub(r'\s','',modifier.lower())))
+ except:
+ try:
+ action = _secondary_dict''.join(sorted(re.sub(r'\s','','Any'.lower())))
+ except:
+ action = 'None'
+ return action
+ # We didn't find an action, so return nothing.
+ return 'None'
+
 def load_shortcut_files():
 global shortcut_files, shortcut_files_display_names
 default_shortcuts_file_found = False
@@ -149,9 +198,6 @@
 except:
 print("Error opening shortcuts file:" + prefs.shortcuts)
 
- #_print_shortcuts()
-
-
 def update_custom_shortcuts():
 # If new shortcuts have been added and user is using custom shortcuts when updating, we need to update custom shortcuts.
 custom_files = os.listdir(userfolders.get_data_dir() + "/" + appconsts.USER_SHORTCUTS_DIR)
@@ -182,6 +228,32 @@
 print("Writing ", custom_xml_file_path)
 pref_shortcuts.write(custom_xml_file_path)
 
+def change_single_shortcut(code, event, shortcut_label):
+ key_val_name = Gdk.keyval_name(event.keyval).lower()
+ 
+ mods_list = 
+ state = event.get_state()
+ if state & Gdk.ModifierType.CONTROL_MASK:
+ mods_list.append("CTRL")
+ if state & Gdk.ModifierType.MOD1_MASK:
+ mods_list.append("ALT")
+ 
+ if state & Gdk.ModifierType.SHIFT_MASK:
+ mods_list.append("SHIFT")
+ elif state & Gdk.ModifierType.LOCK_MASK: # CapsLock is used as an equivalent to SHIFT.
+ mods_list.append("SHIFT")
+
+ shortcut_info_str = get_shortcut_info_for_keyname_and_modlist(key_val_name, mods_list)
+ if is_blocked_shortcut(key_val_name, mods_list):
+ return shortcut_info_str
+
+ shortcut_label.set_text(shortcut_info_str)
+
+ change_custom_shortcut(code, key_val_name, mods_list)
+ set_keyboard_shortcuts()
+
+ return None
+ 
 # code -> xml.etree.ElementTree.Element
 def _get_events_dict(xml_root):
 events_dict = {}
@@ -317,7 +389,8 @@
 if mod_name != "":
 mod_name = mod_name + " + "
 return (mod_name + _key_namesevent.text, _keyboard_action_namescode) 
- except:
+ except Exception as e:
+ print("Exception: ", e)
 print("error in get_shortcut_info, event.text:", event.text)
 pass
 
@@ -398,7 +471,7 @@
 _keyboard_action_names'switch_monitor' = _("Switch Monitor Source")
 _keyboard_action_names'display_clip_in_monitor' = _("Display Clip In Monitor")
 _keyboard_action_names'display_sequence_in_monitor' = _("Display Sequence In Monitor")
- _keyboard_action_names'add_marker' = _("Add Mark")
+ _keyboard_action_names'add_marker' = _("Add Marker")
 _keyboard_action_names'enter_edit' = _("Complete Keyboard Trim Edit")
 _keyboard_action_names'nudge_back' = _("Nudge Move Selection Back 1 Frame")
 _keyboard_action_names'nudge_forward' = _("Nudge Move Selection Forward 1 Frame")
@@ -425,6 +498,7 @@
 _keyboard_action_names'clear_sync_relation' = _('Clear Clip Sync Relation')
 _keyboard_action_names'toggle_audio_mute' = _('Toggle Clip Audio Mute')
 _keyboard_action_names'set_sync_relation' = _('Set Clip Sync Relation')
+ _keyboard_action_names'mark_selection_range' = _('Mark Selection Range')
 
 def _set_key_names():
 global _key_names, _mod_names, _gtk_mod_names

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/shortcutsdialog.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/shortcutsdialog.py Changed

@@ -24,6 +24,7 @@
 import editorpersistance
 import editorstate
 import dialogutils
+import gtkevents
 import guicomponents
 import guiutils
 import shortcuts
@@ -184,7 +185,7 @@
     trimming_box.pack_start(_get_kb_row(_("Right Arrow"), _("Next Frame Trim Edit")), False, False, 0)
     trimming_box.pack_start(_get_kb_row(_("Shift + Left Arrow "), _("Back 10 Frames Trim Edit")), False, False, 0)
     trimming_box.pack_start(_get_kb_row(_("Shift + Right Arrow"), _("Forward 10 Frames Trim Edit")), False, False, 0)
-    trimming_box.pack_start(_get_kb_row(_("ENTER"),  _("Complete Keyboard Trim Edit")), False, False, 0) #  _get_dynamic_kb_row(root_node, "enter_edit"), False, False, 0)
+    trimming_box.pack_start(_get_kb_row(_("ENTER"),  _("Init / Complete Keyboard Trim Edit")), False, False, 0) #  _get_dynamic_kb_row(root_node, "enter_edit"), False, False, 0)
     trimming = guiutils.get_named_frame(_("Trimming"), trimming_box)
 
     sync_box = Gtk.VBox()
@@ -198,6 +199,7 @@
     marks_box = Gtk.VBox()
     marks_box.pack_start(_get_dynamic_kb_row(root_node, "mark_in"), False, False, 0)
     marks_box.pack_start(_get_dynamic_kb_row(root_node, "mark_out"), False, False, 0)
+    marks_box.pack_start(_get_dynamic_kb_row(root_node, "mark_selection_range"), False, False, 0)
     marks_box.pack_start(_get_dynamic_kb_row(root_node, "to_mark_in"), False, False, 0)
     marks_box.pack_start(_get_dynamic_kb_row(root_node, "to_mark_out"), False, False, 0)
     marks_box.pack_start(_get_dynamic_kb_row(root_node, "clear_io_marks"), False, False, 0)
@@ -237,7 +239,7 @@
     kfs_vbox = Gtk.VBox()
     kfs_vbox.pack_start(_get_kb_row(_("Control + C"), _("Copy Keyframe Value")), False, False, 0)
     kfs_vbox.pack_start(_get_kb_row(_("Control + V"), _("Paste Keyframe Value")), False, False, 0)
-    kfs_vbox.pack_start(_get_kb_row(_("Control + Mouse Drag"), _("Move all keyframes after selected")), False, False, 0)
+    kfs_vbox.pack_start(_get_kb_row(_("Shift + Mouse Drag"), _("Move all keyframes after selected")), False, False, 0)
     kfs = guiutils.get_named_frame(_("Keyframe and Geometry Editor"), kfs_vbox)
     
     geom_vbox = Gtk.VBox()
@@ -387,8 +389,9 @@
         item_vbox.pack_start(input_label, True, True, 0)
            
         self.kb_input = Gtk.EventBox()
-        self.kb_input.add_events(Gdk.EventMask.KEY_PRESS_MASK)
-        self.kb_input.connect("key-press-event", lambda w,e: self.kb_input_listener(e))
+        self.kb_input.add_events(Gdk.EventMask.KEY_PRESS_MASK)    
+        self.global_key_controller = gtkevents.KeyPressEventAdapter(self.kb_input, self.kb_input_listener)
+        
         self.kb_input.set_can_focus(True)
         self.kb_input.add(item_vbox)
 
@@ -415,7 +418,7 @@
         self.kb_input.grab_focus()
         KBShortcutEditor.input_listener = self
 
-    def kb_input_listener(self, event):
+    def kb_input_listener(self, widget, event):
 
         
         # Gdk.KEY_Return ? Are using this as clear and make "exit trim edit" not settable?

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/syncsplitevent.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/syncsplitevent.py Changed

@@ -70,35 +70,26 @@
 item_id = "not actually used"
 split_actions_data = 
 split_actions = 
+
 for clip in clips:
 # We're using the existing function to do this need x for clip frame to use it
 index = track.clips.index(clip)
 frame = track.clip_start(index)
 x = tlinewidgets._get_frame_x(frame)
 
- popup_data = (clip, track, item_id, x)
-
 # We can only split audio from unmuted clips because splitting mutes audio
 # and we want to avoid splitting audio twice.
 if clip.mute_filter == None:
- split_action, parent_clip, child_clip, child_clip_track = _get_split_audio_edit_action(popup_data)
+ split_action = _create_sync_split_action_lambda(clip, track) #:lambda : get_synched_split_action_for_clip_and_track(clip, track)
 split_actions.append(split_action)
- split_actions_data.append((parent_clip, child_clip, child_clip_track))
- 
- # We need to do split action before creating set sync actio0ns because we need a clip on timeline 
+
+ # We need to do split action before creating set sync actions because we need a clip on timeline 
 # to actually sync with.
 split_consolidated_action = edit.ConsolidatedEditAction(split_actions)
 split_consolidated_action.do_consolidated_edit()
 
- set_sync_actions = 
- for split_data in split_actions_data:
- parent_clip, child_clip, child_clip_track = split_data
- 
- sync_action = _get_set_sync_action(child_clip_track, child_clip, parent_clip, track)
- set_sync_actions.append(sync_action)
-
- sync_consolidated_action = edit.ConsolidatedEditAction(set_sync_actions)
- sync_consolidated_action.do_consolidated_edit()
+def _create_sync_split_action_lambda(clip, track):
+ return lambda : get_synched_split_action_for_clip_and_track(clip, track)
 
 def sync_menu_launch_pressed(launcher, widget, event):
 guipopover.sync_menu_show(launcher, widget, _sync_property_item_activated, _sync_split_property_activated, _auto_sync_split_menu_item_item_activated)
@@ -112,7 +103,9 @@
 editorpersistance.prefs.sync_dualtrim = new_state
 elif msg == "showsync":
 editorpersistance.prefs.show_sync = new_state
- 
+ elif msg == "autotrimsingle":
+ editorpersistance.prefs.auto_sync_single_childs_on_trim = new_state
+
 action.set_state(GLib.Variant.new_boolean(new_state))
 
 def _sync_split_property_activated(action, variant):
@@ -141,7 +134,6 @@
 "parent_track":parent_track}
 action = edit.set_sync_action(data)
 return action
- #action.do_edit()
 
 def split_audio(popup_data):
 clip, track, item_id, x = popup_data
@@ -171,7 +163,7 @@
 if clip.mute_filter == None:
 action, clip, audio_clip, to_track = _get_split_audio_edit_action(popup_data)
 actions_list.append(action)
- 
+
 consolidated_action = edit.ConsolidatedEditAction(actions_list)
 consolidated_action.do_consolidated_edit()
 
@@ -188,7 +180,7 @@
 if to_track_id < 1:
 to_track_id = 1
 to_track = current_sequence().tracksto_track_id
- 
+
 press_frame = tlinewidgets.get_frame(x)
 index = current_sequence().get_clip_index(track, press_frame)
 frame = track.clip_start(index)
@@ -214,7 +206,7 @@
 if to_track_id < 1:
 to_track_id = 1
 to_track = current_sequence().tracksto_track_id
- 
+ 
 index = track.clips.index(clip)
 frame = track.clip_start(index)
 
@@ -396,8 +388,8 @@
 sel_type, selected_range_in, selected_range_out, child_clip_track = parent_selection_data
 parent_track = tlinewidgets.get_track(event.y)
 if parent_track == None:
- return 
- 
+ return
+
 child_clips = 
 for i in range(selected_range_in, selected_range_out + 1):
 child_clips.append(child_clip_track.clipsi)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tlineaction.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tlineaction.py Changed

@@ -68,7 +68,7 @@
 
 
 # --------------------------- module funcs
-def _get_new_clip_from_clip_monitor():
+def _get_new_clip_from_clip_monitor(force_range=True):
 """
 Creates and returns new clip from current clip monitor clip
 with user set in and out points.
@@ -91,10 +91,11 @@
 new_clip.mark_out = MONITOR_MEDIA_FILE().mark_out
 new_clip.name = MONITOR_MEDIA_FILE().name
 
- if new_clip.mark_in == -1:
- new_clip.mark_in = 0
- if new_clip.mark_out == -1:
- new_clip.mark_out = new_clip.get_length() - 1 #-1 == out inclusive
+ if force_range == True:
+ if new_clip.mark_in == -1:
+ new_clip.mark_in = 0
+ if new_clip.mark_out == -1:
+ new_clip.mark_out = new_clip.get_length() - 1 #-1 == out inclusive
 
 return new_clip
 
@@ -624,12 +625,29 @@
 range_end_frame = out_start + out_clip.clip_out - out_clip.clip_in
 range_length = range_end_frame - range_start_frame + 1 # calculated end is incl.
 
- over_clip = _get_new_clip_from_clip_monitor()
+ over_clip = _get_new_clip_from_clip_monitor(False)
 if over_clip == None:
 no_monitor_clip_info(gui.editor_window.window)
 return
- over_length = over_clip.mark_out - over_clip.mark_in + 1 # + 1 out incl ?????????? what if over_clip.mark_out == -1 ?????????? 
- 
+
+ if over_clip.mark_in == -1 and over_clip.mark_out == -1:
+ over_clip.mark_in = 0
+ over_clip.mark_out = over_clip.get_length() - 1 #-1 == out inclusive
+ elif over_clip.mark_out == -1:
+ if range_length > over_clip.get_length() - over_clip.mark_in:
+ monitor_clip_too_short(gui.editor_window.window)
+ return
+ else:
+ over_clip.mark_out = over_clip.mark_in + over_clip.get_length() - 1
+ elif over_clip.mark_in == -1:
+ if range_length <= over_clip.mark_out:
+ # Use mark out for monitor clip
+ over_clip.mark_in = over_clip.mark_out - range_length + 1
+ else:
+ monitor_clip_too_short(gui.editor_window.window)
+ return
+
+ over_length = over_clip.mark_out - over_clip.mark_in + 1 # + 1 out incl
 if over_length < range_length:
 monitor_clip_too_short(gui.editor_window.window)
 return
@@ -666,22 +684,37 @@
 return
 
 # Get over clip and check it overwrite range area
- over_clip = _get_new_clip_from_clip_monitor()
+ over_clip = _get_new_clip_from_clip_monitor(False)
 if over_clip == None:
 no_monitor_clip_info(gui.editor_window.window)
 return
 
- # tractor is has mark in and mark
+ # Tractor has mark in and mark out.
 mark_in_frame = current_sequence().tractor.mark_in
 mark_out_frame = current_sequence().tractor.mark_out
- 
+
 # Case timeline marked
- if mark_in_frame != -1 and mark_out_frame != -1:
+ if mark_in_frame != -1 and mark_out_frame != -1: 
 range_length = mark_out_frame - mark_in_frame + 1 # end is incl.
 if over_clip.mark_in == -1:
- # This actually should never be hit because mark in and mark out seem to first and last frame if nothing set
- show_three_point_edit_not_defined()
- return
+ if over_clip.mark_out == -1:
+ # not enough data
+ show_three_point_edit_not_defined()
+ return
+ else:
+ if range_length <= over_clip.mark_out:
+ # Use mark out for monitor clip
+ over_clip.mark_in = over_clip.mark_out - range_length + 1
+ else:
+ monitor_clip_too_short(gui.editor_window.window)
+ return
+ elif over_clip.mark_out == -1:
+ if range_length >= over_clip.get_length() - over_clip.mark_in:
+ monitor_clip_too_short(gui.editor_window.window)
+ return
+ else:
+ # Use mark in for monitor clip
+ over_clip.mark_out = over_clip.mark_in + range_length - 1
 
 over_length = over_clip.mark_out - over_clip.mark_in + 1 # + 1 out incl
 if over_length < range_length:
@@ -719,9 +752,8 @@
 "clip_in":over_clip.mark_in,
 "clip_out":over_clip_out,
 "mark_in_frame":mark_in_frame,
- "mark_out_frame":mark_out_frame + 1} # +1 because mark is displayed and end of frame end this 
- # confirms to user expectation of
- # of how this should work
+ "mark_out_frame":mark_out_frame + 1} # +1 because mark is displayed at end of frame end because this 
+ # is how user expects this to work.
 action = edit.range_overwrite_action(data)
 action.do_edit()
 
@@ -960,16 +992,23 @@
 
 # --------------------------------------------------------- view move setting
 def view_mode_menu_lauched(launcher, widget, event):
- guipopover.monitor_view_popupmenu_show(launcher, widget, _view_mode_menu_item_item_activated, _opacity_menu_item_item_activated)
+ guipopover.monitor_view_popupmenu_show(launcher, widget, _view_mode_menu_item_item_activated, _opacity_menu_item_item_activated, _waveform_callback)
 
 def _view_mode_menu_item_item_activated(action, new_value_variant):
 msg = int(new_value_variant.get_string())
- 
 editorstate.current_sequence().set_output_mode(msg)
 editorstate.tline_view_mode = msg
 action.set_state(new_value_variant)
 guipopover._monitorview_popover.hide()
 
+def _waveform_callback(action, variant, msg):
+ pass
+ #new_state = not(action.get_state().get_boolean())
+ #editorpersistance.prefs.show_waveform_in_monitor = new_state
+ #editorpersistance.save()
+ #action.set_state(GLib.Variant.new_boolean(new_state))
+ #gui.monitor_waveform_display.update_visibility()
+ 
 def set_monitor_display_mode(display_mode):
 editorstate.current_sequence().set_output_mode(display_mode)
 editorstate.tline_view_mode = display_mode
@@ -988,6 +1027,7 @@
 action.set_state(new_value_variant)
 guipopover._monitorview_popover.hide()
 
+
 # ------------------------------------------------------- dialogs 
 def no_monitor_clip_info(parent_window):
 primary_txt = _("No Clip loaded into Monitor")
@@ -1255,11 +1295,11 @@
 # ---------------------------------------- timeline edits
 def all_filters_off():
 current_sequence().set_all_filters_active_state(False)
- clipeffectseditor.update_stack_view()
+ clipeffectseditor.reinit_stack_if_needed(True)
 
 def all_filters_on():
 current_sequence().set_all_filters_active_state(True)
- clipeffectseditor.update_stack_view()
+ clipeffectseditor.reinit_stack_if_needed(True)
 
 def set_track_small_height(track_index):
 track = get_track(track_index)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tlinecursors.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tlinecursors.py Changed

@@ -180,35 +180,10 @@
         modesetting.overwrite_move_mode_pressed()
         self.set_cursor_to_mode()
 
-    """
-    def handle_box_mode_button_press(self):
-        modesetting.box_mode_pressed()
-        self.set_cursor_to_mode()
-    """
-    
     def handle_insert_move_mode_button_press(self):
         modesetting.insert_move_mode_pressed()
         self.set_cursor_to_mode()
 
-    """
-    def handle_one_roll_mode_button_press(self):
-        editorstate.trim_mode_ripple = False
-        modesetting.oneroll_trim_no_edit_init()
-        self.set_cursor_to_mode()
-
-    def handle_one_roll_ripple_mode_button_press(self):
-        editorstate.trim_mode_ripple = True
-        modesetting.oneroll_trim_no_edit_init()
-        self.set_cursor_to_mode()
-
-    def handle_two_roll_mode_button_press(self):
-        modesetting.tworoll_trim_no_edit_init()
-        self.set_cursor_to_mode()
-
-    def handle_slide_mode_button_press(self):
-        modesetting.slide_trim_no_edit_init()
-        self.set_cursor_to_mode()
-    """
     def handle_multi_mode_button_press(self):
         modesetting.multi_mode_pressed()
         self.set_cursor_to_mode()
@@ -244,18 +219,8 @@
             self.handle_insert_move_mode_button_press()
         if tool == appconsts.TLINE_TOOL_OVERWRITE:
             self.handle_over_move_mode_button_press()
-        #if tool == appconsts.TLINE_TOOL_TRIM:
-        #    self.handle_one_roll_mode_button_press()
-        #if tool == appconsts.TLINE_TOOL_RIPPLE_TRIM:
-        #    self.handle_one_roll_ripple_mode_button_press()
-        #if tool == appconsts.TLINE_TOOL_ROLL:
-        #    self.handle_two_roll_mode_button_press()
-        #if tool == appconsts.TLINE_TOOL_SLIP:
-        #    self.handle_slide_mode_button_press()
         if tool == appconsts.TLINE_TOOL_SPACER:
             self.handle_multi_mode_button_press()
-        #if tool == appconsts.TLINE_TOOL_BOX:
-        #    self.handle_box_mode_button_press()
         if tool == appconsts.TLINE_TOOL_CUT:
             self.handle_cut_mode_button_press()
         if tool == appconsts.TLINE_TOOL_KFTOOL:

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tlinewidgets.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tlinewidgets.py Changed

@@ -83,7 +83,7 @@
 COLUMN_WIDTH = 150 # column area width
 SCALE_HEIGHT = 25
 SCROLL_HEIGHT = 20
-Y_SCROLL_WIDTH = 19
+Y_SCROLL_WIDTH = 17
 ACTIVE_SWITCH_WIDTH = 18
 COMPOSITOR_HEIGHT_OFF = 10
 COMPOSITOR_HEIGHT = 20
@@ -143,7 +143,8 @@
 SCALE_LINE_Y = 4.5 # scale horizontal line pos
 SMALL_TICK_Y = 18.5 # end for tick drawn in all scales 
 BIG_TICK_Y = 12.5 # end for tick drawn in most zoomed in scales
-TC_Y = 12 # TC text pos in scale.
+TC_Y = 13 # TC text pos in scale.
+TC_X_OFF = -1 # tc x pos tuing in scale
 # Timeline scale is rendered with hardcoded steps for hardcoded 
 # pix_per_frame ranges.
 DRAW_THRESHOLD_1 = 6 # if pix_per_frame below this, draw secs.
@@ -200,7 +201,7 @@
 IMAGE_CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, IMAGE_CLIP_COLOR_GRAD, GRAD_MULTIPLIER) 
 IMAGE_CLIP_SELECTED_COLOR = get_multiplied_color_from_grad(IMAGE_CLIP_COLOR_GRAD, SELECTED_MULTIPLIER + 0.1)
 
-TITLE_IMAGE_CLIP_COLOR_GRAD = (1, 0.20, 0.48, 0.40, 1) # (1, 0.16, 0.26, 0.32, 1) #(1, 0.33, 0.65, 0.69, 1)
+TITLE_IMAGE_CLIP_COLOR_GRAD = (1, 0.42, 0.18, 0.70, 1) # (1, 0.16, 0.26, 0.32, 1) #(1, 0.33, 0.65, 0.69, 1)
 TITLE_IMAGE_CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, TITLE_IMAGE_CLIP_COLOR_GRAD, GRAD_MULTIPLIER) 
 TITLE_IMAGE_CLIP_SELECTED_COLOR = get_multiplied_color_from_grad(TITLE_IMAGE_CLIP_COLOR_GRAD, SELECTED_MULTIPLIER + 0.1)
 
@@ -252,6 +253,7 @@
 BOX_DASHES = BOX_DASH_INK, BOX_DASH_SKIP, BOX_DASH_INK, BOX_DASH_SKIP
 
 FRAME_SCALE_LINES = (0, 0, 0)
+FRAME_SCALE_TEXT = (0, 0, 0)
 
 BG_COLOR = (0.5, 0.5, 0.55)
 FRAME_SCALE_NEUTRAL_BG_COLOR = ((35.0/255.0) + 0.02, (35.0/255.0) + 0.02, (35.0/255.0) + 0.02)
@@ -288,7 +290,7 @@
 TRACK_GRAD_ORANGE_STOP1 = None
 TRACK_GRAD_ORANGE_STOP3 = None
 
-Y_SCROLL_BG = (0.215, 0.215, 0.215)
+Y_SCROLL_BG = (0.17, 0.17, 0.17)
 
 DARK_THEME_COLUMN_BG = ((62.0/255.0), (62.0/255.0), (62.0/255.0))
 
@@ -375,15 +377,15 @@
 TC_POINTER_HEAD = _load_pixbuf("tc_pointer_head.png")
 EDIT_INDICATOR = _load_pixbuf("clip_edited.png")
 
- global FRAME_SCALE_COLOR_GRAD, FRAME_SCALE_COLOR_GRAD_L, BG_COLOR, FRAME_SCALE_LINES, TRACK_GRAD_STOP1, TRACK_GRAD_STOP3, TRACK_NAME_COLOR, \
+ global FRAME_SCALE_COLOR_GRAD, FRAME_SCALE_COLOR_GRAD_L, BG_COLOR, FRAME_SCALE_LINES, FRAME_SCALE_TEXT, TRACK_GRAD_STOP1, TRACK_GRAD_STOP3, TRACK_NAME_COLOR, \
 TRACK_GRAD_ORANGE_STOP1, TRACK_GRAD_ORANGE_STOP3, BLANK_CLIP_COLOR_GRAD, BLANK_CLIP_COLOR_GRAD_L, COLUMN_NOT_ACTIVE_COLOR
 
+ FRAME_SCALE_LINES = (0.5, 0.5, 0.5)
+ FRAME_SCALE_TEXT = (0.65, 0.65, 0.65)
 FRAME_SCALE_COLOR_GRAD = (1, 0.3, 0.3, 0.3, 1)
 FRAME_SCALE_COLOR_GRAD_L = get_multiplied_grad(0, 1, FRAME_SCALE_COLOR_GRAD, GRAD_MULTIPLIER)
 BG_COLOR = (0.44, 0.44, 0.46)
 
- FRAME_SCALE_LINES = (0.8, 0.8, 0.8)
-
 TRACK_NAME_COLOR = (0.68, 0.68, 0.68)
 TRACK_ALL_ON_V_ICON = _load_pixbuf("track_all_on_V_fb.png", True)
 TRACK_ALL_ON_A_ICON = _load_pixbuf("track_all_on_A_fb.png", True)
@@ -396,7 +398,8 @@
 INSERT_ARROW_ICON_INACTIVE = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "insert_arrow_inactive_fb.png")
 INSERT_ARROW_ICON_UP_INACTIVE = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "insert_arrow_up_inactive_fb.png")
 
- r = g = b = 0.215
+ # Tracks column track color
+ r = g = b = 0.190
 
 BLANK_CLIP_COLOR_GRAD = (1, 0.20, 0.20, 0.20, 1)
 BLANK_CLIP_COLOR_GRAD_L = (1, 0.20, 0.20, 0.20, 1)
@@ -409,8 +412,8 @@
 
 COLUMN_NOT_ACTIVE_COLOR = (0.40, 0.40, 0.40)
 
- FRAME_SCALE_LINES = (0.5, 0.5, 0.5)
 
+ 
 def update_clip_thumbnail(media_file):
 global clip_thumbnails
 
@@ -735,7 +738,7 @@
 
 _create_compositor_cairo_path(cr, scale_in, scale_length, y, target_y)
 
- cr.set_source_rgb(*BOX_BOUND_COLOR)
+ cr.set_source_rgba(*BOX_BOUND_COLOR)
 cr.stroke()
 
 # Draw bounding box
@@ -1488,7 +1491,7 @@
 """
 Mouse button callback
 """
- if event.type == Gdk.EventType._2BUTTON_PRESS:
+ if event.n_press == 2:
 self.double_click_listener(get_frame(event.x), event.x, event.y)
 return
 
@@ -2436,7 +2439,7 @@
 """
 Mouse button callback
 """
- if event.type == Gdk.EventType._2BUTTON_PRESS:
+ if event.n_press == 2:
 for tester in self.track_testers:
 if tester.is_hit(event.y):
 self.double_click_listener(tester.data.track)
@@ -2623,6 +2626,7 @@
 cr.rectangle(rect0 + 0.5, rect1 + 0.5, rect2 - 1, rect3)
 cr.stroke()
 
+
 class TimeLineFrameScale:
 """
 GUI component for displaying frame tme value scale.
@@ -2639,6 +2643,8 @@
 self.drag_on = False
 self.set_default_callback = set_default_callback
 
+ #self.font_desc = Pango.FontDescription("Bitstream Vera Sans Mono Condensed " + str(8))
+ 
 global FRAME_SCALE_SELECTED_COLOR_GRAD, FRAME_SCALE_SELECTED_COLOR_GRAD_L, MARK_COLOR 
 FRAME_SCALE_SELECTED_COLOR_GRAD = DARK_FRAME_SCALE_SELECTED_COLOR_GRAD
 FRAME_SCALE_SELECTED_COLOR_GRAD_L = DARK_FRAME_SCALE_SELECTED_COLOR_GRAD_L
@@ -2732,11 +2738,15 @@
 spacer_mult = 2 # for fps like 15 this looks bad without some help
 else:
 spacer_mult = 1
- 
+ 
+ text_x_off = TC_X_OFF
 if pix_per_frame > DRAW_THRESHOLD_1:
 small_tick_step = 1
 big_tick_step = fps / 2
 tc_draw_step = (fps * spacer_mult) / 2
+ if pix_per_frame < 9.0:
+ tc_draw_step = fps * spacer_mult
+ text_x_off = 4
 elif pix_per_frame > DRAW_THRESHOLD_2:
 small_tick_step = fps * spacer_mult
 tc_draw_step = fps * spacer_mult
@@ -2752,13 +2762,13 @@
 tc_draw_step = int(view_length / NUMBER_OF_LINES)
 
 # Draw tc
- cr.select_font_face ("sans-serif",
+ cr.select_font_face ("monospace",
 cairo.FONT_SLANT_NORMAL,
 cairo.FONT_WEIGHT_NORMAL)
 
 cr.set_font_size(11)
 
- # Draw small tick lines
+ # Draw small tick lines and tc texts.
 # Get draw range in steps from 0
 start = int(view_start_frame / small_tick_step)
 if start * small_tick_step == pos:
@@ -2767,14 +2777,17 @@
 end = int(view_end_frame / small_tick_step) + 1 
 for i in range(start, end):
 x = math.floor(i * small_tick_step * pix_per_frame - pos * pix_per_frame) + 0.5 
- # Aug-2019 - SvdB - BB - Added size_adj
 cr.move_to(x, SCALE_HEIGHT*size_adj)
 cr.line_to(x, SMALL_TICK_Y)
+ #cr.set_source_rgb(*FRAME_SCALE_LINES)
+ cr.stroke()
 if tc_draw_step == small_tick_step:
- cr.move_to(x, TC_Y)
+ cr.move_to(x + text_x_off, TC_Y)
 text = utils.get_tc_string(int(round(float(i) * float(tc_draw_step))))
+ cr.set_source_rgb(*FRAME_SCALE_TEXT)
 cr.show_text(text)
- cr.stroke()
+
+ cr.set_source_rgb(*FRAME_SCALE_LINES)
 
 # 23.98 and 29.97 need this to get drawn on even seconds with big ticks and tcs
 if round(fps) != fps:
@@ -2784,13 +2797,16 @@
 
 # Draw big tick lines, if required
 if big_tick_step != -1:
- count = int(seq.get_length() / big_tick_step)
- for i in range(1, count):
+ start = int(view_start_frame / big_tick_step)
+ if start * big_tick_step == pos:
+ start += 1 # don't draw line on first pixel of scale display
+ # +1 to ensure coverage
+ end = int(view_end_frame / big_tick_step) + 1 
+ for i in range(start, end):
 x = math.floor((math.floor(i * big_tick_step) + to_seconds_fix_add) * pix_per_frame \
 - pos * pix_per_frame) + 0.5 
- # Aug-2019 - SvdB - BB - Added size_adj
 cr.move_to(x, SCALE_HEIGHT*size_adj)
- cr.line_to(x, BIG_TICK_Y)
+ cr.line_to(x, 5)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/batchrendering.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/batchrendering.py Changed

@@ -118,6 +118,7 @@
 continue
 
 current_render_time = 0
+ batch_window.render_path = render_item.render_path
 
 # Create render objects
 identifier = render_item.generate_identifier()
@@ -307,7 +308,8 @@
 render_item.save()
 
 # Launch app if not already running.
- launch_batch_rendering()
+ render_file_name = os.path.basename(render_path)
+ launch_batch_rendering(render_file_name)
 
 
 # ------------------------------------------------------- file utils
@@ -364,10 +366,13 @@
 os.mkdir(folder)
 
 # --------------------------------------------------------------- app thread and data objects
-def launch_batch_rendering():
+def launch_batch_rendering(render_file_name=None):
 ipc_handle = BatchRenderIPC()
 if ipc_handle.app_running() == True:
- _show_single_instance_info()
+ if render_file_name == None:
+ _show_single_instance_info()
+ else:
+ _show_queue_add_info(render_file_name)
 else:
 _do_batch_render_launch()
 
@@ -452,6 +457,31 @@
 dialog.connect('response', _early_exit)
 dialog.show_all()
 
+def _show_queue_add_info(render_file_name):
+ global timeout_id
+ timeout_id = GLib.timeout_add(200, _display_queue_add_window, render_file_name)
+ 
+def _display_queue_add_window(render_file_name):
+ GObject.source_remove(timeout_id)
+ primary_txt = _("Render Item added to Render Queue")
+
+ msg_template = _("Render Item %s was added to Render Queue.")
+ msg = msg_template % render_file_name
+
+ content = dialogutils.get_warning_message_dialog_panel(primary_txt, msg, True)
+ align = dialogutils.get_default_alignment(content)
+
+ dialog = Gtk.Dialog("",
+ None,
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+ (_("OK"), Gtk.ResponseType.OK))
+
+ dialog.vbox.pack_start(align, True, True, 0)
+ dialogutils.set_outer_margins(dialog.vbox)
+ dialogutils.default_behaviour(dialog)
+ dialog.connect('response', _early_exit)
+ dialog.show_all()
+
 def _early_exit(dialog, response):
 dialog.destroy()
 
@@ -695,25 +725,38 @@
 app_icon = GdkPixbuf.Pixbuf.new_from_file(respaths.IMAGE_PATH + "flowbladebatchappicon.png")
 self.window.set_icon(app_icon)
 
+ self.render_path = None # Set from thread.
+ self.free_disk = None # Needs to have path available.
+ self.file_size = None # Needs to have path available.
+ 
 self.est_time_left = Gtk.Label()
 self.current_render = Gtk.Label()
 self.current_render_time = Gtk.Label()
 self.current_file = Gtk.Label()
+ self.size_warning = Gtk.Label()
+ self.file_est = Gtk.Label()
+ 
 est_r = guiutils.get_right_justified_box(guiutils.bold_label(_("Estimated Left:")))
 current_r = guiutils.get_right_justified_box(guiutils.bold_label(_("Current Render:")))
 current_r_t = guiutils.get_right_justified_box(guiutils.bold_label(_("Elapsed:")))
 current_file = guiutils.get_right_justified_box(guiutils.bold_label(_("File:")))
+ file_size_est = guiutils.get_right_justified_box(guiutils.bold_label(_("File Size Est. / Free Disk:"))) 
+ 
 est_r.set_size_request(250, 20)
 current_r.set_size_request(250, 20)
 current_r_t.set_size_request(250, 20)
 current_file.set_size_request(250, 20)
+ file_size_est.set_size_request(250, 20)
+ self.size_warning.set_size_request(250, 20)
 
 info_vbox = Gtk.VBox(False, 0)
 info_vbox.pack_start(guiutils.get_left_justified_box(current_r, self.current_render), False, False, 0)
 info_vbox.pack_start(guiutils.get_left_justified_box(current_file, self.current_file), False, False, 0)
 info_vbox.pack_start(guiutils.get_left_justified_box(current_r_t, self.current_render_time), False, False, 0)
 info_vbox.pack_start(guiutils.get_left_justified_box(est_r, self.est_time_left), False, False, 0)
- 
+ info_vbox.pack_start(guiutils.get_left_justified_box(file_size_est, self.file_est), False, False, 0)
+ info_vbox.pack_start(guiutils.get_centered_box(self.size_warning), False, False, 0)
+
 self.items_rendered = Gtk.Label()
 items_r = Gtk.Label(label=_("Items Rendered:"))
 self.render_started_label = Gtk.Label()
@@ -877,6 +920,17 @@
 queue_runner_thread.start()
 
 def update_render_progress(self, fraction, items, current_name, current_render_time_passed):
+
+ if self.render_path != None:
+ try:
+ self.file_size = os.path.getsize(self.render_path)
+ if self.free_disk == None:
+ total, used, free = shutil.disk_usage(os.path.dirname(self.render_path))
+ self.free_disk = free 
+ 
+ except FileNotFoundError:
+ pass # this can get called once before file hits disk
+ 
 self.render_progress_bar.set_fraction(fraction)
 
 progress_str = str(int(fraction * 100)) + " %"
@@ -898,6 +952,26 @@
 
 self.items_rendered.set_text(" " + str(items))
 
+ est_free_mb = round(self.free_disk / 1048576)
+ if fraction > 0.25:
+
+ # We did some testing and pulled this algorithm right out of our...stetson hat.
+ # At least with short simple renders we get too small values all the way through.
+ est_file_size = (1.0 / fraction * self.file_size) * ((1.0 - (fraction - 0.25) / 0.75) * 0.1 + 1.0)
+ est_size_mb = est_file_size / 1048576
+ 
+ if est_size_mb > 0.99999:
+ est_size_mb = round(est_size_mb)
+ else:
+ est_size_mb = round(est_size_mb, 1)
+
+ self.file_est.set_text(" " + str(est_size_mb) + " MB / " + str(est_free_mb) + " MB")
+ 
+ if est_file_size > 0.6 * self.free_disk:
+ self.size_warning.set_text(_("Warning! Estimated render size exeeds 60% of available disk space!"))
+ else:
+ self.file_est.set_text(" " + _("N/A") + " / " + str(est_free_mb) + " MB")
+ 
 def abort_render(self):
 global queue_runner_thread
 queue_runner_thread.abort()
@@ -912,7 +986,8 @@
 self.current_file.set_text("")
 self.remove_selected.set_sensitive(True)
 self.remove_finished.set_sensitive(True)
-
+ self.file_est.set_text("")
+ 
 global queue_runner_thread, render_thread
 render_thread = None
 queue_runner_thread = None 
@@ -1032,9 +1107,7 @@
 elif msg == "delete":
 batch_window.remove_item(render_item)
 elif msg == "saveas":
- file_name = run_save_project_as_dialog(render_item.project_name)
- if file_name != None:
- copy_project(render_item, file_name)
+ run_save_project_as_dialog(render_item)
 elif msg == "changepath":
 show_change_render_item_path_dialog(_change_render_item_path_callback, render_item)
 
@@ -1050,8 +1123,8 @@
 self.storemodel.append(row_data)
 self.scroll.queue_draw()
 
-
-def run_save_project_as_dialog(project_name):
+def run_save_project_as_dialog(render_item):
+ project_name = render_item.project_name
 dialog = Gtk.FileChooserDialog(_("Save Render Item Project As"), None, 
 Gtk.FileChooserAction.SAVE, 
 (_("Cancel"), Gtk.ResponseType.REJECT,
@@ -1060,13 +1133,16 @@
 project_name = project_name.rstrip(".flb")
 dialog.set_current_name(project_name + "_FROM_BATCH.flb")
 dialog.set_do_overwrite_confirmation(True)
- response_id = dialog.run()
- if response_id == Gtk.ResponseType.NONE:
+ dialog.connect('response', _save_render_callback, render_item)
+ dialog.show()
+
+def _save_render_callback(dialog, response_id, render_item):
+ if response_id == Gtk.ResponseType.ACCEPT:
+ file_name = dialog.get_filename()
+ copy_project(render_item, file_name)
+ dialog.destroy()
+ else:
 dialog.destroy()
- return None

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/gmic.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/gmic.py Changed

@@ -49,6 +49,7 @@
 import guiutils
 import glassbuttons
 import gtkbuilder
+import gtkevents
 import mltinit
 import mltprofiles
 import positionbar
@@ -584,7 +585,6 @@
 hamburger_launcher_surface = guiutils.get_cairo_image("hamburger")
 psize = 22
 self.hamburger_launcher = toolguicomponents.PressLaunchSurface(self.hamburger_launch_pressed, hamburger_launcher_surface, psize, psize)
- #self.hamburger_launcher.connect_launched_menu(_hamburger_menu)
 
 # Load media row
 self.load_button = Gtk.Button(label=_("Load Clip"))
@@ -603,15 +603,14 @@
 load_row.set_margin_bottom(8)
 
 # Clip monitor
- black_box = Gtk.EventBox()
- black_box.add(Gtk.Label())
- self.monitor = black_box # This could be any GTK+ widget (that is not "windowless"), only its XWindow draw rect 
- # is used to position and scale SDL overlay that actually displays video.
+ self.monitor = Gtk.Label()
 self.monitor.set_size_request(MONITOR_WIDTH, MONITOR_HEIGHT)
-
+ self.monitors_holder = Gtk.Stack() 
+ self.monitors_holder.add_named(self.monitor, "monitor") # we need to put Gtk.Label inside something with a XWindow to work with SDL.
+ 
 left_vbox = Gtk.VBox(False, 0)
 left_vbox.pack_start(load_row, False, False, 0)
- left_vbox.pack_start(self.monitor, True, True, 0)
+ left_vbox.pack_start(self.monitors_holder, True, True, 0)
 
 self.preview_info = Gtk.Label()
 self.preview_info.set_markup("" + _("no preview") + "" )
@@ -681,9 +680,7 @@
 # Script area 
 # Script selector menu launcher
 self.preset_label = Gtk.Label()
- self.present_event_box = Gtk.EventBox()
- self.present_event_box.add(self.preset_label)
- self.present_event_box.connect("button-press-event", self.script_menu_lauched)
+ self.present_event_box = gtkbuilder.EventBox(self.preset_label, "button-press-event", self.script_menu_lauched)
 
 self.script_menu = toolguicomponents.PressLaunch(self.script_menu_lauched)
 
@@ -860,8 +857,8 @@
 self.update_encode_sensitive()
 
 # Connect global key listener
- self.connect("key-press-event", _global_key_down_listener)
-
+ self.global_key_controller = gtkevents.KeyPressEventAdapter(self, _global_key_down_listener, user_data=None, capture=True)
+ 
 # Set pane and show window
 self.add(align)
 self.set_title(_("G'MIC Effects"))

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/mltxmlheadless.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/mltxmlheadless.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/rotomask.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/rotomask.py Changed

@@ -24,6 +24,8 @@
 import editorstate
 from editorstate import PLAYER
 from editorstate import PROJECT
+import gtkevents
+import gtkbuilder
 import gui
 import guicomponents
 import guiutils
@@ -130,16 +132,24 @@
 self.tc_display.use_internal_frame = True
 self.tc_display.widget.set_valign(Gtk.Align.CENTER)
 
- kf_mode_img = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "roto_kf_edit_mode.png")
- move_mode_img = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "roto_move_mode.png")
 self.kf_mode_button = Gtk.ToggleButton()
- self.kf_mode_button.set_image(kf_mode_img)
+ gtkbuilder.button_set_image(self.kf_mode_button, "roto_kf_edit_mode")
+ self.kf_mode_button.set_tooltip_markup(_("Add or move single edit points and curve handles."))
 self.kf_mode_button.set_active(True) # we start with vieweditorlayer.ROTO_POINT_MODE edit mode
 self.kf_mode_button.connect("clicked", self._kf_mode_clicked)
 self.move_mode_button = Gtk.ToggleButton()
- self.move_mode_button.set_image(move_mode_img)
+ gtkbuilder.button_set_image(self.move_mode_button, "roto_move_mode")
 self.move_mode_button.connect("clicked", self._move_mode_clicked)
+ self.move_mode_button.set_tooltip_markup(_("Move all edit points and curve handles."))
+ self.box_mode_button = Gtk.ToggleButton()
+ gtkbuilder.button_set_image(self.box_mode_button, "roto_box_mode")
+ self.box_mode_button.connect("clicked", self._box_mode_clicked)
+ self.box_mode_button.set_tooltip_markup(_("Drag to select edit points and curve handles and then move selected."))
 
+ red, green, blue, alpha = vieweditorshape.ROTO_CURVE_COLOR
+ self.color_select = Gtk.ColorButton.new_with_rgba(Gdk.RGBA(red, green, blue, alpha))
+ self.color_select.connect("color-set", self.line_color_set)
+ 
 self.scale_selector = vieweditor.ScaleSelector(self)
 self.view_editor.scale_select = self.scale_selector
 
@@ -148,7 +158,9 @@
 timeline_box.pack_start(Gtk.Label(), True, True, 0)
 timeline_box.pack_start(self.kf_mode_button, False, False, 0)
 timeline_box.pack_start(self.move_mode_button, False, False, 0)
+ timeline_box.pack_start(self.box_mode_button, False, False, 0)
 timeline_box.pack_start(Gtk.Label(), True, True, 0)
+ timeline_box.pack_start(self.color_select, False, False, 0)
 timeline_box.pack_start(self.scale_selector, False, False, 0)
 timeline_box.set_margin_top(6)
 timeline_box.set_margin_bottom(6)
@@ -225,8 +237,10 @@
 self.kf_editor.active_keyframe_changed()
 
 self.connect("size-allocate", lambda w, e:self.window_resized())
- self.connect("window-state-event", lambda w, e:self.window_resized())
- self.connect("key-press-event", self.key_down)
+
+ # Connect global key listener
+ self.global_key_controller = gtkevents.KeyPressEventAdapter(self, self.key_down, user_data=None, capture=True)
+ 
 self.window_resized()
 
 self.kf_editor.clip_editor.maybe_set_first_kf_in_clip_area_active()
@@ -262,7 +276,12 @@
 if self.get_mask_type() != -1: # for older project types, this param was added later and we need to handle case that is does not exist.
 rotomask_filter.non_mlt_properties.pop(0)
 rotomask_filter.non_mlt_properties.append(("mask_type", mask_type, 0))
- 
+
+ def line_color_set(self, color_button):
+ color = color_button.get_rgba()
+ vieweditorshape.ROTO_CURVE_COLOR = (color.red, color.green, color.blue, color.alpha)
+ self.update_view()
+ 
 def update_view(self):
 # Callback from kf_editor
 self.show_current_frame()
@@ -300,7 +319,8 @@
 elif self.roto_mask_layer.edit_mode != vieweditorlayer.ROTO_POINT_MODE:
 self.roto_mask_layer.edit_mode = vieweditorlayer.ROTO_POINT_MODE
 self.move_mode_button.set_active(False)
- 
+ self.box_mode_button.set_active(False)
+ 
 def _move_mode_clicked(self, move_button):
 if self.roto_mask_layer.edit_mode == vieweditorlayer.ROTO_MOVE_MODE and move_button.get_active() == False:
 move_button.set_active(True) # we untoggled by clicking which is not allowed, untoggle happens whenthe other mode is selected. We set the untoggled button back to being active. 
@@ -309,7 +329,18 @@
 elif self.roto_mask_layer.edit_mode != vieweditorlayer.ROTO_MOVE_MODE:
 self.roto_mask_layer.edit_mode = vieweditorlayer.ROTO_MOVE_MODE
 self.kf_mode_button.set_active(False)
-
+ self.box_mode_button.set_active(False)
+ 
+ def _box_mode_clicked(self, box_button):
+ if self.roto_mask_layer.edit_mode == vieweditorlayer.ROTO_BOX_MODE and box_button.get_active() == False:
+ box_button.set_active(True) # we untoggled by clicking which is not allowed, untoggle happens whenthe other mode is selected. We set the untoggled button back to being active. 
+ elif box_button.get_active() == False:
+ pass # this event is redundant, we always get two events when changing modes
+ elif self.roto_mask_layer.edit_mode != vieweditorlayer.ROTO_BOX_MODE:
+ self.roto_mask_layer.edit_mode = vieweditorlayer.ROTO_BOX_MODE
+ self.kf_mode_button.set_active(False)
+ self.move_mode_button.set_active(False)
+ 
 def position_listener(self, normalized_pos, length):
 frame = normalized_pos * length
 self.tc_display.set_frame(int(frame))

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/scripttool.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/scripttool.py Changed

@@ -51,6 +51,7 @@
 import guiutils
 import glassbuttons
 import gtkbuilder
+import gtkevents
 import gmicplayer
 import mediaplugin
 import mltinit
@@ -730,9 +731,7 @@
         # -------------------------------------------------------------------- RIGHT SIDE: MONITOR, CONTROLS, ENCODING
         # -------------------------------------------------------------------- RIGHT SIDE: MONITOR, CONTROLS, ENCODING 
         # -------------------------------------------------------------------- RIGHT SIDE: MONITOR, CONTROLS, ENCODING 
-        black_box = Gtk.EventBox()
-        black_box.add(Gtk.Label())
-        self.monitor = black_box  # This could be any GTK+ widget (that is not "windowless"), only its XWindow draw rect 
+        self.monitor = Gtk.Label() #black_box  # This could be any GTK+ widget (that is not "windowless"), only its XWindow draw rect 
                                   # is used to position and scale SDL overlay that actually displays video.
         self.monitor.set_size_request(MONITOR_WIDTH, MONITOR_HEIGHT)
 
@@ -1005,8 +1004,9 @@
 
         self.update_encode_sensitive()
 
-        self.connect("key-press-event", _global_key_down_listener)
-
+        # Connect global key listener
+        self.global_key_controller = gtkevents.KeyPressEventAdapter(self, _global_key_down_listener, user_data=None, capture=True)
+        
         # Set pane and show window
         self.add(align)
         self.tool_name = _("Generator Script Editor")
@@ -1196,6 +1196,7 @@
 
 #------------------------------------------------- global key listener
 def _global_key_down_listener(widget, event):
+
     # CTRL + S saving
     if event.keyval == Gdk.KEY_s:
         if (event.get_state() & Gdk.ModifierType.CONTROL_MASK):
@@ -1203,7 +1204,13 @@
                 save_script_dialog(_save_script_dialog_callback)
             else:
                 _save_script(_last_save_path)
-            
+
+    if event.keyval == Gdk.KEY_R or event.keyval == Gdk.KEY_r:
+        if (event.get_state() & Gdk.ModifierType.CONTROL_MASK):
+            if _last_save_path != None:
+                _load_script(_last_save_path)
+                return
+
     # Script view and frame name entry need their own key presses
     # and we can't e.g. use up LEFT ARROW here.
     if _window.frame_name.has_focus() or _window.script_view.has_focus():
@@ -1231,10 +1238,7 @@
     if event.keyval == Gdk.KEY_Up:
         end_pressed()
 
-    if event.keyval == Gdk.KEY_r:
-        if (event.get_state() & Gdk.ModifierType.CONTROL_MASK):
-            if _last_save_path != None:
-                _load_script(_last_save_path)
+
         
     # I
     if event.keyval == Gdk.KEY_i:

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/simpleeditors.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/simpleeditors.py Changed

@@ -33,6 +33,7 @@
 import cairoarea
 import dialogutils
 import editorstate
+import gtkbuilder
 import guiutils
 import respaths
 import translations
@@ -549,25 +550,16 @@
         
         self.widgets.bold_font = Gtk.ToggleButton()
         self.widgets.italic_font = Gtk.ToggleButton()
-        bold_icon = Gtk.Image.new_from_icon_name("format-text-bold", 
-                                       Gtk.IconSize.BUTTON)
-        italic_icon = Gtk.Image.new_from_icon_name("format-text-italic", 
-                                       Gtk.IconSize.BUTTON)
-        self.widgets.bold_font.set_image(bold_icon)
-        self.widgets.italic_font.set_image(italic_icon)
+        gtkbuilder.button_set_image_icon_name(self.widgets.bold_font, "format-text-bold")
+        gtkbuilder.button_set_image_icon_name(self.widgets.italic_font, "format-text-italic")
         
         self.widgets.left_align = Gtk.RadioButton(None)
         self.widgets.center_align = Gtk.RadioButton.new_from_widget(self.widgets.left_align)
         self.widgets.right_align = Gtk.RadioButton.new_from_widget(self.widgets.left_align)
-        left_icon = Gtk.Image.new_from_icon_name("format-justify-left", 
-                                       Gtk.IconSize.BUTTON)
-        center_icon = Gtk.Image.new_from_icon_name("format-justify-center", 
-                                       Gtk.IconSize.BUTTON)
-        right_icon = Gtk.Image.new_from_icon_name("format-justify-right", 
-                                       Gtk.IconSize.BUTTON)
-        self.widgets.left_align.set_image(left_icon)
-        self.widgets.center_align.set_image(center_icon)
-        self.widgets.right_align.set_image(right_icon)
+        gtkbuilder.button_set_image_icon_name(self.widgets.left_align, "format-justify-left")
+        gtkbuilder.button_set_image_icon_name(self.widgets.center_align, "format-justify-center")
+        gtkbuilder.button_set_image_icon_name(self.widgets.right_align, "format-justify-right")
+        
         self.widgets.left_align.set_mode(False)
         self.widgets.center_align.set_mode(False)
         self.widgets.right_align.set_mode(False)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/tools/titler.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/tools/titler.py Changed

@@ -33,20 +33,23 @@
 from gi.repository import PangoCairo
 
 import atomicfile
-import toolsdialogs
+import editorpersistance
 from editorstate import PLAYER
 import editorstate
 import gui
 import guicomponents
 import guiutils
+import gtkbuilder
+import gtkevents
 import dialogutils
+import positionbar
 import projectaction
 import respaths
-import positionbar
-import utils
+import toolsdialogs
 import vieweditor
 import vieweditorlayer
 import userfolders
+import utils
 
 _titler = None
 _titler_data = None
@@ -279,6 +282,8 @@
         self.view_editor.active_layer_changed_listener = self.active_layer_changed
         
         self.guides_toggle = vieweditor.GuidesViewToggle(self.view_editor)
+
+        self.title_name = "TITLE"
         
         add_b = Gtk.Button(label=_("Add"))
         del_b = Gtk.Button(label=_("Delete"))
@@ -289,13 +294,11 @@
         add_del_box.pack_start(add_b, True, True, 0)
         add_del_box.pack_start(del_b, True, True, 0)
 
-        center_h_icon = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "center_horizontal.png")
-        center_v_icon = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "center_vertical.png")
         center_h = Gtk.Button()
-        center_h.set_image(center_h_icon)
+        gtkbuilder.button_set_image(center_h, "center_horizontal")
         center_h.connect("clicked", lambda w:self._center_h_pressed())
         center_v = Gtk.Button()
-        center_v.set_image(center_v_icon)
+        gtkbuilder.button_set_image(center_v, "center_vertical")
         center_v.connect("clicked", lambda w:self._center_v_pressed())
 
         self.layer_list = TextLayerListView(self._layer_selection_changed, self._layer_visibility_toggled)
@@ -346,7 +349,7 @@
         self.size_spin = Gtk.SpinButton()
         self.size_spin.set_adjustment(adj)
         self.size_spin.connect("changed", self._edit_value_changed)
-        self.size_spin.connect("key-press-event", self._key_pressed_on_widget)
+        self.spin_adapter = gtkevents.KeyPressEventAdapter(self.size_spin, self._key_pressed_on_widget)
 
         font_main_row = Gtk.HBox()
         font_main_row.pack_start(self.font_select, True, True, 0)
@@ -356,27 +359,17 @@
         
         self.bold_font = Gtk.ToggleButton()
         self.italic_font = Gtk.ToggleButton()
-        bold_icon = Gtk.Image.new_from_icon_name("format-text-bold", 
-                                       Gtk.IconSize.BUTTON)
-        italic_icon = Gtk.Image.new_from_icon_name("format-text-italic", 
-                                       Gtk.IconSize.BUTTON)
-        self.bold_font.set_image(bold_icon)
-        self.italic_font.set_image(italic_icon)
+        gtkbuilder.button_set_image_icon_name(self.bold_font, "format-text-bold")
+        gtkbuilder.button_set_image_icon_name(self.italic_font, "format-text-italic")
         self.bold_font.connect("clicked", self._edit_value_changed)
         self.italic_font.connect("clicked", self._edit_value_changed)
         
         self.left_align = Gtk.RadioButton(None)
         self.center_align = Gtk.RadioButton.new_from_widget(self.left_align)
         self.right_align = Gtk.RadioButton.new_from_widget(self.left_align)
-        left_icon = Gtk.Image.new_from_icon_name("format-justify-left", 
-                                       Gtk.IconSize.BUTTON)
-        center_icon = Gtk.Image.new_from_icon_name("format-justify-center", 
-                                       Gtk.IconSize.BUTTON)
-        right_icon = Gtk.Image.new_from_icon_name("format-justify-right", 
-                                       Gtk.IconSize.BUTTON)
-        self.left_align.set_image(left_icon)
-        self.center_align.set_image(center_icon)
-        self.right_align.set_image(right_icon)
+        gtkbuilder.button_set_image_icon_name(self.left_align, "format-justify-left")
+        gtkbuilder.button_set_image_icon_name(self.center_align, "format-justify-center")
+        gtkbuilder.button_set_image_icon_name(self.right_align, "format-justify-right")
         self.left_align.set_mode(False)
         self.center_align.set_mode(False)
         self.right_align.set_mode(False)
@@ -414,8 +407,8 @@
         self.out_line_size_spin = Gtk.SpinButton()
         self.out_line_size_spin.set_adjustment(adj2)
         self.out_line_size_spin.connect("changed", self._edit_value_changed)
-        self.out_line_size_spin.connect("key-press-event", self._key_pressed_on_widget)
-
+        self.out_line_size_adapter = gtkevents.KeyPressEventAdapter(self.out_line_size_spin, self._key_pressed_on_widget)
+        
         self.outline_on = Gtk.CheckButton()
         self.outline_on.set_active(False)
         self.outline_on.connect("toggled", self._edit_value_changed)
@@ -441,22 +434,22 @@
         adj3 = Gtk.Adjustment(value=float(100), lower=float(1), upper=float(100), step_increment=float(1))
         self.shadow_opa_spin.set_adjustment(adj3)
         self.shadow_opa_spin.connect("changed", self._edit_value_changed)
-        self.shadow_opa_spin.connect("key-press-event", self._key_pressed_on_widget)
-
+        self.shadow_opa_spin_adapter = gtkevents.KeyPressEventAdapter(self.shadow_opa_spin, self._key_pressed_on_widget)
+        
         self.shadow_xoff_spin = Gtk.SpinButton()
 
         adj4 = Gtk.Adjustment(value=float(3), lower=float(1), upper=float(100), step_increment=float(1))
         self.shadow_xoff_spin.set_adjustment(adj4)
         self.shadow_xoff_spin.connect("changed", self._edit_value_changed)
-        self.shadow_xoff_spin.connect("key-press-event", self._key_pressed_on_widget)
-
+        self.shadow_xoff_spin_adapter = gtkevents.KeyPressEventAdapter(self.shadow_xoff_spin, self._key_pressed_on_widget)
+        
         self.shadow_yoff_spin = Gtk.SpinButton()
 
         adj5 = Gtk.Adjustment(value=float(3), lower=float(1), upper=float(100), step_increment=float(1))
         self.shadow_yoff_spin.set_adjustment(adj5)
         self.shadow_yoff_spin.connect("changed", self._edit_value_changed)
-        self.shadow_yoff_spin.connect("key-press-event", self._key_pressed_on_widget)
-
+        self.shadow_yoff_spin_adapter = gtkevents.KeyPressEventAdapter(self.shadow_yoff_spin, self._key_pressed_on_widget)
+        
         self.shadow_on = Gtk.CheckButton()
         self.shadow_on.set_active(False)
         self.shadow_on.connect("toggled", self._edit_value_changed)
@@ -541,33 +534,29 @@
         self.x_pos_spin = Gtk.SpinButton()
         self.x_pos_spin.set_adjustment(adj)
         self.x_pos_spin.connect("changed", self._position_value_changed)
-        self.x_pos_spin.connect("key-press-event", self._key_pressed_on_widget)
-
+        self.xpos_adapter = gtkevents.KeyPressEventAdapter(self.x_pos_spin, self._key_pressed_on_widget)
+        
         adj = Gtk.Adjustment(value=float(0), lower=float(0), upper=float(3000), step_increment=float(1))
         self.y_pos_spin = Gtk.SpinButton()
         self.y_pos_spin.set_adjustment(adj)
         self.y_pos_spin.connect("changed", self._position_value_changed)
-        self.y_pos_spin.connect("key-press-event", self._key_pressed_on_widget)
-
+        self.y_pos_spin_adapter = gtkevents.KeyPressEventAdapter(self.y_pos_spin, self._key_pressed_on_widget)
+        
         adj = Gtk.Adjustment(value=float(0), lower=float(0), upper=float(3000), step_increment=float(1))
         self.rotation_spin = Gtk.SpinButton()
         self.rotation_spin.set_adjustment(adj)
         self.rotation_spin.connect("changed", self._position_value_changed)
-        self.rotation_spin.connect("key-press-event", self._key_pressed_on_widget)
+        self.rotation_spin_adapter = gtkevents.KeyPressEventAdapter(self.rotation_spin, self._key_pressed_on_widget)
         
         undo_pos = Gtk.Button()
-        undo_icon = Gtk.Image.new_from_icon_name("edit-undo", 
-                                       Gtk.IconSize.BUTTON)
-        undo_pos.set_image(undo_icon)
-
+        gtkbuilder.button_set_image_icon_name(undo_pos, "edit-undo")
+        
         # ------------------------------------------------- Timeline controls
-        next_icon = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "next_frame_s.png")
-        prev_icon = Gtk.Image.new_from_file(respaths.IMAGE_PATH + "prev_frame_s.png")
         prev_frame = Gtk.Button()
-        prev_frame.set_image(prev_icon)
+        gtkbuilder.button_set_image(prev_frame, "prev_frame_s")
         prev_frame.connect("clicked", lambda w:self._prev_frame_pressed())
         next_frame = Gtk.Button()
-        next_frame.set_image(next_icon)
+        gtkbuilder.button_set_image(next_frame, "next_frame_s")
         next_frame.connect("clicked", lambda w:self._next_frame_pressed())
 
         self.scale_selector = vieweditor.ScaleSelector(self)
@@ -605,7 +594,6 @@
         controls_panel_1 = Gtk.VBox()
         controls_panel_1.pack_start(add_del_box, False, False, 0)
         controls_panel_1.pack_start(self.layer_list, True, True, 0)
-        #controls_panel_1.pack_start(layers_save_buttons_row, False, False, 0)
 
         controls_panel_2 = Gtk.VBox()
         controls_panel_2.pack_start(font_main_row, False, False, 0)
@@ -641,10 +629,24 @@
 
         # ------------------------------------------------------- Editor buttons
         self.save_action_combo = Gtk.ComboBoxText()
-        self.save_action_combo.append_text(_("Save As Title"))
-        self.save_action_combo.append_text(_("Save As Graphic"))
+        self.save_action_combo.append_text(_("Save As Title Media Object"))
+        self.save_action_combo.append_text(_("Save As Graphic Media Object"))
         self.save_action_combo.set_active(0)
 
+        self.title_name_entry = Gtk.Entry()
+        self.title_name_entry.set_text(self.title_name)
+        self.title_name_entry.set_width_chars(20)
+        self.title_name_entry.set_margin_right(12)
+

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/trimmodes.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/trimmodes.py Changed

@@ -24,6 +24,7 @@
 
 import appconsts
 import dialogutils
+import dualsynctrim
 import edit
 import editorstate
 from editorstate import current_sequence
@@ -33,6 +34,8 @@
 import tlinewidgets
 import updater
 
+import utils 
+
 # Default value for pre- and post roll in loop playback
 DEFAULT_LOOP_HALF_LENGTH = 25
 
@@ -114,6 +117,7 @@
 # This is too complex now that roll is handled separately, could be reworked.
 # "both_start", and "both_end" are no longer correct names for range variables since only one clip is
 # needed taken into account when calculating legal trim range.
+ 
 trim_limits = {}
 
 if from_clip == None:
@@ -208,7 +212,7 @@
 "trim_limits":trim_limits,
 "from_clip":from_clip,
 "to_clip":to_clip}
-
+ 
 def _pressed_on_edited_track(y):
 pressed_track = tlinewidgets.get_track(y)
 if ((pressed_track == None) 
@@ -243,6 +247,8 @@
 gui.editor_window.tline_cursor_manager.set_cursor_to_mode()
 
 def set_no_edit_trim_mode():
+ # Exits active trim mods if user in middle of mouse action. 
+ # TODO: We should look if we should exit all active edits, not just trims. 
 if editorstate.edit_mode == editorstate.ONE_ROLL_TRIM or \
 editorstate.edit_mode == editorstate.TWO_ROLL_TRIM or \
 editorstate.edit_mode == editorstate.SLIDE_TRIM:
@@ -451,7 +457,7 @@
 return False
 
 # hack fix for last clip out trim. If frame pointer not at very end of clip
- # the other functions for getting trim frame given +1 too much 
+ # the other functions for getting trim frame give +1 too much 
 if edit_frame > track.get_length():
 edit_frame = track.get_length()
 
@@ -462,38 +468,23 @@
 
 _set_edit_data(track, edit_frame, True)
 
- # Init ripple data if needed
- global ripple_data
- ripple_data = None
- if editorstate.trim_mode_ripple == True:
- ripple_data = RippleData(track, edit_frame)
-
 global edit_data
- # Add ripple data 
- edit_data"ripple_data" = ripple_data
- 
+ # Add ripple data
+
 # Set side being edited to default to-side
 edit_data"to_side_being_edited" = to_side_being_edited
-
- # Set start frame bound for ripple mode edits
+ 
+ # Get ripple data and trim limits if we're in ripple sub mode
 if editorstate.trim_mode_ripple == True:
- ripple_start_bound = edit_frame - ripple_data.max_backwards
-
- # Case: editing to-clip
- if edit_data"to_side_being_edited":
- ripple_end_bound = edit_frame + ripple_data.max_backwards
- edit_data"trim_limits""ripple_display_end" = edit_data"trim_limits""both_end" 
- if edit_data"trim_limits""both_end" > ripple_end_bound:
- edit_data"trim_limits""both_end" = ripple_end_bound
- # Case: editing from-clip
- else:
- ripple_start_bound = edit_frame - ripple_data.max_backwards
- edit_data"trim_limits""ripple_display_start" = edit_data"trim_limits""both_start" 
- if edit_data"trim_limits""both_start" < ripple_start_bound: # name "both_start" is artifact fromearlier when trimlimits were used for both "trim and "roll" edits
- edit_data"trim_limits""both_start" = ripple_start_bound
+ set_ripple_mode()
 else:
+ edit_data"ripple_data" = None
+ # Set start frame bound for ripple mode edits
 edit_data"trim_limits""ripple_display_end" = -1
 edit_data"trim_limits""ripple_display_start" = -1
+ 
+ # Set sync clip if exists and user preference set.
+ dualsynctrim.set_child_clip_trim_data(edit_data, appconsts.TLINE_TOOL_TRIM)
 
 # Can't trim a blank clip. Blank clips are special in MLT and can't be
 # made to do things that are needed in trim.
@@ -502,19 +493,14 @@
 edit_data = None
 gui.tline_canvas.drag_on = False
 primary_txt = _("Can't use Trim tool on blank clips.")
- secondary_txt = _("You can use Move or Roll tools instead.")
+ secondary_txt = _("You can use Move tool instead.")
 dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
 return False
 
 current_sequence().clear_hidden_track()
 
 # Give timeline widget needed data
- if editorstate.trim_mode_ripple == False:
- tlinewidgets.set_edit_mode(edit_data,
- tlinewidgets.draw_one_roll_overlay)
- else:
- tlinewidgets.set_edit_mode(edit_data,
- tlinewidgets.draw_one_roll_overlay_ripple)
+ tlinewidgets.set_edit_mode(edit_data, tlinewidgets.draw_one_roll_overlay)
 
 # Set clip as special producer on hidden track and display current frame 
 # from it.
@@ -550,6 +536,32 @@
 PLAYER().seek_frame(edit_frame + fix_delta)
 return True
 
+def set_ripple_mode():
+ # Init ripple data if needed
+ global edit_data, ripple_data
+ edit_frame = edit_data"edit_frame"
+ track = edit_data"track_object"
+ ripple_data = RippleData(track, edit_frame)
+ edit_data"ripple_data" = ripple_data
+ 
+ # Case: editing to-clip
+ if edit_data"to_side_being_edited":
+ 
+ ripple_end_bound = edit_frame + ripple_data.max_backwards
+ edit_data"trim_limits""ripple_display_end" = edit_data"trim_limits""both_end" 
+ if edit_data"trim_limits""both_end" > ripple_end_bound:
+ edit_data"trim_limits""both_end" = ripple_end_bound
+ 
+ # Case: editing from-clip
+ else:
+ ripple_start_bound = edit_frame - ripple_data.max_backwards
+ edit_data"trim_limits""ripple_display_start" = edit_data"trim_limits""both_start" 
+ if edit_data"trim_limits""both_start" < ripple_start_bound: # name "both_start" is artifact fromearlier when trimlimits were used for both "trim and "roll" edits
+ edit_data"trim_limits""both_start" = ripple_start_bound
+
+ tlinewidgets.set_edit_mode(edit_data, tlinewidgets.draw_one_roll_overlay_ripple)
+ 
+ 
 def oneroll_trim_press(event, frame, x=None, y=None):
 """
 User presses mouse when in one roll mode.
@@ -639,80 +651,95 @@
 
 def _do_one_roll_trim_edit(frame):
 # Get legal edit delta and set to edit mode data for overlay draw
- global edit_data
+ global edit_data, ripple_data
 frame = _legalize_one_roll_trim(frame, edit_data"trim_limits")
 delta = frame - edit_data"edit_frame"
-
+ 
+ # Get edit actions
+ action = sync_trim_action = None
 # case: editing from-side of last clip
 global last_from_trimmed
 if last_from_trimmed:
 last_from_trimmed = False
- if editorstate.trim_mode_ripple == False:
- data = {"track":edit_data"track_object",
- "index":edit_data"index",
- "clip":edit_data"from_clip",
- "delta":delta,
- "undo_done_callback":clip_end_first_do_done,
- "first_do":True}
- action = edit.trim_last_clip_end_action(data)
- last_from_trimmed = False
- action.do_edit()
- else:
- data = {"track":edit_data"track_object",
- "index":edit_data"index",
- "clip":edit_data"from_clip",
- "edit_delta":delta,
- "undo_done_callback":clip_end_first_do_done,
- "first_do":True,
- "multi_data":ripple_data}
- action = edit.ripple_trim_last_clip_end_action(data)
- action.do_edit()
- # Edit is reinitialized in callback from edit action one_roll_trim_undo_done
+ if delta != 0:
+ if editorstate.trim_mode_ripple == False:
+ data = {"track":edit_data"track_object",
+ "index":edit_data"index",
+ "clip":edit_data"from_clip",
+ "delta":delta,
+ "undo_done_callback":clip_end_first_do_done,

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/updater.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/updater.py Changed

@@ -390,7 +390,7 @@
     global save_monitor_frame
     save_monitor_frame = True
 
-    # Opening clip exits trim modes
+    # Opening clip goes to default edit mode for non-move modes.
     if not editorstate.current_is_move_mode():
         set_clip_edit_mode_callback()
 
@@ -449,6 +449,7 @@
 
     # Display frame, marks and pos
     gui.pos_bar.update_display_from_producer(clip_producer)
+    gui.monitor_waveform_display.update_display_from_producer(clip_producer)
     
     display_monitor_clip_name()
 
@@ -467,8 +468,10 @@
     gui.apply_widget_css_class_style_from_string(gui.editor_window.player_buttons_row, css_str)
 
     gui.pos_bar.widget.grab_focus()
+    gui.pos_bar.set_clip_bg(True)
     gui.media_list_view.widget.queue_draw()    
     gui.monitor_switch.widget.queue_draw()
+    gui.monitor_waveform_display.update_visibility()
     repaint_tline()
 
 def display_monitor_clip_name():#we're displaying length and range length also
@@ -521,9 +524,11 @@
     gui.pos_bar.update_display_from_producer(PLAYER().producer)
     display_marks_tc()
 
-    css_str = "#player-bar { background-color: #363636; border-radius: 10px;}"
+    css_str = "#player-bar { background-color: #333333; border-radius: 10px;}"
     gui.apply_widget_css_class_style_from_string(gui.editor_window.player_buttons_row, css_str)
-
+    gui.pos_bar.set_clip_bg(False)
+    
+    gui.monitor_waveform_display.widget.hide()
     gui.monitor_switch.widget.queue_draw()
     repaint_tline()
 
@@ -596,6 +601,7 @@
 
     norm_pos = frame / float(producer_length) 
     gui.pos_bar.set_normalized_pos(norm_pos)
+    gui.monitor_waveform_display.set_normalized_pos(norm_pos)
 
     kftoolmode.update_clip_frame(frame)

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/vieweditor/vieweditor.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/vieweditor/vieweditor.py Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/vieweditor/vieweditorlayer.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/vieweditor/vieweditorlayer.py Changed

@@ -22,12 +22,14 @@
 import vieweditorshape
 import viewgeom
 
+
 # Edit modes
 MOVE_MODE = 0
 ROTATE_MODE = 1
 
 ROTO_POINT_MODE = 0
 ROTO_MOVE_MODE = 1
+ROTO_BOX_MODE = 2
 
 ROTO_NO_EDIT = 0
 ROTO_POINT_MOVE_EDIT = 1
@@ -305,12 +307,12 @@
             # We want to get "mouse_pressed()" below always called from vieweditor so we always return True for hit.
             # self.last_pressed_edit_point is now None if we didn't hit anything and we use info to determine what ediy to do.
             return True
-
         elif self.edit_mode == ROTO_MOVE_MODE:
             # This mode has whole edit area active.
             return True
+        else:
+            return True
 
-        #there are no other modes
 
     def mouse_pressed(self):
         self.view_editor.edit_area_update_blocked = True
@@ -384,7 +386,12 @@
                         self.add_edit_point(len(self.edit_point_shape.curve_points), self.mouse_press_panel_point)
 
                     self.rotomask_editor.update_mask_create_freeze_gui()
+        elif self.edit_mode == ROTO_BOX_MODE:
+            if self.edit_point_shape.box_selection == None:
+                self.edit_point_shape.box_drag_data = ( self.view_editor.movie_coord_to_panel_coord(self.mouse_start_point), 
+                                                        self.view_editor.movie_coord_to_panel_coord(self.mouse_current_point))
 
+                
         self.clip_editor.widget.queue_draw()
 
     def mouse_dragged(self):
@@ -406,7 +413,13 @@
                     self.last_pressed_edit_point.translate_from_move_start(delta)
                     hp1.translate_from_move_start(delta)
                     hp2.translate_from_move_start(delta)
-
+        elif self.edit_mode == ROTO_BOX_MODE:
+            if self.edit_point_shape.box_selection == None:
+                self.edit_point_shape.box_drag_data = ( self.view_editor.movie_coord_to_panel_coord(self.mouse_start_point), 
+                                                        self.view_editor.movie_coord_to_panel_coord(self.mouse_current_point))
+            else:
+                self.edit_point_shape.translate_box_selection(delta)
+                
         self.edit_point_shape.maybe_force_line_mask()
 
     def mouse_released(self):
@@ -430,7 +443,20 @@
                     hp2.translate_from_move_start(delta)
             else:
                 return # no edit point moved, no update needed
-
+        elif self.edit_mode == ROTO_BOX_MODE:
+            if self.edit_point_shape.box_selection == None:
+                self.edit_point_shape.box_drag_data = ( self.view_editor.movie_coord_to_panel_coord(self.mouse_start_point), 
+                                                        self.view_editor.movie_coord_to_panel_coord(self.mouse_current_point))
+                self.edit_point_shape.create_box_selection()
+                self.edit_point_shape.box_drag_data = None
+                if self.edit_point_shape.box_selection != None:
+                    # If we have selection, creates edit_point_shape.box_selection_drag_box object.
+                    self.edit_point_shape.translate_box_selection((0.0, 0.0)) 
+            else:
+                self.edit_point_shape.translate_box_selection(delta)
+                self.edit_point_shape.box_selection = None
+                self.edit_point_shape.box_selection_drag_box = None
+                
         self.last_pressed_edit_point = None
 
         self.edit_point_shape.maybe_force_line_mask()
@@ -479,3 +505,8 @@
             self.edit_point_shape.draw_points(cr, self.view_editor)
         else:
             self.edit_point_shape.draw_curve_points(cr, self.view_editor)
+
+        if self.edit_mode == ROTO_BOX_MODE:
+            self.edit_point_shape.draw_box_selection(cr, self.view_editor)
+            
+            
\ No newline at end of file

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/vieweditor/vieweditorshape.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/vieweditor/vieweditorshape.py Changed

@@ -18,7 +18,9 @@
 along with Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import copy
 import math
+
 import viewgeom
 
 # Edit point display types
@@ -95,6 +97,40 @@
 
 return False
 
+ def inside_box(self, box_points):
+ p1, p2 = box_points
+ x1, y1 = p1
+ x2, y2 = p2
+ 
+ if x1 > x2:
+ x1, x2 = x2, x1
+ if y1 > y2:
+ y1, y2 = y2, y1
+
+ if self.x >= x1 and self.x <= x2:
+ if self.y >= y1 and self.y <= y2:
+ return True
+ 
+ return False 
+
+ def update_bounding_box(self, bounding_box):
+ if bounding_box == None:
+ return ((self.x, self.y), (self.x, self.y))
+
+ p1, p2 = bounding_box
+ x1, y1 = p1
+ x2, y2 = p2
+ if self.x < x1:
+ x1 = self.x 
+ if self.x > x2:
+ x2 = self.x 
+ if self.y < y1:
+ y1 = self.y 
+ if self.y > y2:
+ y2 = self.y 
+ 
+ return((x1, y1), (x2, y2))
+ 
 def draw(self, cr, view_editor):
 if self.display_type == INVISIBLE_POINT:
 return
@@ -365,7 +401,12 @@
 
 self.block_shape_updates = False # We're getting a difficult to kill "size-allocate"., "window-resized" events and have to manage manually when updates to shape are allowed.
 # and this is used to block it from recreating edit shape in middle of mouse edit, bit hacky but works fine.
-
+ 
+ # Used to implement box selection mode
+ self.box_selection = None
+ self.box_selection_drag_box = None
+ self.box_drag_data = None
+ 
 self.update_shape()
 
 def add_point(self, index, p):
@@ -415,6 +456,8 @@
 if self.block_shape_updates == True:
 return
 
+ # THIS GETS CALLED ON ALL FRAME CHANGES BY RotoMaskEditLayer AS IT PROBABLY WAS DEEMED EASIER TO JUST
+ # RE-CREATE POINTS THEN TRANSFORM THEIR POSITIONS. 
 
 # We're not using timeline frame for shape, we're using clip frame.
 frame = self.clip_editor.current_clip_frame
@@ -583,7 +626,7 @@
 return (back.end_point, forward.end_point)
 
 def save_selected_point_data(self, selected_point):
- # These points get re-created all the time and we need to save data on which point was selects
+ # These points get re-created all the time and we need to save data on which point was selected.
 if selected_point in self.curve_points:
 self.selected_point_array = self.curve_points
 self.selected_point_index = self.curve_points.index(selected_point)
@@ -610,6 +653,53 @@
 self.selected_point_array = None
 self.selected_point_index = -1
 
+ def create_box_selection(self):
+ selected_curve_points = 
+ selected_handle1_points = 
+ selected_handle2_points = 
+ 
+ bounding_box = None
+ for p in self.curve_points:
+ if p.inside_box(self.box_drag_data):
+ selected_curve_points.append(self.curve_points.index(p))
+ bounding_box = p.update_bounding_box(bounding_box)
+ 
+ for p in self.handles1:
+ if p.inside_box(self.box_drag_data):
+ selected_handle1_points.append(self.handles1.index(p))
+ bounding_box = p.update_bounding_box(bounding_box)
+ 
+ for p in self.handles2:
+ if p.inside_box(self.box_drag_data):
+ selected_handle2_points.append(self.handles2.index(p))
+ bounding_box = p.update_bounding_box(bounding_box)
+ 
+ if bounding_box != None:
+ self.box_selection = (bounding_box, selected_curve_points, selected_handle1_points, selected_handle2_points)
+ else:
+ self.box_selection = None
+
+ def translate_box_selection(self, delta):
+ box_drag_data, selected_curve_points, selected_handle1_points, selected_handle2_points = self.box_selection
+
+ for i in range (0, len(self.curve_points)):
+ if i in selected_curve_points:
+ self.curve_pointsi.translate_from_move_start(delta)
+
+ for i in range (0, len(self.handles1)):
+ if i in selected_handle1_points:
+ self.handles1i.translate_from_move_start(delta)
+
+ for i in range (0, len(self.handles2)):
+ if i in selected_handle2_points:
+ self.handles2i.translate_from_move_start(delta)
+ 
+ p1, p2 = box_drag_data
+ x1, y1 = p1
+ x2, y2 = p2
+ dx, dy = delta
+ self.box_selection_drag_box = ((x1 + dx, y1 + dy), (x2 + dx, y2 + dy))
+ 
 def get_selected_point(self):
 if self.selected_point_array != None:
 return self.selected_point_arrayself.selected_point_index
@@ -713,6 +803,27 @@
 for ep in self.curve_points:
 ep.draw(cr, view_editor)
 
+ def draw_box_selection(self, cr, view_editor):
+ if self.box_drag_data != None:
+ p1, p2 = self.box_drag_data
+ rgb = (0.3, 0.3, 0.3)
+ 
+ if self.box_selection_drag_box != None:
+ p1, p2 = self.box_selection_drag_box
+ rgb = (0.8, 0.5, 0.5)
+ 
+ if self.box_selection_drag_box != None or self.box_drag_data != None:
+ x1, y1 = p1
+ x2, y2 = p2
+ cr.set_line_width(2.0)
+ cr.set_source_rgb(*rgb)
+ cr.move_to(x1, y1)
+ cr.line_to(x1, y2)
+ cr.line_to(x2, y2)
+ cr.line_to(x2, y1)
+ cr.close_path()
+ cr.stroke()
+
 # ------------------------------------------------------------- saving edits
 def convert_shape_coords_and_update_clip_editor_keyframes(self):
 frame_shape = self._get_converted_frame_shape()

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/Flowblade/workflow.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/Flowblade/workflow.py Changed

@@ -87,7 +87,7 @@
 appconsts.TLINE_TOOL_RIPPLE_TRIM: _("Left Mouse to trim closest clip end and move all clips after it to maintain sync, overwrites not allowed.\nLeft or Right Arrow Key + Enter Key to do the edit using keyboard."), 
 appconsts.TLINE_TOOL_CUT: _("Left Mouse to cut clip under cursor.\nCTRL + Left Mouse to cut clips on all tracks at cursor position."), 
 appconsts.TLINE_TOOL_KFTOOL: _("Click Left Mouse on Clip to init Volume Keyframe editing, Brightness for media with no audio data.\nUse Hamburger menu to select other values to edit.\nLeft Mouse to create or drag keyframes.\nLeft Mouse + Control between keyframes drag and set same value for both.\nLeft Mouse + Shift moves all keyframes after selected keyframe.\nDelete Key to delete active Keyframe."),
- appconsts.TLINE_TOOL_MULTI_TRIM: _("Position cursor near or on clip edges for Trim and Roll edits.\nPosition cursor on clip center for Slip edit.\nDrag with Left Mouse to do edits.\n\nEnter Key to start keyboard edit, Left or Right Arrow Key to move edit point.\nEnter Key to complete keyboard edit.")
+ appconsts.TLINE_TOOL_MULTI_TRIM: _("Position cursor near or on clip edges for Trim and Roll edits.\nPosition cursor on clip center for Slip edit.\nDrag with Left Mouse to do edits.\n\nStart Trim edit with Alt key down to do a Ripple Trim edit.\n\nEnter Key to start keyboard edit, Left or Right Arrow Key to move edit point.\nEnter Key to complete keyboard edit.")
 }
 
 editorpersistance.prefs.active_tools = 2, 11, 6, 1, 9, 10

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/DEPENDENCIES.md -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/docs/DEPENDENCIES.md Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/Migrating_from_GTK_3_to_GTK_4.md -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/docs/Migrating_from_GTK_3_to_GTK_4.md Changed

@@ -1,5 +1,7 @@
 ## Migrating from GTK 3.x to GTK 4
 
+Migraation doc was moved, most links below not working, new place: Migrating from GTK 3.x to GTK 4(https://docs.gtk.org/gtk4/migrating-3to4.html)
+
 ### Done
 
 | Item                                                                                                                            | status                        |
@@ -12,9 +14,9 @@
 | Stop using non-RGBA visuals(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.10)              | **DONE**                      |
 | Adapt to GtkWindow API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.25)                        | **DONE**                      |
 | GtkMenu, GtkMenuBar and GtkMenuItem are gone(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.74)          | **DONE** for popovers.        |
-| Gtk.CheckButton does not inherit signal "clicked"                                                                               | **DONE**        |
+| Gtk.CheckButton does not inherit signal "clicked"                                                                               | **DONE**                      |
 
-###  Showstopper
+### Showstopper
 
 | Item                                                                                                              | status                                     |
 | ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------ |
@@ -22,33 +24,30 @@
 
 ### Changes that can be done running GTK 3.x
 
-| Item                                                                                                                                                                  | status                                                                          |
-| --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
-| Stop using GtkWidget event signals(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.14)                                             | Some can be done here, some need to be worked on port.                          |
-| GtkBox  - use orientatin parameter,  padding, fill and expand child properties(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.11) | Use indirection objects and builder func.                                       |
-| Stop using GtkButton’s image-related API                                                                                                                              | Use indirection builder func,  set_image() 11 instances.                        |
-| Stop using GtkFileChooserButton(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.85)                                                             | Use indirection builder func, 20 instances.                                     |
-| Gtk.Widget.modify_font deprecated                                                                                                                                     | 4 instances, use CSS instead.                                                   |
-| Stop using GtkEventBox(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.22)                                                                      | 14 instances, use indirection builder func, needs more work port time.          |
-| GtkMenu, GtkMenuBar and GtkMenuItem are gone(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.74)                                                | App menu needs to be done in GTK4. |
-
+| Item                                                                                                                                                                  | status                                                                                                               |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- |
+| Stop using GtkWidget event signals(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.14)                                             | **DONE**, except for "button-press-event" and "button-release-event" which don't have the required class backported. |
+| GtkBox  - use orientatin parameter,  padding, fill and expand child properties(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.11) | Use indirection objects and builder func.                                                                            |
+| Stop using GtkButton’s image-related API                                                                                                                              | **DONE** Using indirection builder func                                                                              |
+| Stop using GtkFileChooserButton(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.85)                                                             | **DONE**                                                                                                             |
+| Gtk.Widget.modify_font deprecated                                                                                                                                     | 4 instances, use CSS instead.                                                                                        |
+| Stop using GtkEventBox(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.22)                                                                      | **DONE** easy ones, needs more work port time.                                                                       |
 
 ### Changes that need to be done at the time of the switch
 
 | Item                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | status                                                                                                                                                                                                                                                                                                                                         |
 | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Set a proper application ID(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.15)                                                                                                                                                                                                                                                                                                                                                           | Affects D-Bus, this will be worked on last.                                                                                                                                                                                                                                                                                                    |
-| Adapt to GdkEvent API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.10) - Adapt to event controller API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.19)                                                                                                                                                                                                                                                    | Direct access to GdkEvent structs is no longer possible in GTK 4. Test didn't hit these but these are more of a runtime thing e.g. event.x for mouse events.                                                                                                                                                                                   |
-| Adapt to GdkKeymap API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.13) - Adapt to changes in keyboard modifier handling(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.14) - Use the new apis for keyboard shortcuts(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.21)                                                                                                                      | Keyboard shortcuts may need to be ported to whole new APIs, situation unclear as test didn't get this far.                                                                                                                                                                                                                                     |
-| Adapt to GtkStack, GtkAssistant and GtkNotebook API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.27)                                                                                                                                                                                                                                                                                                                                        | Test didn't hit any, not going to be big issue.                                                                                                                                                                                                                                                                                                |
-| Adapt to button class hierarchy changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.28)                                                                                                                                                                                                                                                                                                                                                            | Gtk.RadioButton removed, 6 instances.                                                                                                                                                                                                                                                                                                          |
+| Adapt to GdkEvent API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.10) - Adapt to event controller API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.19)                                                                                                                                                                                                                                                    | Mainly instances of **event.x** and **event.y** These will be real easy to scriptconvert at post time.                                                                                                                                                                                                                                         |
+| Adapt to GdkKeymap API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.13) - Adapt to changes in keyboard modifier handling(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.14) - Use the new apis for keyboard shortcuts(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.21)                                                                                                                      | Current assessment is that  this does not need to be addressed.                                                                                                                                                                                                                                                                                |
+| Adapt to GtkStack, GtkAssistant and GtkNotebook API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.27)                                                                                                                                                                                                                                                                                                                                        | Current assessment is that  this does not need to be addressed.                                                                                                                                                                                                                                                                                |
+| Adapt to button class hierarchy changes(https://docs.gtk.org/gtk4/migrating-3to4.html#adapt-to-button-class-hierarchy-changes)                                                                                                                                                                                                                                                                                                                                             | Heeds to be done port time, required API was not back ported.                                                                                                                                                                                                                                                                                  |
 | Adapt to GtkScrolledWindow API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.29)                                                                                                                                                                                                                                                                                                                                                             | With scrollbar we hit need to set orientation, other issues likely.                                                                                                                                                                                                                                                                            |
-| Adapt to GtkBin removal(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.30) - Adapt to GtkContainer removal(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.31)  - Switch to GtkWidget’s children APIs(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.40)                                                                                                                                                 | In test these were successfully handled with mostly scripted conversion.                                                                                                                                                                                                                                                                        |
+| Adapt to GtkBin removal(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.30) - Adapt to GtkContainer removal(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.31)  - Switch to GtkWidget’s children APIs(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.40)                                                                                                                                                 | In test these were successfully handled with mostly scripted conversion, and most are not back ported, so this needs to be done port time with script.                                                                                                                                                                                         |
 | Adapt to GtkStyleContext API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.35)                                                                                                                                                                                                                                                                                                                                                               | Single instance, need use function **add_provider_for_display (display, provider, priority)**                                                                                                                                                                                                                                                  |
 | Adapt to GtkWidget’s size request changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.38)                                                                                                                                                                                                                                                                                                                                                          | **get_preferred_width()** 9 instances, Gtk4 has  **GtkWidgetClass::measure()**                                                                                                                                                                                                                                                                 |
 | Adapt to GtkWidget’s size allocation changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.39)                                                                                                                                                                                                                                                                                                                                                       | "size-allocate" signal 3 instances, The ::size-allocate signal has been removed, since it is easy to misuse. If you need to learn about sizing changes of custom drawing widgets, use the “resize” or “resize” signals. If you want to track the size of toplevel windows, use property notification for “default-width” and “default-height”. |
 | Widgets are now visible by default(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.47)                                                                                                                                                                                                                                                                                                                                                                 | show() is no-op on init now, hide() may need to be added somewhere,  show_all() 171 instances can be easily removed with scripts.                                                                                                                                                                                                              |
-| GtkWidget event signals are removed(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.51)                                                                                                                                                                                                                                                                                                                                                                | “motion-event”, "button-press-event" needed for e.g. timeline, lots of work here.                                                                                                                                                                                                                                                              |
 | Stop using GtkWidget::draw(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.53)                                                                                                                                                                                                                                                                                                                                                                         | cairoarea.py, **gtk_drawing_area_set_draw_func()**.                                                                                                                                                                                                                                                                                            |
 | Window content observation has changed(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.54)                                                                                                                                                                                                                                                                                                                                                             | e.g. timeline draw updates after resizes.                                                                                                                                                                                                                                                                                                      |
 | Monitor handling has changed(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.55)                                                                                                                                                                                                                                                                                                                                                                       | Instead of a monitor number, GdkMonitor is used, see e.g. utilsgtk.py                                                                                                                                                                                                                                                                          |
@@ -56,12 +55,13 @@
 | Adapt to cursor API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.57)                                                                                                                                                                                                                                                                                                                                                                        | **set_cursor()** many instances, we need to apply changes to tline canvas widget only.                                                                                                                                                                                                                                                         |
 | Switch to the new Drag-and-Drop api(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.78)                                                                                                                                                                                                                                                                                                                                                                | Yes, APIs different.                                                                                                                                                                                                                                                                                                                           |
 | Update to GtkFileChooser API changes(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.80)                                                                                                                                                                                                                                                                                                                                                               | Very likely not needed or only a minor issue.                                                                                                                                                                                                                                                                                                  |
-| Stop using blocking dialog functions(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.81)                                                                                                                                                                                                                                                                                                                                                               | 1 instance, batchrendering.py                                                                                                                                                                                                                                                                                                                  |
+| Stop using blocking dialog functions(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.81)                                                                                                                                                                                                                                                                                                                                                               | **DONE**                                                                                                                                                                                                                                                                                                                                       |
 | Do not use widget style properties(https://developer-old.gnome.org/gtk4/stable/gtk-migrating-3-to-4.html#id-1.7.4.3.6) Don’t use -gtk-gradient in your CSS(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.41) Don’t use -gtk-outline-…-radius in your CSS(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.44) Stop using GtkContainer::border-width(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.32) | These will worked on last, initial port with Adwaita.                                                                                                                                                                                                                                                                                          |
+| GtkMenu, GtkMenuBar and GtkMenuItem are gone(https://developer-old.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.74)                                                                                                                                                                                                                                                                                                                                                       | Popovers **Done**, App menu needs to be done in GTK4.                                                                                                                                                                                                                                                                                          |
 
 ### Conversion test commits
 
-Can't get xid for widgets in Gtk4 anymore
+Can't get xid for widgets in Gtk4 anymore GdkSurface, GtkSearchEntry
 step - comment out more uimanger and initing compositing mode menu
 step - get_children()0 -> get_first_child()
 step - comment out uimanager via gui

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/RELEASE_NOTES.md -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/docs/RELEASE_NOTES.md Changed

@@ -1,5 +1,77 @@
 # Release Notes
 
+## FLOWBLADE 2.22.1.1
+Date: August 14, 2025
+
+Fixes metadata issues.
+
+## FLOWBLADE 2.22.1
+Date: August 13, 2025
+
+Fixes duplicate alpha filters issue.
+
+## FLOWBLADE 2.22
+Date: June 6, 2025
+
+### New Keyframe Interpolation Types
+
+We added 32 new keyframes types to give users more options and control over animated images and filter values. New keyframe types are presented in two categories:
+
+**Smooth Extented:** *Smooth Natural, Smooth Tight, Quadratic In, Quadratic Out, Quadratic In Out, Cubic In, Cubic Out, Cubic In Out, Quatic In, Quatic Out, Quatic In Out, Quintic In, Quintic Out, Quintic In Out, Exponenetial In, Exponenetial Out, Exponenetial In Out, Circular In, Circular Out, Circular In Out*
+
+**Effect:** *Sinusoidal In, Sinusoidal Out, Sinusoidal In Out, Back In, Back Out, Back In Out, Elastic In, Elastic Out, Elastic In Out, Bounce In, Bounce Out, Bounce In Out*
+
+### New GUI editors for Filters
+
+Previously some filters only provided sliders to edit properties that were clearly geometric in nature. For this release we added mouse operated GUI editors for filters **Alpha Shape, Crop** and **Gradient Tint** to improve editing of these geometric properties.
+
+### Top level UX updates
+
+- Timecode Display was moved from Middlebar to below video monitor to improve locality of displayed image its position on Timeline or Clip. Timecode position in Middlebar is no longer configurable because Timecode is not in Middlebar anymore.
+  
+- Video source information locality was additionally improved by moving monitor source label to the left side in the topbar, next to *In/Out/Source Length* displays.
+  
+- *Tool* launcher icons were moved to Middlebar.
+  
+- Tracks can now be labeled with text that is displayed as a semitransparent overlay next to Track Head Column.
+  
+- Tracks Head Column mute icons were redsigned to be bigger and easier to hit.
+  
+- Custom expander widget was created for filter editing panel to regain vertical space lost to Trash and Up/Down icons.
+  
+- Splash screen was droppped. This was never really needed because Flowblade starts up quite quickly and the current implementation does not work with Wayland or Gtk4.
+  
+
+### Edit workflow
+
+- Added *Box Selection* multitrack sync setting feature.
+  
+- New keyboard shortcuts for actions **Set Clip Sync Relation, Clear Clip Sync Relation, Toggle Clip Audio Mute, Set Clip Length.**
+  
+- Made *Distort* property editable for **Position Scale** and **Position Scale Rotate** filter.
+  
+
+### Contributions
+
+Typo fixes from user *luzpaz* were contributed.
+
+### Small updates and bug fixes
+
+- Move Edit submenu first in Clip menu edit section.
+  Add Sync section to keyboard shortcuts list.
+  
+- Fix keyframe editors menu copy/paste issues.
+  
+- Removed deprecated playback preferences.
+  
+- GUI tweak for Bins and Sequences panels.
+  
+- Delete unused resource images.
+  
+- Code reafactor to use AnimatedValue class to get intepolated values for properties.
+  
+- Clip end drag overwrite bug fix.
+
 ## FLOWBLADE 2.20
 Date: March 25, 2025

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/ROADMAP.md -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/docs/ROADMAP.md Changed

@@ -1,16 +1,45 @@
 # FLOWBLADE ROADMAP
 
-Last updated April 4th 2023.
+Last updated November 20th 2025.
 
-### Media cache and project data folder
+### Planned Features
 
-* Make possible to select folder where project media data is saved. Keep current XDG Data Directory as the default place.
-* Make projects save rendered clips, proxies and contain clips data individual in data folder to enable moving and destroying data per project.
+- Improved UX interactivity for same Track Transitions, move to use Tractors instead of rendered clips.
+
+- Audio autoducking.
+
+- Project Info popover with list of all markers and with new Project and Media Item notes.
+
+- Ingest feature with user selectable transcode or only copy.
+
+- Auto proxy creation if requested.
+
+- Unpacking MLT XML Compound clips to back to original source clips.
+
+- 'Find Black Holes' and 'Find Flash Frames' feature for Timeline.
+
+- Track Soloing,
+
+- Add new  keyframe types for Fluxity media Plugins.
+
+- Alpha Shape GUI editor update to allow for controlling shape dimensions. 
+
+- Control key to toggle mouse zoom target between pointer / playhead.
+
+- Drag and Drop from Timeline to Monitor.
+
+- Mouse Scroll horizontal  speed preference.
+
+### GPU utilization
+
+* Enable GPU decoding for playback on AMD and later for NVidia cards.
 
 ### GTK 4 port
 
-* We will start gradually working towards doing GTK 4 through multiple releases. Adwaita dark theme looks promising and we will drop custom theming if possible.
+* Allmost of the work that can be done prior to commiting to doing the port is now done.
+* GTK 4 does not support setting video display target widget window XID. This means that we need to decide if we only do Wayland version of GTK4 Flowblade or create a new X11 video display solution. We will likely target only Wayland systems at that point, but that pushes back the likely date to 2028 at the earliest, we want a clear majority of users on Wayland if we are to drop X11 support.
 
 ### Video display
 
-- Moving video display away from SDL 1.2 is still a long term goal, but there hasn't been a viable technology path to do that yet. Unfortunately SDL 2 no longer looks promising as the needed API for creating video displays for Wayland will likely never be available there.
+- Video display was moved to use SDL 2 library.
+- Next up is doing Wayland native video display.

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/SYSTEM_REQUIREMENTS.md -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/docs/SYSTEM_REQUIREMENTS.md Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/docs/creating_user_folder_bindings.md -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/docs/creating_user_folder_bindings.md Changed

@@ -1,4 +1,3 @@
-
 ## Building Python 3 bindings to use with repo installation
 
 This is a rough guide on how install and run self created MLT bindinds with Flowblade install from repository.
@@ -6,20 +5,23 @@
 Please create pull request against this document if you have corrections or additions to improve this guide.
 
 ### Install Flowblade from OS repository
+
 See here(./INSTALLING.md). This installs the runtime dependencies to run Flowblade and use MLT. *(Note that Flatpak install does not work here because dependencies when installed by Flatpak will not be available to the local install of MLT we are creating)*
 
 ### Install MLT build dependencies
+
 Here is list of Ubuntu build dependencies. There could be some omissions, please file a pull request to update the list if something is found to be missing.
 
 ```bash
 sudo apt-get install git swig python3-dev python3-numpy libxml2-dev libsdl-dev libavdevice-dev libswscale-dev libvorbis-dev libsamplerate-dev frei0r-plugins-dev libdv-dev libavformat-dev libquicktime-dev libsox-dev libjack-dev ladspa-sdk libopencv-dev librubberband-dev libvidstab-dev
 ```
 
-### Create work directory 
+### Create work directory
 
-Let's call this directory **\<ROOT_DIR\>**. Open terminal in this directory.
+Let's call this directory **\<ROOT_DIR\>**. Open terminal in this directory. If you have previous */build* and */install* dirs in **<ROOT_DIR>** delete those.
 
 ### Clone MLT repository
+
 ```bash
 git clone https://github.com/mltframework/mlt.git
 ```
@@ -29,14 +31,17 @@
 Since 2023, MLT only builds with CMAKE.
 
 #### Configure and build
-With terminal still open in **\<ROOT_DIR\>**.
+
+With terminal still open in **\<ROOT_DIR\>**. 
+
 ```bash
-cmake -DCMAKE_BUILD_TYPE=Release -DSWIG_PYTHON=ON -DMOD_GLAXNIMATE_QT6=OFF -DMOD_GLAXNIMATE=OFF -DMOD_QT=OFF -DMOD_QT6=OFF -DMOD_MOVIT=ON -DMOD_OPENCV=ON -S ./mlt -B ./build
+cmake -DCMAKE_BUILD_TYPE=Release -DSWIG_PYTHON=ON -DMOD_GLAXNIMATE_QT6=OFF -DMOD_GLAXNIMATE=OFF -DMOD_QT=OFF -DMOD_QT6=OFF -DMOD_MOVIT=OFF -DMOD_OPENCV=ON -DMOD_SDL2=ON -DMOD_SPATIALAUDIO=OFF -DMOD_RUBBERBAND=ON -S ./mlt -B ./build
 
 cmake --build ./build --config Release
 ```
 
 #### Create a local install
+
 ```bash
 mkdir install
 
@@ -46,14 +51,19 @@
 ### Set up bindings
 
 1. Copy *mlt7.py* and *_mlt7.so* from *\<ROOT_DIR\>/install/lib/python3.\<current_version\>/dist-packages* into *../flowblade-trunk* where your repository version Flowblade is installed.
-1. Create a launch script in to set up MLT variables correctly on launch.
 
- ```bash
-#!/bin/sh
+2. Create a launch script in to set up MLT variables correctly on launch.
+ 
+ ```bash
+ #!/bin/sh
+ ```
 
 # Set MLT environment variables to point
+
 # where you have the binaries and libraries
+
 # so MLT finds them runtime.
+
 ROOT_DIR=<ROOT_DIR\>
 
 INSTALL_DIR=$ROOT_DIR/install
@@ -65,7 +75,9 @@
 export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH
 
 # Launch repository Flowblade
+
 /home/path/to/flowblade/repo/install/flowblade-trunk/flowblade
-``` 
 
+```
 Launch Flowblade with the script above.
+```

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/flowblade -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/flowblade Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/installdata/io.github.jliljebl.Flowblade.appdata.xml -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/installdata/io.github.jliljebl.Flowblade.appdata.xml Changed

_service:obs_scm:flowblade-2.22.1.1.obscpio/flowblade-trunk/setup.py -> _service:obs_scm:flowblade-2.24.obscpio/flowblade-trunk/setup.py Changed

_service:obs_scm:flowblade.obsinfo Changed