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 12

flowblade.changes Changed

flowblade.spec Changed

_service Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/advanced.html Deleted

@@ -1,1035 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Advanced Editing</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png">
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div id="advtoc">
-<div class="subject-header">Advanced Editing Features</div>
-</div>
-
-<div id="toc"></div>
-
-<h2>1. Advanced Project Actions </h2>
-
-
-<h3>Combining Sequences</h3>
-<p>
-It is possible to import full contents of another Sequence into Sequence currently being edited.
-</p>
-
-<ol>
-<li> Select <b>Sequence->Import Another Sequence into this Sequence...</b></li>
-<li> Select Import action.</li>
-<ul>
-<li> <b>Append Sequence</b> adds imported Sequence at the end of current Sequence</li>
-<li> <b>Insert Sequence at Playhead Position</b> creates a cut at playhead position and inserts imported Sequences at that position</li>
-</ul>
-<li> Select a Sequence to Import</li>
-<ul>
-<li> <b>Note that you obviously need at least two Sequences to exist to do any import actions.</b></li>
-</ul>
-<li> Press <b>Import</b> button to execute import.</li>
-</ol>
-
-<h3>Split part of Sequence to new Sequence</h3>
-
-<ol>
-<li> Select <b>Sequence->Split to new Sequence at Playhead position</b></li>
-<li> After confirmation dialog the a new Sequence with contents of source Sequence after playhead position will be created and made active.</li>
-</ol>
-
-<h3>Importing Media from another Project</h3>
-
-<p>
-You can import Media Items from another Project.
-</p>
-
-<ol>
-<li> Select <b>Project->Import Media From Project...</b></li>
-<li> Select a Project file from file system.</li>
-<li> Media items that are not present in current Project will be opened in the current bin. Note that it takes a few seconds to load the project before new Media Items begin to appear.</li>
-</ol>
-
-
-
-<h2>2. Timeline Audio Syncing</h2>
-
-<p>
-You can make a clip to move to a position in timeline in which its audio is in sync with audio of another clip on timeline.
-</p>
-
-<p>
-This enables you to do simplified version of multicam editing on the timeline.
-</p>
-
-<ol>
-<li> Open context menu with <b>Right Mouse</b> on Clip you wish to sync with some other clip.</li>
-<li> Select menu item <b>Audio->Select Clip to Audio Sync With...</b>. The cursor changes to a targeting cross.</li>
-<li> Click on Clip you wish to audio sync with.</li>
-<li> A dialog opens giving info on the sync action that is to be done to sync clips.</li>
-<li> Press <b>Do Audio Sync Move Edit</b> button to do the syncing edit.</li>
-<li> It is usually a good idea to mute one of the synched clips</li>
-</ol>
-
-<div class="note">
-Audio syncing looks for best mathematical match between two audio waveforms, so <b>audio syncing non-matching audio will produce random results.</b>
-</div>
-
-
-<h2>3. Slow / Fast Motion and Reverse</h2>
-
-<p>
-In Flowblade there are two ways to do motion effects:
-</p>
-<ul>
-<li> Changing Clip Speed and direction in Timeline</li>
-<li> Creating new New Media Items in Bins</li>
-</ul>
-
-
-<h3> Changing Timeline Clip Speed and direction</h3>
-<h4> Creating Slow / Fast Motion Clips </h4>
-<ol>
-<li> Right click on a Timeline Clip File and select <b>Slow Motion -> Slow / Fast</b> from popup menu.</li>
-<li> Edit parameters for the new motion Clip</li>
-<ul>
-<li> Set speed</li>
-<li> Set encoding and quality</li>
-<li> Select render range, either:</li>
-<ul>
-<li> Current Clip Content</li>
-<li> Full Media</li>
-</ul>
-</ul>
-<li> Click <b>Render</b> button to create a new motion Timeline Clip.</li>
-</ol>
-
-<h4> Creating Reverse Motion Clips</h4>
-<ol>
-<li> Right click on a Timeline Clip File and select <b>Slow Motion -> Reverse</b> from popup menu.</li>
-<li> Edit parameters for the new motion Clip</li>
-<ul>
-<li> Set speed</li>
-<li> Set encoding and quality</li>
-<li> Select render range, either:</li>
-<ul>
-<li> Current Clip Content</li>
-<li> Full Media</li>
-</ul>
-</ul>
-<li> Click <b>Render</b> button to create a new reverse Timeline Clip.</li>
-</ol>
-
-<h3> Creating Motion Media Items </h3>
-<h4> Creating Slow / Fast Media Items </h4>
-<ol>
-<li> Right click on a Media File and select <b>Render Slow / Fast Motion File</b> from menu</li>
-<li>Edit parameters for the new motion Clip
-<ul>
-<li> Set speed</li>
-<li> Give name and location for motion Clip </li>
-<li> Select rendering parameters for motion Clip. It is probably a good idea to use a <b>lossless format</b> here to avoid any generational quality losses.</li>
-<li> Select render range, either:</li>
-<ul>
-<li> Full Source Clip</li>
-<li> From Source Clip Mark In to Mark Out</li>
-</ul>
-</ul>
-<li> Click <b>Render</b> button to create a new motion Media Item</li>
-</ol>
-
-<h4> Creating Reverse Media Items </h4>
-<ol>
-<li> Right click on a Media File and select <b>Render Reverse Motion File</b> from menu</li>
-<li>Edit parameters for the new motion Clip
-<ul>
-<li> Set speed</li>
-<li> Give name and location for reverse Clip </li>
-<li> Select rendering parameters for reverse Clip. It is probably a good idea to use a <b>lossless format</b> here to avoid any generational quality losses.</li>
-<li> Select render range, either:</li>
-<ul>
-<li> Full Source Clip</li>
-<li> From Source Clip Mark In to Mark Out</li>
-</ul>
-</ul>
-<li> Click <b>Render</b> button to create a new reverse Media Item</li>
-</ol>
-
-
-<h2>4. Synched Audio Splits and Clip Parenting</h2>
-
-<p>
-In Flowblade Movie Editor you can <b>set a clip's positions to follow another clip's positions</b> on request.
-</p>
-
-<h3>Main points</h3>
-<ul>
-<li>Sync relations are between two clips set up by selecting a <b>Sync Parent Clip</b> for a <b>Sync Child Clip</b>.</li>
-<li>Splitting audio with <b>Audio Split Synched </b> creates sync relation between original clip and split audio clip.</li>
-<li><b>Only clips on track V1 can be Sync Parent Clips</b>. This is done to encourage edit style in which the main body of the Sequence is on track V1 and composites and audio split edits are done relative to the clip sequence on track V1.</li>
-<li><b>Sync feature helps preserve earlier work</b> an multitrack composites and audio split edits when clips are no longer in correct positions relative to each other, because of edits elsewhere on the Sequence.</li>
-<li><b>Resyncs are only done on request</b> to avoid jumping of clips on the timeline while editing. Explicit resyncs are also better from the point of view of avoiding side effects when doing edits.
-</li>
-</ul>
-
-<h3>4.1 Audio Split Syncing</h3>
-<ul>
-<li> Click <b>Right Mouse</b> on clip in track V1 and select  <b>Audio Edit->Select Sync Parent Clip...</b>.</li>
-<li> Now you e.g. can use <b>Multitrim</b> tool to create J or L audio edits.</li>
-<li> Sync State Box appears on the Sync Child Clip.</li>
-<ul>
-<li> Green means that clip is in sync with parent.</li>
-<li> Red means that clip is NOT in sync with parent.</li>
-<li> Displayed number gives info on how many frames clip positions are away from being synched.</li>
-</ul>
-</ul>
-<h4>Resyncing Sync Child Clips</h4>
-<ul>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/all_comp.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/basic_editing.html Deleted

@@ -1,329 +0,0 @@
- <!DOCTYPE html>
-<html>
-<head>
-  <title>Basic Editing</title>
-  <link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div class="subject-header">Basic Editing</div>
-
-<p>
-This section describes the minimal workflow for making a movie using only a single track.
-</p>
-<div id="toc"></div>
-
-<div id="toccontent">
-
-<h3>Creating a New Project</h3>
-<p>
-Flowblade Movie Editor saves work in project files.
-</p>
-<p>
-To create a new Project:
-</p>
-<ul>
-<li> <b>Menu:</b> Select <b>File -> New</b> from menu.</li>
-<li> <b>Keyboard Shortcut:</b> Press <b>Control+N</b>.</li>
-</ul>
-<p>
-A project contains:
-</p>
- <ul>
-<li> one or more Sequences of edited media</li>
-<li> a collection of Media Files stored in Bins.</li>
-</ul>
-<p>
-There are two parameters that can be selected for a new project:
-</p>
-<ul style="list-style-type:none">
-<li> <b>Project Profile</b> Project Profile determines frame rate per second, image size in pixels and pixel aspect ratio.</li>
-<li> <b>Tracks count</b> 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.</li>
-<li> <b>Data Store</b> Thumbnails, Generator and Rendered Transitions, stabilizing and motion tracking data, proxy files etc. are stored here in a <b>Data Store</b>, see chapter: <a href="datastores.html">Data Stores</a>.
-
-
-</ul>
-
-<div class="note">
-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.
-</div>
-<div class="note">
-For <b>best possible quality</b> the <b>input material, Project Profile and Rendering Profile</b> should <b>all have the same pixel dimensions</b> and pixel aspect ratio.
-</div>
-
-<h3>Adding and removing new Sequences</h3>
-<p>
-A Project contains one or more Sequences. The term Sequence refers to the full contents of the timeline forming a program, a movie.
-</p>
-
-<p>
-For complex projects it is sometimes best to use multiple sequences for creating and managing different parts of the finished product.
-</p>
-
-<p>
-<b>Adding Sequences:</b>
-</p>
-<ul>
-<li> <b>Default layout:</b> Press <b>Right Mouse</b> popup menu on Sequences area and select menu item <b>Add New Sequence</b>..</li>
-<li> <b>Small screen layout:</b> Press <b>Right Mouse</b> popup menu in the <b>Project</b> tab <b>Sequences</b> area and select menu item <b>Add New Sequence</b>.</li>
-<li> Or select  <b>Project -> Sequence -> Add New Sequence</b> from application menu.</li>
-</ul>
-
-
-<p>
-<b>Deleting Sequences</b> can be done with menu actions accessed in the same places.
-</p>
-
-<div class="note">
-<p>
-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.
-</p>
-</div>
-
-<h3>Working with Media Files</h3>
-
-<p>
-Flowblade Movie Editor holds files in <b>Media</b> tab. Files are listed in unnamed table that displays contents of the currently selected Bin. Bins are listed in the <b>Bins</b> table.
-</p>
-
-<p>
-<b>Opening Media Files:</b>
-</p>
-
-<ol>
-<li> Press <b>Right Mouse</b> on <b>Media</b> tab empty area and select menu item <b>Add Video, Audio or Image...</b>.
-<li> Or select  <b>Project -> Add Video, Audio or Image...</b> from application menu.
-<li> Use dialog to find and select files.</li>
-<li> Files are displayed as thumbnails.</li>
-<li> Note that creating thumbnails for opened files will take some time.</li>
-</ol>
-
-<div class="note">
-<h3 style="margin-top:10px">Project Media: Absolute and relative paths</h3>
-<ul>
-<li> Flowblade <b>saves references</b> to media files used in a project as <b>absolute paths</b>.</li>
-<li> If a media is <b>not found on load</b>, Flowblade attempts to find a media file with the same name in subfolders relative to the project file.</li>
-<li> If all media used by a project is saved in subfolders relative to project file, <b>project file and media can moved as a unit</b> and the project will load successfully after data is copied to a different place</li>
-<li> <b>Rendered files</b> like transitions are saved by default in a <b>Data Store</b>, see chapter: <a href="datastores.html">Data Stores</a>.</li>
-<li> <b>Load order</b> between absolute and relative paths can be set in preferences window</li>
-<li> <b>Media Relinker</b> tool can be used to fix problems that may occur </li>
-</ul>
-</div>
-
-<h3>Working with Bins</h3>
-
-<p>
-In video editing a bin is a named location for storing media. The term is used in Avid and was earlier used by film editors.
-</p>
-
-<p>
-    <b>Adding a Bin:</b>
-<p>
-<ul>
-<li> <b>Default layout:</b> Press <b>Right Mouse</b> on Bin area to launch a popup menu and select menu item <b>Add Bin</b>.</li>
-<li> <b>Small screen layout:</b> Press <b>Right Mouse</b> in the <b>Media</b> tab <b>Bins</b> panel to launch a popup menu and select menu item <b>Add Bin</b>.</li>
-<li> Or select  <b>Project -> Bin -> Add Bin</b> from application menu.</li>
-</ul>
-
-<p><b>Deleting a Bin</b>: Delete actions can be accessed from the same places as above.</p>
-<p><b>Renaming a Bin</b>: Click on the Bin name, type new name and press <b>Enter</b>.</p>
-<p><b>Moving files to another Bin:</b></p>
-<ul>
-<li> Select and drag files on top of the Bin you wish to move the files into.</li>
-<li> Select files and open <b>Hamburger menu</b> in <b>Media</b> panel and select menu item <b>Move Selected media to Bin</b> and then the menu item with the Bins name.</li>
-</ul>
-<div class="tabbed">
-
-</div>
-
-<h4>Filtering Bin View</h4>
-<p>
-    Bins can be mede to display only subset of media items thei contain. Press on filtering button in <b>Media Panel</b> bottom row next <b>Hamburger</b> and <b>columns</b> buttons.
-<p>
-    <ul>
-    <li> <b>Filtering by media type.</b> Select one of options <i>All Files, Video Files Audio Files, Graphics Files, Image Sequences, Pattern Producers, Unused Files</i>.</li>
-    <li> <b>Filtering by ratings.</b> Select one of options in submenu <i>Ratings</i>, either <i>Show All Ratings, Show Favorites, Hide bad</i>. Each media item can be given a rating in context popover submenu <i>Rating</i>.</li>
-    </ul>
-    
-<h3>Using Timeline</h3>
-
-<h4>Scrolling Timeline</h4>
-<ul>
-<li> Press and Drag <b>Scrollbar</b> below Timeline</li>
-<li> Scroll <b>Mouse Middle</b> button + <b>CTRL</b> key while on top of Timeline</li>
-</ul>
-
-<h4>Zooming Timeline</h4>
-<ul>
-<li> Click <b>Zoom In</b>, <b>Zoom Out</b> or <b>Zoom Length</b> buttons.</li>
-<li> Scroll <b>Mouse Middle</b> button on top of Timeline </li>
-</ul>
-
-<h4>Changing Current Frame</h4>
-<ul>
-<li> Drag with <b>Right Mouse</b> button starting from  an empty space in the Timeline.</li>
-<li> Drag with <b>Left Mouse</b> button on the Frame Scale.</li>
-<li> Drag with <b>Left Mouse</b> on the Monitor Position Bar.</li>
-<li> Click <b>Left Arrow</b> key or <b>Right Arrow</b> key to move to next or previous frame.</li>
-<li> Click <b>Up Arrow</b> key or <b>Down Arrow</b> key to move to next or previous cut on topmost active track.</li>
-<li> Click <b>Next</b> or <b>Prev</b> button in Monitor Buttons area to move to next or previous frame.</li>
-</ul>
-
-<h4>Changing Current Frame when Clip is displayed on Monitor</h4>
-<ul>
-<li> Drag with <b>Left Mouse</b> on the Monitor Position Bar.</li>
-<li> Click <b>Left Arrow</b> key or <b>Right Arrow</b> key to move to next or previous frame.</li>
-<li> Click <b>Up Arrow</b> key or <b>Down Arrow</b> key to move to next or previous of the following: Mark In/Mark Out/Start/End</li>
-<li> Click <b>Next</b> or <b>Prev</b> button in Monitor Buttons area to move to next or previous frame.</li>
-</ul>
-
-<h4>Switching between Timeline and Clip Display</h4>
-<ul>
-<li> Click buttons with icons representing sequence or single clip in Monitor Buttons area.</li>
-<li> Drag Media File on top of <b>Monitor</b> to display Clip.</li>
-</ul>
-
-<h4>Setting Active Tracks</h4>
-<ul>
-<li> Click <b>Track Active Switch</b> on the right side of Tracks Column area. Topmost  <b>Track Active Switch</b> displays arrow pointing downwards indicating that <b>Insert From Monitor</b> and other buttons place clips on that track.</li>
-</ul>
-
-<div class="note">
-<h4>Effects of Track Active State</h4>
-<ul>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/compositor.html Deleted

@@ -1,221 +0,0 @@
- <!DOCTYPE html>
-<html>
-<head>
-  <title>Creating Composited Images</title>
-  <link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Creating Composited Images</div>
-
-<p>
-Flowblade Movie Editor uses Compositors to mix images from two different tracks.
-</p>
-
-<div id="toc"></div>
-
-<h3>Compositing Modes</h3>
-<p>
-The way that Compositors work is defined by a Compositing Mode. Users can select Compositing Mode to suit their preference or editing needs of a particular Sequence.
-</p>
-<p>
-<b>To set Compositing Mode</b> for a Sequence select it from <b><i>Sequence -> Compositing Mode</i></b> sub menu.
-</p>
-
-<h4>Standard Full Track</h4>
-<p>
-This is the most simple and easiest to use Compositing Mode. No Compositors are needed. Fade In/Outs, Wipes and transforms are created with Filters. Some compositing functionality is not available. It is not possible to create node tree compositions
-</p>
-<h4>Compositor Free Move</h4>
-<p>
-This is the most powerful and complex Compositing Mode. Users can set destination tracks and positions of Compositors freely and create node tree compositions if needed.
-</p>
-
-<h2>Standard Full Track Compositing Mode</h2>
-<p>
-Compositing in Standard Full Track mode is similar to using layers in applications like Gimp and Photoshop.
-
-
-<h3>Workflow</h3>
-<h4>Creating layered compositions</h4>
-
-<ul>
-<li> Add Clips on Timeline on different tracks.</li>
-<li> Images are composited in bottom to top order.</li>
-<li> Images with alpha channel are composited with transparency as defined by alpha channel.</li>
-<li> Use Filters to create Dissolves, Wipes, Blends and affine transforms.</li>
-</ul>
-
-<h4>Dissolves</h4>
-<ul>
-<li> Add Clips on Timeline on different tracks.</li>
-<li> Add <b>Fade In</b> or <b>Fade Out</b> Filters to Clip on the upper track to create Dissolves with Clip on the lower track.</li>
-<li> <b>Fade In</b> and <b>Fade Out</b> Filters are in <b>Fade</b> Filter category.</li>
-</ul>
-
-<h4>Dissolves - Rendered Transition</h4>
-
-<ul>
-<li> Select two Clips on the same track.</li>
-<li> Press <b>Add Rendered Transition</b> button in middlebar.</li>
-<li> Give length of rendered transition and press <b>Render</b> button.</li>
-</ul>
-
-<h4>Blends</h4>
-<ul>
-<li> Add Clips on Timeline on different tracks.</li>
-<li> Add <b>Blend</b> Filter to Clip on the upper track to control blend mode used when compositing image on top of the Clip on the lower track.</li>
-<li> <b>Blend</b> Filters can be combined with other Filters to create compositions as wished.</li>
-<li> <b>Blend</b> Filters are in <b>Blend</b> Filter category.</li>
-</ul>
-
-<h4>Wipes</h4>
-<ul>
-<li> Add Clips on Timeline on different tracks.</li>
-<li> Add <b>Wipe</b> Filters to the top Clip to create wipe transitions.</li>
-<li> <b>Wipe</b> Filters are in <b>Blend</b> Filter category.</li>
-</ul>
-
-<h4>Alpha channel manipulation: Keys, Rotomasks etc.</h4>
-<ul>
-<li> Add Clips on Timeline on different tracks.</li>
-<li> Use appropriate Filters in <b>Alpha</b> Filter category to create more complex compositing opearations such as color keys, shaped masks or animated masks.</li>
-</ul>
-
-<h4>Transforms</h4>
-<ul>
-<li> Add Clips on Timeline on different tracks.</li>
-<li> Add <b>Position Scale</b> or <b>Position Scale Rotation</b> Filters to the top Clip to move, rotate and scale image before it is composited on lower track.</li>
-<li> These Filters are in <b>Transform</b> Filter category.</li>
-</ul>
-
-<h2>Compositor Free Move Compositing mode</h2>
-<p>
-In this modes Compositors have a Source track and a Destination track.</p>
-</p>
-<p>
-On the Timeline a Compositor is displayed as a rectangular object on top of two tracks. Source track is always the one above Compositor, but Destination track may be any of the tracks below it.
-</p>
-<p>
-Parameters defining the resulting image are edited in the <b>Edit</b> tab.
-</p>
-
-<h3>Workflow</h3>
-<p>
-By combining multiple tracks and multiple Compositors complex composite images can be achieved.
-</p>
-<ol>
-<li>Creating a Compositor
-<ul>
-<li> Click <b>Right Mouse</b> on any clip on tracks from V5 to V2 and select for example <b>Add Compositor -> Dissolve</b> or <b>Add Blender -> Softlight</b> from popupmenu to create a new Compositor.</li>
-</ul>
-<li>Trimmimg or Moving a Compositor</li>
-<ul>
-<li> To trim Compositor start and end points: Press and drag <b>Left Mouse</b> near either end of Compositor on Timeline.</li>
-<li> To move Compositor: Press and drag <b>Left Mouse</b> in the middle of Compositor on Timeline.</li>
-</ul>
-<li>Editing Compositor Parameters in Compositors Tab</li>
-<ul>
-<li> Double click Compositor with <b>Left Mouse</b>.</li>
-<li> Click <b>Right Mouse</b> on any Compositor and select Open In Compositor Editor</li>
-<li> Edit parameters using value editors.</li>
-</ul>
-<li>Deleting Compositor</li>
-<ul>
-<li> Click <b>Left Mouse</b> on any Compositor to select it and press <b>Delete</b> key.</li>
-</ul>
-</ol>
-
-<h3>Compositor are executed from top to bottom in Top Down Compositing modes</h3>
-In Flowblade Movie Editor <b>the order of rendering is top-to-bottom</b>,
-instead of bottom-to-top like in Gimp or Photoshop.
-
-When attempting certain type of multilayer composites this yields results that seem unintuitive,
-unless the user is aware of rendering order of Compositors.
-
-<h4>Rendering A Composited Frame</h4>
-<ol>
-<li>For each frame it is checked if there is a Compositor covering this frame on the top most track.</li>
-<li>If such Compositor is found, do composite on Destination track.</li>
-<li>Frame on Destination track is now altered and if that frame is used as source the altered version is used</li>
-<li>Check if frame on next track below has compositor and if Compositor is found render the composite image</li>
-<li>This is done for each track.</li>
-<li>Output image on is from the topmost track that has media on the frame and does not have a compostor on the frame.</li>
-</ol>
-
-<h3>Using Filters</h3>
-<p> Exept for <b>Blend</b> Filter, all filters can used in the same way to achieve compositions as in <b>Standard Free Move</b> compositing mode.</p>
-
-<h3>EXAMPLE: Creating a 3-layer composite</h3>
-<p style="margin-bottom:45px" >
-In this example we demonstrate how top-to-bottom Compositor
-order affects compositing. We are trying to make word 'GO' appear on top of 2-color
-background made by combining red and blue Color Clips using 'Free Stripes' wipe.
-</p>
-<h4>Media Items and desired result</h4>
-<p>
-To make alpha transparency work the GO.PNG graphic has to composited using 'Dissolve'.
-</p>
-<p>
-<i><b>Clips: RED and BLUE Color Clips and GO.PNG graphic with alpha transparency</b></i>
-</p>
-<img src="comp_clips.png">
-
-<p>
-<i><b>Desired result</b></i>
-</p>
-
-<img style="margin-bottom:45px" src="correct_comp.png">
-
-<h4>Gimp/Photoshop style layer order yields wrong result</h4>
-<p>
-Here we have arranged clips on the tracks as we would arrange layers in Gimp.
-</p>
-<p>
-<i><b>Gimp style layer order</b></i>
-</p>
-<img src="wrong_timeline.png">
-
-<p>
-What happens here is that first 'GO.PNG' is composited on 'RED' Color Clip, and the resulting image is composited using 'Free Stripes' wipe on top of 'BLUE' Color Clip. We get the wrong result.
-</p>
-<p>
-<i><b>Wrong result</b></i>
-</p>
-<img  style="margin-bottom:45px" src="wrong_comp.png">
-<h4>Correct layer order when compositing order is top-to-bottom</h4>
-<p>
-Here we have arranged clips in correct order for the desired result.
-</p>
-<p>
-<i><b>Correct layer order</b></i>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/container_clips.html Deleted

@@ -1,132 +0,0 @@
-<!DOCTYPE html>
- 
-<html>
-<head>
-  <title>Container Clips</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png">
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Container Clips</div>
-
-
-
-<div id="toc"></div>
-
-<h2>Container Clips Concept</h2>
-<p>
-A <b>Container Clip</b> is a Media Item and the Timeline Clip made from it that has three items packed together as a single entity: <i>Program, Unrendered Media</i> and <i>Rendered Media</i>.
-</p>
-<h3>Components</h3>
-<ol>
-<li><b>Unrendered Media</b> This is what is displayed on timeline if container clip media is not rendered.</li>
-<li><b>Program</b> This data is used to render a media clip on timeline, sometimes using unrendered media as input.</li>
-<li><b>Rendered Media</b> This is what is displayed on timeline when Container Clip is rendered.</li>
-</ol>
-
-
-<h2>G'Mic Script Container Clips</h2>
-
-<h5>Components</h5>
-<p>
-<ul style="list-style-type:none">
-<li><b>Unrendered Media</b> Video Clip.</li>
-<li><b>Program</b> G'Mic script created and saved from G'Mic tool.</li>
-<li><b>Rendered Media</b> A clip rendered with G'mic effect.</li>
-</ul>
-</p>
-<p>
-<h5>Use Cases</h5>
-<ul>
-<li>Render G'Mic effects only on clip ranges used on timeline.</li>
-<li>Make easier to use single user defined G'Mic effect on multiple clips.</li>
-</ul>
-
-<h5> Creating G'Mic Script Container Clips</h5>
-
-<ol>
-<li>Open <b>G'Mic tool</b>.</li>
-<li>Create G'Mic effect script. See section on <b>G'Mic Effects</b> in Chapter <b>Tools</b>.</li>
-<li>Press <b>Save Script</b> button in bottom left corner and save effect.</li>
-<li>Select menu item <b>Project -> Create Contaniner Clip -> From G'Mic Script</b>.</li>
-<li>Select the script you saved and the clip that it will be applied on to create Container Clip.</li>
-</ol>
-
-
-<h2>Selection Container Clips</h2>
-<h5>Components</h5>
-<p>
-<ul style="list-style-type:none">
-<li><b>Unrendered Media</b> A MLT XML vdieo clip created from selection or sequence like Compound clips previously.</li>
-<li><b>Program</b> A MLT XML video clip created from selection or sequence like Compound clips previously. Here Program is the same as unrendered media.</li>
-<li><b>Rendered Media</b> Clip Rendered from MLT XML Clip.</li>
-</ul>
-</p>
-<h5>Use Cases</h5>
-
-<ul>
-<li>Make possible to create Media items from selections and full Sequences.</li>
-<li>Give better timeline performance for complex multitrack container clips by pre-rendering them on timeline.</li>
-</ul>
-
-<h5> Creating Selection Container Clip from Selection</h5>
-
-<ol>
-<li> Select 2 or more adjacent clips from a single track.</li>
-<li> Select <b>Project->Create Container Clip->From Selected Clips</b></li>
-<li> A new Media Item appears in the current Bin.</li>
-</ol>
-
-<h5> Creating Selection Container Clip from Sequence</h5>
-
-<ol>
-<li> Select <b>Project->Create Container Clip->From Current Sequence</b></li>
-<li> A new Media Item appears in the current Bin.</li>
-</ol>
-
-<h5> Creating audio synced Selection Container Clip from two Media Items</h5>
-
-<ol>
-<li> Select 2 Media Items in Media panel.</b>
-	<ul>
-	<li> The expected case is to select <b>1 Video and 1 Audio Clip</b>.</li>
-	<li> If you select <b>2 Video Clips</b> then which is used as video depends on selection order.</li>
-	<li> Audio from clip treated as video is muted.</li>
-	</ul>
-</li>
-<li> Select <b>Project->Create Compound Clip->Audio Sync Merge Clip From 2 Media Items</b></li>
-<li> If audio sync is successful a dialog appears. Give a name for the new Media Item in the dialog.</li>
-<li> A new Media Item appears in the current Bin.</li>
-</ol>
-
-<div class="note">
-Audio syncing looks for best mathemathical match between two audio waveforms, so <b>audio syncing non-matching audio will produce random results.</b>
-</div>
-
-<h2>Generator Container Clips</h2>
-<p>
-<b>Generators</b> are Container Clips too, see more info in chapter <a href="generatorsfluxity.html">Generators and Fluxity API</a>
-</p>
-
-<h2>Blender Project Container Clips</h2>
-<p><i>
-Feature was removed in release 2.10.
-</i></p>
-
-</div>
-
-</div>
-</div>
-
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/edit_tools.html Deleted

@@ -1,251 +0,0 @@
- <!DOCTYPE html>
-<html>
-<head>
-  <title>Timeline Edit Tools</title>
-  <link rel="stylesheet" href="style.css">
-  <META CHARSET="UTF-8">
-</head>
-
-<body>
-
-<div id="content">
-
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div class="subject-header">Timeline Edit Tools</div>
-
-<p>
-Flowblade Movie Editor has 6 edit tools for doing timeline edits.
-</p>
-
-<div id="toccontent">
-<div id="toc"></div>
-
-<h2>Selecting Tools</h2>
-
-<p>
-Use <b>Tool Switcher</b> button drop menu or press key <b>1 - 6</b>  to pick a tool.
-</p>
-
-<p>
-It is also possible to use Tool Dock instead of <b>Tool Switcher</b> button by selecting <b>Dock</b> in <b>View->Edit Tool Selection Widget</b>.
-</p>
-
-
-<div class="note">
-<b>Use Keyboard Shortcuts!</b> It is much faster to use keys <b>1 - 6</b> to change tools. Note that keys 1-6 only change tools if timeline has keyboard focus. 
-</div>
-
-
-<h2>Move Tools</h2>
-
-
-<a id="overwrite"></a>
-<h3>Move</h3>
-
-<p>
-Lift out one or more clips and insert them at any point to overwrite on any track.
-</p>
-
-<ol>
-<li>Select clip
-	<ul>
-	<li><b> Click </b>Left Mouse on a clip.</li>
-	</ul>
-</li>
-<li>Select other end of clip range if moving multiple clips
-	<ul>
-	<li> Click <b>CTRL+Left Mouse</b> on the clip you wish to be the other end of move clip range.</li>
-	</ul>
-</li>
-<li>Drag Clip(s) to new position
-	<ul>
-	<li> Press <b>Left Mouse</b> on a selected clip and drag clip/s to a new position.</li>
-	<li> Red shadow clips show overwrite area.</li>
-	<li> You can also move clips to a different track.</li>
-	</ul>
-</li>
-</ol>
-
-<p>
-Drag clip ends to change clip length.
-</p>
-
-<ol>
-<li>Place cursor near clip end
-	<ul>
-	<li>When cursor changes to horizontal arrow with vertical bar you can start clip end drag edit.</li>
-	</ul>
-</li>
-<li>Drag clip end with <b>Left Mouse</b>.
-	<ul>
-	<li> Added clip length will perform overwrite on blanks and empty space</li>
-	</ul>
-	<ul>
-	<li> Added clip length will perform insert on other clips</li>
-	</ul>
-	<ul>
-	<li> Decreased clip length will perform splice out.</li>
-	</ul>
-</li>
-</ol> 
-
-<p>
-Select and overwrite move all Timeline items contained in a box selection.
-</p>
-
-<ol>
-<li>Select an area on Timeline by dragging a box selection with <b>Left Mouse</b> around all items you wish to move and release mouse button.</li>
-<li>Press <b>Left Mouse</b> inside the box selection and drag the box into new position on timeline and release mouse.</li>
-<li>Box contents are overwritten on new position and Compositors are moved.</li>
-
-</ol>
-
-
-<a id="insert"></a>
-<h3>Insert</h3>
-
-<p>
-Splice out one or more clips and insert them at desired cut on any track.
-</p>
-
-<ol>
-<li>Select clip
-	<ul>
-	<li> Click <b>Left Mouse</b> on a clip.</li>
-	</ul>
-</li>
-<li>Select other end of clip range if moving multiple clips
-	<ul>
-	<li> Click <b>CTRL+Left Mouse</b> on the clip you wish to be the other end of move clip range.</li>
-	</ul>
-</li>
-<li>Drag Clip(s) to new position
-	<ul>
-	<li> Press <b>Left Mouse</b> on a selected clip and drag clip/s to a new position.</li>
-	<li> Yellow arrow displays insert point.</li>
-	<li> You can also move clips to a different track.</li>
-	</ul>
-</li>
-</ol>
-
-<p>
-Drag clip ends to change clip length.
-</p>
-
-<ol>
-<li>Place cursor near clip end 
-	<ul>
-	<li>When cursor changes to horizontal arrow with vertical bar you can start clip end drag edit.</li>
-	</ul>
-</li>
-<li>Drag clip end with <b>Left Mouse</b>.
-	<ul>
-	<li> Added clip length will perform overwrite on blanks and empty space</li>
-	</ul>
-	<ul>
-	<li> Added clip length will perform insert on other clips</li>
-	</ul>
-	<ul>
-	<li> Decreased clip length will perform splice out.</li>
-	</ul>
-</li>
-
-</ol> 
-
-
-
-
-
-
-<a id="spacer"></a>
-<h3>Spacer</h3>
-
-<p>Move all Timeline items after pressed frame on all tracks or on a single track</p>
-<ol>
-<li>Select a clip on Timeline and move it and all items to the right of it
-	<ul>
-	<li> Press <b>Left Mouse</b> on a clip.</li>
-	<li> Continue to <b>Left drag</b> clip and all clips and compositors to right of it into a new position</li>
-	<li> It is not possible to move items on top of clips. Items can only be moved on top of empty space </li>
-		</ul>
-	<li>Use <b>Control</b> button to only affect items on a single track</li>
-		<ul>
-	<li> Press <b>Control</b> and use <b>Left Mouse</b> to move all items on single track to the right of the selected clip</li>
-	</ul>
-</li>
-</ol>
-
-
- 
- 
-<h2>Trim Tools</h2>
-
-<a id="multitrim"></a>
-<h3>Multitrim</h3>
-<p>
-Do  <b>Trim</b>, <b>Roll</b> or <b>Slip</b> tool edits based on cursor position on timeline.
-</p>
-<ol>
-
-<li> Cursor change indicates which type of trim edit is done when edit is initiated with <b>Left Mouse</b> press.
-	<ul>
-	<li> If cursor is right on the cut, a <b>Roll</b> edit is done. <b>Roll</b> edit moves edit point between two clips so that their combined length stays the same.</li>
-	<li> If cursor is right on the center of clip, a <b>Slip</b> edit is done. <b>Slip</b> edit changes the displayed area of media in a clip while keeping the clip position unchanged on the timeline.</li>
-	<li> On other cursor positions a <b>Trim</b> edit on the closer clip end is done. <b>Trim</b> edit makes clip longer or shorter from either clip's end or from clip's beginning.</li>
-	</ul>
-</li>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/fluxity.html Deleted

@@ -1,3836 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
-<meta name="generator" content="pdoc 0.10.0" />
-<title>fluxity API documentation</title>
-<meta name="description" content="GPL Licence text …" />
-<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/sanitize.min.css" integrity="sha256-PK9q560IAAa6WVRRh76LtCaI8pjTJ2z11v0miyNNjrs=" crossorigin>
-<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/typography.min.css" integrity="sha256-7l/o7C8jubJiy74VsKTidCy1yBkRtiUGbVkYBylBqUg=" crossorigin>
-<link rel="stylesheet preload" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/github.min.css" crossorigin>
-<style>:root{--highlight-color:#fe9}.flex{display:flex !important}body{line-height:1.5em}#content{padding:20px}#sidebar{padding:30px;overflow:hidden}#sidebar > *:last-child{margin-bottom:2cm}.http-server-breadcrumbs{font-size:130%;margin:0 0 15px 0}#footer{font-size:.75em;padding:5px 30px;border-top:1px solid #ddd;text-align:right}#footer p{margin:0 0 0 1em;display:inline-block}#footer p:last-child{margin-right:30px}h1,h2,h3,h4,h5{font-weight:300}h1{font-size:2.5em;line-height:1.1em}h2{font-size:1.75em;margin:1em 0 .50em 0}h3{font-size:1.4em;margin:25px 0 10px 0}h4{margin:0;font-size:105%}h1:target,h2:target,h3:target,h4:target,h5:target,h6:target{background:var(--highlight-color);padding:.2em 0}a{color:#058;text-decoration:none;transition:color .3s ease-in-out}a:hover{color:#e82}.title code{font-weight:bold}h2id^="header-"{margin-top:2em}.ident{color:#900}pre code{background:#f8f8f8;font-size:.8em;line-height:1.4em}code{background:#f2f2f1;padding:1px 4px;overflow-wrap:break-word}h1 code{background:transparent}pre{background:#f8f8f8;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ccc;margin:1em 0;padding:1ex}#http-server-module-list{display:flex;flex-flow:column}#http-server-module-list div{display:flex}#http-server-module-list dt{min-width:10%}#http-server-module-list p{margin-top:0}.toc ul,#index{list-style-type:none;margin:0;padding:0}#index code{background:transparent}#index h3{border-bottom:1px solid #ddd}#index ul{padding:0}#index h4{margin-top:.6em;font-weight:bold}@media (min-width:200ex){#index .two-column{column-count:2}}@media (min-width:300ex){#index .two-column{column-count:3}}dl{margin-bottom:2em}dl dl:last-child{margin-bottom:4em}dd{margin:0 0 1em 3em}#header-classes + dl > dd{margin-bottom:3em}dd dd{margin-left:2em}dd p{margin:10px 0}.name{background:#eee;font-weight:bold;font-size:.85em;padding:5px 10px;display:inline-block;min-width:40%}.name:hover{background:#e0e0e0}dt:target .name{background:var(--highlight-color)}.name > span:first-child{white-space:nowrap}.name.class > span:nth-child(2){margin-left:.4em}.inherited{color:#999;border-left:5px solid #eee;padding-left:1em}.inheritance em{font-style:normal;font-weight:bold}.desc h2{font-weight:400;font-size:1.25em}.desc h3{font-size:1em}.desc dt code{background:inherit}.source summary,.git-link-div{color:#666;text-align:right;font-weight:400;font-size:.8em;text-transform:uppercase}.source summary > *{white-space:nowrap;cursor:pointer}.git-link{color:inherit;margin-left:1em}.source pre{max-height:500px;overflow:auto;margin:0}.source pre code{font-size:12px;overflow:visible}.hlist{list-style:none}.hlist li{display:inline}.hlist li:after{content:',\2002'}.hlist li:last-child:after{content:none}.hlist .hlist{display:inline;padding-left:1em}img{max-width:100%}td{padding:0 .5em}.admonition{padding:.1em .5em;margin-bottom:1em}.admonition-title{font-weight:bold}.admonition.note,.admonition.info,.admonition.important{background:#aef}.admonition.todo,.admonition.versionadded,.admonition.tip,.admonition.hint{background:#dfd}.admonition.warning,.admonition.versionchanged,.admonition.deprecated{background:#fd4}.admonition.error,.admonition.danger,.admonition.caution{background:lightpink}</style>
-<style media="screen and (min-width: 700px)">@media screen and (min-width:700px){#sidebar{width:30%;height:100vh;overflow:auto;position:sticky;top:0}#content{width:70%;max-width:100ch;padding:3em 4em;border-left:1px solid #ddd}pre code{font-size:1em}.item .name{font-size:1em}main{display:flex;flex-direction:row-reverse;justify-content:flex-end}.toc ul ul,#index ul{padding-left:1.5em}.toc > ul > li{margin-top:.5em}}</style>
-<style media="print">@media print{#sidebar h1{page-break-before:always}.source{display:none}}@media print{*{background:transparent !important;color:#000 !important;box-shadow:none !important;text-shadow:none !important}ahref:after{content:" (" attr(href) ")";font-size:90%}ahreftitle:after{content:none}abbrtitle:after{content:" (" attr(title) ")"}.ir a:after,ahref^="javascript:":after,ahref^="#":after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,h3{orphans:3;widows:3}h1,h2,h3,h4,h5,h6{page-break-after:avoid}}</style>
-<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js" integrity="sha256-Uv3H6lx7dJmRfRvH8TH6kJD1TSK1aFcwgx+mdg3epi8=" crossorigin></script>
-<script>window.addEventListener('DOMContentLoaded', () => hljs.initHighlighting())</script>
-</head>
-<body>
-<main>
-<article id="content">
-<header>
-<h1 class="title">Module <code>fluxity</code></h1>
-</header>
-<section id="section-intro">
-<h3 id="gpl-licence-text">GPL Licence text</h3>
-<p>Flowblade Movie Editor is a nonlinear video editor.
-Copyright 2021 Janne Liljeblad.</p>
-<p>This file is part of Flowblade Movie Editor <a href="https://github.com/jliljebl/flowblade/">https://github.com/jliljebl/flowblade/</a>.</p>
-<p>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.</p>
-<p>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.</p>
-<p>You should have received a copy of the GNU General Public License
-along with Flowblade Movie Editor. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
-<h1 id="fluxity-scripting">FLUXITY SCRIPTING AND API</h1>
-<p>Fluxity scripting is a <strong>Python scripting solution</strong> created to provide <strong>Flowblade Movie Editor</strong> with a <em>Plugin API</em>.
-Currently <em>Fluxity API</em>
-is used by Flowblade <em>Generators</em> feature.</p>
-<p><em>Fluxity API</em> is made available to scripts mainly by <em>fluxity.FluxityContext</em> object and its methods.
-This object is created to communicate with the script before calling any of the methods of the script.</p>
-<p>Some constants mentioned in this source file - such as <code><a title="fluxity.EDITOR_FLOAT" href="#fluxity.EDITOR_FLOAT">EDITOR_FLOAT</a></code> or <code><a title="fluxity.PROFILE_WIDTH" href="#fluxity.PROFILE_WIDTH">PROFILE_WIDTH</a></code> - can also be used by scripts. </p>
-<p>See below for <em>fluxity.FluxityContext</em> object API details.</p>
-<h2 id="script-interface">SCRIPT INTERFACE</h2>
-<p>A Python script needs to have the following functions to load and run without crashing as a Fluxity API conforming script.</p>
-<pre><code>def init_script(fctx):
-    pass
-
-def init_render(fctx):
-    pass
-
-def render_frame(frame, fctx, w, h):
-    pass
-</code></pre>
-<h2 id="script-lifecycle">SCRIPT LIFECYCLE</h2>
-<p><strong><code>init_script(fctx):</code></strong> This method is called when script is first loaded by Flowblade to create data structures with info on editors and script metadata. </p>
-<p><strong><code>init_render(fctx):</code></strong> This method is called before a render is started to get user input from editors and possibly to create some additional data structures.</p>
-<p><strong><code>render_frame(frame, fctx, w, h):</code></strong> This method is called for each frame rendered to create an output image for that frame.</p>
-<p>Object <strong><code>fctx</code></strong> is object of class <strong><code>fluxity.FluxityContext</code></strong>.</p>
-<h2 id="example-script">EXAMPLE SCRIPT</h2>
-<h3 id="init_script">init_script()</h3>
-<pre><code>import cairo
-import numpy as np
-import random
-import math
-
-import fluxity
-
-def init_script(fctx):
-    fctx.set_name(&quot;Floating Balls&quot;)
-    fctx.set_version(1)
-    fctx.set_author(&quot;Janne Liljeblad&quot;)
-
-    fctx.add_editor(&quot;Hue&quot;, fluxity.EDITOR_COLOR, (0.8, 0.50, 0.3, 1.0))
-    fctx.add_editor(&quot;Speed&quot;, fluxity.EDITOR_FLOAT_RANGE, (1.0, -5.0, 5.0))
-    fctx.add_editor(&quot;Speed Variation %&quot;, fluxity.EDITOR_INT_RANGE, (40, 0, 99))
-    fctx.add_editor(&quot;Number of Items&quot;, fluxity.EDITOR_INT_RANGE, (50, 10, 500))
-    fctx.add_editor(&quot;Size&quot;, fluxity.EDITOR_INT_RANGE, (330, 10, 800))
-    fctx.add_editor(&quot;Size Variation %&quot;, fluxity.EDITOR_INT_RANGE, (0, 0, 80))
-    fctx.add_editor(&quot;Opacity&quot;, fluxity.EDITOR_INT_RANGE, (100, 5, 100))
-    fctx.add_editor(&quot;Random Seed&quot;, fluxity.EDITOR_INT, 42)
-</code></pre>
-<p>In <em>init_script()</em> we define the editors that will be presented to the user and set some metadata like the name of the script displayed to the user and the script author.</p>
-<p>Object <strong><code>fctx</code></strong> is object of class <strong><code>fluxity.FluxityContext</code></strong>.</p>
-<h3 id="init_render">init_render()</h3>
-<pre><code>def init_render(fctx):
-    # The script is possibly rendered using multiple prosesses and we need to have the
-    # same sequence of random numbers in all processes. If we don't set seed we'll get completely different
-    # ball positions, colors and speeds in different rendering processes.
-    random.seed(fctx.get_editor_value(&quot;Random Seed&quot;))
-
-    # Ball colors data structure
-    hue = fctx.get_editor_value(&quot;Hue&quot;)
-    hr, hg, hb, alpha = hue
-    fctx.set_data_obj(&quot;hue_tuple&quot;, hue)
-    color_array = list(hue)
-    ball_colors = 
-    color_mult = 1.05
-    opacity = float(fctx.get_editor_value(&quot;Opacity&quot;)) / 100.0
-
-    for i in range(0, 10):
-        array = np.array(color_array) * color_mult
-        r, g, b, a = array
-        ball_colors.append(cairo.SolidPattern(_clamp(r), _clamp(g), _clamp(b), opacity))
-        color_array = array
-    fctx.set_data_obj(&quot;ball_colors&quot;, ball_colors)
-
-    # Ball animations data structure
-    ball_data = 
-    number_of_balls = fctx.get_editor_value(&quot;Number of Items&quot;)
-    speed = fctx.get_editor_value(&quot;Speed&quot;)
-    speed_var_size_precentage = fctx.get_editor_value(&quot;Speed Variation %&quot;)
-    speed_var_max = speed * (speed_var_size_precentage  / 100.0)
-    size = fctx.get_editor_value(&quot;Size&quot;)
-    size_var_size_precentage = fctx.get_editor_value(&quot;Size Variation %&quot;)
-    size_var_max = size * (size_var_size_precentage / 100.0)
-    size_max = size + size_var_max
-    fctx.set_data_obj(&quot;size_max&quot;, size_max)
-
-    for i in range(0, number_of_balls):
-        path_pos = random.uniform(0.0, 1.0)
-        y = random.randint(-330, 1080 + 330)
-        speed_var = random.uniform(-1.0, 1.0)
-
-        ball_speed = speed + (speed_var * speed_var_max)
-        size_var = random.uniform(-1.0, 1.0)
-        ball_size = size + (size_var * size_var_max)
-        color_index = random.randint(0, 9)
-        ball_data.append((path_pos, y, ball_speed, ball_size, color_index))
-
-    fctx.set_data_obj(&quot;ball_data&quot;, ball_data)
-</code></pre>
-<p>In <em>init_render() </em> we read editor values set by the user and create some data structures for moving ball animations based on that data.</p>
-<p>Also note that <strong>we need to set seed for Pythom module 'random'</strong> because when a frame sequence is rendered using multiple processes we need the exact same sequence of random numbers produced in every process. </p>
-<p>Object <strong><code>fctx</code></strong> is object of class <strong><code>fluxity.FluxityContext</code></strong>.</p>
-<h3 id="render_frame">render_frame()</h3>
-<pre><code>def render_frame(frame, fctx, w, h):
-    cr = fctx.get_frame_cr()
-
-    # Draw bg
-    bg_color = cairo.SolidPattern(*fctx.get_data_obj(&quot;hue_tuple&quot;))
-    ball_colors = fctx.get_data_obj(&quot;ball_colors&quot;)
-    ball_data = fctx.get_data_obj(&quot;ball_data&quot;)
-
-    cr.set_source(bg_color)
-    cr.rectangle(0, 0, w, h)
-    cr.fill()
-
-    # Draw balls
-    number_of_balls = fctx.get_editor_value(&quot;Number of Items&quot;)
-    size_max = fctx.get_data_obj(&quot;size_max&quot;)
-    path_start_x = - size_max
-    path_end_x =  w + size_max
-    path_len = path_end_x - path_start_x
-    SPEED_NORM_PER_FRAME = 15.0 / float(w) # Speed value 1.0 gets 15 pixels of movement per frame.
-    for i in range(0, number_of_balls):
-        path_pos, y, ball_speed, ball_size, color_index = ball_datai
-        xc = ball_size / 2.0
-        yc = ball_size / 2.0
-        xpos_norm = path_pos + (float(frame) * ball_speed * SPEED_NORM_PER_FRAME)
-        while xpos_norm &gt; 1.0:
-            xpos_norm = xpos_norm - 1.0
-        x = path_start_x + path_len * xpos_norm
-        cr.save()
-        cr.translate(x, y)
-        cr.arc(xc, yc, ball_size / 4.0, 0.0, 2.0 * math.pi)
-        cr.set_source(ball_colorscolor_index)
-        cr.fill()
-        cr.restore()
-
-# ----------------------- helper func
-def _clamp(v):
-    return max(min(v, 1.0), 0.0)
-
-</code></pre>
-<p>In <em>render_frame()</em> we first acquire <em>Cairo.Context</em> object that can be drawn onto to create output for the frame.</p>
-<p>After that the data structures created in <em>init_render()</em> are accessed and image is drawn.</p>
-<p>There is a helper function <em>_clamp(v)</em> used to make sure that all color values are in range 0-1. Any number of helper functions, objects and data structures can be created.</p>
-<h2 id="developing-fluxity-scripts">DEVELOPING FLUXITY SCRIPTS</h2>
-<p><strong>Flowblade</strong> comes with a simple GUI tool for developing Fluxity scripts. It can be accessed from menu <strong>Tools-&gt;Generator Script Editor</strong>.</p>
-<p>Using the development tool you can edit scripts, render output from them, and get receive error messages when something goes wrong. From hamburger menu you can open and save your own scripts, access this document, and open and inspect example code of the <em>Generators</em> distributed with Flowblade. </p>
-<p>Since the text editor in the development tool is quite rudimentary <em>(with a future GTK4 port we may get improvement here)</em>, it can be a useful workflow to use an external text editor to edit the scripts, and press <em>Reload Script</em> button to update text area contents before attempting render.</p>
-<h1 id="fluxity-api_1">FLUXITY API</h1>
-<details class="source">
-<summary>
-<span>Expand source code</span>
-</summary>
-<pre><code class="python">&#34;&#34;&#34;
-    ### GPL Licence text
-
-    Flowblade Movie Editor is a nonlinear video editor.
-    Copyright 2021 Janne Liljeblad.
-
-    This file is part of Flowblade Movie Editor &lt;https://github.com/jliljebl/flowblade/&gt;.
-

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/generatorsfluxity.html Deleted

@@ -1,113 +0,0 @@
-<!DOCTYPE html>
- 
-<html>
-<head>
-  <title>Generators</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-
-<img src="header_text_5.png">
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Generators</div>
-
-<div id="toc"></div>
-
-<p>
-<b>Generators</b> are <b>Media Items</b> that render into animated media clips when placed on timeline.
-</p>
-
-<p>
-Currently there are three different types of <b>Generators</b> available:
-<ul style="list-style-type:none">
-<li><b>Backgrounds</b> Animated backgrounds.</li>
-<li><b>Texts</b> Animated texts.</li>
-<li><b>Cover Transitions</b> Incoming shapes cover frame fully and then disappear creating a transition.</li>
-</ul>
-
-</p>
-
-<p>
-Flowblade <b>Generators</b> are implemented as Python scripts using <i>Fluxity API</i> <i>(see below)</i> packed inside <a href="container_clips.html">Container Clips.</a>
-</p>
-
-
-<h3>Using Generators</h3>
-
-<h4>Adding Generators</h4>
-<ol>
-<li>Select menu item <b>Project -> Add Generator</b>.</li>
-<li>Select <b>Generator</b> using <b>Generator</b> drop down menu.</li>
-<li>Set properties using left side panel, select frame using <b>Clip Frame</b> spin button and press <b>Preview</b> button to view results.</li>
-<li>Use <b>Generator Length</b> spin button to set generator maximum length. Use <b>Import Action</b> drop down menu to either add as <b>Media Item</b> or render a video clip.</b></li>
-<li>Use <b>Add Generator</b> button to complete <b>Generator</b> creation.</li>
-</ol>
-
-<h4>Editing Generator Clips</h4>
-<ol>
-<li>Open timeline clip <b>Right Mouse</b> pop-up menu and select item <b>Edit Generator...</b>.</li>
-<li>Set <b>Generator</b> properties using editors opened in <b>Edit</b> panel.</li>
-<li>Select frame using spin button and press <b>Preview</b> button to view results.</li>
-<li>Use <b>Apply</b> button to re-render timeline clip using edited properties.</li>
-</ol>
-
-<h3>Generators List</h3>
- <table>
-  <tr>
-    <th>Category</th>
-    <th>Name</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td><i>Backgrounds</i></td>
-    <td><b>Floating Balls</b></td>
-    <td>Colored balls moving horizontally with differing sizes and speeds.</td>
-  </tr>
-  <tr>
-    <td><i>Backgrounds</i></td>
-    <td><b>Hex Colors</b></td>
-    <td>Colored hexagonals of selected size changing color at selected speed.</td>
-  </tr>
-  <tr>
-    <td><i>Texts</i></td>
-    <td><b>Multiline text</b></td>
-    <td>Animated lines of text with multiple in and out animation types, with optional lines or rectangle background.</td>
-  </tr>
-  <tr>
-    <td><i>Texts</i></td>
-    <td><b>TypeWriter</b></td>
-    <td>Text typewriter effect with steps of adding a letter, word or line.</td>
-  </tr>
-  <tr>
-    <td><i>Cover Transitions</i></td>
-    <td><b>Lines Sweep</b></td>
-    <td>Cover transition with horizontally moving colored lines.</td>
-  </tr>
-   <tr>
-    <td><i>Cover Transitions</i></td>
-    <td><b>Hex Overlay</b></td>
-    <td>Cover transition with apperaing and disappearing hexagonals.</td>
-  </tr>
-</table> 
-
-<h2>Fluxity Scripting</h2>
-<p>Fluxity scripting is a <strong>Python scripting solution</strong> created to provide <strong>Flowblade Movie Editor</strong> with a <em>Plugin API</em> used to create <em>Generators</em> providing means to create e.g. animated text and animated background clips.</p>
-
-
-<h3>Fluxity API</h3>
-<p>Instructions on how to create <strong>Generators</strong> using <strong>Fluxity API</strong> <a href="fluxity.html">here.</a></p>
-
-</div>
-</div>
-
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/header_text_5.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/help.html Deleted

@@ -1,85 +0,0 @@
- <!DOCTYPE html>
-<html>
-<head>
-  <title>Flowblade Reference Guide</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<a class="french-link" href="https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/FLOWBLADE_manuel_fr.pdf">Manuel en français</a>
-
-<div id="help-index">
-		<div class="subject-cell">
-			<a href="intro.html">Introduction</a>
-		</div>
-
-		<div class="subject-cell">
-			<a href="basic_editing.html">Basic Editing</a> 
-		</div>
-
-		<div class="subject-cell">
-			<a href="edit_tools.html">Timeline Edit Tools</a> 
-		</div> 
-
-		<div class="subject-cell">
-			<a href="compositor.html">Creating Composited Images</a>
-		</div>
-
-		<div class="subject-cell">
- 			<a href="filtering.html">Filtering image and audio</a> 
-		</div>
-
-		<div class="subject-cell">
- 			<a href="advanced.html">Advanced Editing Features</a> 
-		</div> 
-
-		<div class="subject-cell">
-			<a href="range_log.html">Range Log</a>
-		</div>
-
-		<div class="subject-cell">
- 			<a href="proxy.html">Proxy Editing</a>
-		</div>
-		
-		<div class="subject-cell">
- 			<a href="container_clips.html">Container Clips</a>
-		</div>
-
-		<div class="subject-cell">
-			 <a href="generatorsfluxity.html">Generators</a>
-		</div>
-
-		<div class="subject-cell">
- 			<a href="tools.html">Tools</a>
-		</div>
-		
-		<div class="subject-cell">
-			 <a href="rendering.html">Rendering</a>
-		</div>
-
-		<div class="subject-cell">
- 			<a href="datastores.html">Data Stores</a>
-		</div>
-
-        <div class="subject-cell">
- 			<a href="infotips.html">Info & Tips</a>
-		</div>
-        
-</div>
-
-<h6 class="appendix-title">Appendices:</h6>
-<a class="appendix-index" href="filters_list.html">Filters list</a>
-<a class="appendix-index" href="fluxity.html">Fluxity API doc</a>
-<a class="appendix-index" href="kbshortcuts.html">Keyboard Shortcuts</a>
-
-<div class="copyright-info">Flowblade Reference Guide v 3.0 9-3-2017.</div> 
-
-</div>
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/only_one_comp.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/style.css Deleted

@@ -1,330 +0,0 @@
-html {
-	font-size: 100%;
-	-webkit-text-size-adjust: 100%;
-	-ms-text-size-adjust: 100%;
-}
-
-body {
- 	font-family: Georgia, "Times New Roman", Times, serif;
-	color:#222222;
-	background-color: #ffffff; 
-	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-}
-
-#content {
-  width: 700px ;
-  margin-left: auto ;
-  margin-right: auto ;
-}
-
-#help-index{
-	margin-top: 80px;
-	width: 900px;
-	margin-bottom: 80px;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	text-align: center;
-}
-
-.appendix-index{
-	margin-top: 10px;
-	width: 900px;
-	margin-bottom: 10px;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	text-align: left;
-	color: #666666;
-	font-size:18px;
-}
-
-.french-link{
-	margin-top: 40px;
-	width: 900px;
-	margin-bottom: 0px;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	text-align: left;
-	font-size:18px;
-}
-
-.subject-cell {
-	padding-right: 20px;
-	color:#222222;
-	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-	font-weight:400;
-	font-size:30px;
-	margin-bottom: 35px;
-}
-
-.grid-container {
-	margin-top: 80px;
-        width: 700px;
-	margin-bottom: 80px;
-}
-
-.row:before, 
-.row:after {
-	content:"";
-	display: table ;
-	clear:both;
-}
-
-.column4 {
-	float: left; 
-	width: 33.3%;
-	margin-bottom: 50px;
-}
-
-.subject-cell {
-	padding-right: 20px;
-	color:#222222;
-	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-	font-weight:400;
-	font-size:22px;
-	text-transform: uppercase;
-}
-
-.appendix-pad {
-	color: #666666;
-	font-size:14px;
-}
-.appendix-title {
-	color: #666666;
-	font-size:20px;
-}
-
-.note {
-	background-color: #f3f3f0;
-	padding: 25px;
-	margin-bottom: 10px ;
-}
-
-.important {
-	background-color: #f5d77d;
-	padding: 25px;
-	margin-bottom: 10px ;
-}
-
-.tabbed {
-	padding-left: 25px;
-	margin-bottom: 10px ;
-}
-
-.tabbed_line {
-	padding-left: 25px;
-}
-
-.tocitem {
-	font-size:12px;
-	line-height: 1.0;
-
-}
-
-.tocli {
-	list-style-type: none;
-}
-
-.copyright-info {
- 	font-family: Georgia, "Times New Roman", Times, serif;
-	margin-top:80px;
-	color: #444444;
-	font-weight:400;
-	font-size:12px;
-}
-
-.code-text {
-	font-family: "Lucida Console", "Courier New", monospace;
-	background-color: #f3f3f0;
-	padding: 10px;
-	margin-bottom: 5px ;
-	line-height: 10px
-}
-
-.subject-header {
-	text-transform: uppercase;
-	margin-top:10px;
-	color: #000000;
-	font-weight:400;
-	font-size:26px;
-}
-
-.filter {
-	margin-bottom: 25px;
-	color: #000000;
-	font-weight:400;
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-}
-
-.filter-name {
-	padding-left: 20px;
-}
-
-.filter-property {
-	padding-left: 50px;
-	font-size:12px;
-}
-.filter-value {
-	display:inline-block;
-	color: #0000bb;
-	font-size: 8;
-}
-
-.filter-group {
-	color: #000000;
-	font-size: 26;
-	text-transform: uppercase;
-	margin-top: 50px;
-	margin-bottom: 10px;
-}
-
-.r-widget {
-	display: inline-block;

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/tocgen.js Deleted

@@ -1,39 +0,0 @@
-/*
-* Generates table of Contents from headers in a html file
-*/
-
-window.onload = function () {
-    var toc = "";
-    var level = 3;
-
-    document.getElementById("toccontent").innerHTML =
-        document.getElementById("toccontent").innerHTML.replace(
-            /<h(\d)>(^<+)<\/h(\d)>/gi,
-            function (str, openLevel, titleText, closeLevel) {
-                if (openLevel != closeLevel) {
-                    return str;
-                }
-
-                if (openLevel > level) {
-                    toc += (new Array(openLevel - level + 1)).join("<ul>");
-                } else if (openLevel < level) {
-                    toc += (new Array(level - openLevel + 1)).join("</ul>");
-                }
-
-                level = parseInt(openLevel);
-
-                var anchor = titleText.replace(/ /g, "_");
-                toc += "<li class=\"tocli\"><a class=\"tocitem\" href=\"#" + anchor + "\">" + titleText
-                    + "</a></li>";
-
-                return "<h" + openLevel + "><a name=\"" + anchor + "\">"
-                    + titleText + "</a></h" + closeLevel + ">";
-            }
-        );
-
-    if (level) {
-        toc += (new Array(level + 1)).join("</ul>");
-    }
-
-    document.getElementById("toc").innerHTML += toc;
-};

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/en/workflow.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/advanced.html Deleted

@@ -1,177 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-  <title>Расширенное редактирование</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div id="advtoc">
-<div class="subject-header">Расширенные возможности редактирования</div>
-</div>
-
-<div id="toc"></div>
-
-<h2>1. Действия по проекту</h2>
-<h3>Объединение последовательностей</h3>
-<p>Можно импортировать всё содержимое других последовательностей в активную в последовательность.</p>
-<ol>
-<li> Выберите <b>Последовательность → Импортировать ещё одну последовательность…</b></li>
-<li> Выберите действие для импорта.</li>
-<ul>
-<li> <b>Добавить последовательность</b>: последовательность будет добавлена в конце текущей последовательности.</li>
-<li> <b>Вставить последовательность по указателю воспроизведения</b>: в месте расположения указателя воспроизведения будет создан надрез, куда и вставится импортируемая последовательность.</li>
-</ul>
-<li> Выберите последовательность для импорта</li>
-<ul>
-<li> <b>Обратите внимание, что для импорта, у вас должно быть не меньше двух последовательностей.</b></li>
-</ul>
-<li> Нажмите на кнопку <b>Импорт</b>, для выполнения операции.</li>
-</ol>
-<h3> Разрезание последовательности</h3>
-<ol>
-<li> Выберите <b>Последовательность → Разрезать последовательность по указателю</b></li>
-<li> Эта операция создаст новую последовательность из элементов расположенных справа от указателя воспроизведения и удалит их из текущей последовательности. Созданная последовательность откроется как текущая активная.</li >
-</ol>
-<h3>Импорт медиа из другого проекта</h3>
-<p>Вы можете импортировать элементы мультимедиа из другого проекта.</p>
-<ol>
-<li> Выберите <b>Проект → Импортировать медиа из проекта…</b></li>
-<li> Выберите файл проекта.</li>
-<li> Элементы медиа, которые отсутствуют в текущем проекте будут открыты в корзине. Обратите внимание, что загрузка новых элементов из проекта, займёт некоторое время.</li>
-</ol>
-<h2>2. Синхронизация звука на монтажном столе</h2>
-<p>На монтажном столе можно сделать, так чтобы, клип на одной дорожке автоматически переместился на нужное количество кадров для синхронизации со звуком клипа на другой дорожке.</p>
-<p>Что позволяет, нам сделать упрощённую версию многокамерного редактирования на монтажном столе.</p>
-<ol>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по клипу, который хотите синхронизировать.</li>
-<li> Выберите пункт меню <b>Выбрать звуковой клип для синхронизаци...</b> Курсор примет форму целевого креста.</li>
-<li> Нажмите на клип, с которым вы хотите синхронизировать звук.</li>
-<li> Откроется диалоговое окно с информацией о действиях синхронизации, которые необходимо выполнить для синхронизации клипов.</li>
-<li> Для выполнения синхронизации нажмите кнопку <b>Сдвинуть клип для синхронизации</b>.</li>
-<li> Обычно рекомендуется отключить один из синхронизированных клипов.</li>
-</ol>
-<p><div class="note">Во время звуковой синхронизации идёт поиск на наилучшее математическое соответствие между двумя звуковыми сигналами, поэтому использование несоответствующего звука приведёт к случайным результатам.</b></div></p>
-<h2>3. Изменение скорости клипа и клип в обратном направлении</h2>
-<p>В Flowblade эффекты движения достигаются путём <b>сборки клипа с изменением скорости или сборки клипа в обратном направлении</b> с последующим их размещением на монтажном столе.</p>
-<h3>Сборка клипа с изменением скорости</h3>
-<ol>
-<li> Щёлкните правой кнопкой мыши по видеоклипу и в выпадающем меню выберите <b>Собрать клип с изменением скорости</b>.</li>
-<li> Измените параметры сборки для нового клипа</li>
-<ul>
-<li> Установите скорость.</li>
-<li> Присвойте имя и выберите место расположения будущего клипа.</li>
-<li> Выберите параметры сборки.</li>
-<li> Выберите длительность сборки:</li>
-<ul>
-<li> Длительность оригинального клипа</li>
-<li> Участок оригинального клипа</li>
-</ul>
-<li> Нажмите кнопку <b>Сборка</b>, для создания нового клипа.</li>
-</ol>
-<h3> Сборка клипа в обратном направлении </h3>
-<ol>
-<li> Щёлкните правой кнопкой мыши по видеоклипу и в выпадающем меню выберите <b>Собрать клип в обратном направлении</b>.</li>
-<li>Измените параметры сборки для нового клипа
-<ul>
-<li> Установите скорость.</li>
-<li> Присвойте имя и выберите место расположения будущего клипа.</li>
-<li> Выберите параметры сборки.</li>
-<li> Выберите участок сборки:</li>
-<ul>
-<li> Длительность оригинального клипа</li>
-<li> Участок оригинального клипа</li>
-</ul>
-</ul>
-<li> Нажмите кнопку <b>Сборка</b>, для создания нового клипа.</li>
-</ol>
-<h2>4. Синхронизация по родительскому клипу</h2>
-<p>В видеоредакторе Flowblade можно <b>установить позицию клипа, так чтобы он стартовал и в дальнейшем работал с позиции другого клипа</b> по запросу.</p>
-<h3>Основные положения</h3>
-<ul>
-<li> Синхронизация устанавливается путём выбора синхронизирующего <b>родительского клипа</b> и синхронизируемого <b>дочернего клипа</b>.</li>
-<li> <b>Родительскими клипами могут быть только те клипы, которые расположенные на дорожке V1</b>. Это сделано для того, чтобы подчеркнуть стиль редактирования, в котором основные элементы последовательности всегда находятся на дорожке V1, а компоновка и отделение звука выполняется относительно последовательности клипов расположенных на дорожке V1.</li>
-<li> <b>Функция синхронизации помогает сохранить проделанную работу</b> — компоновку нескольких дорожек и изменения в отделённом от видеоклипа звуке... Например, когда из-за правок в других местах последовательности, сбилось правильное расположение клипов относительно друг друга.</li>
-<li> Чтобы избежать нежелательных перемещений клипов по монтажному столу, во время редактирования <b>ресинхронизация выполняется только по запросу</b>. Ресинхронизация желательна для возможного предотвращения побочных эффектов при редактировании.</li>
-</ul>
-<h3>Настройка синхронизации родительского клипа</h3>
-<ol>
-<li> Щёлкните <b>правой кнопкой мыши</b> по клипу на любой дорожке кроме V1 и выберите пункт «Выбрать родительский клип для синхронизации…».</li>
-<li> Курсор примет форму целевого креста. На дорожке V1 выберите родительский клип, щёлкнув по нему левой кнопкой мыши.</li>
-<li> Между двумя клипами установится связь синхронизации. Курсор примет форму указателя по умолчанию.</li>
-<li> Узнать состояние синхронизации можно по индикаторным линиям на дочернем клипе. Цвет индикаторных линий синхронизации на клипах:</li>
-<ul>
-<li> Зелёный — дочерний клип синхронизирован с родительским.</li>
-<li> Красный — дочерний клип не синхронизирован с родительским.</li>
-<li> Серый — родительский клип на дорожке V1 отсутствует.</li>
-</ul>
-</ol>
-
-<h3>Повторная синхронизация дочерних элементов</h3>
-<p>Для того чтобы дочерний клип выполнил повторную синхронизацию с родительским, выполните одно из действий:</p>
-<ul>
-<li> В меню приложения выберите <b>Правка → Ресинхронизировать</b>.</li>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по дочернему клипу и выпавшем меню клипа выберите <b>Ресинхронизировать</b>.</li>
-<li> Нажмите <b>Ресинхронизировать</b> на панели редактирования.</li>
-</ul>
-<h3>Удаление связи синхронизации с родительским клипом</h3>
-<ul>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по дочернему клипу и выберите <b>Удалить связь синхронизации</b>.</li>
-</ul>
-<h3>Синхронизация скомпонованных клипов</h3>
-<ul>
-<li> При необходимости установите связь синхронизации всех клипов, которые являются частью многодорожечной компоновки с родительским клипом.</li>
-</ul>
-<h3>Синхронизация отделённого звука</h3>
-<ul>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по клипу на дорожке V1 и выберите «Отделить звук для синхронизации».</li>
-<li> Чтобы поддержать синхронизацию с родительским клипом отредактируйте отделённый от видео звук, используя инструменты «Прокрутка» и «Обрезка».</li>
-<li> При необходимости синхронизируйте звук.</li>
-</ul>
-</ol>
-
-<h2>5. Предпросмотр монтажного стола</h2>
-<p><b>Предпросмотр монтажного стола</b>  — это способ добиться плавного воспроизведения в тех областях монтажного стола, которые предъявляют высокие требования к системным ресурсам для приемлемого воспроизведения.</p>
-<h3>Включение сборки для предпросмотра</h3>
-<p>Включить сборку для предпросмотра монтажного стола можно двумя способами:
-<ul><li>В выпадающем списке под заголовками дорожек;</li>
-<li>через меню <b>«Последовательность» → «Собирать для предпросмотра»</b>.</li></ul></p>
-<img src="tlinerender.webp">
-<p><i>Кнопка запуска предпросмотра монтажного стола слева, а справа под монтажным столом шкала управления сегментами.</i></p>
-<h3>Режимы предпросмотра монтажного стола</h3> 
-<p>Существует два режима активирующих предпросмотр монтажного стола:<ul> 
-<li><b>Собирать автоматически</b>. В этом режиме определённые сегменты при каждом изменении содержимого монтажного стола в этом диапазоне собираются автоматически;</li> 
-<li><b>Собирать по запросу</b>. В этом режиме сегменты собираются по запросу пользователя.</li></ul></p>
-<h3>Работа с сегментами</h3> 
-<p><ul> <li><b>Создание сегмента предпросмотра</b>. Переместите мышь с нажатой <i>левой кнопкой</i> влево или вправо по шкале управления сегментами.</li>
-<li><b>Изменение размера сегмента</b>. Переместите мышь с нажатой <i>левой кнопкой</i> по сегменту за его пределы или наоборот. Перемещение мыши внутри сегмента приведёт к его перезаписи.</li>
-<li><b>Объединение сегментов</b>. Перемещайте мышь с нажатой <i>левой кнопкой</i> захватив несколько сегментов</li>
-<li><b>Удаление сегментов</b>. Щёлкните по сегменту <i>левой кнопкой мыши</i> для его выделения и нажмите клавишу <i>Delete</i> или щёлкните <i>правой кнопкой мыши</i> и в выпавшем меню выберите подходящий элемент меню.</li>
-<li><b>Сборка сегмента в режиме  «Собирать по запросу»</b>.  Дважды щёлкните по сегменту <i>левой кнопкой мыши</i> или щёлкните <i>правой кнопкой мыши</i> и в выпавшем меню выберите  «Собрать сегмент».</li></li></ul></p>
-<h3>Параметры</h3> 
-<p>Формат кодировки сборки и размер кадра можно выбрать через меню <b>«Последовательность» → «Собирать для предпросмотра» → «Параметры»</b>.</p>
-<h2>6. Маскировка эффектов</h2>
-<p>Маскировка эффектов позволяет применять один или несколько эффектов только к определённой пользователем части изображения</b>.</p>
-<img src="filter_mask.webp">
-<p><i>Кнопка запуска меню маскировки эффектов расположена над подсказкой «Добавить маскировку эффектов». «Открывающая маска» и «Закрывающая маска» образуют собой блок и определяют, какие эффекты будут замаскированы. На данном снимке это эффекты «Сепия» и «Пикселизация».</i></p><ol>
-<li> Нажмите на кнопку «Добавить маскировку эффектов» и выберите, хотите ли вы замаскировать один или сразу все эффекты.</li>
-<li> В подменю выберите нужный маскирующий эффект <b>Фигуры в альфа</b> или <b>Ключ яркости</b>.</li>
-<li> Измените параметры маскировки во вкладке редактирования эффектов в начале блока <b>Открывающая маска</b>.</li>
-<li> Эффекты можно перемещать в маскирующий блок и извлекать их из него.</li>
-
-</div>
-</div>
-
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/basic_editing.html Deleted

@@ -1,321 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-  <title>Основы редактирования</title>
-  <link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div class="subject-header">Основы редактирования</div>
-
-<p>
-В этом разделе описывается минимальный процесс создания фильма с использованием только одной дорожки. 
-</p>
-<div id="toc"></div>
-
-<div id="toccontent">
-
-<h3>Создание нового проекта</h3>
-<p>
-Вся информация о вашем фильме хранится в файле проекта Flowblade.
-</p>
-<p>
-Создать новый проект можно через:
-</p>
-<ul>
-<li> <b>Меню:</b> в меню выберете <b>Файл -> Новый проект</b>.</li>
-<li> <b>Сочетания клавиш:</b> нажмите <b>Ctrl + N</b>.</li>
-</ul>
-<p>
-Проект содержит:
-</p>
- <ul>
-<li> одну или несколько последовательностей</li>
-<li> коллекцию медиафайлов, хранящуюся в корзинах.</li>
-</ul>
-<p>
-Для нового проекта можно выбрать два параметра:
-</p>
-<ul style="list-style-type:none">
-<li> <b>Профиль проекта</b>: Определяет кадровую частоту, размер и пропорции кадра и пикселя для всех последовательностей в проекте.</li>
-<li> <b>Количество дорожек</b>: Выберите количество видео и звуковых дорожек, которые будут использоваться в проекте. Изменить их количество можно позже, но помните, что эта операция необратима, она уничтожит все клипы и композиторы на монтажном столе, которые не впишутся в воссозданную версию последовательности и сотрёт историю ваших действий.</li>
-</ul>
-
-<div class="note">
-Видеоматериал автоматически подгоняется под размеры профиля, поэтому выбор профиля проекта с меньшими размерами, чем видеофайл, приведёт к снижению качества видео на выходе.
-</div>
-<div class="note">
-Видеоредактор Flowblade обрабатывает данные изображения внутренне как кадры YUV420, поэтому кодирование, связанное с данным профилем, не влияет на качество перед сборкой.
-</div>
-<div class="note">
-Для <b>сохранения качества входной материал, профиль проекта</b> и <b>профиль сборки</b> должны иметь <b>одинаковую кадровую частоту, размер и пропорции</b> кадра и пикселя.
-</div>
-
-<h3>Добавление и удаление новых последовательностей</h3>
-<p>
-Под понятием «Последовательность» подразумевается всё содержимое монтажного стола. Проект содержит одну или несколько последовательностей.
-</p>
-
-<p>
-В сложных проектах, для создания и управления различными частями готового продукта, иногда лучше использовать несколько последовательностей.
-</p>
-
-<p>
-<b>Добавление последовательности:</b>
-</p>
-<ul>
-<li> <b>С дополнительной панелью</b>: Щёлкните <b>правой кнопкой мыши</b> в области <b>«Последовательность»</b> и в сплывающем меню выберите пункт <b>«Добавить новую последовательность»</b>.</li>
-<li> <b>Без дополнительной панели</b>: Щёлкните <b>правой кнопкой мыши</b> во вкладке <b>«Проект»</b> в области <b>«Последовательность»</b> и в сплывающем меню выберите пункт <b>«Добавить новую последовательность»</b>.</li>
-<li> Или в главном меню  выберите <b>Проект →  Последовательность →  Добавить новую последовательность</b>.</li>
-</ul>
-
-<p>
-<b>Удалить последовательность</b> можно через тоже меню, через которое её добавили. Например, <b>Проект →  Последовательность →  Удалить выбранную последовательность</b>.
-</p>
-
-<div class="note">
-<p>
-При создании новой последовательности вы можете выбрать количество дорожек в последовательности. Изменить их количество можно позже, но помните, что эта операция необратима, она уничтожит все клипы и композиторы на монтажном столе, которые не впишутся в воссозданную версию последовательности и сотрёт историю ваших действий.
-</p>
-</div>
-
-<h3>Работа с медиафайлами</h3>
-
-<p>
-В видеоредакторе Flowblade файлы хранятся во вкладке <b>Медиа</b>. Слева в виде таблицы перечислены <b>Корзины</b>. Справа, в виде содержимого выбранной корзины расположены клипы. 
-</p>
-
-<p>
-Добавление медиафайлов:
-</p>
-
-<ol>
-<li> Во вкладке <b>«Медиа»</b> щёлкните правой кнопкой мыши и выберите пункт меню  <b>«Добавить видео, музыку или изображения...»</b>.
-<li> Или в главном меню  выберите <b>«Проект → Добавить видео, музыку или изображения…»</b>.
-<li> Далее с помощью диалогового окна выберете нужные медиафайлы.</li>
-<li> Файлы отобразятся в виде миниатюр.</li>
-<li> Обратите внимание, что создание миниатюр для открытых файлов займёт некоторое время.</li>
-</ol>
-
-<div class="note">
-<h3 style="margin-top:10px">Медиапроект: абсолютные и относительные пути</h3>
-<ul>
-<li> Flowblade <b>сохраняет ссылки</b> на медиафайлы, используемые в проекте, как <b>абсолютные пути</b>.</li>
-<li> Если медиафайл <b>не найден при загрузке</b>, Flowblade попытается найти его с тем же именем во вложенных папках относительно файла проекта.</li>
-<li> Так как, все медиафайлы, используемые проектом, сохраняются во вложенных папках относительно файла проекта, то, <b>файл проекта и медиафайл могут перемещаться как единое целое</b> и проект будет загружаться после копирования данных из другого места.</li>
-<li> <b>Файлы сборки проекта</b>, такие как переходы, <b>сохраняются по умолчанию в скрытой папке</b>: <i><Домашняя папка>/.flowblade/rendered_clips/</i>.</li>
-<li> Пункт меню <b>Файл -> Создать резервную копию...</b> сохраняет файл проекта, все медиа и файлы сборки в одной папке, так что, ваш проект всегда можно будет загрузить с использованием этих данных.</li>
-<li> <b>Сортировка поиска</b> между абсолютными и относительными путями может быть установлена в окне Настройки Flowblade.</li>
-<li> Инструментом <b>Медиа компоновщик</b> можно воспользоваться для устранения проблем с путями, которые могут возникнуть.</li>
-
-</ul>
-<p><b>ПРИМЕЧАНИЕ:</b> Информация, приведённая здесь, относится только к версиям Flowblade от 0.18 и выше.</p>
-</div>
-
-<h3>Работа с корзинами</h3>
-
-<p>
-Корзина - место для хранения медиафайлов.
-</p>
-
-<p>
-Для простых проектов корзины обычно не требуются, и вы можете скрыть панель Корзины перетаскиванием ручки между панелями.
-</p>
-
-<p>
-    <b>Добавление корзины:</b>
-<p>
-<ul>
-<li> <b>С дополнительной панелью</b>: Щёлкните <b>правой кнопкой мыши</b> в области корзины и в всплывающем меню выберите <b>Добавить корзину</b>.</li>
-<li> <b>Без дополнительной панели</b>: Во вкладке <b>Медиа</b> щёлкните <b>правой кнопкой мыши</b> в области корзины и в всплывающем меню выберите <b>Добавить корзину</b>.</li>
-<li> Или в главном меню выберите <b>Проект → Корзина → Добавить новую корзну</b>.</li>
-</ul>
-
-<p><b>Удалить корзину</b>: можно через тоже меню, через которое её добавили. Например, <b>Проект → Корзина → Удалить выбранную корзину</b>.</p>
-<p><b>Переименование корзины</b>: дважды щёлкните по имени корзины (корзина_№) и нажмите кдавишу Enter.</p>
-<p><b>Перемещение файлов в другую корзину:</b></p>
-<ul>
-<li> Перенесите содержимые файлы одной корзины на значок другой.</li>
-<li> Выберите файлы и откройте меню во вкладке <b>Медиа</b> слева снизу и выберите пункт меню <b>Отправить выбранное медиа в корзину</b> и выберете корзину назначения.</li>
-</ul>
-<div class="tabbed">
-
-</div>
-
-<h3>Использование монтажного стола</h3>
-
-<h4>Прокрутка монтажного стола</h4>
-<ul>
-<li> Осуществляется с помощью <b>Ползунка</b> монтажного стола</li>
-<li> Наведения курсора на монтажный стол и нажатием клавиши <b>Ctrl</b> + <b>колёсико мыши</b>.</li>
-</ul>
-
-<h4>Масштабирование монтажного стола</h4>
-<ul>
-<li> Нажатием кнопки <b>Увеличить</b>, <b>Уменьшить</b> или <b>В размер окна</b>.</li>
-<li> Прокруткой <b>Колёсика мыши</b> над монтажным столом. </li>
-</ul>
-
-<h4>Перемещение курсора монтажного стола</h4>
-<ul>
-<li> Передвиньте курсор и нажмите <b>Правой кнопки мыши</b> в пустом месте на монтажном столе, курсор монтажного стола переместится вслед за курсором мыши.</li>
-<li> На линейке времени монтажного стола то же, что и на монтажном столе, только с нажатием <b>Левой кнопки мыши</b>.</li>
-<li> Передвиньте курсор с нажатием <b>Любой кнопки мыши</b> на линейке времени монитора.</li>
-<li> Нажмите <b>Клавишу со стрелкой влево</b> или <b>Клавишу со стрелкой вправо</b>, чтобы перейти к следующему или предыдущему кадру.</li>
-<li> Нажмите <b>Клавишу со стрелкой вверх</b> или <b>Клавишу со стрелкой вниз</b>, чтобы перейти к началу или концу участка клипа на верхней активной дорожке.</li>
-<li> Нажмите кнопку перемотки <b>Вперёд</b> или <b>Назад</b> в области кнопок монитора, чтобы перейти к следующему или предыдущему кадру.</li>
-</ul>
-
-<h4>Перемещение текущего кадра при предпросмотре клипа на мониторе</h4>
-<ul>
-<li> Передвиньте курсор с нажатием <b>Любой кнопки мыши</b> на линейке времени монитора.</li>
-<li> Нажмите <b>Клавишу со стрелкой влево</b> или <b>Клавишу со стрелкой вправо</b>, чтобы перейти к следующему или предыдущему кадру.</li>
-<li> Нажмите <b>Клавишу со стрелкой вверх</b> или <b>Клавишу со стрелкой вниз</b>, чтобы перейти к началу или концу участка клипа на верхней активной дорожке.</li>
-<li> Нажмите кнопку перемотки <b>Вперёд</b> или <b>Назад</b> в области кнопок монитора, чтобы перейти к следующему или предыдущему кадру.</li>
-</ul>
-
-<h4>Переключение между монтажным столом и показом клипов</h4>
-<ul>
-<li> Нажмите одну из кнопок монитора: Отобразить текущую последовательность с монтажного стола или отобразить клип из Медиа.</li>
-<li> Перенесите клип из медиа на <b>Монитор</b>, чтобы отобразить клип.</li>
-</ul>
-
-<h4>Активные дорожки</h4>
-<ul>
-<li> В правом ряду области столбцов дорожек находятся <b>Кнопки активности дорожек</b>. <b>Кнопка со стрелкой вниз</b> указывает, что начиная с этой дорожки, дорожки расположенные ниже могут быть <b>Активными дорожками</b>.</li>
-</ul>
-
-<div class="note">
-<h4>Особенности активных дорожек</h4>
-<ul>
-<li> Разрезаются клипы только на активных дорожках.</li>
-<li> Вставка медиафайла, отображаемого в настоящее время на мониторе <b>Вставить клип, Склеить клип</b> или <b>Перезаписать клип</b> разместит клип на верхней активной дорожке, обозначенной стрелкой.</li>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/blender_clip_editor.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/blender_color_editor.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/blender_script.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/blender_string_editor.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/comp_clips.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/compositor.html Deleted

@@ -1,154 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Создание композитных клипов</title>
-  <link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Создание композитных клипов</div>
-
-<p>Видеоредактор Flowblade использует композиторы для объединения клипов на двух разных дорожках.</p>
-
-<div id="toc"></div>
-
-<h3>Режимы композитинга</h3>
-<p>Способ работы с композиторами определяется режимом композитинга. Пользователи могут выбрать режим композитинга в соответствии со своими предпочтениями или потребностями редактирования определённой последовательности.</p>
-<p>Чтобы установить <b>Режим композитинга</b> для последовательности, выберите его в меню <b><i>Последовательность → Режим композитинга</i></b>.</p>
-<h4>Свободное перемещение сверху вниз</h4>
-<p>Это самый мощный и сложный режим композитинга. Пользователи могут свободно выбирать дорожки назначения, перемещать композиторы и при необходимости создавать композиции дерева узлов.</p>
-<h4>Автосопровождение сверху вниз</h4>
-<p>В Flowblade 2.6 данный режим был удалён.</p>
-<h4>Стандартное автосопровождение</h4>
-<p> Композиторы автоматически сопровождают клипы источника, можно добавить только один композитор к клипу. Для всех композиторов дорожкой назначения всегда будет дорожка V1, создавать композиции дерева узлов не получится.</p>
-<h4>Стандартный (без композиторов)</h4>
-<p>Это самый простой и лёгкий в использовании режим композитинга. Композиторы не требуются. Затемнение, вытеснение и трансформации создаются с помощью эффектов. Некоторые функции композитинга недоступны. Создавать композиции дерева узлов не получится.</p>
-<h2>Режим «Стандартный (без композиторов)»</h2>
-<p>Компоновка в стандартном режиме (без композиторов) аналогична использованию слоёв в таких приложениях, как Gimp и Photoshop. Компоновка в стандартном режиме (без композиторов) происходит снизу вверх. Композиторы не используются.</p>
-<h3>Работа в стандартном режиме</h3>
-<ol>
-<li>Добавление клипов на монтажный стол
-<ul>
-<li>Изображения с альфа-каналом компонуются в порядке снизу вверх.</li>
-</ul>
-<li>Управление непрозрачностью изображения</li>
-<ul>
-<li> Добавьте эффект из категории <b>Уход / выход из затемнения</b> и управляя шкалой <b>Непрозрачность</b> добавьте затемнение в начале и/или в конце клипа.</li>
-<li> Добавьте эффект <b>Вытеснение</b> для создания перехода вытеснения.</li>
-</ul>
-<li>Трансформация изображения</li>
-<ul>
-<li>Добавьте эффект <b>Вращение</b>, <b>Наклон и сдвиг</b> или <b>Позиция и масштаб</b>.</li>
-</ul>
-</ol>
-<h2>Режим «Стандартное автосопровождение»</h2>
-<p>Компоновка в режиме стандартного автосопровождения похожа на использование слоёв в таких приложениях, как Gimp или Photoshop. Этот режим работает аналогично тому, как работает большинство других видеоредакторов.</p>
-<p>На монтажном столе композитор отображается в виде фиолетового прямоугольника с закругленными углами.</p>
-<p>Параметры, определяющие полученное изображение, редактируются во вкладке <b>Композиторы</b>.</p>
-<h3>Работа с композиторами</h3>
-<ol>
-<li>Выбор композитора
-<ul>
-<li> <b>Правой кнопкой мыши</b> нажмите на любой клип на дорожках с V5 по V2 и в всплывающем меню выберите, к примеру: <b>Добавить композитор → Наплыв</b> или <b>Добавить композитор → Режим смешения → Умножение</b>.</li>
-</ul>
-<li>Изменение параметров композитора во вкладке «Композиторы»</li>
-<ul>
-<li> Дважды щёлкните по композитору <b>Левой кнопкой мыши</b>.</li>
-<li> Щёлкните по любому композитору <b>Правой кнопкой мыши</b> и выберете «Открыть в редакторе композиторов».</li>
-<li> Измените параметры в открывшейся вкладке.</li>
-</ul>
-<li>Удаление композитора</li>
-<ul>
-<li> Щёлкните <b>Левой кнопкой мыши</b> по композитору для его выделения и нажмите клавишу <b>Delete</b>.</li>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по композитору для его выделения и в всплывающем меню выберите <b>Удалить</b>.</li>
-</ul>
-</ol>
-<h3>ПРИМЕР: при создании композиций с использованием больше 2 дорожек композиторы размещаются на всех дорожках</h3>
-<p>В этом режиме во всех композиторах дорожкой назначения будет V1.</p>
-<p>Поэтому добавление композитора только к верхней дорожке скроет изображение на ней. </p>
-<p>Когда в композиции используется больше 2 дорожек, композиторы должны быть добавлены ко всем клипам, иначе мы не получим ожидаемого результата.</p>
-<p><i><b>Композитор размещён только на верхней дорожке</b></i></p>
-<img src="only_one_comp.png">
-<p>К клипу на дорожке V3 добавлен композитор, который объединяет его с дорожкой V1. Однако отображается клип размещённый на дорожке V2, так как именно он расположен поверх нашей композиции.</p>
-</p><i><b>Композиторы размещены на всех дорожках</b></i></p>
-<img src="all_comp.png">
-<p>
-Изображения на всех дорожках комбинируются на дорожке V1, мы получаем ожидаемый результат.
-</p>
-<h2>Режим «Свободное перемещение сверху вниз»</h2>
-<p>В этом режиме композиторы имеют дорожку источника и дорожку назначения.</p></p>
-<p>На монтажном столе композитор отображается в виде тёмного прямоугольного объекта поверх двух дорожек. Дорожка источника всегда находится над композитором, но дорожка назначения может быть любой из дорожек ниже.</p>
-<p>Параметры, определяющие полученное изображение, редактируются во вкладке <b>Композиторы</b>.</p>
-<h3>Работа с композиторами</h3>
-<p>Комбинируя несколько композиторов на нескольких дорожках можно получить сложные композитные кадры.</p>
-<ol>
-<li>Выбор композитора
-<ul>
-<li> <b>Правой кнопкой мыши</b> нажмите на любой клип на дорожках с V5 по V2 и в всплывающем меню выберите, к примеру: <b>Добавить композитор→Наплыв</b> или <b>Добавить композитор→Режим смешения→Умножение</b>.</li>
-</ul>
-<li>Изменение размера и перемещение композитора</li>
-<ul>
-<li> На монтажном столе <b>Левой кнопкой мыши</b> нажмите на композитор и переместите его левую или правую сторону внутрь композитора - при обрезке, или наружу - при растягивании.</li>
-<li> <b>Левой кнопкой мыши</b> нажмите на композитор и переместите его в нужное место на монтажном столе.</li>
-</ul>
-<li>Изменение параметров композитора во вкладке «Композиторы»</li>
-<ul>
-<li> Дважды щёлкните по композитору <b>Левой кнопкой мыши</b>.</li>
-<li> Щёлкните по любому композитору <b>Правой кнопкой мыши</b> и выберете «Открыть в редакторе композиторов».</li>
-<li> Измените параметры в открывшейся вкладке.</li>
-</ul>
-<li>Удаление композитора</li>
-<ul>
-<li> Щёлкните <b>Левой кнопкой мыши</b>, по композитору для его выделения и нажмите клавишу <b>Delete</b>.</li>
-<li> Щёлкните <b>Правой кнопкой мыши</b>, по композитору для его выделения и в всплывающем меню выберите <b>Удалить</b>.</li>
-</ul>
-</ol>
-<h3>Сборка композиций в режимах композитинга сверху вниз</h3>
-<p>В видеоредакторе Flowblade <b>порядок сборки композиций выполняется сверху вниз</b>, а не снизу вверх как в Gimp или Photoshop.</p>
-<p>На первый взгляд такой метод сборки, особенно при создании определённых типов составных видеоклипов, может показаться не интуитивным, если конечно, не знать о порядке покадровой сборки композита.</p>
-<h4>Покадровая сборка композита</h4>
-<ol>
-<li>Проверяется каждый кадр на наличие перекрывающего его композитора на самой верхней дорожке.</li>
-<li>Если композитор найден композиция собирается на дорожке назначения.</li>
-<li>Кадр на дорожке назначения теперь изменён и если он используется как источник, то используется его изменённая версия.</li>
-<li>Если на следующей дорожке ниже имеется кадр и если композитор найден, создаётся составной клип.</li>
-<li>Эта операция выполняется для каждой дорожки.</li>
-<li>Выходное изображение подключено к верхней дорожке с клипом и не имеет композитора в кадре.</li>
-</ol>
-<h3>ПРИМЕР: Создание трёхслойного составного клипа</h3>
-<p style="margin-bottom:45px" >В этом примере мы продемонстрируем, как расположение клипа и композитора влияет на композицию в целом. Мы попытаемся разместить изображение с пингвином Tux поверх двухцветного фона, сделанного сочетанием зелёных и синих цветовых клипов с использованием типа вытеснения «Свободные полосы».</p>
-<h4>Элементы медиа и желаемый результат</h4>
-<p>Чтобы начать работу с прозрачностью, рисунок «Пингвин Tux.png» должен компоноваться с использованием композитора «Наплыв».</p>
-<p><i><b>Цветовые клипы СИНИЙ и ЗЕЛЁНЫЙ и графический рисунок «Пингвин Tux.png» с альфа-каналом</b></i></p>
-<img src="comp_clips.png">
-<p><i><b>Желаемый результат</b></i></p>
-<img style="margin-bottom:45px" src="correct_comp.png">
-<h4>Порядок расположения клипов, подобно расположению изображения в Gimp или в Photoshop даст неверный результат.</h4>
-<p>Здесь мы разместили клипы на дорожках, подобно тому, как они должны быть размещены в Gimp.</p>
-<p><i><b>Неправильное расположение (как Gimp)</b></i></p>
-<img src="wrong_timeline.png">
-<p>Что здесь происходит? «Пингвин Tux.png» компонуется на «Зелёный» цветовой клип, а результирующее изображение компонуется с помощью «Свободных полос», сверху вытесняющего «Синий» цветовой клип. В итоге получаем неверный результат.</p>
-<p><i><b>Неверный результат</b></i></p>
-<img  style="margin-bottom:45px" src="wrong_comp.png">
-<h4>Правильный порядок клипов и композиторов при упорядочивании сверху вниз.</h4>
-<p>Здесь для получения желаемого результата, мы установили клипы в правильном порядке.</p>
-<p><i><b>Правильное расположение</b></i></p>
-<img src="correct_timeline.png">
-<p>«Зелёный» цветовой клип сначала компонуется с использованием «Свободных полос» вытесняя «Синий» цветовой клип. После этого «Пингвин Tux.png» компонуется поверх полученного изображения (которое уже отображается на дорожке V1), используя «Наплыв» для получения выходного изображения.</p>
-<p><i><b>Дорожка назначения в композиторе «Область» - V1, дорожка источника - V3</b></i></p>
-<img src="correct_dest.png">
-<p><i><b>Получаем желаемый результат</b></i></p>
-<img style="margin-bottom:45px" src="correct_comp.png">
-</div>
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/container_clips.html Deleted

@@ -1,274 +0,0 @@
- <!DOCTYPE html>
-<html>
-<head>
-  <title>Контейнерные клипы</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png">
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Контейнерные клипы</div>
-
-
-
-<div id="toc"></div>
-
-<h2>Определение контейнерного клипа</h2>
-<p>
-<b>Контейнерный клип</b> — это медиаэлемент и созданный на его основе клип монтажного стола состоящий из трёх компонентов, упакованных вместе в единый объект: <i>программа, несобранное медиа</i> и <i>собранное медиа</i>.
-</p>
-<h3>Компоненты</h3>
-<ol>
-<li><b>Несобранное медиа</b> — несобранное на монтажном столе медиа, которое не отображается в окне просмотра.</li>
-<li><b>Программа</b> — данные о сборке клипа на монтажном столе, иногда использующие несобранное медиа в качестве входного материала.</li>
-<li><b>Собранное медиа</b> — собранное на монтажном столе медиа, которое отображается в окне просмотра.</li>
-</ol>
-<h2>Обоснование</h2>
-<ul>
-<li><b>Производительность</b> 
-<p>Контейнерные клипы предоставляют средства для преобразования ресурсоёмких элементов мультимедиа, таких как последовательность клипов, в собранные медиа</p>
-</li>
-<li><b>Управление ресурсами</b> <p>Например, проектами Blender и сценариями G'Mic можно управлять благодаря их доступности через контейнеры.</p></li>
-<li><b>Расширение возможностей</b> <p>Существующие технологии и приложения могут быть созданы для обеспечения функциональности, недоступной в противном случае. В будущем будет больше событий в этой области.</p></li>
-<li><b>Взаимообмен</b> <p>В будущем будет создан центральный репозиторий для совместного использования ресурсов контейнерных клипов.</p></li>
-</ul>
-<h2>Рабочий процесс</h2>
-<ol>
-<li>Создание контейнерного клипа через меню <b>Проект → Создать контейнерный клип</b>.</li>
-<li>Правка контейнерного клипа осуществляется щелчком по нему правой кнопкой мыши и выбором <b>Править данные контейнерного клипа</b> если данные доступны.</li>
-<li>Добавление контейнерного клипа на монтажный стол.</li>
-<li>Сборка и управление контейнерными клипами на монтажном столе осуществляется щелчком по нему правой кнопкой мыши и выбором подменю <b>Действия с контейнерным клипом</b>.</li>
-</ol>
-
-<h2>Типы контейнерных клипов</h2>
-<h3>Контейнерный клип из сценария G'Mic</h3>
-
-<h5>Компоненты</h5>
-<p>
-<ul style="list-style-type:none">
-<li><b>Несобранное медиа</b> — видеоклип.</li>
-<li><b>Программа</b> — сценарий G'Mic созданный и сохранённый в инструменте G'Mic.</li>
-<li><b>Собранное медиа</b> — собранный клип с применённым эффектом G'Mic.</li>
-</ul>
-</p>
-<p>
-<h5>Случаи использования</h5>
-<ul>
-<li>Сборка эффектов G'Mic только на участках клипов, используемых на монтажном столе.</li>
-<li>Упрощение использования одного пользовательского эффекта G'Mic для нескольких клипов.</li>
-</ul>
-
-<h5>Создание контейнерного клипа из сценария G'Mic</h5>
-
-<ol>
-<li>Откройте <b>инструмент G'Mic</b>.</li>
-<li>Создайте сценарий эффекта G'Mic. См. раздел <b>Эффекты G'Mic</b> в главе <b>Автономные инструменты</b>.</li>
-<li>Нажмите на кнопку <b>Сохранить сценарий</b> в левом нижнем углу и сохраните эффект.</li>
-<li>Выберите в меню <b>Проект → Создать контейнерный клип → из сценария G'Mic</b>.</li>
-<li>Выберите сценарий, который вы сохранили и клип, к которому он будет применён для создания контейнера.</li>
-</ol>
-
-<h3>Контейнерный клип из проекта Blender</h3>
-<h5>Компоненты</h5>
-
-<p>
-<ul style="list-style-type:none">
-<li><b>Несобранное медиа</b> — заполнитель видеоклипа, созданный при создании элемента медиа.</li>
-<li><b>Программа</b> — файл проекта с расширением *blend.</li>
-<li><b>Собранное медиа</b> — клип собранный из файла проекта.</li>
-</ul>
-</p>
-<h5>Случаи использования</h5>
-<ul>
-<li>Управление проектами Blender, с помощью дескрипторов Flowblade.</li>
-<li>Создание редакторов в проектах Blender, чтобы иметь возможность правки свойств в Flowblade</li>
-<li>Возможность внесения изменений и обмена интересными проектами Blender. Например, приятными текстовыми эффектами.</li>
-</ul>
-
-<h5> Создание контейнерного клипа из проекта Blender</h5>
-
-<ol>
-<li>Выберите в меню <b>Проект → Создать контейнерный клип → из проекта Blender</b> и выберите файл проекта Blender с расширением <i>.blend</i>.</li>
-<li>При необходимости отредактируйте значения проекта Blender см. раздел <b>Правка контейнерной программы</b>.</li>
-</ol>
-
-<h3>Создание контейнерного клипа из выбранного</h3>
-<h5>Компоненты</h5>
-<p>
-<ul style="list-style-type:none">
-<li><b>Несобранное медиа</b> видеоклип MLT XML, созданный из выбранных клипов или последовательности, подобной составным клипам ранее.</li>
-<li><b>Программа</b> видеоклип MLT XML, созданный из выбранных клипов или последовательности, подобной составным клипам ранее. Здесь программа та же, что в несобранных медиа </li>
-<li><b>Собранное медиа</b> Собранный клип из видеоклипа MLT XML.</li>
-</ul>
-</p>
-<h5>Случаи использования</h5>
-
-<ul>
-<li>Возможность создания медиаэлементов из выбранных клипов или последовательностей.</li>
-<li>Улучшение производительности монтажного стола для сложных многодорожечных контейнерных клипов, с предварительной их сборкой на монтажном столе.</li>
-</ul>
-
-<h5>Создание контейнерного клипа из выбранного</h5>
-
-<ol>
-<li> Выберите от двух до нескольких соседних клипов на одной дорожке.</li>
-<li> Выберите <b>Проект → Создать контейнерный клип → Из выбранных клипов</b>.</li>
-<li> Новый элемент медиа появится в текущей корзине.</li>
-</ol>
-
-<h5>Создание контейнерного клипа из последовательности</h5>
-
-<ol>
-<li> Выберите Проект → Создать контейнерный клип → Из текущей последовательности</b>.</li>
-<li> Новый элемент медиа появится в текущей корзине.</li>
-</ol>
-
-<h5> Синхронизация звука слиянием 2 клипов</h5>
-
-<ol>
-<li> Выберите два элемента мультимедиа во вкладке Медиа.</b>
-	<ul>
-	<li> Предполагается, что вы выберете <b>1 видео и 1 звуковой клип</b>.</li>
-	<li> При выборе <b>двух видеоклипов</b>, в зависимости от порядка выбора, один видеоклип будет обработан как видео, другой как звук.
-	<li> Звук в клипе, обработанном как видео, отключится.</li>
-	</ul>
-</li>
-<li> Выберите <b>Проект → Создать контейнерный клип → Синхронизация звука слиянием 2 клипов.</b></li>
-<li> Если звуковая синхронизация прошла успешно, появится диалоговое окно. В диалоговом окне, присвойте имя новому элементу медиа.</li>
-<li> Новый элемент медиа появится в текущей корзине.</li>
-</ol>
-
-<div class="note">
-Во время звуковой синхронизации идёт поиск на наилучшее математическое соответствие между двумя звуковыми сигналами, поэтому <b>использование несоответствующего звука приведёт к случайным результатам</b>.
-</div>
-
-<h2>Создание редакторов в контейнерной программе Blender</h2>
-
-<p>
-В контейнерных клипах Blender можно создавать и добавлять редакторы, которые позволяют пользователям изменять клип на выходе.
-</p>
-<p>
-Функция использует Blender Python API и запускает сценарий перед выводом данных для изменения значений атрибутов объектов сцены Blender
-</p>
-<p>
-Это продвинутая функция, требующая практических знаний по написанию сценариев с использованием Python API Blender.
-</p>
-
-<h4>Редактируемые объекты</h4>
-<p>
-В настоящее время, для редактирования, доступно три типа объекта:
-</p>
-<ul>
-<li> <b>Объекты</b> — это объекты  словаря <b>bpy.data.objects</b>, доступтные для сценария Python;</li>
-<li> <b>Кривые</b> — это объекты  словаря <b>bpy.data.curves</b>, доступтные для сценария Python;</li>
-<li> <b>Материалы</b> — это объекты  словаря  <b>bpy.data.materials</b>, доступтные для сценария Python.</li>
-</ul>
-
-<h4>Редакторы</h4>
-<p>
-В настоящее время, для редактирования атрибутов объектов, доступны пять различных типов редакторов:
-</p>
-<ul>
-<li> Редактор <b>строк</b> выводит строку в кавычках в сценарии запуска;</li>
-<li> Редактор <b>целого числа</b> выводит целое число в сценарии запуска;</li>
-<li> Редактор <b>плавающей</b>  выводит число с плавающей запятой в сценарии запуска;</li>
-<li> Редактор <b>цвета</b> выводит последовательность из 4 чисел, разделённых запятыми, которые определяют цвет;</li>
-<li> Редактор <b>значений</b> выводит строку без кавычек в сценарии запуска. Это может быть использовано в качестве значения для любого атрибута.</li>
-</ul>
-
-<h3>Пример</h3>
-<p>
-В этом примере мы создаём редакторы <b>строк</b> и <b>цвета</b> для изменения текста и цвета, отображаемых в проекте Blender.
-</p>
-<h4>Шаг 1: Установка имён объектов и атрибутов с помощью сценария Blender</h4>
-<p>
-<img src="blender_script.png">
-</p>
-<p>
-<i>Панель сцен и сценариев Blender с открытым тестовым проектом.</i>
-</p>
-<p>
-Здесь мы установили, что:

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/correct_comp.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/correct_dest.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/correct_timeline.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/edit_tools.html Deleted

@@ -1,419 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Инструменты редактирования и режим работы</title>
-  <link rel="stylesheet" href="style.css">
-  <META CHARSET="UTF-8">
-</head>
-
-<body>
-
-<div id="content">
-
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div class="subject-header">Инструменты редактирования и режим работы</div>
-
-<p>
-Видеоредактор Flowblade предостовляет 10 инструментов редактирования, <b>4 инструмента перемещения</b>, <b>4 инструмента обрезки</b>, <b>инструмент Резка</b> и <b>инструмент Ключевой кадр</b>.
-</p>
-
-<div id="toccontent">
-<div id="toc"></div>
-
-<h2>Конфигурация режима работы</h2>
-
-<p>
-Flowblade предлагает настраиваемый режим работы с выбором набора инструментов и поведения монтажного стола.
-</p>
-
-<p>
-Режим работы настраивается из меню, запускаемого нажатием на значок <img src="workflow.png">.
-</p>
-
-<p>
-Из представленного списка инструментов можно выбрать 9 присвоив каждому порядковый номер. Выбранный инструмент с первым номером автоматически станет инструментом по умолчанию.
-</p>
-
-<p>
-Также в режиме работы можно выбрать автосопровождение композитора за их исходными клипами и включать или отключать подсказки по работе с инструментами.
-</p>
-
-<p>
-Предустановлено всего два режима работы.
-</p>
-
-
-<h3>Предустановленные режимы работы</h3>
-<p>
-<h4><b>Стандартный</b></h4>
-</p>
-<p>
-«Стандартный» режим работы предлагает инструмент <b>Перемещение</b> в качестве инструмента по умолчанию, а сам режим работы схож с работой большинства видеоредакторов.
-</p>
-<p>
-<b>Инструменты:</b> <b>Перемещение</b>, <b>Мультиобрезка</b>, <b>Распорка</b>, <b>Вставка</b>, <b>Резка</b>, <b>Ключевой кадр</b>.
-</p>
-<p>
-<b>Поведение:</b> В действиях перемещения выбран пункт <i>«Перезаписывать пробелы»</i>, <i>«Автосопровождение композитора»</i> отключено.
-</p>
-<p>
-<h4><b>В стиле фильма</b></h4>
-</p>
-<p>
-Режим работы «В стиле фильма» предлагает инструмент <b>Вставка</b> в качестве инструмента по умолчанию и использует редактирование со склейкой. Этот режим работы использовался в предыдущих версиях приложения.
-</p>
-<p>
-<b>Инструменты:</b> <b>Вставка</b>, <b>Перемещение</b>, <b>Обрезка</b>, <b>Прокрутка</b>, <b>Скольжение</b>, <b>Распорка</b>, <b>Коробка</b>.
-</p>
-<p>
-<b>Поведение:</b> В действиях перемещения выбран пункт <i>«Перезаписывать пробелы, кроме дорожки V1»</i>, <i>«Автосопровождение композитора»</i> отключено.
-</p>
-
-<h3>Управление набором инструментов</h3>
-
-<ol>
-<li>Запуск всплывающего меню настройки режима работы</li>
-	<ul>
-	<li> Нажмите на значок <img src="workflow.png">.</li>
-	</ul>
-<li>Включение и выключение инструментов </li>
-	<ul>
-	<li> Наведите курсор на инструмент и выберите <b><i>«Использовать инструмент»</i></b>
-	</ul>
-<li>Присвоение номера инструменту</li>
-	<ul>
-	<li> Наведите курсор на <b><i>инструмент</i> → <i>Присвоить номер</i></b>, выберите порядковый номер под которым будет значится инструмент.</li>
-	</ul>
-</ol>
-
-<h3>Настройка поведения монтажного стола</h3>
-
-<ol>
-<li>Запуск всплывающего меню настройки режима работы</li>
-	<ul>
-	<li> Нажмите на значок <img src="workflow.png">.</li>
-	</ul>
-    
-<li>Выбор поведения drag'n'drop в подменю <b>Поведение → Действия перемещения</b></li>
-
-<ul>
-<li>При выборе <i>«Перезаписывать пробелы»</i>:</li>
-<ul>
-<li> Перемещаемый клип перезапишет, как доступное пустое пространство, так и определённое количество кадров, уже размещённого на монтажном столе клипа.</li>
-</ul>
-<li>При выборе <i>«Перезаписывать пробелы, кроме дорожки V1»</i>:</li>
-<ul>
-<li> На дорожке V1 клип будет вставлен на дорожку на ближайшем срезе.</li>
-<li> На дорожках, кроме V1:.</li>
-<ul>
-<li> Клип будет вставлен, даже если попадает на уже размещённый клип.</li>
-<li> Перемещаемый клип перезапишет, как доступное пустое пространство, так и определённое количество кадров, уже размещённого на монтажном столе клипа.</li>
-</ul>
-</ul>
-<li>При выборе <i>«Не перезаписывать пробелы»</i>:</li>
-<ul>
-<li> Клип будет вставлен на дорожку на ближайшем срезе.</li>
-</ul>
-</ul>
-
-<li>Установка поведения «Композитора» с контрольным элементом <b>Автосопровождение композитора</b></li>
-<ul>
-<li> При <i>«Выкл.»</i>:</li>
-<ul>
-<li> Композиторы не будут следовать за своими клипами.</li>
-<li> Композиторы можно свободно перемещать и обрезать.</li>
-</ul>
-<li>  При <i>«Вкл.»</i>:</li>
-<ul>
-<li> Композиторы будут следовать за своими клипами.</li>
-<li> Композиторы нельзя свободно перемещать и обрезать.</li>
-<ul>
-</ul>
-</ul>
-
-</ol>
-
-<h2>Выбор инструментов</h2>
-
-<p>
-Используйте выпадающее меню <b>Переключателя инструментов</b> или клавиши <b>1 - 9</b>.
-</p>
-
-<div class="note">
-<b>Используйте горячие клавиши!</b> Гораздо удобнее и быстрее использовать клавиши <b>1 - 9</b>  для смены инструментов. Обратите внимание, что с помощью клавиш менять инструменты можно, только, если курсор находится в фокусе монтажного стола. 
-</div>
-
-<h2>Инструменты перемещения</h2>
-
-<a id="insert"></a>
-<h3>Вставка</h3>
-
-<p>
- С помощью инструмента «Вставка» можно вставить клип на начало дорожки, или соединить один или несколько клипов и вставить их в желаемом срезе на дорожке. 
-</p>
-
-<ol>
-<li>Выбор клипа</li>
-	<ul>
-	<li><b>Левой кнопкой мыши</b> нажмите на клип.</li>
-	</ul>
-<li>Выбор группы клипов</li>
-	<ul>
-	<li> Нажмите <b>Ctrl + Левой кнопкой мыши</b> по тому клипу, который будет использоваться в качестве второй стороны группы клипов для вставки.</li>
-	</ul>
-<li>Перенос клипа (группы клипов) в новое место</li>
-	<ul>
-	<li> Нажмите <b>Левой кнопки мыши</b> на клип (группу клипов) и перенесите его в новое место.</li>
-	<li> Жёлтая стрелка указывает на место вставки.</li>
-	<li> Также можно переместить клипы на другую дорожку.</li>
-	</ul>
-</ol>
-
-<p>
-ИЗМЕНЕНИЕ ДЛИТЕЛЬНОСТИ КЛИПА.
-</p>
-
-<ol>
-<li>Поместите курсор возле среза клипа</li>
-	<ul>
-	<li>Когда курсор изменится на горизонтальную стрелку с вертикальной полосой, вы можете изменить размер клипа.</li>
-	</ul>
-<li>Протяните срез клипа с нажатием <b>левой кнопкой мыши</b> в желаемом направлении.</li>
-	<ul>
-	<li> При увеличении длительности клипа произойдёт перезапись пробелов и пустого пространства</li>
-	</ul>
-	<ul>
-	<li> При увеличении длительности клипа произойдёт вставка на другие клипы</li>
-	</ul>
-	<ul>
-	<li> При уменьшении длительности клипа выполнится склейка с соседним клипом.</li>
-	</ul>
- </ol> 
-
-<a id="overwrite"></a>
-<h3>Перемещение</h3>
-

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/encoding.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/filtering.html Deleted

@@ -1,71 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Видео и звуковые эффекты</title>
-  <link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Видео и звуковые эффекты</div>
-
-<p>
-Эффектами в видеоредакторе Flowblade можно воспользоваться для внесения изменений в свойства звуковых и видео данных оригинального материала.
-</p>
-
-
-<div id="toc"></div>
-
-<h3>Работа с эффектами</h3>
-
-
-<h4>  Добавление эффекта</h4>
-	<ul>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по нужному клипу и выберите из всплывающего меню, например, <b>Добавить эффект→Размывание→Пикселизация</b>.</li>
-<li> Во вкладке <b>Эффекты</b> дважды щёлкните по эффекту в текущем списке эффектов.</li>
-<li> Во вкладке <b>Эффекты</b> нажмите на кнопку добавить эффект в стек эффектов клипа.</li>
-	</ul>
-
-<h4> Открытие вкладки "Эффекты" для редактирования эффектов</h4>
-	<ul>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по нужному клипу и в всплывающем меню, выберите <b>Открыть в редакторе эффектов</b>.</li>
-<li> <b>Дважды щёлкните</b> по нужному клипу.</li>
-	</ul>
-
-<h4> Изменение параметров</h4>
-	<ul>
-<li>Параметры, эффектов изменяются во вкладке «Эффекты»</li>
-<li> На клипах, с добавленным эффектом, будет отображаться небольшой значок в верхнем правом углу.</li>
-<li> Если клип редактируется, то также будет отображаться значок серого эффекта в центре клипа. </li>
-<li>Эффекты, изменяющие альфа-канал, будут работать только в том случае, если клип, к которому они прикреплены, смешивается с другими клипами с помощью композитора.</li>
-	</ul>
-
-<h4> Клонирование эффектов из других клипов</h4>
-	<ul>
-<li> Щёлкните <b>Правой кнопкой мыши</b> по нужному клипу и в всплывающем меню выберите <b>Клонировать эффект→Из следующего клипа</b> или <b>Клонировать эффект→Из предыдущего клипа</b>.</li>
-	</ul>
-
-<h4> Удаление эффектов из клипов</h4>
-	<ul>
-<li> Выберите эффект в стеке эффектов клипа и нажмите кнопку <b>Удалить</b>.</li>
-<li> Выберите эффект в стеке эффектов клипа и нажмите клавишу <b>Delete</b>.</li>
-<li> Выберите клип или участок клипа на монтажном столе и в всплывающем меню выберите <b>Удалить эффекты</b>.</li>
-	</ul>
-
-
-
-</div>
-
-</div>
-
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/filters_list.html Deleted

@@ -1,705 +0,0 @@
-
- <!DOCTYPE html>
-<html>
-<head>
-<title>Список эффектов</title>
-<link rel="stylesheet" href="style.css">
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-<script src="tocgen.js"></script>
-<div class="subject-header">Эффекты Flowblade</div>
-<br/>
-<div id="toc"></div>
-<br/>
-<div id="toccontent">
-
- <h2>Альфа</h2>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Блуждающая маска</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Тип маски  (Кривые по точкам, Прямые по точкам)<div class="filter-value">Кривые по точкам</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Режим (Альфа, Яркостный, RGB)   <div class="filter-value">Альфа</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Режим альфа (Очищение, Добавление, Вычитание)   <div class="filter-value">Очищение</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Инвертировать   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Растушёвка   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Проходов растушёвки   <div class="filter-value">1</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Выделение по цвету</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Цвет   <div class="filter-value">#00ff00</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Инвертировать   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Подпространство    <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>R/A/Оттенок   <div class="filter-value">0=0.2</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>G/B/Цветность   <div class="filter-value">0=0.2</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>B/I/I   <div class="filter-value">0=0.2</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Режим контура (Жёсткий:0.0,Толстый:0.35,Обычный:0.60,Тонкий:1.0)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Фигура (Прямоугольнк:0.0,Эллипс:0.5,Ромб:1.0)  <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Операция (Перезапись:0.0,Макс:0.3,Мин:0.5,Добавление:0.7,Вычитание:1.0)   <div class="filter-value">0.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Вытеснение</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Тип вытеснения (50 файлов каше) <div class="filter-value">По горизонатали из центра</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Порог    <div class="filter-value">50</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Мягкость   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Инвертировать   <div class="filter-value">0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Градиент Альфа</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Позиция   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Ширина градиента   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Наклон   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Мин.   <div class="filter-value">0=0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Макс.   <div class="filter-value">0=1</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Кадрирование</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Слева   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Справа   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Сверху   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Снизу   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Размывание   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Инвертировать   <div class="filter-value">1</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Ключ Яркости</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Порог   <div class="filter-value">128</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Крутизна   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Низкий уровень   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Высокий уровень   <div class="filter-value">255</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Модификация альфа</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Операция (Сохранить:0.21,Жёсткое сжатие:0.36,Мягкое сжатие:0.50,Жёсткое увеличение:0.64,Мягкое увеличение:0.79)  <div class="filter-value">0.21</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Сумма   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Инвертировать   <div class="filter-value">0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Нерозрачность</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b> Непрозрачность   <div class="filter-value">100</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Подавление рассеивания</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b> Подавлять (Зелёный:0.0,Синий:1.0)   <div class="filter-value">0.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Фигуры в альфа</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Фигура (Прямоугольник:0.0,Эллипс:0.32,Треугольник:0.68,Ромб:1.0)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Позиция по X   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Позиция по Y   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Ширина   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Высота   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Наклон   <div class="filter-value">0=0.5</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Ширина перехода   <div class="filter-value">0=0.2</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Хромакей</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Основной цвет   <div class="filter-value">#00ff00</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Отклонение   <div class="filter-value">0.15</div></div>
-</div>
-
-<h2>Движение</h2>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Балтан (без параметров)</div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Головокружение</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Шаг фазы   <div class="filter-value">0=0.02</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Масштаб   <div class="filter-value">0=0.202</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Нервозность (без параметров)</div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Стоп-кадр</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Номер кадра   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Остановить за   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Остановить до   <div class="filter-value">0</div></div>
-</div>
-
-<h2>Звук</h2>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Громкость</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Громкость  <div class="filter-value">0=1.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Моно в стерео</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс  <div class="filter-value">1</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Нормализация</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Режим смешения   <div class="filter-value">-23</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Длительность анализа   <div class="filter-value">10</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Максимальное усиление   <div class="filter-value">15</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Минимальное усиление   <div class="filter-value">-15</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Панорама</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Левый/Правый   <div class="filter-value">0.5</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Панорама по ключевым кадрам</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Левый/Правый   <div class="filter-value">0.5</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Поменять каналы местами (без параметров)</div>
-</div>
-
-<h2>Звуковые фильтры</h2>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Delayorama</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Случайная зернистость   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Усиление на входе (дБ)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Обратная связь (%)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Количество отводов   <div class="filter-value">2</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Первая задержка (c)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Диапазон задержки (c)   <div class="filter-value">6.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Изменения задержки   <div class="filter-value">1.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Случайная задержка (%)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Амплитудные изменения   <div class="filter-value">1.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Случайная амплитуда (%)   <div class="filter-value">0.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс   <div class="filter-value">1.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>GSM Симулятор</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Проход   <div class="filter-value">1</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Частота ошибок   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс   <div class="filter-value">1.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Pitchshifter - AM</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Транспонирование   <div class="filter-value">1.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Размер буфера   <div class="filter-value">4</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс   <div class="filter-value">1</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Виниловая пластинка</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Год   <div class="filter-value">1950</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Оборотов в минуту   <div class="filter-value">33</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Деформация поверхности   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Потрескивание   <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Изношенность  <div class="filter-value">0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс   <div class="filter-value">1.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Изменение тона (высокое качество)</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Коэффициент тона   <div class="filter-value">1.0</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс   <div class="filter-value">1.0</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Искажение (Barry's Satan)</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Задержка (образец)   <div class="filter-value">30</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Угол (дБ)   <div class="filter-value">-30</div></div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Баланс   <div class="filter-value">1</div></div>
-</div>
-<div class="filter">
-        <div class="filter-name"><b>Эффект: </b>Искажение (Диодный процессор)</div>
-        <div class="filter-property"><b>Параметр по умолчанию: </b>Сумма   <div class="filter-value">1.0</div></div>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/help.html Deleted

@@ -1,60 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Руководство пользователя по Flowblade</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<div id="help-index">
-		<div class="subject-cell">
-			<a href="intro.html">Введение</a>
-		</div>
-		<div class="subject-cell">
-			<a href="basic_editing.html">Основы редактирования</a> 
-		</div>
-		<div class="subject-cell">
-			<a href="edit_tools.html">Инструменты редактирования и режим работы</a> 
-		</div> 
-		<div class="subject-cell">
-			<a href="compositor.html">Создание композитных клипов</a>
-		</div>
-		<div class="subject-cell">
- 			<a href="filtering.html">Видео и звуковые эффекты</a> 
-		</div>
-		<div class="subject-cell">
- 			<a href="advanced.html">Расширенные возможности редактирования</a> 
-		</div> 
-		<div class="subject-cell">
-			<a href="range_log.html">Журнал участков</a>
-		</div>
-		<div class="subject-cell">
- 			<a href="proxy.html">Редактирование прокси</a>
-		</div>
-		<div class="subject-cell">
- 			<a href="container_clips.html">Контейнерные клипы</a>
-		</div>
-		<div class="subject-cell">
- 			<a href="tools.html">Автономные инструменты</a>
-		</div>
-		<div class="subject-cell">
-			 <a href="rendering.html">Сборка</a>
-	</div>
-</div>
-
-<h6 class="appendix-title">Приложения:</h6>
-<a class="appendix-index" href="filters_list.html">Список эффектов</a>
-<a class="appendix-index" href="kbshortcuts.html">Комбинации клавиш</a>
-
-<div class="copyright-info">Справочное руководство по Flowblade (июнь 2020 год).</div> 
-
-</div>
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/intro.html Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/kbshortcuts.html Deleted

@@ -1,454 +0,0 @@
-<!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Комбинации клавиш</title>
-<style>
-.tablestyle {
-  font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-.tablestyle  td, .tablestyle th {
-  border: 1px solid #ddd;
-  padding: 8px;
-}
-
-.tablestyle tr:nth-child(even){background-color: #f2f2f2;}
-
-.tablestyle  tr:hover {background-color: #ddd;}
-
-.tablestyle th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  background-color: #1e35b5;
-  color: white;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	padding-top: 48px;
-	padding-bottom: 12px;
-	font-family: sans-serif;
-	text-transform: uppercase;
-	margin:2px 0;
-	color: #000000;
-	font-weight:400;
-}
-#content {
-  width: 700px ;
-  margin-left: auto ;
-  margin-right: auto ;
-}
-
-
-</style>
-</head>
-<body>
-
-<div id="content">
-
-<h1>Комбинации клавиш в Flowblade по умолчанию</h1>
-<h2>Основные</h2>
-
-<table class="tablestyle">
-<thead>
-<tr>
-<th>Комбинация</th>
-<th>Действие</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Control + N</td>
-<td>Создать новый проект</td>
-</tr>
-<tr>
-<td>Control + S</td>
-<td>Сохранить проект</td>
-</tr>
-<tr>
-<td>Delete</td>
-<td>Удалить</td>
-</tr>
-<tr>
-<td>ESCAPE</td>
-<td>Остановить создание звуковых уровней</td>
-</tr>
-<tr>
-<td>Control + Q</td>
-<td>Выйти</td>
-</tr>
-<tr>
-<td>Control + Z</td>
-<td>Отменить</td>
-</tr>
-<tr>
-<td>Control + Y</td>
-<td>Повторить</td>
-</tr>
-<tr>
-<td>Control + O</td>
-<td>Открыть проект</td>
-</tr>
-<tr>
-<td>Tab</td>
-<td>Переключить источник предпросмотра</td>
-</tr>
-<tr>
-<td>Alt + N</td>
-<td>Открыть следующий клип в мониторе</td>
-</tr>
-<tr>
-<td>Control + L</td>
-<td>Добавить отмеченный участок в журнал</td>
-</tr>
-<tr>
-<td>-</td>
-<td>Уменьшить</td>
-</tr>
-<tr>
-<td>+</td>
-<td>Увеличить</td>
-</tr>
-</tbody>
-</table>
-
-
-<h2>Монтажный стол</h2>
-
-<table class="tablestyle">
-<thead>
-<tr>
-<th>Комбинация</th>
-<th>Действие</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>I</td>
-<td>Выбрать начало участка</td>
-</tr>
-<tr>
-<td>O</td>
-<td>Выбрать конец участка</td>
-</tr>
-<tr>
-<td>Alt + I</td>
-<td>Перейти к началу участка</td>
-</tr>
-<tr>
-<td>Alt + O</td>
-<td>Перейти в конец участка</td>
-</tr>
-<tr>
-<td>Alt + K</td>
-<td>Удалить участок</td>
-</tr>
-<tr>
-<td>X</td>
-<td>Разрезать на активных дорожках</td>
-</tr>
-<tr>
-<td>Shift + X</td>
-<td>Разрезать на всех дорожках</td>
-</tr>
-<tr>
-<td>DELETE</td>
-<td>Удалить со вставкой</td>
-</tr>
-<tr>
-<td>Control + DELETE</td>
-<td>Удалить без вставки</td>
-</tr>
-<tr>
-<td>Alt + C</td>
-<td>Удалить эффекты</td>
-</tr>
-<tr>
-<td>Alt + S</td>
-<td>Синхронизировать композитор</td>
-</tr>
-<tr>
-<td>Alt + R</td>
-<td>Ресинхронизировать</td>
-</tr>
-<tr>
-<td>Y</td>
-<td>Вставка</td>
-</tr>
-<tr>
-<td>U</td>
-<td>Склейка</td>
-</tr>
-<tr>
-<td>T</td>
-<td>Перезапись по трём точкам</td>
-</tr>
-<tr>
-<td>R</td>
-<td>Перезаписать участок</td>
-</tr>
-<tr>
-<td>A</td>
-<td>Добавить выбранные из корзины клипы</td>
-</tr>
-<tr>
-<td>M</td>
-<td>Добавить маркер</td>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/proxy.html Deleted

@@ -1,97 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Редактирование прокси</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Редактирование прокси</div>
-
-<p>
-Редактирование прокси — это метод редактирования, в котором оригинальные медиаклипы представлены на монтажном столе прокси-клипами.
-
-</p> 
-<div id="toc"></div>
-
-<h3>Обоснование</h3>
-<p>
-Прокси-клипы, используемые при редактировании прокси, обычно имеют меньшую скорость передачи данных и потребляют меньше ресурсов процессора для декодирования. Для редактирования с использованием прокси есть две основные причины:
-</p>
-<ul>
-<li> Исходный носитель, с которого выполняется редактирование, предъявляет слишком высокие требования к пропускной способности диска или к мощности процессора для декодирования, что не позволяет обеспечить комфортное редактирование в целом. </li>
-<li> Оригинал хранится на сетевом сервере, медленном внешнем диске или другом носителе с ограниченным доступом и не позволяет обеспечить комфортное редактирование при прямом доступе.</li>
-</ul>
-
-
-
-<h3>Общий процесс редактирования с использованием прокси</h3>
-
-<p>
-Все рабочие процессы редактирования с использованием прокси имеют одни и те же этапы:
-</p>
-<ol>
-<li> Сборка прокси из оригинальных клипов </li>
-<li> Замена оригинального клипа на прокси </li>
-<li> Редактирование с использованием прокси </li>
-<li> Замена прокси на оригинальные клипы </li>
-<li> Финальная сборка с использованием оригинальных клипов </li>
-</ol>
-
-<h3>Редактирование прокси во Flowblade</h3>
-<ol>
-<li> Создание прокси-клипа</li>
-<ol>
-<li> В главном меню выберите <b>Проект→Менеджер прокси</b> и задайте параметры для прокси в области <b>Кодирование прокси</b>.</li>
-<li> Выберите элемент медиа во вкладке <b>«Медиа»</b>.</li>
-<li> Нажмите кнопку со значком прокси рядом кнопкой Удалить во вкладке «Медиа».</li>
-<li> Если проект уже находится в режиме прокси <b>«Использование прокси-клипов»</b> оригинальные клипы на монтажном столе, на которых были собраны прокси, будут немедленно заменены прокси-клипами.</li>
-</ol>
-<li>Включение режима «Использование прокси-клипов»</li>
-<ol>
-<li> В главном меню выберите <b>Проект→Менеджер прокси</b>.</li>
-<li> В открывшемся окне нажмите кнопку <b>Использование прокси-клипов</b>.</li>
-</ol>
-<li>Редактирование с использованием прокси-клипов</li>
-<ol>
-<li> Клипы, использующие прокси, имеют голубую полосу, указывающую на статус прокси.</li>
-<li> Значок индикатора редактирования прокси отображается в левом нижнем углу.</li>
-<li> Если на монтажном столе создаётся новый клип использующий оригинальный медиафайл, то он немедленно будет заменён на прокси-клип.</li>
-<li> Проект может быть нормально сохранён и преобразован после загрузки, для использования оригинальных клипов.</li>
-</ol>
-<li>Включение режима «Использование оригинальных клипов»</li>
-<ol>
-<li> В главном меню выберите <b>Проект→Менеджер прокси</b>.</li>
-<li> В открывшемся окне нажмите кнопку <b>Использование оригинальных клипов</b>.</li>
-</ol>
-</ol>
-<h3>Важные замечания о редактировании прокси во Flowblade</h3>
-<div class="important">
-<li> <b>УНИЧТОЖЕНИЕ ЛЮБОГО МЕДИА во время редактирования прокси СДЕЛАЕТ НЕВОЗМОЖНЫМ ПРЕОБРАЗОВАНИЕ И ВОЗВРАЩЕНИЕ К ИСПОЛЬЗОВАНИЮ ОРИГИНАЛЬНЫХ КЛИПОВ</b> </li>
-<li> <b>Можно использовать, либо все <i>существующие</i> прокси-клипы, либо все оригинальные клипы</b>. Нельзя выборочно использовать только некоторые из созданных прокси-клипов.</li>
-
-</div>
-<div class="note">
-<p>
-Flowblade использует технику программирования, которая изменяет пути, используемые элементами мультимедиа, чтобы указывать, либо на скрытые прокси-клипы, либо на оригинальные.
-</p>
-<p>
-Переход от одного к другому осуществляется путём записи скрытого временного файла проекта на диск и замены путей при чтении проекта. Из-за этого любые отсутствующие оригинальные клипы снова преобразуются в оригинальный медиафайл.
-</p>
-</div>
-
-</div>
-</div>
-</body>
-
-</html> >

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/range_log.html Deleted

@@ -1,71 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Журнал участков</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Журнал участков</div>
-
-<p>
-Flowblade предоставляет функцию сохранения, изменения, переименования и управления <b>участками</b> элементов мультимедиа.
-
-<div id="toc"></div>
-
-<h3>Обоснование</h3>
-Эта функция в основном полезна, когда есть <b>элементы мультимедиа, которые содержат несколько интересных участков</b>, или если пользователь хочет сохранить и изменить участок для последующего редактирования.
-</p>
-<p>
-Типичным примером использования этой функции будет:
-</p>
-<ol>
-<li> Пользователь редактирует длинный клип с речью, произносимой в каком либо социальном институте — На собрании в производстве, поздравлении, подготовке презинтации и т.д. </li>
-<li> Пользователь хочет отметить и присвоить имя интересным участкам клипа.</li>
-</ol>
-
-<h3>Создание элементов журнала участков</h3>
-<h4> С помощью монитора:</h4>
-<ol>
-<li>Открыть элемент мультимедиа в мониторе,</li>
-<li>Выбрать начало и конец участка,</li>
-<li>Нажать кнопку «Добавить отмеченный участок» в левом нижнем углу вкладки «Журнал участков».</li>
-</ol>
-<h4>С помощью монтажного стола:</h4>
-<ol>
-<li>Переместите клип из монтажного в список элементов во вкладке «Журнал участков».</li>
-</ol>
-
-
-<h3> Добавление элементов журнала участков на монтажный стол</h3>
-<h4>С помощью кнопок:</h4>
-<ul>
-<li> Нажмите на кнопку «Вставить отображаемые участки на монтажный стол...», в правом нижнем углу, для добавления всех элементов в качестве клипов на активную дорожку.</li>
-<li>Нажмите на кнопку «Вставить выбранные участки на монтажный стол...», рядом с кнопкой вставки отображаемых участков, чтобы вставить все выбранные элементы на активной дорожке в ближайшем разрезе из текущего отображаемого положения монтажного стола.</li>
-</ul>
-<h4>С помощью мыши:</h4>
-<ul>
-<li> Выберите элемент журнала участков и переместите его в нужную позицию на монтажном столе.</li>
-</ul>
-
-<h3>Управление элементами журнала участков</h3>
-<ul>
-<li> В выпадающем меню верхней строки выберите отображаемую группу элементов.</li>
-<li> Используйте кнопку выпадающего меню, в верхнем левом углу, для создания, переименования и удаления групп элементов.</li>
-</ul>
-
-</div>
-</div>
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/rendering.html Deleted

@@ -1,115 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Сборка</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Сборка</div>
-<p>
-В Flowblade есть два способа сборки вашего фильма в файл: 
-</p>
-<ul>
-<li> Вкладка <b>«Сборка»</b> расположена слева от Монитора.</li>
-<li> Инструмент <b>«Очередь пакетной сборки»</b>, который расположен в главном меню «Сборка».</li>
-</ul>
-
-<p>
-Почти все кодировки, доступные для приложений FLOSS, могут использоваться в Flowblade. 
-</p>
-
-<div id="toc"></div>
-
-<h3>Вкладка «Сборка»</h3>
-
-<h4>Виджеты</h4>
-<h5>Выпадающее меню <b>«Папка»</b> </h5> <div class="r-widget">Выберите папку для размещения выходного файла.</div>
-<h5>Поле ввода <b>«Имя»</b></h5> <div class="r-widget"> Присвойте имя выходному файлу.</div>
-<h5>Выпадающее меню <b>«Тип»</b> сборки</h5> <div class="r-widget">Выберите между сборкой с параметрами заданными пользователем или используйте предустановленные параметры сборки и типа файла.</div>
-<h5>Выпадающее меню <b>«Предустановки»</b></h5> <div class="r-widget">Выберите предустановленные параметры сборки и тип файла.</div>
-<h5>Флажок <b>«С профилем проекта»</b></h5> <div class="r-widget">Снимите флажок с «С профилем проекта», если нужно выбрать профиль для сборки фильма, отличный от профиля вашего проекта.</div>
-<h5>Выпадающее меню <b>«Профиль»</b> сборки</h5> <div class="r-widget">Выберите профиль сборки.</div>
-<h5>Выпадающее меню <b>«Формат кодирования»</b></h5> <div class="r-widget">Выберите формат кодирования и расширение файла для сборки.</div>
-<h5>Выпадающее меню <b>«Качества сборки»</b></h5> <div class="r-widget">Выберите скорость потока для сборки.</div>
-<h5>Использование <b>«Аргументов сборки»</b></h5> <div class="r-widget">Сборка с использованием аргументов, заданных в области редактирования текста.</div>
-<h5>Кнопка <b>загрузки аргументов</b></h5></h5> <div class="r-widget">Загрузите аргументы сборки, взятые из текстового файла.</div>
-<h5>Кнопка <b>сохранения аргументов</b></h5> <div class="r-widget">Сохраните аргументы сборки в текстовом файле.</div>
-<h5>Кнопка <b>«Изменение аргументов»</b></h5> <div class="r-widget">Установите аргументы сборки в области текста.</div>
-<h5>Выбор <b>расширения</b> файла</b></h5> <div class="r-widget">Введите расширение для собираемого файла.</div>
-<h5>Выпадающее меню <b>«Участка сборки»</b></h5> <div class="r-widget">Выберите между всей последовательностью и определённым участком.</div>
-<h5>Кнопка <b>«Сборка»</b></h5> <div class="r-widget">После нажатия, содержимое монтажного стола собирётся в файл. </div>
-</ul>
-
-<h4>Отображение результатов</h4>
-<ol>
-<li> Нажмите кнопку <b>«Сборка»</b> для запуска процесса сборки.</li>
-<li> Откроется окно процесса сборки, которое отображает информацию о пути собираемого файла, предполагаемом времени, времени сборки.</li>
-<li> После завершения сборки окно процесса сборки закроется автоматически.</li>
-</ol>
-
-<h3> Очередь пакетной сборки </h3>
-
-<p>
-Flowblade предлагает специализированное приложение очереди пакетной обработки. «Очередь пакетной сборки»- это автономное приложение, работающее в собственном процессе и не влияющее на проект, поэтому закрытие Flowblade, не затронет текущую пакетную сборку.
-</p>
-<p>
-Пакетная сборка - это постоянная структура данных элементов сборки на диске. Каждый элемент состоит из файла проекта и сохранённых параметров сборки. Пользователи могут добавлять объекты сборки в очередь пакетной сборки, а затем собрать всю очередь без дальнейших действий пользователя.
-</p>
-
-<h4>Добавление элементов в очередь пакетной сборки</h4>
-<ul>
-<li> В главном меню выберете пункт <b>Сборка→ Добавить в очередь пакетной сборки...</b></li>
-</ul>
-
-<h4>Использование приложения очереди пакетной сборки</h4>
-<ol>
-<li> Откройте приложение в главном меню <b>Сборка→ Очередь пакетной сборки</b>.</li>
-<li> Используйте кнопки <b>«Удалить выбранные»</b> и <b>« Удалить завершённые»</b>, чтобы удалить элементы из очереди.</li>
-<li> Используйте флажок в столбце <b>«Сборка»</b>, чтобы выбрать, какие элементы будут собираться. </li>
-<li> Нажмите кнопку <b>«Сборка»</b>, для запуска процесса сборки.</li>
-</ol>
-<p>
-Дополнительные действия:
-</p>
-<ul>
-<li> <b>Щёлкните правой кнопкой мыши</b> по элементу проекта, для отображения его всплывающего меню.</li>
-<li> <b>Сохранить элемент проекта как...</b> позволяет пользователю сохранять в файл проекта, выбранный элемент в другом месте.</li>
-<li> <b>Свойства сборки</b> отображает информацию о параметрах, которые были установлены, во время добавления элемента в очередь сборки.</li>
-<li> <b>Удалить</b> удаляет элемент из очереди.</li>
-</ul>
-<h3>Сборка за кулисами: MLT и libavformat (FFMpeg)</h3>
-<p>
-Видеоредактор Flowblade - это приложение написанное на Python, взаимодействующее с мультимедийной средой MLT. Другими приложениями для редактирования видео, использующими MLT в качестве платформы, являются OpenShot и Kdenlive.
-</p>
-<p>
-MLT использует C-library libavformat (FFMpeg) для сборки выходных файлов, а сборка определяется настройкой параметров кодирования FFMpeg. Эти параметры доставляются из видеоредактора Flowblade в MLT, с помощью потребителя «avformat» для данного профиля Сборки, а затем задаются аргументы сборки.
-Аргументы задаются точно такие же, которые используются в FFmpeg для кодирования видеофайлов.
-</p>
-<p>
-Аргументы сборки для кодирования различных типов видеофайлов предварительно упаковывается и могут быть определены с помощью меню «Формат кодирования». Аргументы можно уточнить, проверив Сборку с помощью флажка «Использование аргументов сборки» и изменив и/или добавив/удалив значения аргументов.
-</p>
-<p>
-Любые видеоролики, поддерживаемые установленной версией MLT, могут быть перекодированы путём создания пользовательского профиля Сборки и установки аргументов сборки. В поисковых системах, например в Google, можно найти различные комбинации использования аргументов для кодирования видеофайлов в FFMpeg.
-</p>
-<p>
-Посмотрите в интернете информацию о кодировании файлов с помощью FFMpeg, для ознакомления с примерами использования аргументов сборки.
-</p>
-<h3>Модель сборки в Flowblade</h3>
-
-<img src="encoding.png">
-
-</div>
-</div>
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/style.css Deleted

@@ -1,279 +0,0 @@
-html {
-	font-size: 100%;
-	-webkit-text-size-adjust: 100%;
-	-ms-text-size-adjust: 100%;
-}
-
-body {
- 	font-family: Georgia, "Times New Roman", Times, serif;
-	color:#222222;
-	background-color: #ffffff; 
-	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-}
-
-#content {
-  width: 700px ;
-  margin-left: auto ;
-  margin-right: auto ;
-}
-
-#help-index{
-	margin-top: 80px;
-	width: 900px;
-	margin-bottom: 80px;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	text-align: center;
-}
-
-.appendix-index{
-	margin-top: 10px;
-	width: 900px;
-	margin-bottom: 10px;
-	display: flex;
-	justify-content: center;
-	flex-direction: column;
-	text-align: left;
-	color: #666666;
-	font-size:18px;
-}
-
-.subject-cell {
-	padding-right: 20px;
-	color:#222222;
-	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-	font-weight:400;
-	font-size:30px;
-	margin-bottom: 35px;
-}
-
-.grid-container {
-	margin-top: 80px;
-        width: 700px;
-	margin-bottom: 80px;
-}
-
-.row:before, 
-.row:after {
-	content:"";
-	display: table ;
-	clear:both;
-}
-
-.column4 {
-	float: left; 
-	width: 33.3%;
-	margin-bottom: 50px;
-}
-
-.subject-cell {
-	padding-right: 20px;
-	color:#222222;
-	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-	font-weight:400;
-	font-size:22px;
-	text-transform: uppercase;
-}
-
-.appendix-pad {
-	color: #666666;
-	font-size:14px;
-}
-.appendix-title {
-	color: #666666;
-	font-size:20px;
-}
-
-.note {
-	background-color: #f3f3f0;
-	padding: 25px;
-	margin-bottom: 10px ;
-}
-
-.important {
-	background-color: #f5d77d;
-	padding: 25px;
-	margin-bottom: 10px ;
-}
-
-.tabbed {
-	padding-left: 25px;
-	margin-bottom: 10px ;
-}
-
-.tabbed_line {
-	padding-left: 25px;
-}
-
-.tocitem {
-	font-size:12px;
-	line-height: 1.0;
-
-}
-
-.tocli {
-	list-style-type: none;
-}
-
-.copyright-info {
- 	font-family: Georgia, "Times New Roman", Times, serif;
-	margin-top:80px;
-	color: #444444;
-	font-weight:400;
-	font-size:12px;
-}
-
-.subject-header {
-	text-transform: uppercase;
-	margin-top:10px;
-	color: #000000;
-	font-weight:400;
-	font-size:26px;
-}
-
-.filter {
-	margin-bottom: 25px;
-	color: #000000;
-	font-weight:400;
-	font-family: sans-serif;
-	word-wrap: break-word;
-	line-height: 1.4;
-	vertical-align: baseline;
-}
-
-.filter-name {
-	padding-left: 20px;
-}
-
-.filter-property {
-	padding-left: 50px;
-	font-size:12px;
-}
-.filter-value {
-	display:inline-block;
-	color: #0000bb;
-	font-size: 8;
-}
-
-.filter-group {
-	color: #000000;
-	font-size: 26;
-	text-transform: uppercase;
-	margin-top: 50px;
-	margin-bottom: 10px;
-}
-
-.r-widget {
-	display: inline-block;
-	margin-top:0px;
-	margin-left:15px;
-	margin-bottom:10px;
-}
-
-#advtoc {
-	margin-top:50px;
-	margin-bottom:30px;
-}
-
-
-/* Otsikot 1 */
-h1, h2, h3, h4, h5, h6{
-	text-transform: uppercase;
-	margin:2px 0;
-	color: #000000;
-	font-weight:400;
-}
-

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/tools.html Deleted

@@ -1,93 +0,0 @@
- <!DOCTYPE html>
-<html class="client-nojs" lang="ru" dir="ltr">
-<head>
-<meta charset="UTF-8"/>
-	<title>Автономные инструменты</title>
-  <link rel="stylesheet" href="style.css">
-<script src="toc.js" type="text/javascript"></script>
-</head>
-
-<body>
-
-<div id="content">
-<img src="header_text_5.png" >
-
-<script src="tocgen.js"></script>
-
-<div id="toccontent">
-
-<div class="subject-header">Автономные инструменты</div>
-
-<p>
-Flowblade предоставляет автономные инструменты для важных функций, которые не могут быть логически или удобно представлены с помощью вкладок или на монтажном столе.
-</p>
-
-
-<div id="toc"></div>
-
-<h3> Редактор титров </h3>
-<p>Особенности:</p>
-<ul>
-<li> Добавление и удаление слоёв в области слоёв</li>
-<li> Изменение свойств слоя и текста в области активного слоя</li>
-<li> Установка текстового положения, перетаскиванием активного слоя в окне просмотра</li>
-<li> Установка фонового изображения из монтажного стола, для правильного позиционирования текста, перетаскиванием курсора по линейке времени</li>
-<li> Загрузка и сохранение данных слоёв в области слоёв</li>
-</ul>
-<h3> Звуковой микшер </h3>
-<p>Особенности:</p>
-<ul>
-<li> Контроль уровней звука в VU-метрах во время воспроизведения</li>
-<li> Использование ползунков для установки громкости на дорожках или на выходе</li>
-<li> Использование кнопки <b>Панорама</b>, для активации ползунка панорамы и панорамирования звука  </li>
-</ul>
-<h3> Перелинковщик медиа </h3>
-<p>
-<b>Перелинковщик медиа</b> — это автономное приложение, работающее в собственном процессе и не влияющее на проект, открытый в Flowblade. 
-</p>
-<ol>
-<li> Начните с нажатия кнопки <b>Загрузить проект для перелинковки</b> и выберите проект, который хотите восстановить.</li>
-<li> Выберите медиафайл, который вы хотите заменить каким-либо другим медиафайлом. Нажмите кнопку <b>Указать путь к файлу</b> или щёлкните <b>Правой кнопкой мыши</b> по элементу, для выбора нового файла. Клипы и типы вытеснения в проекте будут связаны новым медиафайлом. </li>
-<li> Используйте выпадающее меню внизу слева, чтобы отобразить отсутствующие или найденные мультимедийные файлы.</li>
-<li> Нажмите <b>Сохранить проект как...</b> для повторного сохранения подключенной версии проекта.</li>
-<li> Откройте перелинкованный проект в Flowblade и продолжайте работать с ним.</li>
-<li> Перелинковщик медиа запускается в собственном процессе и не влияет на общее состояние и данные запущенного приложения.</li>
-<li> При повторном открытии проекта в Flowblade, убедитесь, что при сохранении не перезапишите подключенную версию открытого в Flowblade проекта </li>
-</ol>
-
-<h3> Эффекты G'Mic</h3>
-<p>
-G'Mic — полнофункциональная среда с открытым исходным кодом для обработки изображений.
-</p>
-<p>
-Инструмент Flowblade G'Mic представляет пользователю набор кодов, которые могут использоваться для достижения сложной фильтрации видеороликов.</p>
-<p>
-<b>ПРИМЕЧАНИЕ. Если в системе нет предустановленных команд, соответствующий выбор эффектов работать не будет.</b>
-</p>
-<p>
-Команды в основном встроены в двоичный файл <b>/usr/bin/gmic</b> поэтому для получения доступа к большему количеству команд, вам скорее всего потребуется обновить двоичный файл в вашей системе.
-</p>
-<p>
-Тем не менее, можно добавлять пользовательские команды и использовать их в качестве эффектов для видео, более подробно можно ознакомится <a href="  http://gmic.eu/reference.shtml#section11">здесь</a> (eng). 
-</p>
-
-<h4>Загрузка клипов и предпросмотр сборки</h4>
-<ul>
-<li> Начните с нажатия кнопки <b>Загрузить клип</b> и выберите видеоклип, к которому хотите применить эффект.</li>
-<li> Нажмите на треугольник внизу над <b>областью редактирования скриптов</b> в левой части окна, для выбора команды G'Mic.</li>
-<li> В <b>области редактирования скриптов</b> можно менять значения команд.</li>
-<li> Чтобы просмотреть изображение с применённым эффектом, нажмите кнопку <b>Предпросмотр</b> в правой части экрана.</li>
-<li> После того, как вы, просмотрели изображение, под <b>областью редактирования скриптов</b> может последовать текстовый вывод из G'Mic с возможными сообщениями об ошибках.</li>
-<li> Вы можете применить несколько команд, установив флажок <b>Добавить в скрипт</b>.</li>
-</ul>
-<h4>Сборка</h4>
-<ul>
-<li> Для сборки последовательности кадров, необходимо выбрать <b>Начало и конец участка</b> и  <b>выбрать папку</b> для хранения отображаемой последовательности кадров. </li>
-<li> Для сборки видеофайла из отфильтрованной последовательности кадров, установите флажок <b>Кодировать видео</b> и нажмите кнопку <b>Параметры кодирования</b>, для определения свойств собираемого видеофайла.</li>
-</ul>
-
-</div>
-</div>
-</body>
-
-</html>

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/wrong_comp.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/ru/wrong_timeline.png Deleted

_service:obs_scm:flowblade-2.18.1.obscpio/README.md -> _service:obs_scm:flowblade-2.20.obscpio/README.md Changed

@@ -2,6 +2,8 @@
 
 !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)**
+
 1. Introduction(https://github.com/jliljebl/flowblade#introduction)
 2. Features(https://github.com/jliljebl/flowblade#features)
 3. Releases(https://github.com/jliljebl/flowblade#releases)
@@ -16,13 +18,13 @@
 
 **--- FIX FOR NON_WORKING VIDEO PREVIEW ISSUE ---**
 
-**Start application from terminal with command:**
+**Fix is to update to the latest version 2.20.**
+
+**If not possible, start application from terminal with command:**
 
 ```
 SDL12COMPAT_NO_QUIT_VIDEO=1 GDK_BACKEND=x11 SDL_VIDEODRIVER=x11  /usr/bin/flowblade 
 ```
-**More info on Issue here: Issue #1134(https://github.com/jliljebl/flowblade/issues/1134)**
-
 **--- FIX FOR NON_WORKING VIDEO PREVIEW ISSUE ---**
 
 # Introduction
@@ -56,7 +58,7 @@
 **Advanced features:**
 * **Generators:** Powerful media generator plugin framework available to create e.g. animated texts and backgrounds.
 * **Range Log:** Save and edit clip in/out ranges to easily utilize best parts of your material
-* **G'Mic Tool:** Create media with beatiful, complex effects not available in any other editor
+* **G'Mic Tool:** Create media with beautiful, complex effects not available in any other editor
 * **Text Tool:** Create text plates with a handy purpose build tool with large set of features like text shadow, outline etc.
 * **Batch Encoding:** Render multiple output clips automatically 
 * **Media re-linking:** Fix projects with missing media to be editable again.
@@ -75,7 +77,7 @@
 
 # Releases
 
-**Latest release:** Flowblade Movie Editor 2.16 was released in May 2024.
+**Latest release:** Flowblade Movie Editor 2.20 was released in March 2025.
 
 # Installing Flowblade

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/app.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/app.py Changed

@@ -449,6 +449,8 @@
             GLib.idle_add(_create_sdl_2_consumer)
 
         self.add_window(_window)
+        if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
+            self.add_window(gui.editor_window.window2)
 
 # --------------------------------------- display
 def _create_sdl_2_consumer():
@@ -478,11 +480,13 @@
     callbackbridge.compositeeditor_get_compositor = compositeeditor.get_compositor
     callbackbridge.compositormodes_get_snapped_x = compositormodes.get_snapped_x
     callbackbridge.compositormodes_get_pointer_context = compositormodes.get_pointer_context
+    callbackbridge.dialogs_show_cyclic_error = dialogs.show_cyclic_error 
     callbackbridge.editevent_do_multiple_clip_insert = editevent.do_multiple_clip_insert
     callbackbridge.medialog_clips_drop = medialog.clips_drop
     callbackbridge.mediaplugin_get_clip = mediaplugin.get_clip
     callbackbridge.mediaplugin_set_plugin_to_be_edited = mediaplugin.set_plugin_to_be_edited
     callbackbridge.modesetting_set_default_edit_mode = modesetting.set_default_edit_mode
+    callbackbridge.modesetting_kftool_mode_from_kf_editor = modesetting.kftool_mode_from_kf_editor
     callbackbridge.movemodes_select_clip = movemodes.select_clip
     callbackbridge.movemodes_select_from_box_selection = movemodes.select_from_box_selection
     callbackbridge.projectaction_open_rendered_file = projectaction.open_rendered_file
@@ -561,6 +565,8 @@
     editorlayout.set_positions_frames_visibility()
         
     # All widgets are now realized and references captured so can find out theme colors.
+    # TODO: Delete this code, we are not detecting anything anymore and theme colors not
+    # variable anymore.
     gui.set_theme_colors()
     tlinewidgets.set_dark_bg_color()
     gui.pos_bar.set_dark_bg_color()
@@ -1190,13 +1196,13 @@
     stop_usb_hid_input()
 
     # Now that autosave file is deleted, the data folder contents for unsaved
-    # projects are unreachable and can be destoyed.
+    # projects are unreachable and can be destroyed.
     projectdatavault.delete_unsaved_data_folders()
 
     # Calling _app.quit() will block if Gio.Application.hold() has been called,
     # and the documentation helpfully says "(Note that you may have called 
     # Gio.Application.hold() indirectly, for example through gtk_application_add_window().)"
-    # I'm not calling add_window() on render processess but somehow those call Gio.Application.hold()
+    # I'm not calling add_window() on render processes but somehow those call Gio.Application.hold()
     # but I don't know where. 
     #
     # However, those processes complete and exit cleanly and the only problem

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/appconsts.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/appconsts.py Changed

@@ -41,7 +41,7 @@
 SHOW_AUDIO_FILES = 2
 SHOW_GRAPHICS_FILES = 3
 SHOW_IMAGE_SEQUENCES = 4
-SHOW_PATTERN_PRODUCERS = 5
+SHOW_CONTAINERS = 5
 SHOW_UNUSED_FILES = 6
 
 # These are used to draw indicators that tell if more frames are available while trimming.
@@ -309,6 +309,7 @@
 CONTAINER_CLIP_CAIRO_SCRIPT = 2
 CONTAINER_CLIP_BLENDER = 3 # DEPRECATED
 CONTAINER_CLIP_FLUXITY = 4
+CONTAINER_CLIP_SEQUENCE_LINK = 5
 
 CONTAINER_CLIP_VIDEO_CLIP_NAME = "container_clip"
 
@@ -386,7 +387,7 @@
 STABILIZE_DATA_EXTENSION = ".stabdata"
 MOTION_TRACKING_DATA_EXTENSION = ".trackdata"
 
-# magic values string propertie that have not been set yet.
+# magic values string properties that have not been set yet.
 FILE_PATH_NOT_SET = "!!##PATHNOTSET##!!"
 TRACKING_DATA_NOT_SET = "!!##TRACKINGDATANOTSET##!!"
 
@@ -418,3 +419,8 @@
 DEFAULT_RENDER_CLIP = "clip"
 DEFAULT_RENDER_ALPHA_CLIP = "alphaclip"
 DEFAULT_RENDER_FRAME_SEQUENCE = "framesequecne"
+
+AUDIO_AUTO_SPLIT_OFF = 0
+AUDIO_AUTO_SPLIT_ALL_TACKS = 1
+AUDIO_AUTO_SPLIT_V1_V2 = 2
+AUDIO_AUTO_SPLIT_V1 = 3

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/boxmove.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/boxmove.py Changed

@@ -19,7 +19,7 @@
 """
 
 """
-Handles Box tool functionality.
+Handles box selection functionality, moves and deletes.
 """
 
 import appconsts
@@ -97,7 +97,7 @@
         
     if box_selection_data == None: # mouse action is to select
         box_selection_data = BoxMoveData(edit_data"press_point", (x, y))
-        
+
         locked_track = box_selection_data.get_possible_locked_track()
         if locked_track != None:
             dialogutils.track_lock_check_and_user_info(locked_track)
@@ -298,7 +298,7 @@
     def __init__(self, i, start_frame, end_frame):
         self.track_id = i
         self.selected_range_in  = -1
-        self.selected_range_out = -1
+        self.selected_range_out = -1 # inclusive
         self.range_frame_in  = -1
         self.range_frame_out = -1
         self.clip_lengths = 
@@ -372,4 +372,36 @@
 
         return False
 
+def box_selection_splice_out():
+    global box_selection_data, edit_data
+    
+    # Do edit
+    data = {"box_selection_data":box_selection_data}
+    action = edit.box_splice_out_action(data)
+    action.do_edit()
+
+    # Back to start state
+    edit_data = None
+    box_selection_data = None
+    
+    # Exit box mode if entered from overwrite with empty selection
+    if entered_from_overwrite == True:
+        _exit_to_overwrite()
+        return
+
+def box_selection_lift():
+    global box_selection_data, edit_data
+    
+    # Do edit
+    data = {"box_selection_data":box_selection_data}
+    action = edit.box_lift_action(data)
+    action.do_edit()
 
+    # Back to start state
+    edit_data = None
+    box_selection_data = None
+    
+    # Exit box mode if entered from overwrite with empty selection
+    if entered_from_overwrite == True:
+        _exit_to_overwrite()
+        return

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/callbackbridge.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/callbackbridge.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/clipeffectseditor.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/clipeffectseditor.py Changed

@@ -248,20 +248,60 @@
         surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "trash.png")
         trash_button = guicomponents.PressLaunch(self.trash_pressed, surface, w=22, h=22)
         
+        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filters_up_arrow.png")
+        up_button = guicomponents.PressLaunch(self.up_pressed, surface, w=10, h=22)
+        up_button.surface_x = 0
+
+        surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filters_down_arrow.png")
+        down_button = guicomponents.PressLaunch(self.down_pressed, surface, w=10, h=22)
+        down_button.surface_x = 0
+        down_button.surface_y = 10
+        
         self.trash_vbox = Gtk.VBox(False, 0)
         self.trash_vbox.pack_start(trash_button.widget, False, False, 0)
         self.trash_vbox.pack_start(Gtk.Label(), True, True, 0)
+
+        self.up_vbox = Gtk.VBox(False, 0)
+        self.up_vbox.pack_start(up_button.widget, False, False, 0)
+        self.up_vbox.pack_start(Gtk.Label(), True, True, 0)
+
+        self.down_vbox = Gtk.VBox(False, 0)
+        self.down_vbox.pack_start(down_button.widget, False, False, 0)
+        self.down_vbox.pack_start(Gtk.Label(), True, True, 0)
         
         self.widget = Gtk.HBox(False, 0)
         self.widget.pack_start(self.active_check_vbox, False, False, 0)
         self.widget.pack_start(self.expander_frame, True, True, 0)
         self.widget.pack_start(self.trash_vbox, False, False, 0)
+        self.widget.pack_start(self.up_vbox, False, False, 0)
+        self.widget.pack_start(self.down_vbox, False, False, 0)
         self.widget.pack_start(guiutils.pad_label(10,2), False, False, 0)
+
         self.widget.show_all()
 
     def trash_pressed(self, w, e):
         self.filter_stack.delete_filter_for_stack_item(self)
-    
+
+    def up_pressed(self, w, e):
+        from_index = self.filter_stack.get_filter_index(self.filter_object)
+        if len(self.filter_stack.filter_stack) == 1:
+            return
+        if from_index == 0:
+            return
+        to_index = from_index - 1
+
+        do_stack_move(self.filter_stack.clip, to_index, from_index, False)
+
+    def down_pressed(self, w, e):
+        from_index = self.filter_stack.get_filter_index(self.filter_object)
+        if len(self.filter_stack.filter_stack) == 1:
+            return
+        if from_index == len(self.filter_stack.filter_stack) - 1:
+            return
+        to_index = from_index + 1
+
+        do_stack_move(self.filter_stack.clip, to_index, from_index, False)
+
     def toggle_filter_active(self, widget):
         self.filter_object.active = (self.filter_object.active == False)
         self.filter_object.update_mlt_disabled_value()
@@ -322,7 +362,7 @@
             edit_panel.pack_start(guiutils.pad_label(12,12), False, False, 0)
             stack_item = FilterStackItem(filter_object, edit_panel, self)
             
-            # Put eveything back
+            # Put everything back
             self.filter_stack.insert(stack_index, stack_item)
             for stack_item in self.filter_stack:
                 self.widget.pack_start(stack_item.widget,False, False, 0)
@@ -461,6 +501,11 @@
 
     gui.editor_window.edit_multi.set_visible_child_name(appconsts.EDIT_MULTI_FILTERS)
 
+
+def set_clip_and_filter(clip, track, clip_index, filter_index):
+    set_clip(clip, track, clip_index, True)
+    _filter_stack.set_single_expanded(filter_index)
+
 def refresh_clip():
     if _filter_stack == None:
         return 
@@ -688,7 +733,7 @@
     update_stack(clip, track, clip_index)
     _filter_stack.set_expanded(expanded_panels)
 
-def do_stack_move(clip, insert_row, delete_row):
+def do_stack_move(clip, insert_row, delete_row, expand=True):
     data = {"clip":clip,
             "insert_index":insert_row,
             "delete_index":delete_row,
@@ -696,7 +741,10 @@
     action = edit.move_filter_action(data)
     set_stack_update_blocked()
     action.do_edit()
-    _filter_stack.set_single_expanded(insert_row)
+    if expand:
+        _filter_stack.set_single_expanded(insert_row)
+    else:
+        _filter_stack.set_all_filters_expanded_state(False)
     set_stack_update_unblocked()
 
 def reinit_stack_if_needed(force_update):

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/clipenddragmode.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/clipenddragmode.py Changed

@@ -22,6 +22,7 @@
 Module handles clip end dragging edits.
 """
 
+from gi.repository import Gdk
 
 import appconsts
 import gui
@@ -35,8 +36,16 @@
 _enter_mode = None
 _enter_draw_func = None
 
+# we are handling difference between insert on overwrite drags internally in
+# this module.
+INSERT_DRAG = 0
+OVERWRITE_DRAG = 1
+_submode = INSERT_DRAG
 
-def maybe_init_for_mouse_press(event, frame): 
+def get_submode():
+    return _sub_mode
+
+def maybe_init_for_mouse_press(event, frame):
     # See if we actually hit a clip
     track = tlinewidgets.get_track(event.y)
     if track == None:
@@ -53,10 +62,20 @@
     
     if clip.is_blanck_clip:
         return
-    
+
+    cut_frame = current_sequence().get_closest_cut_frame(track.id, frame)
+
+    if (event.get_state() & Gdk.ModifierType.MOD1_MASK):
+        _init_overwrite_drag(clip, clip_index, track, frame, cut_frame)
+    else:
+        _init_insert_drag(clip, clip_index, track, frame, cut_frame)
+
+def _init_insert_drag(clip, clip_index, track, frame, cut_frame):
+    global _submode
+    _submode = INSERT_DRAG
+
     # Now we will in fact enter CLIP_END_DRAG edit mode
     # See if we're dragging clip end or start
-    cut_frame = current_sequence().get_closest_cut_frame(track.id, frame)
     editing_clip_end = True
     if frame >= cut_frame:
         editing_clip_end = False
@@ -70,7 +89,7 @@
             bound_end = bound_end - 1
     else: # clip beginning drags
         bound_start = cut_frame - clip.clip_in 
-        bound_end =  cut_frame + (clip.clip_out - clip.clip_in) + 1
+        bound_end = cut_frame + (clip.clip_out - clip.clip_in) + 1
 
     global _enter_mode, _enter_draw_func, _edit_data
 
@@ -88,21 +107,113 @@
     _edit_data"editing_clip_end" = editing_clip_end
     _edit_data"bound_end" = bound_end
     _edit_data"bound_start" = bound_start
+    _edit_data"clip_end" = bound_end
+    _edit_data"clip_start" = bound_start
     _edit_data"track_height" = track.height
     _edit_data"orig_in" = cut_frame - 1
     _edit_data"orig_out" = cut_frame + (clip.clip_out - clip.clip_in)
+    _edit_data"submode" = _submode
+
+    _enter_mouse_drag_edit(editing_clip_end)
+
+def _init_overwrite_drag(clip, clip_index, track, frame, cut_frame):
+    global _submode
+    _submode = OVERWRITE_DRAG
+    
+    # Now we will in fact enter CLIP_END_DRAG edit mode
+    # See if we're dragging clip end or start
+    editing_clip_end = True
+    edit_frame = cut_frame 
+        
+    if frame >= cut_frame:
+        editing_clip_end = False
+
+    # Can't do overwrite drag on track first clip start or last clip end. 
+    if clip_index == 0 and editing_clip_end == False:
+        _init_insert_drag(clip, clip_index, track, frame, cut_frame)
+        return
+    elif clip_index == (len(track.clips) - 1) and editing_clip_end == True:
+        _init_insert_drag(clip, clip_index, track, frame, cut_frame)
+        return
+
+    from_clip, to_clip = _get_from_clip_and_to_clip(editing_clip_end, track, clip_index)
+
+    # Get edit bounds and clip start/end on tline for draw func
+    if editing_clip_end == True: # clip end drags
+
+        clip_start = cut_frame - (clip.clip_out - clip.clip_in)
+        clip_end = cut_frame
+
+        to_clip_start = track.clip_start(clip_index + 1) - to_clip.clip_in
+        to_clip_end = track.clip_start(clip_index + 1) + to_clip.clip_length() 
+        from_clip_start = track.clip_start(clip_index) 
+        from_clip_end = track.clip_start(clip_index) + from_clip.get_length() - from_clip.clip_in
+    else: # clip beginning drags
+        clip_start = cut_frame
+        clip_end = cut_frame + (to_clip.clip_out - to_clip.clip_in) + 1
+        
+        to_clip_start = track.clip_start(clip_index) - to_clip.clip_in
+        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:
+        bound_start = to_clip_start
+    else:
+        bound_start = from_clip_start
+    
+    if from_clip_end < to_clip_end:
+        bound_end = from_clip_end
+    else:
+        bound_end = to_clip_end
+            
+    global _enter_mode, _enter_draw_func, _edit_data
+
+    _enter_mode = editorstate.edit_mode
+    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
+    _edit_data"clip_media_type" = clip.media_type
+    _edit_data"frame" = frame
+    _edit_data"press_frame" = frame
+    _edit_data"edit_frame" = edit_frame
+    _edit_data"editing_clip_end" = editing_clip_end
+    _edit_data"bound_end" = bound_end
+    _edit_data"bound_start" = bound_start
+    _edit_data"clip_end" = clip_end
+    _edit_data"clip_start" = clip_start
+    _edit_data"track_height" = track.height
+    _edit_data"orig_in" = clip_start - 1
+    _edit_data"orig_out" = clip_end
+    _edit_data"submode" = _submode
+
+    _enter_mouse_drag_edit(editing_clip_end)
+
+def _enter_mouse_drag_edit(editing_clip_end):
     tlinewidgets.set_edit_mode(_edit_data, tlinewidgets.draw_clip_end_drag_overlay)
 
     if tlinewidgets.pointer_context == appconsts.POINTER_CONTEXT_NONE:
-        # We did CTRL + Mouse Right to get here, we need to set pointer context to left or right
         if editing_clip_end == True:
             tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_END_DRAG_RIGHT
         else:
             tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_END_DRAG_LEFT
 
     gui.editor_window.tline_cursor_manager.set_cursor_to_mode()
-
+    
+def _get_from_clip_and_to_clip(editing_clip_end, track, clip_index):
+    if editing_clip_end == True:
+        from_clip = track.clipsclip_index
+        to_clip = track.clipsclip_index + 1
+    else:
+        from_clip = track.clipsclip_index - 1
+        to_clip = track.clipsclip_index
+    
+    return (from_clip, to_clip)
+    
 def mouse_press(event, frame):
     frame = _legalize_frame(frame)
     _edit_data"frame" = frame
@@ -115,6 +226,13 @@
     updater.repaint_tline()
 
 def mouse_release(x, y, frame, state):
+    if _submode == INSERT_DRAG:
+        _do_insert_trim(x, y, frame, state)
+    else:
+        _do_overwrite_trim(x, y, frame, state)
+
+
+def _do_insert_trim(x, y, frame, state):
     frame = _legalize_frame(frame)
     _edit_data"frame" = frame
     updater.repaint_tline()
@@ -201,7 +319,51 @@
     _exit_clip_end_drag()
 
     updater.repaint_tline()
-        
+
+def _do_overwrite_trim(x, y, frame, state):
+    frame = _legalize_frame(frame)
+
+    updater.repaint_tline()
+
+    track = _edit_data"track"

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/clipmenuaction.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/clipmenuaction.py Changed

@@ -27,9 +27,11 @@
 from gi.repository import GLib
 from gi.repository import Gtk
 
+import copy
 from operator import itemgetter
 import os
 import time
+import hashlib
 
 import audiosync
 import appconsts
@@ -53,12 +55,14 @@
 import movemodes
 import projectaction
 import render
+import renderconsumer
 import singletracktransition
 import syncsplitevent
 import titler
 import tlinewidgets
 import tlineaction
 import updater
+import userfolders
 import utils
 
 # --------------------------------------------- menu data for each invocation.
@@ -472,7 +476,48 @@
 
 def _lift(data):
     tlineaction.lift_button_pressed()
+
+def _ripple_delete(data):
+    clip, track, item_id, item_data = data
+    clip_index = track.clips.index(clip)
+    clip_start_in_tline = track.clip_start(clip_index)
+    clip_end_in_tline = clip_start_in_tline + (clip.clip_out - clip.clip_in)
+
+    orig_mark_in = current_sequence().tractor.mark_in 
+    orig_mark_out = current_sequence().tractor.mark_out
+    
+    current_sequence().tractor.mark_in = clip_start_in_tline
+    current_sequence().tractor.mark_out = clip_end_in_tline
+
+    tlineaction.delete_range_button_pressed()
+
+    current_sequence().tractor.mark_in = orig_mark_in
+    current_sequence().tractor.mark_out = orig_mark_out
+    
+    updater.repaint_tline()
+
+def _ripple_delete_selection(data):
+    clip, track, item_id, item_data = data
+
+    start_clip_start_in_tline = track.clip_start(movemodes.selected_range_in)
+
+    end_clip = track.clipsmovemodes.selected_range_out
+    end_clip_start_in_tline = track.clip_start(movemodes.selected_range_out)
+    end_clip_end_in_tline = end_clip_start_in_tline + (end_clip.clip_out - end_clip.clip_in)
+
+    orig_mark_in = current_sequence().tractor.mark_in 
+    orig_mark_out = current_sequence().tractor.mark_out
+    
+    current_sequence().tractor.mark_in = start_clip_start_in_tline
+    current_sequence().tractor.mark_out = end_clip_end_in_tline
+
+    tlineaction.delete_range_button_pressed()
+
+    current_sequence().tractor.mark_in = orig_mark_in
+    current_sequence().tractor.mark_out = orig_mark_out
     
+    updater.repaint_tline()
+
 def _set_length(data):
     clip, track, item_id, item_data = data
     dialogs.clip_length_change_dialog(_change_clip_length_dialog_callback, clip, track)
@@ -707,8 +752,10 @@
     source_clip = paste_clips0
 
     # Currently selected clips are target clips
-    target_clips = clip
-    
+    target_clips = 
+    for i in range(movemodes.selected_range_in, movemodes.selected_range_out + 1):
+         target_clips.append(track.clipsi)
+
     actions =     
     for target_clip in target_clips:
         data = {"clip":target_clip,"clone_source_clip":source_clip}
@@ -777,6 +824,32 @@
     movemodes._select_multiple_clips(track.id, 0, track.clips.index(clip))
     updater.repaint_tline()
 
+def _mark_clip_range(data):
+    clip, track, item_id, item_data = data
+
+    clip_index = track.clips.index(clip)
+    clip_start_in_tline = track.clip_start(clip_index)
+    clip_end_in_tline = clip_start_in_tline + (clip.clip_out - clip.clip_in)
+    
+    current_sequence().tractor.mark_in = clip_start_in_tline
+    current_sequence().tractor.mark_out = clip_end_in_tline
+
+    updater.repaint_tline()
+
+def _mark_selection_range(data):
+    clip, track, item_id, item_data = data
+
+    start_clip_start_in_tline = track.clip_start(movemodes.selected_range_in)
+
+    end_clip = track.clipsmovemodes.selected_range_out
+    end_clip_start_in_tline = track.clip_start(movemodes.selected_range_out)
+    end_clip_end_in_tline = end_clip_start_in_tline + (end_clip.clip_out - end_clip.clip_in)
+    
+    current_sequence().tractor.mark_in = start_clip_start_in_tline
+    current_sequence().tractor.mark_out = end_clip_end_in_tline
+    
+    updater.repaint_tline()
+    
 def _add_clip_marker(data):
     clip, track, item_id, item_data = data
     current_frame = PLAYER().current_frame()
@@ -788,7 +861,6 @@
         current_frame_clip = None
     
     if current_frame_clip != clip:
-        # Playhead is not on popup clip
         return
 
     clip_start_in_tline = track.clip_start(current_frame_clip_index)
@@ -887,23 +959,78 @@
 def _set_audio_sync_clip(data):
     audiosync.init_select_tline_sync_clip(_get_data_with_xpos(data))
 
+def _set_container_default_enconding(data):
+    containerclip.set_project_default_video_endoding(data)
+
 def _render_tline_generator(data):
     clip, track, item_id, item_data = data
     clip, track, x = _popover_clip_data
     containerclip.render_tline_generator_clip(clip, _render_tline_generator_callback)
 
 def _render_tline_generator_callback(combo):
+    # Use selected render options are saved in clip.container_data.render_data 
     clip, track, x = _popover_clip_data
-    render_data = (clip, None, None, None) # We keep old data package format for now.
+    render_data_packet = (clip, None, None, None) # We keep old data package format for now.
     if combo.get_active() == 0: # 0 is render full media, see containeractions.set_video_endoding()
-        containerclip.render_full_media(render_data)
+        containerclip.render_full_media(render_data_packet)
     else:
-        containerclip.render_clip_length(render_data)
+        containerclip.render_clip_length(render_data_packet)
 
     """
     TODO: see if "cc_render_full_media", "cc_render_settings" can be deleted below.
     """
 
+def _update_seq_link(data):
+    clip, track, item_id, item_data = data
+
+    link_sequence = PROJECT().get_sequence_for_uid(clip.link_seq_data)
+    if link_sequence == None:
+        # Sequence has been deleted.
+        # TODO: info
+        return 
+
+    # 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"
+    
+    render_player = renderconsumer.XMLRenderPlayer( write_file, _sequence_link_update_xml_render_done_callback, 
+                                                    (clip, track, write_file), link_sequence, 
+                                                    PROJECT(), PLAYER())
+    render_player.start()
+
+def _sequence_link_update_xml_render_done_callback(data):
+    # We need to do this in a Gdk lock holding thread because it does GUI updates.
+    GLib.idle_add(_do_seq_link_tline_edit, data)
+
+def _do_seq_link_tline_edit(data):
+    # We do GUI updates on add, so we need GLib thread.
+    clip, track, write_file = data
+
+    # Container clips, create new container_data object and generate uuid for clip so it gets it own folder in.$XML_DATA/.../container_clips
+    new_clip = current_sequence().create_file_producer_clip(write_file, clip.name, False, clip.ttl)
+    new_clip.container_data = copy.deepcopy(clip.container_data)
+    # Unlike every other seq link update clip replace we need updated container data, e.g. 'unrendered_media' in container data is different between 
+    # new clip and old clip, and 'unrendered_media' is used if this updated xml clip is rendered.
+    new_clip.container_data.unrendered_media = write_file
+    new_clip.container_data.program = write_file # for consistencys sake, not used in this container type.
+    new_clip.container_data.rendered_media = None # updated sequence has not been rendered to video.
+    new_clip.container_data.rendered_media_range_in = -1
+    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)
+    
+    clip_index = track.clips.index(clip)
+

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/compositorfades.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/compositorfades.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/containeractions.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/containeractions.py Changed

@@ -37,6 +37,7 @@
 
 import appconsts
 import callbackbridge
+import ccrutils
 import dialogutils
 import edit
 import editorstate
@@ -65,7 +66,7 @@
 all actions on container clips data.
 
 Objects of class containerclips.ContainerData are persistent data for container clips, 
-objects in this module created and discarded as needed.
+objects in this module are created and discarded as needed.
 """
 
 FULL_RENDER = 0
@@ -78,6 +79,7 @@
 MLT_XML_TYPE_ICON = None
 BLENDER_TYPE_ICON = None # Deprecated
 FLUXITY_TYPE_ICON = None
+SEQUENCE_LINK_TYPE_ICON = None
 
 NEWLINE = '\n'
 
@@ -90,11 +92,13 @@
          return MLTXMLContainerActions(container_data)
     elif container_data.container_type == appconsts.CONTAINER_CLIP_FLUXITY:
          return FluxityContainerActions(container_data)
+    elif container_data.container_type == appconsts.CONTAINER_CLIP_SEQUENCE_LINK:
+         return SequenceLinkContainerActions(container_data)
          
 # ------------------------------------------------------------ thumbnail creation helpers
 def _get_type_icon(container_type):
-    # TODO: When we get third move this into action objects.
-    global GMIC_TYPE_ICON, MLT_XML_TYPE_ICON, FLUXITY_TYPE_ICON
+    # TODO: We should move this into action objects.
+    global GMIC_TYPE_ICON, MLT_XML_TYPE_ICON, FLUXITY_TYPE_ICON, SEQUENCE_LINK_TYPE_ICON
     
     if GMIC_TYPE_ICON == None:
         GMIC_TYPE_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "container_clip_gmic.png")
@@ -102,6 +106,8 @@
         MLT_XML_TYPE_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "container_clip_mlt_xml.png")
     if FLUXITY_TYPE_ICON == None:
         FLUXITY_TYPE_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "container_clip_fluxity.png")
+    if SEQUENCE_LINK_TYPE_ICON == None:
+        SEQUENCE_LINK_TYPE_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "container_sequence_link_icon.png")
         
     if container_type == appconsts.CONTAINER_CLIP_GMIC:
         return GMIC_TYPE_ICON
@@ -109,7 +115,9 @@
         return MLT_XML_TYPE_ICON
     elif container_type == appconsts.CONTAINER_CLIP_FLUXITY:  
         return FLUXITY_TYPE_ICON
-        
+    elif container_type == appconsts.CONTAINER_CLIP_SEQUENCE_LINK:
+        return SEQUENCE_LINK_TYPE_ICON
+
 def _write_thumbnail_image(profile, file_path, action_object):
     """
     Writes thumbnail image from file producer
@@ -158,7 +166,8 @@
         self.container_data = container_data
         self.render_type = -1 # to be set in methods below
         self.do_filters_clone = False
-        
+        self.video_file_name = None
+
     def create_data_dirs_if_needed(self):
         session_folder = self.get_session_dir()
         clip_frames_folder = session_folder + appconsts.CC_CLIP_FRAMES_DIR
@@ -170,6 +179,25 @@
         if not os.path.exists(rendered_frames_folder):
             os.mkdir(rendered_frames_folder)
 
+    def clone_container_data_files(self, orig_clip):
+        if orig_clip.container_data.rendered_media != None:
+            orig_clip_action = get_action_object(orig_clip.container_data)
+            src_dir = orig_clip_action.get_session_dir()
+            dst_dir = self.get_session_dir()
+            
+            shutil.copytree(src_dir, dst_dir)
+            
+            # Fix 'rendered_media' path.
+            rendered_path = None
+            for f in os.listdir(orig_clip_action.get_session_dir()):
+                if os.path.basename(f).split()0 == "caintainer_clip":
+                    rendered_path = f
+
+            self.container_data.rendered_media = rendered_path
+
+        # This is only used between containers in same project so not cloning 
+        # file pointed to by 'container_data.unrendered_media' is acceptable.
+
     def validate_program(self):
         print("AbstractContainerActionObject.validate_program() not impl")
 
@@ -180,7 +208,7 @@
         job_proxy = self.get_launch_job_proxy()
         jobs.add_job(job_proxy)
         
-        # Render starts on callback from jobs.py
+        # Render starts on callback from jobs.py self._launch_render()
         
     def render_clip_length_media(self, clip):
         self.render_type = CLIP_LENGTH_RENDER
@@ -290,9 +318,13 @@
 
     def get_rendered_video_clip_path(self):
         if self.container_data.render_data.save_internally == True:
-            resource_path = self.get_session_dir() +  "/" + appconsts.CONTAINER_CLIP_VIDEO_CLIP_NAME + self.container_data.render_data.file_extension
+            if self.video_file_name == None:
+                file_name = appconsts.CONTAINER_CLIP_VIDEO_CLIP_NAME
+            else:
+                file_name = self.video_file_name
+            resource_path = self.get_session_dir() + "/" + appconsts.CONTAINER_CLIP_VIDEO_CLIP_NAME + self.container_data.render_data.file_extension
         else:
-            resource_path = self.container_data.render_data.render_dir +  "/" + self.container_data.render_data.file_name + self.container_data.render_data.file_extension
+            resource_path = self.container_data.render_data.render_dir + "/" + self.container_data.render_data.file_name + self.container_data.render_data.file_extension
     
         return resource_path
     
@@ -310,7 +342,7 @@
     def abort_render(self):
         print("AbstractContainerActionObject.abort_render not impl")
 
-    def create_producer_and_do_update_edit(self, unused_data):
+    def create_producer_and_do_update_edit(self, unused_data, video_file_name=None):
 
         # Using frame sequence as clip
         if  self.container_data.render_data.do_video_render == False:
@@ -362,7 +394,7 @@
         # Create default render data if not available, we need to know profile to do this.
         if self.container_data.render_data == None:
             self.container_data.render_data = toolsencoding.create_container_clip_default_render_data_object(current_sequence().profile)
-            
+    
         encoding_panel = toolsencoding.get_encoding_panel(self.container_data.render_data, True)
         if show_render_buttons == True:
             render_combo = Gtk.ComboBoxText()
@@ -410,7 +442,36 @@
                     self.external_encoding_callback(self.render_combo)
                     
         dialog.destroy()
+
+    def set_project_default_video_endoding(self):
+        current_profile_index = mltprofiles.get_profile_index_for_profile(current_sequence().profile)
+        # These need to re-initialized always when using this module.
+        toolsencoding.create_widgets(current_profile_index, True, True)
+
+        encoding_panel = toolsencoding.get_default_encoding_setting_panel(PROJECT().container_default_encoding)
+        encoding_panel.set_margin_right(150)
+        align = dialogutils.get_default_alignment(encoding_panel)
         
+        dialog = Gtk.Dialog(_("Set Container Default Encoding"),
+                            gui.editor_window.window,
+                            Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                            (_("Cancel"), Gtk.ResponseType.REJECT,
+                             (_("Set Default Encoding")), Gtk.ResponseType.ACCEPT))
+        dialog.vbox.pack_start(align, True, True, 0)
+        dialogutils.set_outer_margins(dialog.vbox)
+        dialog.set_resizable(False)
+        dialog.connect('response', self.default_encode_settings_callback)
+        dialog.show_all()
+
+    def default_encode_settings_callback(self, dialog, response_id):
+        if response_id == Gtk.ResponseType.ACCEPT:
+            encoding_panel = toolsencoding.widgets.encoding_panel
+            encoding_option_index = encoding_panel.encoding_selector.get_selected_encoding_index()
+            quality_option_index = encoding_panel.quality_selector.widget.get_active()
+            default_encoding = (encoding_option_index, quality_option_index)
+            PROJECT().container_default_encoding = default_encoding
+        dialog.destroy()
+
     def clone_clip(self, old_clip):
         new_container_data = copy.deepcopy(old_clip.container_data)
         new_container_data.generate_clip_id()
@@ -463,6 +524,7 @@
     def create_image_surface(self, icon_path):
         return _create_image_surface(icon_path)
 
+
 class GMicContainerActions(AbstractContainerActionObject):
 
     def __init__(self, container_data):
@@ -545,7 +607,9 @@
         for arg in args:
             command_list.append(arg)
 
-        subprocess.Popen(command_list)
+        # We need to wait() in thread.
+        command_list_runner = ProcessCommandListRunner(command_list)
+        command_list_runner.start()
         
     def update_render_status(self):
         GLib.idle_add(self._do_update_render_status)
@@ -617,6 +681,7 @@
         cr.set_source_surface(type_icon, 1, 30)
         cr.set_operator (cairo.OPERATOR_OVERLAY)
         cr.paint_with_alpha(0.5)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/containerclip.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/containerclip.py Changed

@@ -20,6 +20,7 @@
 
 from gi.repository import Gtk, GLib
 
+import copy
 import hashlib
 import os
 import shutil
@@ -61,15 +62,17 @@
             self.container_clip_uid = -1 # This is set at clip creation time.
 
             self.container_type = container_type
-            self.program = program # path to program file
+            self.program = program # path to program file, used by Generators and Gmic containers.
 
-            self.rendered_media = None
+            self.rendered_media = None # lives in directory specified by 'self.container_clip_uid' in vault 'container_data' directory.
             self.rendered_media_range_in = -1
             self.rendered_media_range_out = -1
             self.last_render_type = containeractions.FULL_RENDER
             
-            self.unrendered_media = unrendered_media
+            self.unrendered_media = unrendered_media # 'unrendered_media' is created before ContainerClipData and 
+                                                     # lives in user file system (GMic) or vault 'rendered_clips' directory (rest).
             self.unrendered_length = None # This is also maximum length for media produced using this container data.
+                                          
             # This gets set later for some container types
             if unrendered_media != None:
                 self.unrendered_type = utils.get_media_type(unrendered_media)
@@ -112,7 +115,7 @@
 
 def render_tline_generator_clip(clip, callback):
     action_object = containeractions.get_action_object(clip.container_data)
-    action_object.set_video_endoding(None, callback, True)
+    action_object.set_video_endoding(None, callback, True) # All generator tline rendering goes via render settins and continues from given callback.
 
 def render_full_media(data):
     clip, track, item_id, item_data = data
@@ -143,6 +146,10 @@
     action_object = containeractions.get_action_object(clip.container_data)
     action_object.edit_program(clip)
 
+def set_project_default_video_endoding(data):
+    clip, track, item_id, item_data = data
+    action_object = containeractions.get_action_object(clip.container_data)
+    action_object.set_project_default_video_endoding()
 
 #------------------------------------------------------------- Cloning
 def clone_clip(clip):
@@ -415,6 +422,13 @@
     _update_gui_for_media_object_add()
 
 
+# ---------------------------------------------------------------------- SEQUENCE LINK
+def create_sequence_link_media_item(xml_file_path, media_name, linked_sequence_uid):
+    container_clip_data = ContainerClipData(appconsts.CONTAINER_CLIP_SEQUENCE_LINK, xml_file_path, xml_file_path)
+    media_item = ContainerClipMediaItem(PROJECT().next_media_file_id, media_name, container_clip_data)
+    PROJECT().add_sequence_link_media_object(media_item, linked_sequence_uid)
+    _update_gui_for_media_object_add()
+    
 
 # ---------------------------------------------------------------- MEDIA FILE OBJECT
 
@@ -440,7 +454,8 @@
         self.has_proxy_file = False
         self.is_proxy_file = False
         self.second_file_path = None
-
+        self.link_seq_data = None
+        
         self.ttl = None
 
         self.current_frame = 0
@@ -454,6 +469,9 @@
         print("create_mlt_producer() not implemented")
 
     def create_icon(self):
+        # NOTE: self.container_data.unrendered_length GETS SET HERE!!!!
+        # it IS NOT VERY OBVIOUS OR EXPECTED THAT THIS IS THE PLACE WHERE THIS GETS DONE!!!
+        # TODO: CHANGE FUNCTION NAME.
         try:
             action_object = containeractions.get_action_object(self.container_data)
             if self.icon_path == None:
@@ -470,3 +488,12 @@
             cr, scaled_icon = containeractions._create_image_surface(self.icon_path)
             self.icon = scaled_icon
 
+# ---------------------------------------------------------------- cloning
+def container_clone(clone_clip, old_clip):
+    clone_clip.container_data = copy.deepcopy(old_clip.container_data)
+    clone_clip.container_data.generate_clip_id()
+
+    action_object = containeractions.get_action_object(clone_clip.container_data)
+    action_object.clone_container_data_files(old_clip)
+    
+    
\ No newline at end of file

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/dialogs.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/dialogs.py Changed

@@ -41,6 +41,7 @@
 import mltprofiles
 import mltfilters
 import mlttransitions
+import mltplayer
 import panels
 import projectdatavaultgui
 import projectdatavault
@@ -403,6 +404,38 @@
     dialog.connect('response', callback)
     dialog.show()
 
+def save_generator_template(callback, default_name, data):
+    dialog = Gtk.FileChooserDialog( _("Save Generator Template"), None,
+                                   Gtk.FileChooserAction.SAVE,
+                                   (_("Cancel"), Gtk.ResponseType.CANCEL,
+                                    _("Save"), Gtk.ResponseType.ACCEPT), None)
+    dialog.set_action(Gtk.FileChooserAction.SAVE)
+    dialog.set_current_name(default_name)
+    dialog.set_do_overwrite_confirmation(True)
+
+    dialog.set_select_multiple(False)
+    file_filter = Gtk.FileFilter()
+    file_filter.set_name(_("Flowblade Generator Template"))
+    file_filter.add_pattern("*" + "generatortemplate")
+    dialog.add_filter(file_filter)
+    
+    dialog.connect('response', callback, data)
+    dialog.show()
+
+def load_generator_template(callback):
+    dialog = Gtk.FileChooserDialog(_("Load Generator Properties"), None,
+                                   Gtk.FileChooserAction.OPEN,
+                                   (_("Cancel"), Gtk.ResponseType.CANCEL,
+                                    _("OK"), Gtk.ResponseType.ACCEPT))
+    dialog.set_action(Gtk.FileChooserAction.OPEN)
+    dialog.set_select_multiple(False)
+    file_filter = Gtk.FileFilter()
+    file_filter.set_name(_("Flowblade Generator Template"))
+    file_filter.add_pattern("*" + "generatortemplate")
+    dialog.add_filter(file_filter)
+    dialog.connect('response', callback)
+    dialog.show()
+    
 def get_media_plugin_length(callback, data):
     dialog = Gtk.Dialog(_("Create Cloned Media Item"), gui.editor_window.window,
                         Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
@@ -488,18 +521,6 @@
         dialog.connect('response', callback, (data, name_entry))
     dialog.show_all()
     
-def save_env_data_dialog(callback):
-    dialog = Gtk.FileChooserDialog(_("Save Runtime Environment Data"),  gui.editor_window.window,
-                                   Gtk.FileChooserAction.SAVE,
-                                   (_("Cancel"), Gtk.ResponseType.CANCEL,
-                                   _("Save"), Gtk.ResponseType.ACCEPT))
-    dialog.set_action(Gtk.FileChooserAction.SAVE)
-    dialog.set_current_name("flowblade_runtime_environment_data")
-    dialog.set_do_overwrite_confirmation(True)
-    dialog.set_select_multiple(False)
-    dialog.connect('response', callback)
-    dialog.show()
-
 def save_cont_clip_edit_data(callback, default_name, edit_data):
     dialog = Gtk.FileChooserDialog(_("Save Container Clip Edit Data"),  gui.editor_window.window,
                                    Gtk.FileChooserAction.SAVE,
@@ -579,7 +600,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.18.1")
+    ver_label = Gtk.Label(label="2.20")
     janne_label = Gtk.Label(label="Copyright 2024 Janne Liljeblad and contributors.")
     page_label = Gtk.Label(label=_("Project page:") + " " + "<a href=\"https://github.com/jliljebl/flowblade\">https://github.com/jliljebl/flowblade</a>")
     page_label.set_use_markup(True)
@@ -720,14 +741,20 @@
         run_type = "FLATPAK"
     else:
         run_type = _("DEVELOPER VERSION")
-
     r4 = guiutils.get_left_justified_box(Gtk.Label(label=_("Running from: ")), Gtk.Label(label=run_type))
 
+    if mltplayer.get_sdl_consumer_version() == mltplayer.SDL_1:
+        p_ver = "SDL 1"
+    else:
+        p_ver = "SDL 2"
+    r5 = guiutils.get_left_justified_box(Gtk.Label(label=_("Consumer type: ")), Gtk.Label(label=p_ver))
+
     vbox = Gtk.VBox(False, 4)
     vbox.pack_start(r1, False, False, 0)
     vbox.pack_start(r2, False, False, 0)
     vbox.pack_start(r3, False, False, 0)
     vbox.pack_start(r4, False, False, 0)
+    vbox.pack_start(r5, False, False, 0)
 
 
     filters = sorted(mltenv.services)
@@ -1121,7 +1148,7 @@
                 "\u2022" + _(" It is recommended that you save Project before completing this operation.\n") + \
                 "\u2022" + _(" There is no Undo for this operation.\n") + \
                 "\u2022" + _(" Current Undo Stack will be destroyed.\n") + \
-                "\u2022" + _(" Replacing current media with shorter or othervise unsuitable media may result in\n   crashes or corrupted project data.")
+                "\u2022" + _(" Replacing current media with shorter or otherwise unsuitable media may result in\n   crashes or corrupted project data.")
     info_label = Gtk.Label(label=info_text)
     info_label.set_use_markup(True)
     info_box = guiutils.get_left_justified_box(info_label)
@@ -1831,7 +1858,7 @@
     dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
 
 def active_jobs_info(active_jobs_count):
-    primary_txt =  _("There are currenly ") + str(active_jobs_count) + _(" active job/s!")
+    primary_txt =  _("There are currently ") + str(active_jobs_count) + _(" active job/s!")
     secondary_txt = _("Let active jobs complete or cancel them before closing the application.")
     dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
 
@@ -1843,7 +1870,7 @@
 
 def no_timeline_ranges_dialog():
     primary_txt = _("Cannot log Ranges from Timelime!")
-    secondary_txt = _("'Range Log' functionality is intented to log areas of interest\nin Media Items.\n\nTo save interesting positions or ranges on Timeline use\nthe 'Timeline Markers' functionality.")
+    secondary_txt = _("'Range Log' functionality is intended to log areas of interest\nin Media Items.\n\nTo save interesting positions or ranges on Timeline use\nthe 'Timeline Markers' functionality.")
     dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
 
 def add_compositor_dialog(compositors, callback):
@@ -1888,5 +1915,66 @@
 
     dialogutils.panel_ok_cancel_dialog(title, panel, accept_text, callback, value_spin)
 
+def set_parent_track_dialog(child_track, callback):
+    title = _("Set Track Clips Sync")
+    accept_text = _("Set")
+    
+    child_track_name = utils.get_track_name(child_track, editorstate.current_sequence())
+    label_text = _("Set Sync for all Clips on Track {} with Track:").format(child_track_name)
+    info_label = Gtk.Label(label=label_text)
+    info_label.set_margin_right(4)
+
+    tracks_combo = Gtk.ComboBoxText()
+    selection_data = 
+    active_index = 0
+    for i in range(len(editorstate.current_sequence().tracks) - 2, 0, -1):
+        track = editorstate.current_sequence().tracksi
+        if track is child_track:
+            continue
+        selection_data.append(track)
+        tracks_combo.append_text(utils.get_track_name(track, editorstate.current_sequence()))
+
+    active_index = 0
+    for i in range(0, len(selection_data)):
+        if selection_datai is editorstate.current_sequence().first_video_track():
+            active_index = i
+    tracks_combo.set_active(active_index)
+
+    hbox = Gtk.HBox(False, 2)
+    hbox.pack_start(info_label, False, False, 0)
+    hbox.pack_start(tracks_combo, False, False, 0)
+
+    panel = dialogutils.get_alignment2(hbox)
+
+    dialogutils.panel_ok_cancel_dialog(title, panel, accept_text, callback, (child_track, selection_data, tracks_combo))
+
+def select_link_sequence_for_container(callback):
+    title = _("Create Sequence Link Container Clip")
+    accept_text = _("Create Sequence Link Container")
+    
+    label_text = _("Create Sequence Link Container for Sequence:")
+    info_label = Gtk.Label(label=label_text)
+    info_label.set_margin_right(4)
+
+    sequences_combo = Gtk.ComboBoxText()
+    selection_data = 
+    active_index = 0
+    for i in range(0, len(editorstate.PROJECT().sequences)):
+        seq = editorstate.PROJECT().sequencesi
+        selection_data.append(seq)
+        sequences_combo.append_text(seq.name)
+    sequences_combo.set_active(0)
+
+    hbox = Gtk.HBox(False, 2)
+    hbox.pack_start(info_label, False, False, 0)
+    hbox.pack_start(sequences_combo, False, False, 0)
+
+    panel = dialogutils.get_alignment2(hbox)
+
+    dialogutils.panel_ok_cancel_dialog(title, panel, accept_text, callback, (sequences_combo, selection_data))
+    
 
-    
\ No newline at end of file
+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)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/edit.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/edit.py Changed

@@ -35,6 +35,7 @@
 from editorstate import current_sequence
 from editorstate import get_track
 from editorstate import PLAYER
+from editorstate import PROJECT
 import mltfilters
 import movemodes
 import mediaplugin
@@ -186,6 +187,13 @@
     new_clip.name = clip.name
     new_clip.titler_data = copy.deepcopy(clip.titler_data)
     new_clip.slowmo_data = copy.deepcopy(clip.slowmo_data)
+    new_clip.link_seq_data = copy.deepcopy(clip.link_seq_data)
+    if clip.sync_data != None:
+        new_clip.sync_data = SyncData()
+        new_clip.sync_data.pos_offset = clip.sync_data.pos_offset
+        new_clip.sync_data.master_clip = clip.sync_data.master_clip
+        new_clip.sync_data.master_clip_track = clip.sync_data.master_clip_track
+        new_clip.sync_data.sync_state = clip.sync_data.sync_state 
     return new_clip
 
 def _create_mute_volume_filter(seq): 
@@ -355,13 +363,11 @@
 
         trackaction.maybe_do_auto_expand(tracks_clips_count_before)
         
+        undo.force_revert_if_cyclic_seq_links(PROJECT())
+        
     def undo(self):
         PLAYER().stop_playback()
 
-        # HACK, see above in __init()__
-        if self.stop_for_edit:
-            PLAYER().consumer.stop()
-
         movemodes.clear_selected_clips()  # selection not valid after change in sequence
         _remove_trailing_blanks_undo(self)
         _consolidate_all_blanks_undo(self)
@@ -371,22 +377,13 @@
         _remove_all_trailing_blanks(None)
 
         resync.calculate_and_set_child_clip_sync_states()
-    
-        # HACK, see above.
-        if self.stop_for_edit:
-            PLAYER().consumer.start()
         
         if do_gui_update:
-            #print("undo() _update_gui")
             self._update_gui()
             
     def redo(self):
         PLAYER().stop_playback()
 
-        # HACK, see above in __init()__
-        if self.stop_for_edit and self.is_part_of_consolidated_group == False:
-            PLAYER().consumer.stop()
-
         movemodes.clear_selected_clips() # selection is not valid after a change in sequence
 
         self.redo_func(self)
@@ -395,10 +392,6 @@
         _remove_trailing_blanks_redo(self)
 
         resync.calculate_and_set_child_clip_sync_states()
-
-        # HACK, see above.
-        if self.stop_for_edit and self.is_part_of_consolidated_group == False:
-            PLAYER().consumer.start()
                 
         # Update GUI.
         if do_gui_update:
@@ -449,24 +442,36 @@
     def do_consolidated_edit(self):
         # There is 1 - n edits in these,
         # and they are assumed to be all of the same type.
-        # ...well, they need to have properties:
+        # More precisely, they need to have properties:
         #    .exit_active_trimmode_on_edit
         #    .turn_on_stop_for_edit
-        #    .exit_active_trimmode_on_edit
         # same for all the consolidated edits for this to work reliably.
         if self.edit_actions0.exit_active_trimmode_on_edit:
             trimmodes.set_no_edit_trim_mode()
 
-        # We only want to do one consumer stop per group.
-        if self.edit_actions0.stop_for_edit or self.edit_actions0.turn_on_stop_for_edit:
-            PLAYER().consumer.stop()
-            
+        # We only do one gui update.
+        global do_gui_update
+        do_gui_update = False
+
         for edit_action in self.edit_actions:
             edit_action.is_part_of_consolidated_group = True
             
             # Tracks autoexpand-on-drop feature needs to be here to avoid caching data.
             tracks_clips_count_before = current_sequence().get_tracks_clips_counts()
 
+            # Some actions like audio splice may need the previous edit_action to 
+            # complete before they can be created, so for these we provide a lambda 
+            # that cretes the edit action.
+            if callable(edit_action) == True:
+                new_edit_action = edit_action()
+                old_index = self.edit_actions.index(edit_action)
+                self.edit_actionsold_index = new_edit_action
+                edit_action = new_edit_action
+
+            # Enable GUI update for last action.
+            if edit_action is self.edit_actionslen(self.edit_actions) - 1:
+                do_gui_update = True
+
             edit_action.redo()
 
             if edit_action.turn_on_stop_for_edit:
@@ -476,22 +481,38 @@
             edit_done_since_last_save = True
 
             trackaction.maybe_do_auto_expand(tracks_clips_count_before)
-        
+
+        do_gui_update = True
+                
         undo.register_edit(self)
 
-        # We only want to do one consumer start per group.
-        if self.edit_actions0.stop_for_edit or self.edit_actions0.turn_on_stop_for_edit:
-            PLAYER().consumer.start()
-            
+        undo.force_revert_if_cyclic_seq_links(PROJECT())
+        
     def redo(self):
+        # We only do one gui update.
+        global do_gui_update
+        do_gui_update = False
+        
         for edit_action in self.edit_actions:
+            if edit_action is self.edit_actionslen(self.edit_actions) - 1:
+                do_gui_update = True
+
             edit_action.redo()
             
     def undo(self):
+        # We only do one gui update.
+        global do_gui_update
+        do_gui_update = False
+        
         for edit_action in reversed(self.edit_actions):
-            #edit_action = self.edit_actionsi
+            if edit_action is self.edit_actions0:
+                do_gui_update = True
+
             edit_action.undo()
-        
+
+
+
+
 # ---------------------------------------------------- compositor sync methods
 def get_full_compositor_sync_data():
     # Returns list of tuples in form (compositor, orig_in, orig_out, clip_start, clip_end)
@@ -555,9 +576,22 @@
         self.clip_in = None
         self.clip_out = None
         self.master_clip = None
+        self.master_clip_track = None
         self.master_inframe = None
         self.master_audio_index = None # this does nothing? try to remove.
-           
+
+def _switch_synched_clip(child_clip, child_track, old_child_clip):
+    # Set sync data
+    resync.clip_added_to_timeline(child_clip, child_track)
+    resync.clip_removed_from_timeline(old_child_clip)
+
+def _clone_sync_data(new_clip, clip):
+    new_clip.sync_data = SyncData()
+    new_clip.sync_data.pos_offset = clip.sync_data.pos_offset
+    new_clip.sync_data.master_clip = clip.sync_data.master_clip
+    new_clip.sync_data.master_clip_track = clip.sync_data.master_clip_track
+    new_clip.sync_data.sync_state = clip.sync_data.sync_state 
+    
 #-------------------- APPEND CLIP
 # "track","clip","clip_in","clip_out"
 # Appends clip to track
@@ -572,6 +606,21 @@
     self.clip.index = self.track.count()
     append_clip(self.track, self.clip, self.clip_in, self.clip_out)
 
+#-------------------- APPEND MULTIPLE CLIPS
+# "track","clips"
+# Appends clip to track
+def append_multiple_action(data):
+    action = EditAction(_append_multiple_undo,_append_multiple_redo, data)
+    return action
+
+def _append_multiple_undo(self):
+    for add_clip in self.clips:
+        self.clip = _remove_clip(self.track, self.append_index)
+

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/editevent.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/editevent.py Changed

@@ -95,17 +95,13 @@
             "clip_in":clip_in,
             "clip_out":clip_out}
     action = edit.insert_action(data)
-    action.do_edit()
+    _do_action_and_maybe_autosplit_action(action, new_clip, track)
     
     updater.display_tline_cut_frame(track, index)
 
 def do_multiple_clip_insert(track, clips, tline_pos, use_as_action_build_func_for_paste=False):
     index = _get_insert_index(track, tline_pos)
     
-    if use_as_action_build_func_for_paste == True:
-        # For this use case there happens a cut before the insert is done.
-        index += 1
-    
     # Can't put audio media on video track
     for new_clip in clips:
         if isinstance(new_clip, int):
@@ -137,6 +133,7 @@
     # Dropping on first available frame after last clip is append 
     # and is handled by insert code
     if track.get_length() == frame:
+        print("insert")
         return False
 
     # Clip dropped after last clip on track
@@ -152,7 +149,8 @@
                 "clip_in":clip.mark_in,
                 "clip_out":clip.mark_out}
         action = edit.dnd_after_track_end_action(data)
-        action.do_edit()
+        _do_action_and_maybe_autosplit_action(action, clip, track)
+
 
         updater.display_tline_cut_frame(track, index + 1)
         return True
@@ -181,7 +179,7 @@
                         "index":index,
                         "clip_in":clip.mark_in}
                 action = edit.dnd_on_blank_replace_action(data)
-                action.do_edit()
+                _do_action_and_maybe_autosplit_action(action, clip, track)
             else: # If dropped clip shorter then blank, replace start part of blank
                 data = {"track":track,
                         "clip":clip,
@@ -190,7 +188,7 @@
                         "clip_in":clip.mark_in,
                         "clip_out":clip.mark_out}
                 action = edit.dnd_on_blank_start_action(data)
-                action.do_edit()
+                _do_action_and_maybe_autosplit_action(action, clip, track)
 
             updater.display_tline_cut_frame(track, index)
             return True
@@ -206,7 +204,7 @@
                     "clip_in":clip.mark_in,
                     "clip_out":clip.mark_out}
             action = edit.dnd_on_blank_end_action(data)
-            action.do_edit()
+            _do_action_and_maybe_autosplit_action(action, clip, track)
         else: # Overwrite part of blank ei toimi
             data = {"track":track,
                     "clip":clip,
@@ -216,13 +214,32 @@
                     "clip_in":clip.mark_in,
                     "clip_out":clip.mark_out}
             action = edit.dnd_on_blank_middle_action(data)
-            action.do_edit()
+            _do_action_and_maybe_autosplit_action(action, clip, track)
             
         updater.display_tline_cut_frame(track, index + 1)
         return True
 
     return False # this won't be hit
+
+def _do_action_and_maybe_autosplit_action(action, clip, track):
     
+    if editorpersistance.prefs.sync_autosplit == appconsts.AUDIO_AUTO_SPLIT_ALL_TACKS:
+        auto_split = True
+    elif editorpersistance.prefs.sync_autosplit == appconsts.AUDIO_AUTO_SPLIT_V1_V2 and (track.id == current_sequence().first_video_index or track.id == current_sequence().first_video_index + 1):
+        auto_split = True
+    elif editorpersistance.prefs.sync_autosplit == appconsts.AUDIO_AUTO_SPLIT_V1 and track.id == current_sequence().first_video_index:
+        auto_split = True
+    else:
+        auto_split = False
+    
+    if track.type == appconsts.AUDIO or auto_split == False:
+        action.do_edit()
+    else:
+        split_action = lambda : syncsplitevent.get_synched_split_action_for_clip_and_track(clip, track)
+        edit_actions = action, split_action
+        action = edit.ConsolidatedEditAction(edit_actions)
+        action.do_consolidated_edit()
+
 def _get_insert_index(track, tline_pos):
     cut_frame = current_sequence().get_closest_cut_frame(track.id, tline_pos)
     index = current_sequence().get_clip_index(track, cut_frame)
@@ -559,6 +576,7 @@
             new_clip = current_sequence().create_file_producer_clip(media_file.path, media_file.name, False, media_file.ttl)
             new_clip.container_data = copy.deepcopy(media_file.container_data)
             new_clip.container_data.generate_clip_id()
+            new_clip.link_seq_data = media_file.link_seq_data
     else:
         new_clip = current_sequence().create_pattern_producer(media_file)
 
@@ -602,9 +620,9 @@
                 if media_file.type == appconsts.IMAGE_SEQUENCE:
                     new_clip.mark_out = media_file.length
 
-    # Images fom media panel get bin default length.
+    # Images from media panel get bin default length.
     use_clip_in = False
-    if dnd.drag_source != dnd.SOURCE_MONITOR_WIDGET and  new_clip.media_type == appconsts.IMAGE:
+    if dnd.drag_source != dnd.SOURCE_MONITOR_WIDGET and new_clip.media_type == appconsts.IMAGE:
         default_grfx_length = PROJECT().get_current_bin_graphics_default_length()
         in_fr = (new_clip.get_length() - 1) // 2 - (default_grfx_length // 2)
         out_fr = in_fr + default_grfx_length - 1
@@ -651,7 +669,6 @@
     if clip.container_data == None:
         return
 
-    print("---------------renderdata:", clip.container_data.render_data)
     if editorpersistance.prefs.auto_render_media_plugins == True:
         if clip.container_data.container_type == appconsts.CONTAINER_CLIP_FLUXITY:
             action_object = containeractions.get_action_object(clip.container_data)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/editorpersistance.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/editorpersistance.py Changed

@@ -82,6 +82,7 @@
     prefs.buttons_style = NO_DECORATIONS 
     prefs.show_tool_tooltips = True
     prefs.theme = appconsts.FLOWBLADE_THEME_NEUTRAL
+    prefs.icons_scale = appconsts.ICONS_SCALE_DEFAULT
 
     try:
         recent_projects = utils.unpickle(recents_file_path)
@@ -117,7 +118,7 @@
             write_file = afw.get_file()
             pickle.dump(prefs, write_file)
         print("prefs updated to new version, new param count:", len(prefs.__dict__))
-        
+            
 def save():
     """
     Write out prefs and recent_projects files
@@ -192,7 +193,7 @@
     auto_center_check, play_pause_button, timeline_start_end_button, auto_center_on_updown, \
     ffwd_rev_shift_spin, ffwd_rev_caps_spin, follow_move_range, loop_clips = playback_prefs_widgets
     
-    force_language_combo, disp_splash, window_mode_combo, full_names, tracks_combo, icons_combo, project_panel_width_spin, \
+    force_language_combo, disp_splash, 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
 
     perf_render_threads, perf_drop_frames = performance_widgets
@@ -230,7 +231,6 @@
     prefs.show_full_file_names = full_names.get_active()
     prefs.center_on_arrow_move = auto_center_on_updown.get_active()
     prefs.tracks_scale = tracks_combo.get_active()
-    prefs.icons_scale = icons_combo.get_active()
     prefs.playback_follow_move_tline_range = follow_move_range.get_active()
     prefs.auto_save_delay_value_index = autosave_combo.get_active()
     prefs.layout_display_index = layout_monitor.get_active()
@@ -383,7 +383,13 @@
         self.zoom_to_playhead = True
         self.filter_select_width = 220
         self.tracks_scale = appconsts.TRACKS_SCALE_DEFAULT
-        self.icons_scale = appconsts.ICONS_SCALE_DEFAULT
+        self.icons_scale = appconsts.ICONS_SCALE_DEFAULT  # DEPRECATED, we are not ever getting useful results with this.
         self.project_panel_width = PROJECT_PANEL_WIDTH_MIN
         self.editor_panel_width = EDIT_PANEL_WIDTH_MIN 
         self.media_panel_width = MEDIA_PANEL_WIDTH_MIN
+        self.sync_autosplit = appconsts.AUDIO_AUTO_SPLIT_OFF
+        self.sync_mirror = True
+        self.sync_dualtrim = False
+        self.show_sync = True
+        self.wide_multitrim_slip = False
+        self.disable_drag_when_selected = True

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/editorstate.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/editorstate.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/editorwindow.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/editorwindow.py Changed

@@ -74,6 +74,7 @@
 import shortcuts
 import shortcutsdialog
 import singletracktransition
+import syncsplitevent
 import titler
 import tlineaction
 import tlinecursors
@@ -373,6 +374,10 @@
 
         # 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)
+        # example code for using widget css from deleted test dev branch
+        #gui.apply_widget_css_class(effect_select_list_view.treeview, "bold-text", "bold-text-class.css")
+        #effect_select_list_view.treeview.set_name("light-text")
+        #gui.apply_widget_css(effect_select_list_view.treeview, "light-text", "light-text-id.css")
         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
@@ -514,19 +519,8 @@
         self._create_monitor_buttons()
         self._create_monitor_row_widgets()
 
-        self.player_buttons = glassbuttons.PlayerButtons()
-        if (editorpersistance.prefs.play_pause == True):
-            if (editorpersistance.prefs.timeline_start_end is True):
-            # ------------------------------ timeline_start_end_button
-                tooltips = _("Start - Home key"), _("End - End key"),_("Prev Frame - Arrow Left"), _("Next Frame - Arrow Right"), _("Play/Pause- Space"), _("Mark In - I"), _("Mark Out - O"), _("Clear Marks"), _("To Mark In"), _("To Mark Out")
-            else:
-                tooltips = _("Prev Frame - Arrow Left"), _("Next Frame - Arrow Right"), _("Play/Pause - Space"), _("Mark In - I"), _("Mark Out - O"), _("Clear Marks"), _("To Mark In"), _("To Mark Out")
-        else:
-            if (editorpersistance.prefs.timeline_start_end is True):
-                tooltips = _("Start - Home key"), _("End - End key"),_("Prev Frame - Arrow Left"), _("Next Frame - Arrow Right"), _("Play - Space"), _("Stop - Space"), _("Mark In - I"), _("Mark Out - O"), _("Clear Marks"), _("To Mark In"), _("To Mark Out")
-            else:
-                tooltips = _("Prev Frame - Arrow Left"), _("Next Frame - Arrow Right"), _("Play - Space"), _("Stop - Space"), _("Mark In - I"), _("Mark Out - O"), _("Clear Marks"), _("To Mark In"), _("To Mark Out")
-            # ------------------------------End of timeline_start_end_button
+        self.player_buttons = glassbuttons.PlayerButtonsCompact()
+        tooltips = _("Prev Frame - Arrow Left"),  _("Play/Pause - Space"), _("Next Frame - Arrow Right")
         tooltip_runner = glassbuttons.TooltipRunner(self.player_buttons, tooltips)
         if editorpersistance.prefs.buttons_style == 2: # NO_DECORATIONS
             self.player_buttons.no_decorations = True
@@ -535,14 +529,33 @@
         self.view_mode_select.widget.set_margin_end(10)
         self.trim_view_select = guicomponents.get_trim_view_select_launcher(monitorevent.trim_view_menu_launched)
 
+        callbacks = monitorevent.mark_in_pressed,
+                     monitorevent.mark_out_pressed,
+                     monitorevent.marks_clear_pressed
+        markbuttons = glassbuttons.MarkButtons(callbacks)
+        markbuttons.widget.set_margin_right(12)
+        mbtooltips = _("Mark In - I"),  _("Mark Out - O"), _("Clear Marks - Alt + K")
+        tooltip_runner = glassbuttons.TooltipRunner(markbuttons, mbtooltips)
+        
         player_buttons_row = Gtk.HBox(False, 0)
         player_buttons_row.pack_start(self.monitor_switch.widget, False, False, 0)
         player_buttons_row.pack_start(Gtk.Label(), True, True, 0)
+        #player_buttons_row.pack_start(self.monitor_clip_type.widget, False, False, 0)
+        #player_buttons_row.pack_start(Gtk.Label(), True, True, 0)
         player_buttons_row.pack_start(self.player_buttons.widget, False, False, 0)
         player_buttons_row.pack_start(Gtk.Label(), True, True, 0)
+        #player_buttons_row.pack_start(Gtk.Label(), True, True, 0)
+        player_buttons_row.pack_start(markbuttons.widget, False, False, 0)
         player_buttons_row.pack_start(self.trim_view_select.widget, False, False, 0)
         player_buttons_row.pack_start(self.view_mode_select.widget, False, False, 0)
-        player_buttons_row.set_margin_top(4)
+        player_buttons_row.set_margin_top(8)
+        player_buttons_row.set_margin_bottom(6)
+        player_buttons_row.set_margin_left(12)
+        player_buttons_row.set_margin_right(12)
+
+        player_buttons_row.set_name("player-bar")
+        gui.apply_widget_css(player_buttons_row, "player-bar", "player-bar-id.css")
+        
         self.player_buttons_row = player_buttons_row
 
         # Switch / pos bar row
@@ -575,7 +588,9 @@
         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())
-            
+        #self.edit_buttons_frame.set_name("middlebar")
+        #gui.apply_widget_css(player_buttons_row, "middlebar", "middlebar-id.css")
+                    
     def _init_tline(self):
         self.tline_scale = tlinewidgets.TimeLineFrameScale(modesetting.set_default_edit_mode,
                                                            updater.mouse_scroll_zoom)
@@ -589,11 +604,8 @@
         info_h.pack_start(Gtk.Label(), True, True, 0)
         # Aug-2019 - SvdB - BB - Height doesn't need to be doubled. 1.4x is nicer
         size_adj = 1
-        size_x = tlinewidgets.COLUMN_WIDTH - 22 - 22 - 22
+        size_x = tlinewidgets.COLUMN_WIDTH - 22 - 22 - 22 - 22
         size_y = tlinewidgets.SCALE_HEIGHT
-        if editorpersistance.prefs.double_track_hights:
-            size_adj = 1.4
-            size_x = tlinewidgets.COLUMN_WIDTH - (66*size_adj)
 
         info_h.set_size_request(size_x, size_y)
 
@@ -607,9 +619,13 @@
         levels_launcher_surface = guiutils.get_cairo_image("audio_levels_menu_launch")
         levels_launcher = guicomponents.PressLaunchPopover(trackaction.tline_properties_menu_launch_pressed, levels_launcher_surface, 22*size_adj, 22*size_adj)
 
+        sync_launcher_surface = guiutils.get_cairo_image("sync_menu_launch")
+        sync_launcher = guicomponents.PressLaunchPopover(syncsplitevent.sync_menu_launch_pressed, sync_launcher_surface, 22*size_adj, 22*size_adj)
+
         # Timeline top row
         tline_hbox_1 = Gtk.HBox()
         tline_hbox_1.pack_start(info_h, False, False, 0)
+        tline_hbox_1.pack_start(sync_launcher.widget, False, False, 0)
         tline_hbox_1.pack_start(levels_launcher.widget, False, False, 0)
         tline_hbox_1.pack_start(tracks_launcher.widget, False, False, 0)
         tline_hbox_1.pack_start(markers_launcher.widget, False, False, 0)
@@ -823,6 +839,7 @@
             ('RangeOverWriteClip', None, _('Range Overwrite'), None, None, lambda a:tlineaction.range_overwrite_pressed()),
             ('CutClip', None, _('Cut Clip At Playhead'), None, None, lambda a:tlineaction.cut_pressed()),
             ('SequenceSplit', None, _('Split to new Sequence at Playhead Position'), None, None, lambda a:tlineaction.sequence_split_pressed()),
+            ('SequenceDuplicate', None, _('Duplicate Sequence'), None, None, lambda a:projectaction.duplicate_sequence()),
             ('DeleteClip', None, _('Lift'), None, None, lambda a:tlineaction.lift_button_pressed()),
             ('SpliceOutClip', None, _('Splice Out'), None, None, lambda a:tlineaction.splice_out_button_pressed()),
             ('ResyncSelected', None, _('Resync Track'),  resync_shortcut, None, lambda a:tlineaction.resync_button_pressed()),
@@ -861,6 +878,7 @@
             ('LoadMediaPluginScript', None, _('Load Generator Script...'), None, None,lambda w: containerclip.create_fluxity_media_item()),
             ('CreateSelectionCompound', None, _('From Selected Clips'), None, None, lambda a:projectaction.create_selection_compound_clip()),
             ('CreateSequenceCompound', None, _('From Current Sequence'), None, None, lambda a:projectaction.create_sequence_compound_clip()),
+            ('CreateSequenceLinkContainerItem', None, _("Add Sequence Link Container Clip..."), None, None, lambda a:projectaction.create_sequence_link_container()),
             ('CreateSequenceFreezeCompound', None, _('From Current Sequence With Freeze Frame at Playhead Position'), None, None, lambda a:projectaction.create_sequence_freeze_frame_compound_clip()),
             ('AudioSyncCompoundClip', None, _('Audio Sync Merge Clip From 2 Media Items '), None, None, lambda a:audiosync.create_audio_sync_compound_clip()),
             ('ImportProjectMedia', None, _('Import Media From Project...'), None, None, lambda a:projectaction.import_project_media()),
@@ -974,6 +992,7 @@
                         <separator/>
                         <menuitem action='CreateGMicContainerItem'/>
                     </menu>
+                    <menuitem action='CreateSequenceLinkContainerItem'/>
                     <separator/>
                     <menuitem action='AddMediaFolder'/>
                     <menuitem action='ImportProjectMedia'/>
@@ -1004,6 +1023,7 @@
                     <separator/>
                     <menuitem action='CombineSequences'/>
                     <menuitem action='SequenceSplit'/>
+                    <menuitem action='SequenceDuplicate'/>
                     <separator/>
                     <menuitem action='AddVideoTrack'/>
                     <menuitem action='AddAudioTrack'/>
@@ -1230,15 +1250,6 @@
             menu.append(new_item)
             new_item.show()
 
-    """
-    def hide_tline_render_strip(self):
-        guiutils.remove_children(self.tline_renderer_hbox)
-
-    def show_tline_render_strip(self):
-        self.tline_renderer_hbox.pack_start(self.pad_box, False, False, 0)
-        self.tline_renderer_hbox.pack_start(self.tline_render_strip.widget, True, True, 0)
-    """
-    
     def _change_windows_preference(self, widget, new_window_layout):
         if widget.get_active() == False:
             return
@@ -1299,6 +1310,11 @@
     # ----------------------------------------------------------- GUI components monitor, middlebar.
     def _create_monitor_buttons(self):
         self.monitor_switch = guicomponents.MonitorSwitch(self._monitor_switch_handler)
+        self.monitor_switch.widget.set_margin_top(2)
+        self.monitor_switch.widget.set_margin_right(57)
+
+        self.monitor_clip_type = guicomponents.MonitorClipType()
+        #self.monitor_clip_type.widget.set_margin_right(17)
 
     def _create_monitor_row_widgets(self):
         self.monitor_tc_info = guicomponents.MonitorMarksTCInfo()
@@ -1312,54 +1328,11 @@
             updater.display_clip_in_monitor()
 
     def connect_player(self, mltplayer):
-        # Buttons
-        # NOTE: ORDER OF CALLBACKS IS THE SAME AS ORDER OF BUTTONS FROM LEFT TO RIGHT
-        # Jul-2016 - SvdB - For play/pause button
-        if editorpersistance.prefs.play_pause == False:
-            # ------------------------------timeline_start_end_button
-            if (editorpersistance.prefs.timeline_start_end is True):
-                pressed_callback_funcs = monitorevent.start_pressed,  #  go to start
-                                          monitorevent.end_pressed,   #  go to  end
-                                          monitorevent.prev_pressed,
-                                          monitorevent.next_pressed,
-                                          monitorevent.play_pressed,
-                                          monitorevent.stop_pressed,
-                                          monitorevent.mark_in_pressed,
-                                          monitorevent.mark_out_pressed,
-                                          monitorevent.marks_clear_pressed,
-                                          monitorevent.to_mark_in_pressed,
-                                          monitorevent.to_mark_out_pressed
-            else:
-                pressed_callback_funcs = monitorevent.prev_pressed,
-                                          monitorevent.next_pressed,
-                                          monitorevent.play_pressed,
-                                          monitorevent.stop_pressed,

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/extraeditors.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/extraeditors.py Changed

@@ -34,6 +34,7 @@
 import appconsts
 import cairo
 import cairoarea
+import dialogutils
 from editorstate import PROJECT
 import guiutils
 import guicomponents
@@ -1209,12 +1210,16 @@
         clip_path = self.editable_properties0.clip.path
         accuracy_prop = ep for ep in self.editable_properties if ep.name == "accuracy"0
         shakiness_prop = ep for ep in self.editable_properties if ep.name == "shakiness"0
+        smoothing_prop = ep for ep in self.editable_properties if ep.name == "smoothing"0
+        zoom_prop = ep for ep in self.editable_properties if ep.name == "zoom"0
         
         args = ("session_id:" + str(session_id),
                 "profile_desc:" + str(profile_desc),
                 "clip_path:" + str(clip_path),
                 "shakiness:" + str(shakiness_prop.value),
-                "accuracy:" + str(accuracy_prop.value))
+                "accuracy:" + str(accuracy_prop.value),
+                "smoothing:" + str(smoothing_prop.value),
+                "zoom:" + str(zoom_prop.value))
 
         job = jobs.StablizeDataRenderJobQueueObject(session_id, self.filter, self.editable_properties, self, args)
         job.add_to_queue()
@@ -1229,8 +1234,8 @@
 class AnalyzeMotionTrackingFilterEditor:
     def __init__(self, filter, editable_properties):
         self.filter = filter
-        # We need to turn this because otherwise filter keeps attemting to 
-        # analyze tracking continuosly. We want analyzing to happen in the 
+        # We need to turn this because otherwise filter keeps attempting to 
+        # analyze tracking continuously. We want analyzing to happen in the 
         # dedicated process and only results be displayed.
         # ...aaand this only has effect if we have some results?
         self.filter.mlt_filter.set("analyze", "0")
@@ -1324,7 +1329,7 @@
         if len(data_label) == 0:
             data_label = self.get_default_data_label()
         
-        job = jobs.MotionTrackingDataRenderJobQueueObject(session_id, self.filter, self.editable_properties, self, args, data_label)
+        job = jobs.TrackingDataRenderJobQueueObject(session_id, self.filter, self.editable_properties, self, args, data_label)
         job.add_to_queue()
 
     def analysis_complete(self, final_label, data_file_path):
@@ -1345,7 +1350,7 @@
             self.box_gui_editor.geom_kf_edit.widget.queue_draw()
             self.set_buttons_state()
         except Exception as e :
-            # GUI might havenn destoyed during rendering.
+            # GUI might havenn destroyed during rendering.
             print(e)
 
     def clear_button_clicked(self, button):
@@ -1374,16 +1379,21 @@
         self.non_mlt_editors = non_mlt_editors
         self.non_mlt_properties = non_mlt_properties
 
-        select_label = Gtk.Label(label=_("Select Motion Tracking Data:"))
-        select_label.set_margin_right(4)
+        self.select_label = Gtk.Label(label=_("Select Motion Tracking Data:"))
+        self.select_label.set_margin_right(4)
 
         selected_tracking_data = ep for ep in self.non_mlt_properties if ep.name == "selected_tracking_data"0.value
         self.data_select_keys, self.data_select_combo = motiontracking.get_tracking_data_select_combo(_("No Tracking Data Available"), selected_tracking_data)
 
-        hbox1 = Gtk.HBox()
-        hbox1.pack_start(select_label, False, False, 0) 
-        hbox1.pack_start(self.data_select_combo, True, True, 0)
-        hbox1.set_margin_bottom(24)
+        self.delete_button = Gtk.Button(label=_("Delete"))
+        self.delete_button.connect("clicked", self.delete_data)
+        self.delete_button.set_margin_left(12)
+    
+        self.hbox1 = Gtk.HBox()
+        self.hbox1.pack_start(self.select_label, False, False, 0) 
+        self.hbox1.pack_start(self.data_select_combo, True, True, 0)
+        self.hbox1.pack_start(self.delete_button, False, False, 0) 
+        self.hbox1.set_margin_bottom(24)
 
         self.info_label = Gtk.Label("<small>No Tracking Data Applied</small>")
         last_applied_date_str = ep for ep in self.non_mlt_properties if ep.name == "last_applied_tracking_data"0.value
@@ -1391,11 +1401,12 @@
             self.show_last_applied_date(last_applied_date_str)
         self.info_label.set_use_markup(True)
         self.info_label.set_margin_right(4)
-
+        
         self.button = Gtk.Button(label=_("Apply Motion Tracking Data"))
         self.button.connect("clicked", self.apply_tracking)
 
         hbox2 = Gtk.HBox()
+        hbox2.pack_start(self.delete_button, False, False, 0)
         hbox2.pack_start(Gtk.Label(), True, True, 0) 
         hbox2.pack_start(self.info_label, False, False, 0) 
         hbox2.pack_start(self.button, False, False, 0)
@@ -1403,7 +1414,7 @@
         hbox2.set_margin_bottom(24)
         
         self.widget = Gtk.VBox()
-        self.widget.pack_start(hbox1, False, False, 0)
+        self.widget.pack_start(self.hbox1, False, False, 0)
         for row in self.non_mlt_editors:
             self.widget.pack_start(row, False, False, 0)
         self.widget.pack_start(hbox2, False, False, 0)
@@ -1415,14 +1426,14 @@
         interpretation = ep for ep in self.non_mlt_properties if ep.name == "interpretation"0.value
         size = ep for ep in self.non_mlt_properties if ep.name == "size"0.value
         clip_in = self.editable_properties0.clip.clip_in
-        
+
         info = utils.get_file_producer_info(self.editable_properties0.clip)
         source_w = int(info"width")
         source_h = int(info"height")
         if self.editable_properties0.clip.media_type == appconsts.IMAGE:
             graphic_img = Image.open(self.editable_properties0.clip.path)
             source_w, source_h = graphic_img.size
-            
+
         motiontracking.apply_tracking(  tracking_data_id, self.filter, self.editable_properties, 
                                         int(float(xoff)), int(float(yoff)), interpretation, size, clip_in,
                                         source_w, source_h)
@@ -1440,6 +1451,47 @@
         self.info_label.set_use_markup(True)
         self.info_label.queue_draw()
 
+    def delete_data(self, button):
+        used_data = motiontracking.get_used_motion_tracking_data()
+        tracking_data_id = self.data_select_keysself.data_select_combo.get_active()
+        
+        if tracking_data_id in used_data:
+            self.confirm_delete()
+        else:
+            self.delete_selected()
+
+    def confirm_delete(self):
+        title = _("Confirm Motion Tracking Data Delete")
+        text = Gtk.Label(label=_("Current selected motion tracking data was applied somewhere in the project.\n\nDelete anyway?"))
+        panel = guiutils.get_left_justified_box(text)
+        accept_text = _("Delete")
+        dialogutils.panel_ok_cancel_dialog(title, panel, accept_text, self.delete_dialog_callback)
+
+    def delete_dialog_callback(self, dialog, response_id):
+        dialog.destroy()
+        if response_id == Gtk.ResponseType.ACCEPT:
+            self.delete_selected()
+
+    def delete_selected(self):
+        tracking_data_id = self.data_select_keysself.data_select_combo.get_active()
+        if tracking_data_id == None:
+            return # no tracking data exists.
+
+        PROJECT().delete_tracking_data(tracking_data_id)
+
+        children = self.hbox1.get_children()
+        for child in children:
+            self.hbox1.remove(child)
+
+        self.data_select_keys, self.data_select_combo = motiontracking.get_tracking_data_select_combo(_("No Tracking Data Available"), -1)
+        self.data_select_combo.show() 
+
+        self.hbox1.pack_start(self.select_label, False, False, 0) 
+        self.hbox1.pack_start(self.data_select_combo, True, True, 0)
+        self.hbox1.pack_start(self.delete_button, False, False, 0) 
+        
+        self.widget.queue_draw() 
+            
 
 class FilterMaskApplyMotionTrackingEditor:
     def __init__(self, filter, editable_properties, non_mlt_editors, non_mlt_properties):
@@ -1448,16 +1500,21 @@
         self.non_mlt_properties = non_mlt_properties
         self.non_mlt_editors = non_mlt_editors
         
-        select_label = Gtk.Label(label=_("Select Motion Tracking Data:"))
-        select_label.set_margin_right(4)
+        self.select_label = Gtk.Label(label=_("Select Motion Tracking Data:"))
+        self.select_label.set_margin_right(4)
 
         selected_tracking_data = ep for ep in self.non_mlt_properties if ep.name == "selected_tracking_data"0.value
         self.data_select_keys, self.data_select_combo = motiontracking.get_tracking_data_select_combo(_("No Tracking Data Available"), selected_tracking_data)
 
-        hbox1 = Gtk.HBox()
-        hbox1.pack_start(select_label, False, False, 0) 
-        hbox1.pack_start(self.data_select_combo, True, True, 0)
-        hbox1.set_margin_bottom(24)
+        self.delete_button = Gtk.Button(label=_("Delete"))
+        self.delete_button.connect("clicked", self.delete_data)
+        self.delete_button.set_margin_left(12)
+        
+        self.hbox1 = Gtk.HBox()
+        self.hbox1.pack_start(self.select_label, False, False, 0) 
+        self.hbox1.pack_start(self.data_select_combo, True, True, 0)
+        self.hbox1.pack_start(self.delete_button, False, False, 0) 
+        self.hbox1.set_margin_bottom(24)
 
         self.info_label = Gtk.Label("<small>No Tracking Data Applied</small>")
         last_applied_date_str = ep for ep in self.non_mlt_properties if ep.name == "last_applied_tracking_data"0.value
@@ -1469,18 +1526,18 @@

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/glassbuttons.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/glassbuttons.py Changed

@@ -25,6 +25,7 @@
 import editorpersistance
 import gui
 import guiutils
+import respaths
 
 BUTTONS_GRAD_STOPS =    (1, 1, 1, 1, 0.2),
                         (0.8, 1, 1, 1, 0),
@@ -277,6 +278,7 @@
             x += self.button_width
 
     def show_prelight_icons(self):
+        self.prelight_icons = 
         for icon in self.icons:
             surface_prelight = cairo.ImageSurface(cairo.FORMAT_ARGB32, icon.get_width(), icon.get_height())
             cr = cairo.Context(surface_prelight)
@@ -339,7 +341,7 @@
                 self.icons = prev_icon, next_icon, play_pause_icon,
                           mark_in_icon, mark_out_icon,
                           marks_clear_icon, to_mark_in_icon, to_mark_out_icon
-                self.image_x =  5*size_adj, 7*size_adj, 5*size_adj, 3*size_adj, 11*size_adj, 2*size_adj, 7*size_adj, 6*size_adj
+                self.image_x =  5*size_adj, 7*size_adj, 11*size_adj, 3*size_adj, 11*size_adj, 2*size_adj, 7*size_adj, 0*size_adj
         else:
             #  go to start end
             if (editorpersistance.prefs.timeline_start_end == True):
@@ -423,7 +425,110 @@
         self.button_x = mid_x - (buttons_width // 2)
         self._draw_buttons(cr, w, h)
 
+class PlayerButtonsCompact(AbstractGlassButtons):
+
+    def __init__(self):
+        # Aug-2019 - SvdB - BB - Multiple changes - size_ind, size_adj, get_cairo_image
+        size_ind = 0
+        AbstractGlassButtons.__init__(self, MB_BUTTON_WIDTHsize_ind, MB_BUTTON_HEIGHTsize_ind, MB_BUTTON_Y, MB_BUTTONS_WIDTHsize_ind, MB_BUTTONS_HEIGHTsize_ind - 2)
+
+        # Force no decorations for player buttons, this cannot be made to work.
+        self.no_decorations = True 
+
+        self.play_icon = guiutils.get_cairo_image("play_2_s")
+        self.stop_icon = guiutils.get_cairo_image("stop_s")
+        self.next_icon = guiutils.get_cairo_image("next_frame_s")
+        self.prev_icon = guiutils.get_cairo_image("prev_frame_s")
+
+        self.icons = self.prev_icon, self.play_icon, self.next_icon
+        self.image_x = 0, 0, -1
+
+
+        for i in range(0, len(self.icons)):
+            self.image_y.append(MB_BUTTON_IMAGE_Y - 6)
+        
+        self.pressed_callback_funcs = None # set using set_callbacks()
+
+        self.set_sensitive(True)
+
+        focus_groupsDEFAULT_FOCUS_GROUP.append(self.widget)
+
+        self.show_prelight_icons()
+        self.stopped_prelight_icons = self.prelight_icons 
+        self.icons = self.prev_icon, self.stop_icon, self.next_icon
+        self.show_prelight_icons()
+        self.playing_prelight_icons = self.prelight_icons 
+        
+        self.icons = self.prev_icon, self.play_icon, self.next_icon
+        self.prelight_icons = self.stopped_prelight_icons 
+        
+    def set_normal_sensitive_pattern(self):
+        self.set_sensitive(True)
+        self.widget.queue_draw()
+
+    def show_playing_state(self, is_playing):
+        if is_playing == True:
+            self.icons = self.prev_icon, self.stop_icon, self.next_icon
+            self.prelight_icons = self.playing_prelight_icons 
+        else:
+            self.icons = self.prev_icon, self.play_icon, self.next_icon
+            self.prelight_icons = self.stopped_prelight_icons
+                
+        self.widget.queue_draw()
+        
+    # ------------------------------------------------------------- mouse events
+    def _press_event(self, event):
+        """
+        Mouse button callback
+        """
+        self.pressed_button = self._get_hit_code(event.x, event.y)
+        if self.pressed_button >= 0 and self.pressed_button < len(self.icons):
+            callback_func = self.pressed_callback_funcsself.pressed_button # index is set to match at editorwindow.py where callback func list is created
+            callback_func()
+        self.widget.queue_draw()
+
+    def _motion_notify_event(self, x, y, state):
+        """
+        Mouse move callback
+        """
+        button_under = self._get_hit_code(x, y)
+        if self.pressed_button != button_under: # pressed button is released
+            self.pressed_button = NO_HIT
+
+        if len(self.prelight_icons) > 0:
+            self.prelight_index = button_under
+            
+        self.widget.queue_draw()
+
+    def _release_event(self, event):
+        """
+        Mouse release callback
+        """
+        self.pressed_button = -1
+        self.widget.queue_draw()
+
+    def _leave_notify_event(self, event):
+        self.prelight_index = -1
+        self.widget.queue_draw()
+
+    def _enter_notify_event(self, event):
+        self.prelight_index = -1
+        
+    def set_callbacks(self, pressed_callback_funcs):
+        self.pressed_callback_funcs = pressed_callback_funcs
+
+    # ---------------------------------------------------------------- painting
+    def _draw(self, event, cr, allocation):
+        x, y, w, h = allocation
+        self.allocation = allocation
 
+        mid_x = w // 2
+        buttons_width = self.button_width * len(self.icons)
+        # Jul-2016 - SvdB - No changes made here, but because of the calculation of button_x the row of buttons is slightly moved right if play/pause
+        # is enabled. This could be solved by setting self.button_x = 1, if wished.
+        self.button_x = mid_x - (buttons_width // 2)
+        self._draw_buttons(cr, w, h)
+        
 class GmicButtons(AbstractGlassButtons):
 
     def __init__(self):
@@ -603,6 +708,19 @@
         pass
 
 
+class MarkButtons(GlassButtonsGroup):
+    
+    def __init__(self, callbacks):
+            
+        GlassButtonsGroup.__init__(self, 16, 18, 0, 0, 2)
+            
+        self.add_button(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "mark_in_xs.png"), callbacks0)
+        self.add_button(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "mark_out_xs.png"), callbacks1)
+        self.add_button(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "mark_clear_xs.png"), callbacks2)
+        self.no_decorations = True 
+        
+        self.show_prelight_icons()
+
 
 class TooltipRunner:

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/gtkbuilder.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/gtkbuilder.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/gui.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/gui.py Changed

@@ -182,6 +182,31 @@
 
     return True
 
+def apply_widget_css(widget, widget_css_name, css_file):
+    css_path = respaths.ROOT_PATH + "/res/css3/" + css_file
+
+    provider = Gtk.CssProvider()
+    provider.load_from_path(css_path)
+    
+    widget.set_name(widget_css_name)
+    widget.get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+def apply_widget_css_class(widget, widget_css_class_name, css_file):
+    css_path = respaths.ROOT_PATH + "/res/css3/" + css_file
+    provider = Gtk.CssProvider()
+    provider.load_from_path(css_path)
+    
+    widget.get_style_context().add_class(widget_css_class_name)
+    widget.get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+def apply_widget_css_class_style_from_string(widget, css_str):#, widget_css_class_name, css_file):
+    css_data = css_str.encode("utf-8")
+    provider = Gtk.CssProvider()
+    provider.load_from_data(css_data)
+    
+    #widget.get_style_context().add_class(widget_css_class_name)
+    widget.get_style_context().add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+    
 def get_default_filter_icon():
     return GdkPixbuf.Pixbuf.new_from_file(respaths.IMAGE_PATH + "filter.png")

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/guicomponents.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/guicomponents.py Changed

@@ -66,6 +66,7 @@
 CLIP_EDITOR_LEFT_WIDTH = 200
 
 TC_COLOR = (0.7, 0.7, 0.7)
+TC_ZEROS_COLOR = (0.4, 0.4, 0.4)
 
 BIG_TC_GRAD_STOPS =    (1, 1, 1, 1, 0.2),
                         (0.8, 1, 1, 1, 0),
@@ -526,44 +527,6 @@
                 self.double_click_counter = 0
                 self.double_click_cb()
 
-class MediaListView(ImageTextTextListView):
-    """
-    GUI component displaying list of media files.
-    """
-
-    def __init__(self, row_activated_cb, file_name_edited_cb):
-        ImageTextTextListView.__init__(self)
-
-        # Connect double-click listener and allow multiple selection
-        self.treeview.connect("row-activated",
-                              row_activated_cb)
-
-        tree_sel = self.treeview.get_selection()
-        tree_sel.set_mode(Gtk.SelectionMode.MULTIPLE)
-        self.text_rend_1.set_property("editable", True)
-        self.text_rend_1.set_property("font-desc", Pango.FontDescription("sans bold 9"))
-        self.text_rend_1.connect("edited",
-                                 file_name_edited_cb,
-                                 (self.storemodel, 1))
-
-        self.text_rend_2.set_property("font-desc", Pango.FontDescription("sans 8"))
-        self.text_rend_2.set_property("yalign", 0.5)
-
-    def fill_data_model(self):
-        """
-        Creates displayed data.
-        Displays thumbnail icon, file name and length
-        """
-        self.storemodel.clear()
-        for file_id in current_bin().file_ids:
-            media_file = PROJECT().media_filesfile_id
-            row_data = media_file.icon,
-                        media_file.name,
-                        utils.clip_length_string(media_file.length)
-            self.storemodel.append(row_data)
-            self.scroll.queue_draw()
-
-
 class FilterListView(ImageTextImageListView):
     """
     GUI component displaying list of available filters.
@@ -1236,7 +1199,8 @@
                     self.selected_objects.append(media_object)
 
         elif event.button == 3:
-            self.clear_selection()
+            if self.media_object_selected_test(media_object) == False:
+                self.clear_selection()
             self.media_file_popup_cb(media_object.widget,
                                      media_object.media_file,
                                      event)
@@ -1406,8 +1370,8 @@
             if ((editorstate.media_view_filter == appconsts.SHOW_IMAGE_SEQUENCES)
                 and (media_file.type != appconsts.IMAGE_SEQUENCE)):
                 continue
-            if ((editorstate.media_view_filter == appconsts.SHOW_PATTERN_PRODUCERS)
-                and (media_file.type != appconsts.PATTERN_PRODUCER)):
+            if ((editorstate.media_view_filter == appconsts.SHOW_CONTAINERS)
+                and (media_file.container_data == None)):
                 continue
             if ((editorstate.media_view_filter == appconsts.SHOW_UNUSED_FILES)
                 and (media_file not in unused_list)):
@@ -1698,12 +1662,13 @@
     if guiutils.double_icon_size():
        size_adj = 2
     surface = guiutils.get_cairo_image("program_view_2")
-    menu_launch = PressLaunchPopover(callback, surface, w=24*size_adj, h=20*size_adj)
+    menu_launch = PressLaunchPopover(callback, surface, w=24*size_adj, h=16*size_adj)
     if guiutils.double_icon_size():
         menu_launch.surface_y = 8*size_adj
     else:
         menu_launch.surface_y = 3
-        
+    
+    menu_launch.widget.set_margin_top(2)
     return menu_launch
 
 def get_trim_view_select_launcher(callback):
@@ -1714,12 +1679,13 @@
     if guiutils.double_icon_size():
        size_adj = 2
     surface = guiutils.get_cairo_image("trim_view")
-    menu_launch = PressLaunchPopover(callback, surface, w=24*size_adj, h=20*size_adj)
+    menu_launch = PressLaunchPopover(callback, surface, w=24*size_adj, h=16*size_adj)
     if guiutils.double_icon_size():
         menu_launch.surface_y = 8*size_adj
     else:
         menu_launch.surface_y = 3
-        
+
+    menu_launch.widget.set_margin_top(2)
     return menu_launch
     
 def get_compositor_track_select_combo(source_track, target_track, callback):
@@ -1932,9 +1898,6 @@
         self.TEXT_X = 18
         self.TEXT_Y = 1
 
-        global TC_COLOR
-        TC_COLOR = (0.55, 0.55, 0.55)
-
         self.widget.connect("button-press-event", self._button_press)
         self.widget.set_margin_top(1)
 
@@ -1971,6 +1934,23 @@
 
         PangoCairo.update_layout(cr, layout)
         PangoCairo.show_layout(cr, layout)
+        
+        try:
+            frame = PLAYER().tracktor_producer.frame()
+            frame_str = utils.get_tc_zeros_overlay_fine_grained(frame)
+        except:
+            print("execpt")
+            frame_str = "00:00:00:00"
+            
+        layout = PangoCairo.create_layout(cr)
+        layout.set_text(frame_str, -1)
+        layout.set_font_description(self.font_desc)
+
+        cr.set_source_rgb(*TC_ZEROS_COLOR)
+        cr.move_to(self.TEXT_X, self.TEXT_Y)
+        
+        PangoCairo.update_layout(cr, layout)
+        PangoCairo.show_layout(cr, layout)
                 
     def _round_rect_path(self, cr):
         x, y, width, height, aspect, corner_radius, radius, degrees = self._draw_consts
@@ -2132,7 +2112,7 @@
         self.monitor_source = Gtk.Label()
         self.monitor_source.modify_font(Pango.FontDescription(font_desc))
         self.monitor_source.set_ellipsize(Pango.EllipsizeMode.END)
-        self.monitor_source.set_sensitive(False)
+        #self.monitor_source.set_sensitive(False)
         
         self.monitor_tc = Gtk.Label()
         self.monitor_tc.modify_font(Pango.FontDescription(font_desc))
@@ -2142,25 +2122,17 @@
         self.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)
         
     def set_source_tc(self, tc_str):
         self.monitor_tc.set_text(tc_str)
     
-    def set_range_info(self, in_str, out_str, len_str):
-        self.marks_tc_display.in_str = in_str
-        self.marks_tc_display.out_str = out_str
-        self.marks_tc_display.len_str = len_str
-        
+    def set_range_info(self, mark_in, mark_out):
+        self.marks_tc_display.set_marks_range_info(mark_in, mark_out)
         self.marks_tc_display.widget.queue_draw()
-        #if editorstate.screen_size_small_width() == False:
-        #    self.in_value.set_text(in_str)
-        #    self.out_value.set_text(out_str)
-        #self.marks_length_value.set_text(len_str)
-    
-    
+
+
 
 class MonitorInfoDisplay:
 
@@ -2168,14 +2140,18 @@
         self.widget = cairoarea.CairoDrawableArea2( widget_width,
                                                     18,
                                                     self._draw)
-        self.font_desc = Pango.FontDescription("Bitstream Vera Sans Mono Condensed 8")
+        self.font_desc = Pango.FontDescription("sans bold 9")
         self.mark_in_img = guiutils.get_cairo_image("mark_in_tc", force=False) 
         self.mark_out_img = guiutils.get_cairo_image("mark_out_tc", force=False)
         self.marks_length_img = guiutils.get_cairo_image("marks_length_tc", force=False)
 
-        self.in_str = "--:--:--:--"
-        self.out_str = "--:--:--:--"
-        self.len_str = "--:--:--:--"
+        self.in_str = ""
+        self.out_str = ""
+        self.len_str = ""
+
+        self.in_zeros_overlay = ""
+        self.out_zeros_overlay = ""
+        self.len_zeros_overlay = ""

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/guipopover.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/guipopover.py Changed

@@ -38,6 +38,9 @@
 _markers_menu = None
 _tline_properties_popover = None
 _tline_properties_menu = None
+_sync_popover = None
+_sync_menu = None
+_autosync_split_submenu = None
 _all_tracks_popover = None
 _all_tracks_menu = None
 _compositing_mode_popover = None
@@ -66,6 +69,8 @@
 _file_filter_menu = None
 _media_file_popover = None
 _media_file_menu = None
+_media_file_multi_popover = None
+_media_file_menu_multi = None
 _jobs_popover = None
 _jobs_menu = None
 _effects_popover = None
@@ -108,9 +113,10 @@
 _icon_section = None
 _mf_render_section = None
 _mf_proxy_section = None
+_mf_stabilize_section = None
 
 
-# -------------------------------------------------- menuitems builder fuctions
+# -------------------------------------------------- menuitems builder functions
 def add_menu_action(menu, label, item_id, data, callback, active=True, app=None):
     if active == True:
         menu.append(label, "app." + item_id) 
@@ -238,6 +244,13 @@
 
     _tline_properties_menu = menu_clear_or_create(_tline_properties_menu)
 
+    wide_multitrim_is_on = editorpersistance.prefs.wide_multitrim_slip
+    disable_drag_when_selected_is_on = editorpersistance.prefs.disable_drag_when_selected
+    edit_prefs_section = Gio.Menu.new()
+    add_menu_action_check(edit_prefs_section, _("Disable Clip Ends Drag When Selected"), "midbar.tlineproperties.disabledrag", disable_drag_when_selected_is_on, "disabledrag", callback)
+    add_menu_action_check(edit_prefs_section, _("Wide Multitrim Slip Target Area"), "midbar.tlineproperties.wideslip", wide_multitrim_is_on, "wideslip", callback)
+    _tline_properties_menu.append_section(None, edit_prefs_section)
+
     display_section = Gio.Menu.new()
     add_menu_action_check(display_section, _("Display Clip Media Thumbnails"), "midbar.tlineproperties.thumb", editorstate.display_clip_media_thumbnails, "thumbs", callback)
     add_menu_action_check(display_section, _("Display Audio Levels"), "midbar.tlineproperties.all", editorstate.display_all_audio_levels, "all", callback)
@@ -258,13 +271,54 @@
     _tline_properties_menu.append_section(None, snapping_section)
 
     scrubbing_section = Gio.Menu.new()
-    add_menu_action_check(scrubbing_section, _("Audio scrubbing"), "midbar.tlineproperties.scrubbing", editorpersistance.prefs.audio_scrubbing, "scrubbing", callback)
+    add_menu_action_check(scrubbing_section, _("Audio Scrubbing"), "midbar.tlineproperties.scrubbing", editorpersistance.prefs.audio_scrubbing, "scrubbing", callback)
     _tline_properties_menu.append_section(None, scrubbing_section)
 
     _tline_properties_popover = Gtk.Popover.new_from_model(widget, _tline_properties_menu)
     launcher.connect_launched_menu(_tline_properties_popover)
     _tline_properties_popover.show()
 
+def sync_menu_show(launcher, widget, properties_set_callback, split_mirror_callback, sync_callback):
+    global _sync_popover, _sync_menu, _autosync_split_submenu
+
+    if _sync_menu == None:
+        _sync_menu = menu_clear_or_create(_sync_menu)
+            
+        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)
+        _sync_menu.append_section(None, properties_section)
+
+        mirror_section = Gio.Menu.new()
+        _autosync_split_submenu = menu_clear_or_create(_autosync_split_submenu)
+        items_data =   ( _("Off"), str(appconsts.AUDIO_AUTO_SPLIT_OFF)), 
+                        (_("On All Video Tracks"), str(appconsts.AUDIO_AUTO_SPLIT_ALL_TACKS)),
+                        ( _("On Tracks V1 and V2"), str(appconsts.AUDIO_AUTO_SPLIT_V1_V2)), 
+                        ( _("On Track V1"), str(appconsts.AUDIO_AUTO_SPLIT_V1)) 
+        active_index = editorpersistance.prefs.sync_autosplit
+        add_menu_action_all_items_radio(_autosync_split_submenu, items_data,  "midbar.sync.autosplit", active_index, sync_callback)
+        mirror_section.append_submenu(_("Auto Sync Split Video Clips on Add"), _autosync_split_submenu)
+        items_data =(_("Audio Split To Mirrored Track"), "splitmirror"), (_("Audio Split To V1 Always"), "splitv1")
+        if  editorpersistance.prefs.sync_mirror == True:
+            active_index = 0
+        else:
+            active_index = 1
+        add_menu_action_all_items_radio(mirror_section, items_data, "midbar.sync.mirror", active_index, split_mirror_callback)
+        _sync_menu.append_section(None, mirror_section)
+    else:
+        _autosync_split_submenu = menu_clear_or_create(_autosync_split_submenu)
+        items_data =   ( _("Off"), str(appconsts.AUDIO_AUTO_SPLIT_OFF)), 
+                        (_("On All Video Tracks"), str(appconsts.AUDIO_AUTO_SPLIT_ALL_TACKS)),
+                        ( _("On Tracks V1 and V2"), str(appconsts.AUDIO_AUTO_SPLIT_V1_V2)), 
+                        ( _("On Track V1"), str(appconsts.AUDIO_AUTO_SPLIT_V1)) 
+        active_index = editorpersistance.prefs.sync_autosplit
+        add_menu_action_all_items_radio(_autosync_split_submenu, items_data,  "midbar.sync.autosplit", active_index, sync_callback)
+    
+    _sync_popover = Gtk.Popover.new_from_model(widget, _sync_menu)
+    launcher.connect_launched_menu(_sync_popover)
+    _sync_popover.show()
+    
 def all_tracks_menu_show(launcher, widget, callback):
     global _all_tracks_popover, _all_tracks_menu
 
@@ -357,12 +411,13 @@
 
     main_section = Gio.Menu.new()
     add_menu_action(main_section, _("Add New Sequence"), "sequencepanel.add", "add sequence", callback)
-    add_menu_action(main_section, _("Edit Selected Sequence"), "sequencepanel.edit", "edit sequence", callback)
-    add_menu_action(main_section, _("Delete Selected Sequence"), "sequencepanel.delete", "delete sequence", callback)
+    add_menu_action(main_section, _("Edit"), "sequencepanel.edit", "edit sequence", callback)
+    add_menu_action(main_section, _("Delete"), "sequencepanel.delete", "delete sequence", callback)
     _sequence_panel_menu.append_section(None, main_section)
 
     container_section = Gio.Menu.new()
-    add_menu_action(container_section, _("Create Container Clip from Selected Sequence"), "sequencepanel.create", "compound clip", callback)
+    add_menu_action(container_section, _("Create Container Clip"), "sequencepanel.create", "container clip", callback)
+    add_menu_action(container_section, _("Create Sequence Link Container Clip"), "sequencepanel.createseqlink", "sequence link container clip", callback)
     _sequence_panel_menu.append_section(None, container_section)
 
     rect = create_rect(x, y)
@@ -480,6 +535,10 @@
     global _media_panel_hamburger_popover, _media_panel_hamburger_menu
 
     _media_panel_hamburger_menu = menu_clear_or_create(_media_panel_hamburger_menu)
+
+    delete_section = Gio.Menu.new()
+    add_menu_action(delete_section, _("Delete"), "mediapanel.delete", "delete", callback)
+    _media_panel_hamburger_menu.append_section(None, delete_section)
     
     proxy_section = Gio.Menu.new()
     add_menu_action(proxy_section, _("Render Proxy Files For Selected Media"), "mediapanel.proxyrender", "render proxies", callback)
@@ -548,8 +607,8 @@
 
         items_data =( _("All Files"), "0"), (_("Video Files"), "1"), \
                     ( _("Audio Files"), "2"), (_("Graphics Files"), "3"), ( _("Image Sequences"), "4"), \
-                    (_("Pattern Producers"), "5"), (_("Unused Files"), "6")
-                    
+                    (_("Containers"), "5"), (_("Unused Files"), "6")
+
         active_index = editorstate.media_view_filter
         radio_section = Gio.Menu.new()
         add_menu_action_all_items_radio(radio_section, items_data, "mediapanel.fileview", active_index, callback)
@@ -574,7 +633,7 @@
 
 def media_file_popover_show(media_file, widget, x, y, callback, callback_rating):
     global _media_file_popover, _media_file_menu, _rated_section, _rated_submenu, _monitor_section, \
-    _mf_properties_section, _icon_section, _mf_render_section, _mf_proxy_section
+    _mf_properties_section, _icon_section, _mf_render_section, _mf_stabilize_section, _mf_proxy_section
 
     if _media_file_menu == None:
         _media_file_menu = menu_clear_or_create(_media_file_menu)
@@ -610,6 +669,10 @@
         _fill_mf_render_section(_mf_render_section, media_file, callback)
         _media_file_menu.append_section(None, _mf_render_section)
 
+        _mf_stabilize_section  = Gio.Menu.new()
+        _fill_mf_stabilize_section(_mf_stabilize_section, media_file, callback)
+        _media_file_menu.append_section(None, _mf_stabilize_section)
+
         _mf_proxy_section = Gio.Menu.new()
         _fill_mf_proxy_section(_mf_proxy_section, media_file, callback)
         _media_file_menu.append_section(None, _mf_proxy_section)
@@ -633,12 +696,38 @@
         menu_clear_or_create(_mf_render_section)
         _fill_mf_render_section(_mf_render_section, media_file, callback)
 
+        menu_clear_or_create(_mf_stabilize_section)
+        _fill_mf_stabilize_section(_mf_stabilize_section, media_file, callback)
+        
         menu_clear_or_create(_mf_proxy_section)
         _fill_mf_proxy_section(_mf_proxy_section, media_file, callback)
         
     rect = create_rect(x, y)
     _media_file_popover = new_mouse_popover(widget, _media_file_menu, rect)
 
+def media_file_popover_multi_show(widget, x, y, callback):
+    global _media_file_multi_popover, _media_file_menu_multi
+
+    if _media_file_menu_multi == None:
+        _media_file_menu_multi = menu_clear_or_create(_media_file_menu_multi)
+
+        file_action_section = Gio.Menu.new()
+        add_menu_action(file_action_section, _("Delete"), "mediapanel.mediafilemulti.delete", "Delete", callback)
+        _media_file_menu_multi.append_section(None, file_action_section)
+
+        media_item_action_section = Gio.Menu.new()
+        add_menu_action(media_item_action_section, _("Move to Clicked Position..."), "mediapanel.mediafilemulti.movetoclicked", "Move to Clicked Position", callback)
+        add_menu_action(media_item_action_section, _("Render Proxy File"), "mediapanel.mediafilemulti.proxy", "Render Proxy", callback)
+        _media_file_menu_multi.append_section(None, media_item_action_section)
+        
+        edit_action_section = Gio.Menu.new()
+        add_menu_action(edit_action_section, _("Append to Timeline"), "mediapanel.mediafilemulti.append", "Append to Timeline", callback)
+        _media_file_menu_multi.append_section(None, edit_action_section)
+            
+    rect = create_rect(x, y)
+    _media_file_multi_popover = new_mouse_popover(widget, _media_file_menu_multi, rect)
+
+
 def _fill_monitor_section(_monitor_section, media_file, callback):
     if hasattr(media_file, "container_data"): 
         if media_file.container_data == None:
@@ -681,6 +770,13 @@

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/guipopoverclip.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/guipopoverclip.py Changed

@@ -47,6 +47,7 @@
 _edit_bottom_section = None
 _compositor_section = None
 _title_section = None
+_generator_sub_menu = None
 _generator_section = None
 
 _audio_clip_popover = None
@@ -62,6 +63,7 @@
 _multi_clip_popover = None
 _multi_clip_menu = None
 _multi_audio_section = None
+_multi_sync_section = None
 
 _compositor_popover = None
 _compositor_menu = None
@@ -81,7 +83,7 @@
 _kf_select_menu = None
  
  
-# -------------------------------------------------- menuitems builder fuctions
+# -------------------------------------------------- menuitems builder functions
 def add_menu_action(menu, label, item_id, data, callback, active=True, app=None):
     return guipopover.add_menu_action(menu, label, item_id, data, callback, active, app)
 
@@ -108,7 +110,7 @@
 
     global _clip_popover, _clip_menu, _audio_submenu, _markers_submenu, \
     _markers_submenu_static_items, _reload_section, _edit_actions_menu, \
-    _tools_submenu, _title_section, _compositor_section, _generator_section
+    _tools_submenu, _title_section, _compositor_section, _generator_section, _generator_sub_menu
 
     if _clip_menu == None:
         _clip_menu = guipopover.menu_clear_or_create(_clip_menu)
@@ -124,6 +126,8 @@
         _clip_menu.append_section(None, audio_section)
 
         _generator_section = Gio.Menu.new()
+        _generator_sub_menu = Gio.Menu.new()
+        _fill_generator_render_section(_generator_sub_menu, clip, callback)
         _fill_generator_section(_generator_section, clip, callback)
         _clip_menu.append_section(None, _generator_section)
         
@@ -171,8 +175,8 @@
         clone_sub_menu = Gio.Menu.new()
         _fill_clone_filters_menu(clone_sub_menu, callback, False, False)
         filters_copy_section.append_submenu(_("Clone Filter"), clone_sub_menu)
-        add_menu_action(filters_copy_section, _("Copy Filters"), "clipmenu.openinmonitor.copyfilters",  ("copy_filters", None), callback)
-        add_menu_action(filters_copy_section, _("Paste Filters"), "clipmenu.openinmonitor.pastefilters",  ("paste_filters", None), callback)
+        add_menu_action(filters_copy_section, _("Copy Filters"), "clipmenu.copyfilters",  ("copy_filters", None), callback)
+        add_menu_action(filters_copy_section, _("Paste Filters"), "clipmenu.pastefilters",  ("paste_filters", None), callback)
         _clip_menu.append_section(None, filters_copy_section)
 
         _title_section = Gio.Menu.new()
@@ -206,9 +210,12 @@
         guipopover.menu_clear_or_create(_title_section)
         _fill_title_section(_title_section, clip, callback)
 
+        guipopover.menu_clear_or_create(_generator_sub_menu)
+        _fill_generator_render_section(_generator_sub_menu, clip, callback)
+
         guipopover.menu_clear_or_create(_generator_section)
         _fill_generator_section(_generator_section, clip, callback)
-
+        
     rect = guipopover.create_rect(x, y)
     _clip_popover = guipopover.new_mouse_popover(widget, _clip_menu, rect, Gtk.PositionType.TOP)
 
@@ -267,6 +274,7 @@
         _fill_clone_filters_menu(clone_sub_menu, callback, False, True)
         filters_section.append_submenu(_("Clone Filter"), clone_sub_menu)
         add_menu_action(filters_section, _("Clear Filters"), "audioclipmenu.clearfilters",  ("clear_filters", None), callback)
+        add_menu_action(filters_section, _("Paste Filters"), "audioclipmenu.pastefilters",  ("paste_filters", None), callback)
         _audio_clip_menu.append_section(None, filters_section)
 
         edit_bottom_section = Gio.Menu.new()
@@ -310,7 +318,7 @@
         transition_popover_menu_show(widget, clip, track, x, y, callback)
         return
 
-    global _multi_clip_popover, _multi_clip_menu, _multi_audio_section
+    global _multi_clip_popover, _multi_clip_menu, _multi_audio_section, _multi_sync_section
 
     if _multi_clip_menu == None:
         _multi_clip_menu = guipopover.menu_clear_or_create(_multi_clip_menu)
@@ -319,6 +327,10 @@
         _fill_multi_audio_section(_multi_audio_section, clip, track, callback)
         _multi_clip_menu.append_section(None, _multi_audio_section)
 
+        _multi_sync_section = Gio.Menu.new()
+        _fill_multi_sync_section(_multi_sync_section, clip, track, callback)
+        _multi_clip_menu.append_section(None, _multi_sync_section)
+            
         container_section = Gio.Menu.new()
         add_menu_action(container_section, _("Create Container Clip From Selected Clips"), "multiclipmenu.createmulticompound",  ("create_multi_compound", None), callback)
         _multi_clip_menu.append_section(None, container_section)
@@ -331,17 +343,25 @@
         _fill_clone_filters_menu(clone_sub_menu, callback, True, False)
         filters_section.append_submenu(_("Clone Filter"), clone_sub_menu)
         add_menu_action(filters_section, _("Clear Filters"), "multiclipmenu.clearfilters",  ("clear_filters", None), callback)
+        add_menu_action(filters_section, _("Paste Filters"), "multiclipmenu.pastefilters",  ("paste_filters", None), callback)
         _multi_clip_menu.append_section(None, filters_section)
 
         delete_section = Gio.Menu.new()
         add_menu_action(delete_section, _("Delete"), "multiclipmenu.delete",  ("delete", None), callback)
         add_menu_action(delete_section, _("Lift"), "multiclipmenu.lift",  ("lift", None), callback)
+        add_menu_action(delete_section, _("Ripple Delete Selection Range"), "multiclipmenu.ripplerange",  ("ripplerangeselection", None), callback)
         _multi_clip_menu.append_section(None, delete_section)
 
+        mark_section = Gio.Menu.new()
+        add_menu_action(mark_section, _("Mark Selection Range"), "multiclipmenu.markselectionrange",  ("mark_selection_range", None), callback)
+        _multi_clip_menu.append_section(None, mark_section)
+    
     else: # Menu items with possible state changes need to recreated.
         guipopover.menu_clear_or_create(_multi_audio_section)
         _fill_multi_audio_section(_multi_audio_section, clip, track, callback)
-
+        guipopover.menu_clear_or_create(_multi_sync_section)
+        _fill_multi_sync_section(_multi_sync_section, clip, track, callback)
+        
     rect = guipopover.create_rect(x, y)
     _multi_clip_popover = guipopover.new_mouse_popover(widget, _multi_clip_menu, rect, Gtk.PositionType.TOP)
 
@@ -391,6 +411,7 @@
         _fill_clone_filters_menu(clone_sub_menu, callback, False, False, True)
         filters_section.append_submenu(_("Clone Filter"), clone_sub_menu)
         add_menu_action(filters_section, _("Clear Filters"), "transitionclipmenu.clearfilters",  ("clear_filters", None), callback)
+        add_menu_action(filters_section, _("Paste Filters"), "transitionclipmenu.pastefilters",  ("paste_filters", None), callback)
         _transition_menu.append_section(None, filters_section)
 
     else: # Menu items with possible state changes need to recreated.
@@ -405,17 +426,21 @@
     if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
         active = False
     add_menu_action(multi_audio_section, _("Split Audio"), "multiclipmenu.multisplitaudio",  ("multi_split_audio", None), callback, active)
-    active = (track.id == current_sequence().first_video_index)
+    active = True
     if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
         active = False
     add_menu_action(multi_audio_section, _("Split Audio Synched"), "multiclipmenu.multisplitaudiosynched",  ("multi_split_audio_synched", None), callback, active)
     if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
         active = False
-    else:
-        active = True
+
     add_menu_action(multi_audio_section, _("Mute Audio"), "multiclipmenu.muteaudio",  ("multi_mute_audio", None), callback, active)
     add_menu_action(multi_audio_section, _("Unmute Audio"), "multiclipmenu.unmuteaudio",  ("multi_unmute_audio", None), callback, active)
-    
+
+def _fill_multi_sync_section(sync_section, clip, track, callback):
+    add_menu_action(sync_section,_("Select Sync Parent Clip..."), "clipmenu.multisetmaster",  ("multi_set_master", None), callback)
+    add_menu_action(sync_section,_("Resync"), "clipmenu.multiresync",  ("multi_resync", None), callback)
+    add_menu_action(sync_section,_("Clear Sync Relations"), "clipmenu.multiclearsyncrel",  ("multi_clear_sync_rel", None), callback)
+
 def _fill_audio_menu(audio_submenu, clip, track, callback):
     if track.type == appconsts.VIDEO:
         active = True
@@ -423,7 +448,7 @@
             active = False
         add_menu_action(audio_submenu, _("Split Audio"), "clipmenu.splitaudio",  ("split_audio", None), callback, active)
 
-        active = (track.id == current_sequence().first_video_index)
+        active = True
         if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
             active = False
         add_menu_action(audio_submenu, _("Split Audio Synched"), "clipmenu.splitaudiosynched", ("split_audio_synched", None), callback, active)
@@ -504,16 +529,18 @@
     del_section = Gio.Menu.new()
     add_menu_action(del_section,_("Delete"), "clipmenu.delete",  ("delete", None), callback)
     add_menu_action(del_section,_("Lift"), "clipmenu.delete",  ("lift", None), callback)
+    add_menu_action(del_section, _("Ripple Delete Clip Range"), "clipmenu.ripplerange",  ("ripplerange", None), callback)
     edit_actions_menu.append_section(None, del_section)
 
-    if track.id != current_sequence().first_video_index:
-        sync_section = Gio.Menu.new()
-        if clip.sync_data != None:
-            add_menu_action(sync_section,_("Resync"), "clipmenu.resync",  ("resync", None), callback)
-            add_menu_action(sync_section,_("Clear Sync Relation"), "clipmenu.clearsyncrel",  ("clear_sync_rel", None), callback)
-        else:
-            add_menu_action(sync_section,_("Select Sync Parent Clip..."), "clipmenu.setmaster",  ("set_master", None), callback)
-        edit_actions_menu.append_section(None, sync_section)
+    sync_section = Gio.Menu.new()
+
+    active = (clip.sync_data != None)
+    add_menu_action(sync_section,_("Resync"), "clipmenu.resync",  ("resync", None), callback, active)
+    add_menu_action(sync_section,_("Clear Sync Relation"), "clipmenu.clearsyncrel",  ("clear_sync_rel", None), callback, active)
+
+    active = (clip.sync_data == None)
+    add_menu_action(sync_section,_("Select Sync Parent Clip..."), "clipmenu.setmaster",  ("set_master", None), callback, active)
+    edit_actions_menu.append_section(None, sync_section)
 
     length_section = Gio.Menu.new()
     add_menu_action(length_section, _("Set Clip Length..."), "clipmenu.length",  ("length", None), callback)
@@ -544,8 +571,14 @@
         pre_id = "audio"
     else:
         pre_id = ""
-    add_menu_action(select_menu, _("All Clips After"), pre_id + "clipmenu.selectallafter",  ("select_all_after", None), callback)
-    add_menu_action(select_menu, _("All Clips Before"), pre_id + "clipmenu.selectallbefore",  ("select_all_before", None), callback)
+    select_section = Gio.Menu.new()

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/jobs.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/jobs.py Changed

@@ -46,6 +46,7 @@
 import renderconsumer
 import respaths
 import stabilizeheadless
+import stabilizedvideoheadless
 import trackingheadless
 import userfolders
 import utils
@@ -64,6 +65,7 @@
 CONTAINER_CLIP_RENDER_FLUXITY = 6
 STABILIZE_DATA_RENDER = 7
 MOTION_TRACKING_DATA_RENDER = 8
+STABILIZED_MEDIA_ITEM_RENDER = 9
 
 FFMPEG_ATTR_SOURCEFILE = "%SOURCEFILE"
 FFMPEG_ATTR_SCREENSIZE = "%SCREENSIZE"
@@ -122,7 +124,15 @@
         self.text = text
         self.elapsed = elapsed
 
-                  
+class ProcessCommandListRunner(threading.Thread):
+    def __init__(self, command_list):
+        threading.Thread.__init__(self)
+        self.command_list = command_list
+        
+    def run(self):
+        process = subprocess.Popen(self.command_list)
+        process.wait()
+
 #---------------------------------------------------------------- interface
 def add_job(job_proxy):
     global _jobs, _jobs_list_view 
@@ -455,7 +465,6 @@
         return file_name
         
     def start_render(self):
-        
         job_msg = self.get_job_queue_message()
         job_msg.text = _("Render Starting...")
         job_msg.status = RENDERING
@@ -468,8 +477,10 @@
             command_list.append(arg)
         parent_folder_arg = "parent_folder:" + str(self.parent_folder)
         command_list.append(parent_folder_arg)
-            
-        subprocess.Popen(command_list)
+
+        # We need to wait() in thread.
+        command_list_runner = ProcessCommandListRunner(command_list)
+        command_list_runner.start()
         
     def update_render_status(self):
         GLib.idle_add(self._update_from_gui_thread)
@@ -512,7 +523,7 @@
             else:
                 # Process start/stop on their own and we hit trying to get non-existing status for e.g completed renders.
                 
-                # This may not necessery to do here.
+                # This may not necessary to do here.
                 if self.tline_clip_data != None:
                     self.target_clip.render_progress = None
 
@@ -553,7 +564,7 @@
         # Set writefile.
         data_file_uid = utils.get_uid_str()
         self.write_file = userfolders.get_render_dir() + data_file_uid + appconsts.STABILIZE_DATA_EXTENSION
-        print(self.write_file)
+
         # Create command list and launch process.
         command_list = sys.executable
         command_list.append(respaths.LAUNCH_DIR + "flowbladestabilizeheadless")
@@ -612,7 +623,159 @@
         stabilizeheadless.abort_render(self.parent_folder, self.get_session_id())
 
 
-class MotionTrackingDataRenderJobQueueObject(AbstractJobQueueObject):
+class StablizedMediaItemDataRenderJobQueueObject(AbstractJobQueueObject):
+
+    def __init__(self, session_id, media_file, render_params, data_render_comple_callback, args):
+        
+        AbstractJobQueueObject.__init__(self, session_id, STABILIZE_DATA_RENDER)
+        
+        self.media_file = media_file
+        self.render_params = render_params
+        self.args = args
+        self.parent_folder = userfolders.get_temp_render_dir() # This is used for message passing, output file goes to path given by 'write_file'.
+        self.data_render_comple_callback = data_render_comple_callback
+        
+    def start_render(self):
+        
+        job_msg = self.get_job_queue_message()
+        job_msg.text = _("Render Starting...")
+        job_msg.status = RENDERING
+        update_job_queue(job_msg)
+        
+        # Set writefile.
+        data_file_uid = utils.get_uid_str()
+        self.write_file = userfolders.get_render_dir() + data_file_uid + appconsts.STABILIZE_DATA_EXTENSION
+
+        # Create command list and launch process.
+        command_list = sys.executable
+        command_list.append(respaths.LAUNCH_DIR + "flowbladestabilizeheadless")
+        for arg in self.args:
+            command_list.append(arg)
+        parent_folder_arg = "parent_folder:" + str(self.parent_folder)
+        command_list.append(parent_folder_arg)
+        write_file_arg = "write_file:" + str(self.write_file)
+        command_list.append(write_file_arg)
+        
+        subprocess.Popen(command_list)
+        
+    def update_render_status(self):
+        GLib.idle_add(self._update_from_gui_thread)
+            
+    def _update_from_gui_thread(self):
+
+        if stabilizeheadless.session_render_complete(self.parent_folder, self.get_session_id()) == True:
+            
+            job_msg = self.get_completed_job_message()
+            update_job_queue(job_msg)
+            
+            stabilizeheadless.delete_session_folders(self.parent_folder, self.get_session_id())
+            
+            GLib.idle_add(self.data_render_done)
+
+        else:
+            status = stabilizeheadless.get_session_status(self.parent_folder, self.get_session_id())
+            if status != None:
+                fraction, elapsed = status
+                
+                self.progress = float(fraction)
+                if self.progress > 1.0:
+                    # A fix for how progress is calculated because producers can render a bit longer then required.
+                    self.progress = 1.0
+
+                self.elapsed = float(elapsed)
+                self.text = _("Stabilizing Analysis") + " " + self.media_file.name
+                
+                job_msg = self.get_job_queue_message()
+                
+                update_job_queue(job_msg)
+            else:
+                # Process start/stop on their own and we hit trying to get non-existing status for e.g completed renders.
+                pass
+
+    def data_render_done(self):
+        self.data_render_comple_callback(self.media_file, self.render_params, self.write_file)
+        
+    def abort_render(self):
+        #remove_as_status_polling_object(self)
+        stabilizeheadless.abort_render(self.parent_folder, self.get_session_id())
+
+
+class StabilizedMediaItemVideoRenderJobQueueObject(AbstractJobQueueObject):
+
+    def __init__(self, session_id, write_file, args):
+        
+        AbstractJobQueueObject.__init__(self, session_id, STABILIZED_MEDIA_ITEM_RENDER)
+        
+        self.write_file = write_file
+        self.args = args
+        self.parent_folder = userfolders.get_temp_render_dir() # THis is just used for message passing, output file goes where user decided.
+                
+    def get_job_name(self):
+        folder, file_name = os.path.split(self.write_file)
+        return file_name
+        
+    def start_render(self):
+        
+        job_msg = self.get_job_queue_message()
+        job_msg.text = _("Render Starting...")
+        job_msg.status = RENDERING
+        update_job_queue(job_msg)
+        
+        # Create command list and launch process.
+        command_list = sys.executable
+        command_list.append(respaths.LAUNCH_DIR + "flowbladestabilizedvideoheadless")
+        for arg in self.args:
+            command_list.append(arg)
+        parent_folder_arg = "parent_folder:" + str(self.parent_folder)
+        command_list.append(parent_folder_arg)
+
+        # We need to wait() in thread.
+        command_list_runner = ProcessCommandListRunner(command_list)
+        command_list_runner.start()
+        
+    def update_render_status(self):
+        GLib.idle_add(self._update_from_gui_thread)
+            
+    def _update_from_gui_thread(self):
+
+        if stabilizedvideoheadless.session_render_complete(self.parent_folder, self.get_session_id()) == True:
+            job_msg = self.get_completed_job_message()
+            update_job_queue(job_msg)
+            
+            stabilizedvideoheadless.delete_session_folders(self.parent_folder, self.get_session_id())
+            
+            GLib.idle_add(self.create_media_item)
+

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/keyevents.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/keyevents.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/keyframeeditcanvas.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/keyframeeditcanvas.py Changed

@@ -360,6 +360,17 @@
         self.keyframes.append((frame, copy.deepcopy(p_shape), copy.deepcopy(p_opacity),  p_type))
         
         self.keyframes.sort(key=_geom_kf_sort)
+
+    def add_keyframe_with_shape_opacity_and_type(self, frame, shape, opacity, kf_type):
+        if self._frame_has_keyframe(frame) == True:
+            kf_index = self._get_frame_keyframe_index(frame)
+            self.keyframes.pop(kf_index)
+            self._update_shape()
+
+        # Add with values, for now we always set opacity to max.
+        self.keyframes.append((frame, shape, opacity,  kf_type))
+        
+        self.keyframes.sort(key=_geom_kf_sort)
         
     def delete_active_keyframe(self, keyframe_index):
         if keyframe_index == 0:
@@ -377,6 +388,15 @@
 
         return False
 
+    def _get_frame_keyframe_index(self, frame):
+        for i in range(0, len(self.keyframes)):
+            kf = self.keyframesi
+            kf_frame, rect, opacity, kf_type = kf
+            if frame == kf_frame:
+                return i
+
+        return None
+        
     def set_keyframes(self, keyframes_str, out_to_in_func):
         self.keyframes = self.keyframe_parser(keyframes_str, out_to_in_func)
 
@@ -566,6 +586,10 @@
     def _draw_edit_shape(self, cr, allocation):
         print("_draw_edit_shape not impl.")
         
+    def print_keyframes(self):
+        for i in range(0, len(self.keyframes)):
+            print(self.keyframesi)
+
 
 class BoxEditCanvas(AbstractEditCanvas):
     """
@@ -801,9 +825,7 @@
         
         self.source_edit_rect.h = self.source_edit_rect.h * (self.source_edit_rect.w / old_w)
 
-    def print_keyframes(self):
-        for i in range(0, len(self.keyframes)):
-            print(self.keyframesi)
+
 
 
 class RotatingEditCanvas(AbstractEditCanvas):

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/keyframeeditor.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/keyframeeditor.py Changed

@@ -37,6 +37,7 @@
 import cairoarea
 import callbackbridge
 import compositorfades
+import dialogutils
 from editorstate import PLAYER
 from editorstate import current_sequence
 from editorstate import PROJECT
@@ -539,6 +540,26 @@
         self.keyframes.append((frame, prev_value, prev_type))
         self.active_kf_index = len(self.keyframes) - 1
 
+    def add_keyframe_with_type(self, frame, type):
+        # NOTE: This makes added keyframe the active keyframe too.
+        kf_index_on_frame = self.frame_has_keyframe(frame)
+        if kf_index_on_frame != -1:
+            # Trying add on top of existing keyframe makes it active
+            self.active_kf_index = kf_index_on_frame
+            return
+
+        for i in range(0, len(self.keyframes)):
+            kf_frame, kf_value, kf_type = self.keyframesi
+            if kf_frame > frame:
+                prev_frame, prev_value, prev_type = self.keyframesi - 1
+                self.keyframes.insert(i, (frame, prev_value, type))
+                self.active_kf_index = i
+                return
+
+        prev_frame, prev_value, prev_type = self.keyframeslen(self.keyframes) - 1
+        self.keyframes.append((frame, prev_value, type))
+        self.active_kf_index = len(self.keyframes) - 1
+        
     def print_keyframes(self, msg="no_msg"):
         print(msg, "clip edit keyframes:")
         for i in range(0, len(self.keyframes)):
@@ -554,6 +575,21 @@
             self.active_kf_index = 0
         self._set_pos_to_active_kf()
 
+    def delete_keyframe(self, index):
+        if index == 0:
+            return
+
+        try:
+            self.keyframes.pop(index)
+        except:
+            print("ClipKeyFrameEditor.delete_keyframe index out of range")
+            return
+                
+        if self.active_kf_index >= len(self.keyframes):
+            self.active_kf_index = len(self.keyframes) - 1
+            return
+        self._set_pos_to_active_kf()
+        
     def set_next_active(self):
         """
         Activates next keyframe or keeps last active to stay in range.
@@ -578,7 +614,15 @@
             self.active_kf_index = len(self.get_out_of_range_before_kfs())
 
         self._set_pos_to_active_kf()
-    
+
+    def set_active_keyframe_to_kf_in_frame(self, frame):
+        # this is noop if no keyframe in frame exists.
+        for i in range(0, len(self.keyframes)):
+            kf_frame, kf_value, kf_type = self.keyframesi
+            if kf_frame == frame:
+                self.active_kf_index = i
+                self._set_pos_to_active_kf()
+
     def _set_pos_to_active_kf(self):
         try:
             frame, value, type = self.keyframesself.active_kf_index
@@ -996,6 +1040,10 @@
         guipopover.add_menu_action_all_items_radio(kftype_section, items_data, action_id, active_index, callback)
         menu.append_section(None, kftype_section)
 
+    def print_keyframes(self, msg="no_msg"):
+        print(msg, "clip edit keyframes:")
+        for i in range(0, len(self.clip_editor.keyframes)):
+            print(self.clip_editor.keyframesi)
         
 class KeyFrameEditor(AbstractKeyFrameEditor):
     """
@@ -1191,7 +1239,18 @@
             self.clip_editor.clone_value_from_next()
         elif msg  == "clonekfprev":
             self.clip_editor.clone_value_from_prev()
-    
+        elif msg == "openinkftool":
+            track = self.editable_property.track
+            clip = self.editable_property.clip
+            displayname = self.editable_property.args"displayname".replace("!", " ")
+            filter_index = self.editable_property.filter_index
+            filter = clip.filtersfilter_index
+            prop = filter.propertiesself.editable_property.property_index
+            param_name, val, type = prop
+            callbackbridge.modesetting_kftool_mode_from_kf_editor(clip, track, param_name, filter, filter_index, displayname)
+
+            return
+            
         self.queue_draw()
         self.update_property_value()
 
@@ -1260,6 +1319,10 @@
 
         _kf_menu.append_section(None, kfs_section)
 
+        open_in_kf_tool_section = Gio.Menu.new()
+        guipopover.add_menu_action(open_in_kf_tool_section, _("Open in Keyframe Tool"), "keyframes.openinkftool",  "openinkftool", self._menu_item_activated)
+        _kf_menu.append_section(None, open_in_kf_tool_section)
+        
         _kf_popover = guipopover.new_popover(widget, _kf_menu, launcher)
 
 
@@ -1850,7 +1913,7 @@
         # that contain the property values when opening editor.
         # From now on clip editor opacity values are used until editor is discarded.
         self.clip_editor.keyframes = self.get_clip_editor_keyframes()
-      
+
         # Build gui
         self.pack_start(g_frame, False, False, 0)
         self.pack_start(self.pos_entries_row, False, False, 0)
@@ -2049,6 +2112,239 @@
         self.update_editor_view_with_frame(frame)
         self.update_property_value()
 
+    def _show_add_movement_dialog(self):
+        categories_list = 
+        in_moves = _("Slide In Form Left"), _("Slide In From Right"), _("Slide In From Top"), _("Slide In From Bottom")
+        categories_list.append((_("Slide In"), in_moves))
+        out_moves = _("Slide Out To Left"), _("Slide Out To Right"), _("Slide Out To Top"), ("Slide Out To Bottom")
+        categories_list.append((_("Slide Out"), out_moves))
+        zoom_in_moves = _("Zoom In 5%"), _("Zoom In 10%"), _("Zoom In 20%"), _("Zoom In 30%")
+        categories_list.append((_("Zoom In"), zoom_in_moves))
+        zoom_out_moves = _("Zoom Out 5%"), _("Zoom Out 10%"), _("Zoom Out 20%"), _("Zoom Out 30%")
+        categories_list.append((_("Zoom Out"), zoom_out_moves))
+        
+        combo = guicomponents.CategoriesModelComboBox(categories_list)
+        combo.set_selected(in_moves0)
+
+        hbox, slider = guiutils.get_non_property_slider_row(2, 200, 1, 10)
+        hbox.set_size_request(300, 20)
+
+        kf_type_combo = Gtk.ComboBoxText()
+        kf_type_combo.append_text(_("Linear"))
+        kf_type_combo.append_text(_("Smooth"))
+        kf_type_combo.set_active(0)
+
+        left_width = 170
+        row1 = guiutils.get_two_column_box(Gtk.Label(label=_("Movement Type:")), combo.widget, left_width)
+        row2 = guiutils.get_two_column_box(Gtk.Label(label=_("Movement Length:")), hbox, left_width)
+        row3 = guiutils.get_two_column_box(Gtk.Label(label=_("Keyframe Type:")), kf_type_combo, left_width)
+        
+        pane = Gtk.VBox()
+        
+        pane = Gtk.VBox()
+        pane.pack_start(row1, False, False, 0)
+        pane.pack_start(row2, False, False, 0)
+        pane.pack_start(row3, False, False, 0)
+
+        dialogutils.panel_ok_cancel_dialog(_("Add Preset Movement"), pane, _("Add Movement"), self._add_movemement_callback, (combo, slider, kf_type_combo, in_moves, out_moves, zoom_in_moves, zoom_out_moves))
+
+    def _add_movemement_callback(self, dialog, response_id, data):
+        if response_id != Gtk.ResponseType.ACCEPT:
+            dialog.destroy()
+            return
+
+        combo, slider, kf_type_combo, in_moves, out_moves, zoom_in_moves, zoom_out_moves = data
+
+        sel = combo.get_selected()
+        length = int(slider.get_value()) 
+        in_frame = self.editable_property.clip.clip_in
+        out_frame = self.editable_property.clip.clip_out
+
+        if kf_type_combo.get_active() == 0:
+            kf_type = appconsts.KEYFRAME_LINEAR
+        else:
+            kf_type = appconsts.KEYFRAME_SMOOTH
+            
+        dialog.destroy()
+        
+        if ((sel in in_moves) or (sel in out_moves)) == True:
+            active_frame = self._write_preset_slide_keyframes(sel, length, kf_type, in_frame, out_frame, in_moves, out_moves)
+        else:
+            active_frame = self._write_preset_zoom_keyframes(sel, length, kf_type, in_frame, out_frame, zoom_in_moves, zoom_out_moves)
+        
+        # Update view.
+        self.clip_editor.set_active_keyframe_to_kf_in_frame(active_frame)
+        
+        frame = self.clip_editor.get_active_kf_frame()
+        self.pos_entries_row.update_entry_values(self.geom_kf_edit.get_keyframe(self.clip_editor.active_kf_index))
+        self.update_editor_view_with_frame(frame)
+        self.update_property_value()
+        self.buttons_row.set_kf_info(self.clip_editor.get_kf_info())
+
+        #def _write_preset_slide_keyframes(self, x1, x2, y1, y2, fr1, fr2, kf_type):
+    def _write_preset_slide_keyframes(self, sel, length, kf_type, in_frame, out_frame, in_moves, out_moves):

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/kftoolmode.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/kftoolmode.py Changed

@@ -208,6 +208,10 @@
     tlinewidgets.set_edit_mode_data(edit_data)
     updater.repaint_tline()
 
+def init_for_clip_filter_and_param(clip, track, param_name, filter, filter_index, dispay_name):
+    param_data = (param_name, filter, filter_index, dispay_name)
+    init_tool_for_clip(clip, track, PARAM_KF_EDIT, param_data)
+
 def get_clip_kftool_editable_params_data(clip):
     kftool_editable_params = 
     for i in range(0, len(clip.filters)):
@@ -332,7 +336,7 @@
     global enter_mode
     if enter_mode != None:
         # Exit to enter mode if we had one.
-        gui.editor_window.tline_cursor_manager.tline_cursor_manager.kf_tool_exit_to_mode(enter_mode)
+        gui.editor_window.tline_cursor_manager.kf_tool_exit_to_mode(enter_mode)
         enter_mode = None
     else:
         # Exit to default mode if no editor was open.
@@ -1702,6 +1706,10 @@
             global _playhead_follow_kf
             _playhead_follow_kf = new_state
             action.set_state(GLib.Variant.new_boolean(new_state))
+        elif msg == "editpanel":
+            ep = edit_data"editable_property"
+            clipeffectseditor.set_clip_and_filter(ep.clip, ep.track, ep.clip_index, ep.filter_index)
+            exit_tool()
         elif msg == "exit":
             set_no_clip_edit_data()

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/launch/flowblademltxmlheadless -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/launch/flowblademltxmlheadless Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/launch/flowbladestabilizedvideoheadless Added

@@ -0,0 +1,49 @@
+#!/usr/bin/python3
+
+import sys
+import os
+
+def _get_arg_value(args, key_str):
+    for arg in sys.argv:
+        parts = arg.split(":")
+        if len(parts) > 1:
+            if parts0 == key_str:
+                return parts1
+    
+    return None
+
+modules_path = os.path.dirname(os.path.abspath(sys.argv0)).rstrip("/launch")
+
+sys.path.insert(0, modules_path)
+import processutils
+processutils.update_sys_path(modules_path)
+
+try:
+    import stabilizedvideoheadless
+    import editorstate # Used to decide which translations from file system are used
+    root_dir = modules_path.split("/")1
+    
+    # And we need this for translations?
+    if root_dir != "home":
+        editorstate.app_running_from = editorstate.RUNNING_FROM_INSTALLATION
+    else:
+        editorstate.app_running_from = editorstate.RUNNING_FROM_DEV_VERSION
+    
+    session_id = _get_arg_value(sys.argv, "session_id")
+    parent_folder = _get_arg_value(sys.argv, "parent_folder")
+    write_file = _get_arg_value(sys.argv, "write_file")
+    results_file = _get_arg_value(sys.argv, "results_file")
+    encoding_option_index = _get_arg_value(sys.argv, "encoding_option_index")
+    quality_option_index = _get_arg_value(sys.argv, "quality_option_index")
+    source_path = _get_arg_value(sys.argv, "source_path")
+    profile_desc_under_score = _get_arg_value(sys.argv, "profile_desc")
+    profile_desc = profile_desc_under_score.replace("_", " ") # We need to put underscores in profile names to get them here in one piece.
+                                                              # Now we take underscores out to get correct MLT profile names.
+except Exception as err:
+    print ("Failed to import mltxmlheadless")
+    print ("ERROR:", err)
+    print ("Installation was assumed to be at:", modules_path)
+    sys.exit(1)
+
+stabilizedvideoheadless.main(   modules_path, session_id, parent_folder, write_file, results_file, profile_desc, encoding_option_index, 
+                                quality_option_index, source_path)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/launch/flowbladestabilizeheadless -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/launch/flowbladestabilizeheadless Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/launch/flowbladetrackingheadless -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/launch/flowbladetrackingheadless Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -33,138 +33,138 @@
 msgid "5 min"
 msgstr ""
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr ""
 
-#: app.py:1029
+#: app.py:1035
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr ""
 
-#: app.py:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr ""
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr ""
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr ""
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr ""
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr ""
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr ""
 
-#: projectaction.py:228
+#: projectaction.py:232
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 
-#: projectaction.py:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr ""
 
-#: projectaction.py:230
+#: projectaction.py:234
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 
-#: projectaction.py:231
+#: projectaction.py:235
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr ""
 
-#: projectaction.py:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr ""
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr ""
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr ""
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -172,110 +172,110 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""
 "\n"
 "Add the correct extension to load a problem file."
 msgstr ""
 
-#: projectaction.py:445
+#: projectaction.py:449
 msgid "Media files already present in project were opened!"
 msgstr ""
 
-#: projectaction.py:451

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -35,114 +35,114 @@
 msgid "5 min"
 msgstr "5 minut"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Příliš malá obrazovka pro tento program."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Rozměry vaší obrazovky jsou "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Program nelze spustit z důvodu chyby v inicializaci složky XDG."
 
-#: app.py:1052
+#: app.py:1058
 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:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Verze MLT: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Pro běh Flowblade nainstalujte MLT 6.18 nebo novější."
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Projekt předtím byl uložen"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Uložte projekt před zavřením pomocí Soubor → Uložit."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Otevírá se"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Položka záznamů chybí!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Cesta k chybějící položce:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Pro nahrání projektu budete potřebovat:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Otevřít projekt v nástroji pro odkazování záznamů"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Profil s popisem: „"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "“ nebyl při nahrávání nalezen!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 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:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr "Otevírání animovaného souboru .gif bylo odmítnuto!"
 
-#: projectaction.py:361
+#: projectaction.py:365
 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:362
+#: projectaction.py:366
 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:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -187,21 +187,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -36,110 +36,110 @@
 msgid "5 min"
 msgstr ""
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Zu kleiner Bildschirm für diese Applikation."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Ihre Auflösung beträgt "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Kann Applikation wegen XDG-Ordner-Fehler nicht starten."
 
-#: app.py:1052
+#: app.py:1058
 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:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Ihre MLT-Version ist: "
 
-#: app.py:1053
+#: app.py:1059
 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:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Projekt wurde noch nicht gesichert"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Projekt vor dem Schließen sichern mit 'Datei -> Sichern als...'."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Öffnen"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Mediendatei fehlt!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Pfad der fehlenden Datei:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "Suche nach Ersatzdatei in Unterordnern des Projekts fehlgeschlagen."
 
-#: projectaction.py:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Um das Projekt zu laden müssen Sie entweder:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Öffne das Projekt im 'Medien-Link' Werkzeug"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Profil mit Beschreibung: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' wurde beim Laden nicht gefunden!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Nutzerprofile können unter 'Bearbeiten->Profil-Manager' angelegt werden."
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr "Öffnen einer animierten GIF-Datei verweigert!"
 
-#: projectaction.py:361
+#: projectaction.py:365
 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:362
+#: projectaction.py:366
 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:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -183,21 +183,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""
 "\n"
 "Add the correct extension to load a problem file."
 msgstr ""

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -34,11 +34,11 @@
 msgid "5 min"
 msgstr "5 minutos"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr "¡La ubicación de la carpeta de datos XDG ha cambiado!"
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
@@ -51,7 +51,7 @@
 "porque el valor de la variable <b>Inicio de datos XDG</b> ha cambiado.\n"
 "\n"
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
@@ -61,7 +61,7 @@
 "Los proyectos existentes con datos de proyecto guardados en el <b>Almacén de "
 "datos XDG predeterminado</b> seguirán funcionando.\n"
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
@@ -71,67 +71,67 @@
 "proyectos tendrán datos guardados en la ubicación especificada por la nueva "
 "variable de valor <b>XDG Data Home</b>."
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "La pantalla es demasiado pequeña para esta aplicación."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Las dimensiones de su pantalla son "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Cannot launch application because XDG folders init error."
 
-#: app.py:1052
+#: app.py:1058
 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:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Versión de MLT: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Install MLT 6.18 or higher to run Flowblade."
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "El proyecto no se ha salvado antes"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Salvar el proyecto en un Archivo -> Salvar como antes de cerrar."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Abriendo"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "¡Falta un recurso multimedia!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Ruta del activo faltante:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Para cargar el proyecto necesitarás:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Abrir proyecto en la herramienta Media Relinker"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Perfil con descripción: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' ¡No se encontró en la carga!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 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:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr "¡Se rechazó la apertura del archivo .gif animado!"
 
-#: projectaction.py:361
+#: projectaction.py:365
 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:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
@@ -194,11 +194,11 @@
 "convertir el GIF en una secuencia de cuadros y\n"
 "abrirlo como un elemento multimedia."
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr "¡Se rechazó la apertura de archivos con extensiones desconocidas!"
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -213,11 +213,11 @@
 "multimedia a partir de sus extensiones.\n"
 "Archivos problemáticos:\n"

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -38,93 +38,93 @@
 msgid "5 min"
 msgstr ""
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Votre écran est trop petit pour cette application."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Votre résolution actuelle est "
 
-#: app.py:1041
+#: app.py:1047
 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:1052
+#: app.py:1058
 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:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Version MLT : "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Installez MLT 6.18 ou supérieure pour lancer Flowblade."
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Le projet n'a jamais été sauvegardé"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 "Avant de fermer, sauvegardez le projet avec <u>Menu Fichier</u> -> "
 "Enregistrer sous."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Ouverture"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Le média est absent !"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Chemin du média manquant :"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Pour charger le projet vous avez besoin soit :"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Ouvrir le projet dans l'outil Remplacement de médias"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Description : '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "'n'a pas été trouvé au chargement !"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -187,21 +187,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -33,115 +33,115 @@
 msgid "5 min"
 msgstr "5 perc"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Túl kicsi a képernyő az alkalmazás számára."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Az ön képernyőjének felbontása "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1053
+#: app.py:1059
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "MLT változat: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "A projekt korábban még nem volt mentve"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 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:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Megnyitás"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Hiányzó média összetevő!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "A hiányzó média összetevő útvonala:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 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:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Projekt megnyitása a 'Média újracsatoló' eszközben"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "A profil ezzel a leírással: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' nem volt a megtalálható betöltés során!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 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:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -184,21 +184,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -36,112 +36,112 @@
 msgid "5 min"
 msgstr "5 min"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Lo schermo è troppo piccolo per questa applicazione."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "La risoluzione corrente è "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1053
+#: app.py:1059
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "Versione MLT: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Il progetto non è mai stato salvato"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Salva il progetto da File -> Salva con nome prima di chiudere."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Apertura"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "File multimediale mancante!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Percorso del file mancante:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Per caricare il progetto è necessario:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Apri il progetto con Media Relinker"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Descrizione: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' non è stato trovato!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "I profili utente possono essere creati da 'Modifica->Gestione Profili'."
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -183,21 +183,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""
 "\n"
 "Add the correct extension to load a problem file."
 msgstr ""

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -34,11 +34,11 @@
 msgid "5 min"
 msgstr ""
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr "Zmieniła się lokalizacja folderu danych XDG!"
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
@@ -47,7 +47,7 @@
 "Lokalizacja <b>Domyślnego magazynu danych XDG</b> uległa zmianie, ponieważ "
 "zmieniła się wartość zmiennej <b>XDG Data Home</b>.\n"
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
@@ -55,7 +55,7 @@
 "Istniejące projekty z danymi projektu zapisanymi w <b>Domyślnym magazynie "
 "danych XDG</b> będą nadal działać,\n"
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
@@ -63,92 +63,92 @@
 "ale nowe projekty będą miały dane zapisane w lokalizacji określonej przez "
 "nową wartość zmiennej <b>XDG Data Home</b>."
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Zbyt mały ekran dla tej aplikacji."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Wymiary twojego ekranu to "
 
-#: app.py:1041
+#: app.py:1047
 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:1052
+#: app.py:1058
 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:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Twoja wersja MLT to: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Zainstaluj MLT 6.18 lub nowszy, aby uruchomić Flowblade."
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Projekt nie został wcześniej zapisany"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Przed zamknięciem, zapisz projekt za pomocą Plik -> Zapisz jako."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Otwieranie"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Brak zasobów multimedialnych!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Ścieżka brakującego zasobu:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Aby załadować projekt, musisz również:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Otwórz projekt w narzędziu Relinker Multimediów"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Profil z Opisem: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' nie został znaleziony podczas ładowania!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 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:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr "Odmówiono otwarcia animowanego pliku .gif!"
 
-#: projectaction.py:361
+#: projectaction.py:365
 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:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
@@ -182,11 +182,11 @@
 "Możliwym obejściem jest wyrenderowanie GIF jako sekwencji klatek i\n"
 "otwarcie jej jako elementu multimedialnego."
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr "Odmowa otwarcia plików o nieznanych rozszerzeniach!"
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -198,11 +198,11 @@
 "Problematyczne pliki:\n"
 "\n"

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+0200\n"
 "PO-Revision-Date: 2023-06-20 15:06+0300\n"
 "Last-Translator: Смольянинов Николай <smolianinow.colya2016@yandex.ru>\n"
 "Language-Team: ru\n"
@@ -35,112 +35,112 @@
 msgid "5 min"
 msgstr "каждые 5 минут"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Недостаточное разрешение экрана."
 
-#: app.py:1029
+#: app.py:1035
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Минимальное разрешение экрана должно быть не ниже 1152 х 768.\n"
 
-#: app.py:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Разрешение вашего экрана "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr "Не удалось запустить приложение из-за ошибки инициализации папок XDG."
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Для запуска Flowblade 2.6 (или выше) требуется версия MLT не ниже 6.18"
 
-#: app.py:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Ваша версия MLT: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Установите MLT 6.18 или выше для запуска Flowblade."
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Проект не был сохранён"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Открытие"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Медиафайлы потеряны!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Путь к потерянному файлу:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
 "Не удалось найти медиафайл по относительному пути во вложенных папках "
 "проекта для его замены."
 
-#: projectaction.py:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Для загрузки проекта выполните одно из действий:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Откройте проект в «Перелинковщике медиа», чтобы повторно связать пути с "
 "новыми файлами"
 
-#: projectaction.py:231
+#: projectaction.py:235
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Расположите файл по тому же пути и с тем же именем"
 
-#: projectaction.py:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Открыть проект в Перелинковщике медиа"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Профиль с описанием: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' не найден при загрузке!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Пользовательские профили создаются через меню «Правка ⇨ Менеджер профилей»."
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr "Открытие анимированного файла .gif невозможно!"
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 "Flowblade не поддерживает отображение анимированных файлов GIF\n"
 "в качестве медиаобъектов.\n"
 
-#: projectaction.py:362
+#: projectaction.py:366
 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:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr "Отказано в открытии файлов с неизвестными расширениями!"
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -190,11 +190,11 @@
 "Проблемные файлы:\n"
 "\n"
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr "Слишком большое количество для перечисления.\n"
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/tr/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+0200\n"
 "PO-Revision-Date: 2021-04-04 15:07+0300\n"
 "Last-Translator: \n"
 "Language-Team: Türkçe\n"
@@ -34,113 +34,113 @@
 msgid "5 min"
 msgstr "5 dakika"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Bu uygulama için çok küçük bir ekran."
 
-#: app.py:1029
+#: app.py:1035
 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:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Ekran boyutlarınız aşağıdaki gibidir "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr "XDG klasörleri başlangıç hatası nedeniyle uygulama başlatılamıyor."
 
-#: app.py:1052
+#: app.py:1058
 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:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "MLT sürümünüz şu şekildedir: "
 
-#: app.py:1053
+#: app.py:1059
 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:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Proje daha önce kaydedilmedi"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Projeyi dosyaya kaydedin -> kapatmadan önce Farklı Kaydet."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Açılan"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Ortam varlığı kayıptı!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Eksik varlığın yolu:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 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:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Projeyi yüklemek için şunlardan birine ihtiyacınız olacak:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 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:231
+#: projectaction.py:235
 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:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Projeyi Ortam Bağlama aracında aç"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Profil ile birlikte Tanımı: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' yük bulunamadı!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 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:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr "Açılış animasyonlu .gif dosyası reddedildi!"
 
-#: projectaction.py:361
+#: projectaction.py:365
 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:362
+#: projectaction.py:366
 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:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -186,21 +186,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/uk/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+0200\n"
 "PO-Revision-Date: 2021-01-15 21:19+0300\n"
 "Last-Translator: Микита Бесчастний <micitabesh1992@rambler.ua>\n"
 "Language-Team: \n"
@@ -35,111 +35,111 @@
 msgid "5 min"
 msgstr "5 мін"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "Занадто маленький екран для цього додатка."
 
-#: app.py:1029
+#: app.py:1035
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Мінімальні розміри екрана для цієї програми - 1152 x 768.\n"
 
-#: app.py:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "Ваші розміри екрана "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 "Програму не можна запустити, оскільки сталася помилка ініціалізації папки "
 "XDG."
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr "Flowblade версії 2.6 (або пізнішої) вимагає запуску MLT версії 6.18"
 
-#: app.py:1053
+#: app.py:1059
 msgid "Your MLT version is: "
 msgstr "Ваша версія MLT: "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr "Встановіть MLT 6.18 або вище для запуску Flowblade."
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "Проект раніше не зберігався"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "Перед закриттям збережіть проект через Файл -> Зберегти як."
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "Відкривається"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "Медіа-ресурс відсутній!"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "Шлях відсутнього ресурсу:"
 
-#: projectaction.py:228
+#: projectaction.py:232
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "Помилка відносного пошуку файлів заміни у підпапках файлу проекту."
 
-#: projectaction.py:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "Для завантаження проекту вам потрібно:"
 
-#: projectaction.py:230
+#: projectaction.py:234
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
 "Відкрийте проект у Media Relinker, щоб пов’язати медіа з новими файлами, або"
 
-#: projectaction.py:231
+#: projectaction.py:235
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "Помістіть файл з тим самим іменем та шляхом на жорсткий диск"
 
-#: projectaction.py:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "Відкрийте проект у Media Relinker"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "Профіль із описом: '"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "'не знайдено під час завантаження!"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr ""
 "Профілі користувачів можна створити, вибравши \"Редагувати -> Менеджер "
 "профілів\"."
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -182,21 +182,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""
 "\n"
 "Add the correct extension to load a problem file."
 msgstr ""

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+0200\n"
 "PO-Revision-Date: 2017-04-15 18:47+0800\n"
 "Last-Translator: wu <laowudebox@126.com>\n"
 "Language-Team: Language LANGUAGE\n"
@@ -32,109 +32,109 @@
 msgid "5 min"
 msgstr "5 min"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "对于这个应用，画面太小。"
 
-#: app.py:1029
+#: app.py:1035
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "对于这个应用，最小画面尺寸是1152 x 768.\n"
 
-#: app.py:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "你的画面尺寸是 "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1053
+#: app.py:1059
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "MLT 版本 "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "项目还未被保存过"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "在关闭之前通过菜单 文件 -> 另存为 保存项目"
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "正在打开"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "有用的媒体已丢失"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "已丢失的有用东西的路径"
 
-#: projectaction.py:228
+#: projectaction.py:232
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "在失败项目文件的子文件夹中搜索相关代替文件"
 
-#: projectaction.py:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "加载你将会需要的另一个项目"
 
-#: projectaction.py:230
+#: projectaction.py:234
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr "在媒体重新链接器工具中打开项目以便重新连接相关媒体到新文件，或者"
 
-#: projectaction.py:231
+#: projectaction.py:235
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "放置一个名字和路径完全相同的的文件到硬盘上"
 
-#: projectaction.py:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "在媒体重新链接器工具中打开项目"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "带有描述的配置文件"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "未找到加载内容"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr "用户配置文件可以通过选择“配置文件管理器”来创建"
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -174,21 +174,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""
 "\n"
 "Add the correct extension to load a problem file."
 msgstr ""
 
-#: projectaction.py:445
+#: projectaction.py:449
 msgid "Media files already present in project were opened!"
 msgstr "媒体文件已经发送到被打开的项目"

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/locale/zh_TW/LC_MESSAGES/flowblade.po -> _service:obs_scm:flowblade-2.20.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: 2024-12-18 10:56+0200\n"
+"POT-Creation-Date: 2025-03-24 15:26+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"
@@ -32,109 +32,109 @@
 msgid "5 min"
 msgstr "5 分鐘"
 
-#: app.py:939
+#: app.py:945
 msgid "XDG Data folder location has changed!"
 msgstr ""
 
-#: app.py:940
+#: app.py:946
 msgid ""
 "Location of <b>Default XDG Data Store</b> has changed because value of "
 "<b>XDG Data Home</b> variable has changed.\n"
 "\n"
 msgstr ""
 
-#: app.py:941
+#: app.py:947
 msgid ""
 "Existing Projects with project data saved in <b>Default XDG Data Store</b> "
 "will continue to work,\n"
 msgstr ""
 
-#: app.py:942
+#: app.py:948
 msgid ""
 "but new projects will have data saved in the location specified by the new "
 "value <b>XDG Data Home</b> variable ."
 msgstr ""
 
-#: app.py:1027
+#: app.py:1033
 msgid "Too small screen for this application."
 msgstr "畫面太小無法執行此應用程式"
 
-#: app.py:1029
+#: app.py:1035
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "此應用程式的最小螢幕解析度為 1152 x 768。\n"
 
-#: app.py:1030
+#: app.py:1036
 msgid "Your screen dimensions are "
 msgstr "你的螢幕解析度是 "
 
-#: app.py:1041
+#: app.py:1047
 msgid "Cannot launch application because XDG folders init error."
 msgstr ""
 
-#: app.py:1052
+#: app.py:1058
 msgid "Flowblade version 2.6 (or later) requires MLT version 6.18 to run"
 msgstr ""
 
-#: app.py:1053
+#: app.py:1059
 #, fuzzy
 msgid "Your MLT version is: "
 msgstr "MLT 版本： "
 
-#: app.py:1053
+#: app.py:1059
 msgid "Install MLT 6.18 or higher to run Flowblade."
 msgstr ""
 
-#: app.py:1127 projectaction.py:555 projectaction.py:757
+#: app.py:1133 projectaction.py:559 projectaction.py:761
 msgid "Project has not been saved previously"
 msgstr "先前的專案尚未儲存"
 
-#: app.py:1128 projectaction.py:556 projectaction.py:758
+#: app.py:1134 projectaction.py:560 projectaction.py:762
 msgid "Save project with File -> Save As before closing."
 msgstr "在結束之前，從 檔案 -> 另存新檔 來儲存專案。"
 
-#: projectaction.py:147
+#: projectaction.py:151
 msgid "Opening"
 msgstr "開啟中"
 
-#: projectaction.py:226
+#: projectaction.py:230
 msgid "Media asset was missing!"
 msgstr "媒體資產遺失！"
 
-#: projectaction.py:227
+#: projectaction.py:231
 msgid "Path of missing asset:"
 msgstr "遺失資產的路徑："
 
-#: projectaction.py:228
+#: projectaction.py:232
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr "在專案檔案的子資料夾中相對尋找替代檔案失敗。"
 
-#: projectaction.py:229
+#: projectaction.py:233
 msgid "To load the project you will need to either:"
 msgstr "載入專案，您將需要："
 
-#: projectaction.py:230
+#: projectaction.py:234
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr "在 '媒體重新連接器' 工具中開啟專案來重新連結媒體資產到新的檔案，或"
 
-#: projectaction.py:231
+#: projectaction.py:235
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "在硬碟中的相同路徑放一個相同名稱的檔案"
 
-#: projectaction.py:232
+#: projectaction.py:236
 msgid "Open project in Media Relinker tool"
 msgstr "在媒體重新連接器工具開啟專案"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "Profile with Description: '"
 msgstr "載入專案描述： ''"
 
-#: projectaction.py:251
+#: projectaction.py:255
 msgid "' was not found on load!"
 msgstr "' 時未發現！"
 
-#: projectaction.py:252
+#: projectaction.py:256
 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:253
+#: projectaction.py:257
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
 msgstr "使用者設定檔可以藉由 '編輯 -> 設定檔管理員' 來創建。"
 
-#: projectaction.py:360
+#: projectaction.py:364
 msgid "Opening animated .gif file was refused!"
 msgstr ""
 
-#: projectaction.py:361
+#: projectaction.py:365
 msgid ""
 "Flowblade does not support displaying animated GIF files as media objects.\n"
 msgstr ""
 
-#: projectaction.py:362
+#: projectaction.py:366
 msgid ""
 "A possible workaround is to render GIF into a frame sequence and\n"
 "open that as a media item."
 msgstr ""
 
-#: projectaction.py:366
+#: projectaction.py:370
 msgid "Opening files with unknown  extensions refused!"
 msgstr ""
 
-#: projectaction.py:367
+#: projectaction.py:371
 msgid ""
 "Flowblade does not open files that cannot be identified as media from file "
 "extensions.\n"
@@ -174,21 +174,21 @@
 "\n"
 msgstr ""
 
-#: projectaction.py:369
+#: projectaction.py:373
 msgid "Too many to list.\n"
 msgstr ""
 
-#: projectaction.py:374
+#: projectaction.py:378
 msgid ""
 "\n"
 "Add the correct extension to load a problem file."
 msgstr ""
 
-#: projectaction.py:445
+#: projectaction.py:449
 msgid "Media files already present in project were opened!"
 msgstr "媒體檔案已存在開啟的專案！"

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/mediaplugin.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/mediaplugin.py Changed

@@ -19,7 +19,7 @@
 """
 
 """
-Thís module handels creating, editing and cloning of
+Thís module handles creating, editing and cloning of
 Generators.
 
 Generators are container clips that use Fluxity Scripts to render 
@@ -105,6 +105,16 @@
         script_file = respaths.MEDIA_PLUGINS_PATH + self.folder + "/" + self.script_file
         return script_file
 
+    def get_data(self):
+        return (self.folder, self.script_file, self.name, self.category, self.default_render)
+
+
+class GeneratorTemplate:
+    
+    def __init__(self, plugin_data, edited_script_data):
+        self.plugin_data = plugin_data
+        self.edited_script_data = edited_script_data
+
 
 # --------------------------------------------------------------- interface
 def init():
@@ -167,7 +177,7 @@
     
     return categories_list  
 
-# This method is used by scriptool.py create sub menu to load generator code into 
+# This method is used by scriptool.py to create a sub menu to load generator code into 
 # editor window as an example.
 def fill_media_plugin_sub_menu_gio(app, menu, callback):
     for group_data in _plugins_groups:
@@ -272,14 +282,57 @@
 def get_plugin_script_path(plugin_folder_and_script):
     return respaths.MEDIA_PLUGINS_PATH + plugin_folder_and_script
 
+def _save_current_state_as_generator_template():
+    global _current_plugin_data_object
+    plugin_data = _selected_plugin.get_data()
+    
+    edited_script_data = copy.deepcopy(_current_plugin_data_object)
+    edited_script_data"editors_list" = simpleeditors.get_editors_data_as_editors_list(_add_plugin_window.plugin_editors.editor_widgets)
+    edited_script_data"length" = int(_add_plugin_window.length_spin.get_value())
+
+    gen_data = GeneratorTemplate(plugin_data, edited_script_data)
+    default_name = edited_script_data"name" + ".generatortemplate"
+    
+    dialogs.save_generator_template(_save_template_callback, default_name, gen_data)
+
+def _save_template_callback(dialog, response_id, save_data):
+    if response_id == Gtk.ResponseType.ACCEPT:
+        save_path = dialog.get_filenames()0
+        with atomicfile.AtomicFileWriter(save_path, "wb") as afw:
+            write_file = afw.get_file()
+            pickle.dump(save_data, write_file)
+
+    dialog.destroy()
+
+def _load_generator_template():
+    dialogs.load_generator_template(_load_template_callback)
+    
+def _load_template_callback(dialog, response_id):
+    global _add_plugin_window
+    if response_id == Gtk.ResponseType.ACCEPT:
+        load_path = dialog.get_filenames()0
+        try:
+            generator_template = utils.unpickle(load_path)
+            _add_plugin_window._plugin_selection_changed(None, generator_template)
+        except Exception as e:
+            primary_txt = _("Generator Template load failed!")
+            secondary_txt = _("Error message: ") + str(e)
+            dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window)
+            gui.editor_window.edit_multi.set_visible_child_name(appconsts.EDIT_MULTI_EMPTY)
+
+    _add_plugin_window.position_listener(0.5, _add_plugin_window.producer.get_length())
+    _add_plugin_window.pos_bar.set_normalized_pos(0.5)
+    _add_plugin_window._show_preview()
+ 
+    dialog.destroy()
+    
 # --------------------------------------------------------- Window
 class AddMediaPluginWindow(Gtk.Window):
     def __init__(self):
         GObject.GObject.__init__(self)
         
         self.producer = PosBarProducer()
-        
-        self.set_modal(True)
+
         self.set_transient_for(gui.editor_window.window)
         self.set_title(_("Add Generator"))
         self.connect("delete-event", lambda w, e:_close_window())
@@ -332,8 +385,7 @@
         pos_bar_frame.set_margin_bottom(9)
         pos_bar_frame.set_margin_start(6)
         pos_bar_frame.set_margin_end(2)
-                                                 
-                                                 
+
         control_panel = Gtk.HBox(False, 2)
         control_panel.pack_start(self.tc_display.widget, False, False, 0)
         control_panel.pack_start(pos_bar_frame, True, True, 0)
@@ -374,13 +426,20 @@
         values_row = Gtk.HBox(False, 8)
         values_row.pack_start(self.editors_box, False, False, 0)
         values_row.pack_start(right_column_panel, True, True, 0)
-        
+
         close_button = guiutils.get_sized_button(_("Close"), 150, 32)
         close_button.connect("clicked", lambda w: _close_clicked())
         self.add_button = guiutils.get_sized_button(_("Add Generator"), 150, 32)
         self.add_button.connect("clicked", lambda w: _add_media_plugin())
+
+        save_button = guiutils.get_sized_button(_("Save Generator Template"), 170, 32)
+        save_button.connect("clicked", lambda w: _save_current_state_as_generator_template())
+        load_button = guiutils.get_sized_button(_("Load Generator Template"), 170, 32)
+        load_button.connect("clicked", lambda w: _load_generator_template())
         
         buttons_row = Gtk.HBox(False, 0)
+        buttons_row.pack_start(save_button, False, False, 0)
+        buttons_row.pack_start(load_button, False, False, 0)
         buttons_row.pack_start(Gtk.Label(), True, True, 0)
         buttons_row.pack_start(close_button, False, False, 0)
         buttons_row.pack_start(self.add_button, False, False, 0)
@@ -456,11 +515,17 @@
         cr.line_to(mx + 0.5, my + 0.5)
         cr.stroke()
         
-    def _plugin_selection_changed(self, combo):
-        name, new_selected_plugin = self.plugin_select.get_selected()
+    def _plugin_selection_changed(self, combo, plugin_template=None):
+
+        if plugin_template == None:
+            name, new_selected_plugin = self.plugin_select.get_selected()
+            success, fctx = self.get_plugin_data(new_selected_plugin.get_plugin_script_file())
+            script_data_object = json.loads(fctx.get_script_data())
+        else:
+            
+            new_selected_plugin = MediaPlugin(*plugin_template.plugin_data)
+            script_data_object = plugin_template.edited_script_data
         
-        success, fctx = self.get_plugin_data(new_selected_plugin.get_plugin_script_file())
-        script_data_object = json.loads(fctx.get_script_data())
         self._show_plugin_editors_panel(script_data_object)
 
         global _selected_plugin, _current_screenshot_surface, _current_plugin_data_object

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/middlebar.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/middlebar.py Changed

@@ -245,17 +245,18 @@
     tooltip_runner = glassbuttons.TooltipRunner(editor_window.edit_buttons_3, tooltips)
     editor_window.edit_buttons_3.no_decorations = no_decorations
     editor_window.edit_buttons_3.show_prelight_icons()
-    
+
     # Resync and split audio
     editor_window.edit_buttons_2 = glassbuttons.GlassButtonsGroup(44*size_adj, 23*size_adj, 2*size_adj, 3*size_adj, 5*size_adj)
     editor_window.edit_buttons_2.add_button(guiutils.get_cairo_image("split_audio"), tlineaction.split_audio_synched_button_pressed)
+    editor_window.edit_buttons_2.add_button(guiutils.get_cairo_image("set_track_sync"), tlineaction.set_track_sync_button_pressed)
     editor_window.edit_buttons_2.add_button(guiutils.get_cairo_image("resync_track"), tlineaction.resync_track_button_pressed)
     editor_window.edit_buttons_2.add_button(guiutils.get_cairo_image("resync"), tlineaction.resync_button_pressed)
-    tooltips = _("Split Audio Synched"),  _("Resync Track Containing Selected Clip/s"), _("Resync Selected Clip")
+    tooltips = _("Split Audio Synched"), _("Set Sync for All Clips on Track Containing Selected Clip/s"), _("Resync Track Containing Selected Clip/s"), _("Resync Selected Clips")
     tooltip_runner = glassbuttons.TooltipRunner(editor_window.edit_buttons_2, tooltips)
     editor_window.edit_buttons_2.no_decorations = no_decorations
     editor_window.edit_buttons_2.show_prelight_icons()
-    
+
     editor_window.monitor_insert_buttons = glassbuttons.GlassButtonsGroup(44*size_adj, 23*size_adj, 2*size_adj, 3*size_adj, 5*size_adj)
     editor_window.monitor_insert_buttons.add_button(guiutils.get_cairo_image("overwrite_range"), tlineaction.range_overwrite_pressed)
     editor_window.monitor_insert_buttons.add_button(guiutils.get_cairo_image("overwrite_clip"), tlineaction.three_point_overwrite_pressed)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/mltfilters.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/mltfilters.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/mltplayer.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/mltplayer.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/mlttransitions.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/mlttransitions.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/modesetting.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/modesetting.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/monitorevent.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/monitorevent.py Changed

@@ -57,51 +57,21 @@
     if editorstate.current_is_active_trim_mode() and trimmodes.submode != trimmodes.NOTHING_ON:
         return
 
-    if current_is_move_mode():
-        movemodes.play_pressed()
-    elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
-        trimmodes.oneroll_play_pressed()
-    elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:
-        movemodes.play_pressed()
-    elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
-        trimmodes.tworoll_play_pressed()
-    elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM_NO_EDIT:
-        movemodes.play_pressed()
-    elif EDIT_MODE() == editorstate.SLIDE_TRIM:
-        trimmodes.slide_play_pressed()
-    elif EDIT_MODE() == editorstate.SLIDE_TRIM_NO_EDIT:
-        movemodes.play_pressed()
-    elif EDIT_MODE() == editorstate.KF_TOOL:
-        movemodes.play_pressed()
-    elif EDIT_MODE() == editorstate.MULTI_TRIM:
-        movemodes.play_pressed()
-    elif EDIT_MODE() == editorstate.CUT:
-        movemodes.play_pressed()
+    PLAYER().start_playback()
+    gui.editor_window.player_buttons.show_playing_state(True)
 
 def stop_pressed():
-    if current_is_move_mode():
-        movemodes.stop_pressed()
-    elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:
-        movemodes.stop_pressed()
-    elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM_NO_EDIT:
-        movemodes.stop_pressed()
-    elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
-        trimmodes.oneroll_stop_pressed()
-    elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
-        trimmodes.tworoll_stop_pressed()
-    elif EDIT_MODE() == editorstate.SLIDE_TRIM:
-        trimmodes.slide_stop_pressed()
-    elif EDIT_MODE() == editorstate.SLIDE_TRIM_NO_EDIT:
-        movemodes.stop_pressed()
-    elif EDIT_MODE() == editorstate.KF_TOOL:
-        movemodes.stop_pressed()
-    elif EDIT_MODE() == editorstate.MULTI_TRIM:
-        movemodes.stop_pressed()
-    elif EDIT_MODE() == editorstate.CUT:
-        movemodes.stop_pressed()
-
+    PLAYER().stop_playback()
+    gui.editor_window.player_buttons.show_playing_state(False)
+    
     updater.maybe_autocenter()
 
+def play_stop_pressed():
+    if PLAYER().is_playing():
+        stop_pressed()
+    else:
+        play_pressed()
+            
 #------------------------------------------  go to start, end
 def start_pressed():
     if current_is_move_mode():

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/motiontracking.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/motiontracking.py Changed

@@ -56,6 +56,22 @@
         tdata_select_combo.set_active(current_selection_index)
     return (tdata_keys, tdata_select_combo)
 
+def get_used_motion_tracking_data():
+    used_tracking_data = 
+    for seq in PROJECT().sequences:
+        for track in seq.tracks:
+            for clip in track.clips:
+                try:
+                    for filt in clip.filters:
+                        if filt.info.mlt_service_id == "affine":
+                            for non_mlt_property in filt.non_mlt_properties:
+                                p_name, p_value, p_type = non_mlt_property
+                                if p_name == "selected_tracking_data":
+                                    used_tracking_data.append(p_value)
+                except:
+                    pass # Blank clip hit
+    return used_tracking_data
+
 def apply_tracking( tracking_data_id, filter, editable_properties, 
                     xoff, yoff, interpretation, size, clip_in,
                     source_width, source_height):

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/movemodes.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/movemodes.py Changed

@@ -45,7 +45,7 @@
 # Mouse delta in pix needed before selection is interpreted as move.
 MOVE_START_LIMIT = 5
 
-# Width of area in pixels that is iterpreted as an attempt to place overwrite
+# Width of area in pixels that is interpreted as an attempt to place overwrite
 # clips, starting from edit
 MAGNETIC_AREA_IN_PIX = 5
 
@@ -69,23 +69,6 @@
 # Data/state for ongoing edit.
 edit_data = None
 
-#------------------------------ playback control
-# These four buttons act differently in trimmodes and move modes
-def play_pressed():
-    # This handles only move modes, see trimmodes.py module for others.
-    # Jul-2016 - SvdB - Added code to handle play/pause button
-    if editorpersistance.prefs.play_pause == True:
-        if PLAYER().is_playing():
-            PLAYER().stop_playback()
-        else:
-            PLAYER().start_playback()
-    else:
-        # Original code
-        PLAYER().start_playback()
-
-def stop_pressed():
-    # This handles only move modes, see trimmodes.py module for others.
-    PLAYER().stop_playback()
 
 #------------------------------------------ go to start end
 def start_pressed():
@@ -95,6 +78,7 @@
 def end_pressed():
     # This handles only move modes, see trimmodes.py module for others.
     PLAYER().seek_frame(PLAYER().get_active_length() - 1)
+    
 #------------------------------------------ End of  go to start end
 def prev_pressed():
     # This handles only move modes, see trimmodes.py module for others.

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/panels.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/panels.py Changed

@@ -194,7 +194,9 @@
     return align
 
 def get_file_properties_panel(data):
-    media_file, img, size, length, vcodec, acodec, channels, frequency, fps, match_profile_name, matches_current_profile = data
+    media_file, img, size, length, vcodec, acodec, channels, frequency, \
+    fps, match_profile_name, matches_current_profile, pixel_format, colorspace = data
+
     name_label = Gtk.Label(label=media_file.name)
     name_label.set_max_width_chars(100)
     name_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
@@ -212,7 +214,9 @@
     row5 = get_two_column_box_fixed(get_bold_label(_("Audio Sample Rate:")), Gtk.Label(label=frequency))
     row6 = get_two_column_box_fixed(get_bold_label(_("Best Profile:")), Gtk.Label(label=match_profile_name))
     row7 = get_two_column_box_fixed(get_bold_label(_("Matches Project Profile:")), Gtk.Label(label=matches_current_profile))
-    
+    row8 = get_two_column_box_fixed(get_bold_label(_("Colorspace:")), Gtk.Label(label=colorspace))
+    row9 = get_two_column_box_fixed(get_bold_label(_("Pixel Format:")), Gtk.Label(label=pixel_format))
+
     vbox = Gtk.VBox(False, 2)
     vbox.pack_start(img, False, False, 0)
     vbox.pack_start(guiutils.get_pad_label(12, 16), False, False, 0)
@@ -222,6 +226,8 @@
     vbox.pack_start(row111, False, False, 0)
     vbox.pack_start(row11, False, False, 0)
     vbox.pack_start(row2, False, False, 0)
+    vbox.pack_start(row9, False, False, 0)
+    vbox.pack_start(row8, False, False, 0)
     vbox.pack_start(row3, False, False, 0)
     vbox.pack_start(row4, False, False, 0)
     vbox.pack_start(row5, False, False, 0)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/patternproducer.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/patternproducer.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/persistance.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/persistance.py Changed

@@ -65,7 +65,7 @@
 # Used to send messages when loading project, set at callsite.
 load_dialog = None
 
-# These are used to recrete parenting relationships
+# These are used to recreate parenting relationships
 all_clips = {}
 sync_clips = 
 
@@ -239,6 +239,10 @@
 
     s_playlist.clips = add_clips
     
+    # Replace parent track with its id.
+    if s_playlist.parent_track != None:
+        s_playlist.parent_track = s_playlist.parent_track.id
+    
     # Remove unpicleable attributes
     remove_attrs(s_playlist, PLAY_LIST_REMOVE)
    
@@ -341,10 +345,12 @@
 
 def get_p_sync_data(sync_data):
     s_sync_data = copy.copy(sync_data)
-    if isinstance( sync_data.master_clip, int ): # When saving relinked projects sync_data.master_clip 
-                                                   # is already int and does not need to be replaced
+    if isinstance( sync_data.master_clip, int ):   # When saving relinked projects sync_data.master_clip 
+                                                   # and s_sync_data.master_clip_track are already ints
+                                                   # because they haven't been replacved with live objects.
         return s_sync_data
     s_sync_data.master_clip = sync_data.master_clip.id
+    s_sync_data.master_clip_track = sync_data.master_clip_track.id
     return s_sync_data
 
 def remove_attrs(obj, remove_attrs):
@@ -511,7 +517,7 @@
     # Compositing mode COMPOSITING_MODE_TOP_DOWN_AUTO_FOLLOW was removed 2.6->
     persistancecompat.FIX_DEPRECATED_SEQUENCE_COMPOSITING_MODE(seq)
     
-    # Grap and replace py tracks. Do this way to use same create
+    # Grab and replace py tracks. Do this way to use same create
     # method as when originally created.
     py_tracks = seq.tracks
     seq.tracks = 
@@ -522,6 +528,7 @@
     # Create and fill MLT tracks.
     for py_track in py_tracks:
         mlt_track = seq.add_track(py_track.type)
+        persistancecompat.FIX_MISSING_TRACK_ATTRS(mlt_track)
         if py_track.id == len(py_tracks) - 1:
             continue # Do not try to fill hidden track even if somehow a clip was saved there.
         fill_track_mlt(mlt_track, py_track)
@@ -529,7 +536,7 @@
         if hasattr(mlt_track, "gain_filter"): # Hidden track and black track do not have these
             mlt_track.gain_filter.set("gain", str(mlt_track.audio_gain))
         if mlt_track.audio_pan != appconsts.NO_PAN:
-            seq.add_track_pan_filter(mlt_track, mlt_track.audio_pan) # only rtack with non-center pan values have pan filters
+            seq.add_track_pan_filter(mlt_track, mlt_track.audio_pan) # only track with non-center pan values have pan filters
     
     # Create and connect compositors.
     mlt_compositors = 
@@ -576,12 +583,25 @@
         clip, track = clip_n_track
         try:
             master_clip = all_clipsclip.sync_data.master_clip # master clip has been replaced with its id on save
-            clip.sync_data.master_clip = master_clip # put back reference to master clip
-            resync.clip_added_to_timeline(clip, track) # save data to enagble sync states monitoring after eddits
+            if hasattr(clip.sync_data, "master_clip_track"):
+                master_clip_track = seq.tracksclip.sync_data.master_clip_track
+            else:
+                # All sync parents were previously on track V1.
+                master_clip_track = seq.tracksseq.first_video_index
+            # put back references to objects
+            clip.sync_data.master_clip = master_clip
+            clip.sync_data.master_clip_track = master_clip_track
+            resync.clip_added_to_timeline(clip, track) # save data to enagble sync states monitoring after edits
         except KeyError:
             clip.sync_data = None # masterclip no longer on track V1
             resync.clip_removed_from_timeline(clip)
 
+    # Replace track ids with track objects on parented tracks.
+    for i in range(1, len(seq.tracks) - 1):
+        track = seq.tracksi
+        if track.parent_track != None:
+            track.parent_track = seq.trackstrack.parent_track
+
     # This sets MLT properties that actually do mute
     seq.set_tracks_mute_state()

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/persistancecompat.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/persistancecompat.py Changed

@@ -21,7 +21,10 @@
 """
 This module holds functions that maintain compatibility between project savefiles
 created by different versions of application.
+
+When new attributes are added to persistent classes they are added here to classes in save files created by older versions.  
 """
+
 import hashlib
 import os
 
@@ -53,6 +56,9 @@
     if not hasattr(media_file, "rating"):
         media_file.rating = appconsts.MEDIA_FILE_UNRATED
 
+    if not hasattr(media_file, "link_seq_data"):
+        media_file.link_seq_data = None
+
 def FIX_MISSING_CLIP_ATTRS(clip):
     # Add color attribute if not found
     if not hasattr(clip, "color"):
@@ -77,7 +83,10 @@
     # Add container data if not found.
     if not hasattr(clip, "slowmo_data"):
         clip.slowmo_data = None
-        
+
+    if not hasattr(clip, "link_seq_data"):
+        clip.link_seq_data = None 
+
 def FIX_MISSING_FILTER_ATTRS(filter):
     if not hasattr(filter.info, "filter_mask_filter"):
         filter.info.filter_mask_filter = None
@@ -93,6 +102,9 @@
     if not hasattr(seq, "compositing_mode"):
         seq.compositing_mode = appconsts.COMPOSITING_MODE_TOP_DOWN_FREE_MOVE
 
+    if(not hasattr(seq, "uid")):
+        seq.uid = hashlib.md5(str(os.urandom(32)).encode('utf-8')).hexdigest()
+        
 def FIX_DEPRECATED_SEQUENCE_COMPOSITING_MODE(seq):
     # Compositing mode COMPOSITING_MODE_TOP_DOWN_AUTO_FOLLOW was removed 2.6->, we just convert it 
     # to COMPOSITING_MODE_TOP_DOWN_FREE_MOVE.
@@ -123,8 +135,14 @@
 
     if(not hasattr(project, "tracking_data")):
         project.tracking_data = {}
-        
+
+    if(not hasattr(project, "container_default_encoding")):
+        project.container_default_encoding = None
+
 def FIX_MISSING_BIN_ATTRS(bin):
     if(not hasattr(bin, "uid")):
         bin.uid = hashlib.md5(str(os.urandom(32)).encode('utf-8')).hexdigest()
-    
\ No newline at end of file
+
+def FIX_MISSING_TRACK_ATTRS(track):
+    if(not hasattr(track, "parent_track")):
+        track.parent_track = None

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/positionbar.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/positionbar.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/preferenceswindow.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/preferenceswindow.py Changed

@@ -367,11 +367,6 @@
     tracks_combo.append_text(_("2 x - 100px, 50px"))
     tracks_combo.set_active(prefs.tracks_scale)
 
-    icons_combo = Gtk.ComboBoxText()
-    icons_combo.append_text(_("Default"))
-    icons_combo.append_text(_("Double"))
-    icons_combo.set_active(prefs.icons_scale)
-
     monitors_data = utilsgtk.get_display_monitors_size_data()
     layout_monitor = Gtk.ComboBoxText()
 
@@ -409,7 +404,6 @@
     row1 = _row(guiutils.get_checkbox_row_box(display_splash_check, Gtk.Label(label=_("Display splash screen"))))
     row6 = _row(guiutils.get_checkbox_row_box(show_full_file_names, Gtk.Label(label=_("Show Full File names"))))
     row7 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Tracks Heights:")), tracks_combo, PREFERENCES_LEFT))
-    row8 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Icons Size:")), icons_combo, PREFERENCES_LEFT))
 
     row10 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Do GUI layout based on:")), layout_monitor, PREFERENCES_LEFT))
     row13 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Edit panel width:")), edit_panel_width_spin, PREFERENCES_LEFT))
@@ -424,7 +418,6 @@
     vbox.pack_start(row1, False, False, 0)
     vbox.pack_start(row6, False, False, 0)
     vbox.pack_start(row7, False, False, 0)
-    vbox.pack_start(row8, False, False, 0)
     vbox.pack_start(row14, False, False, 0)
     vbox.pack_start(row13, False, False, 0)
     vbox.pack_start(row12, False, False, 0)
@@ -434,7 +427,7 @@
     guiutils.set_margins(vbox, 12, 0, 12, 12)
 
     return vbox, (force_language_combo, display_splash_check, window_mode_combo, show_full_file_names,
-                  tracks_combo, icons_combo, project_panel_width_spin, edit_panel_width_spin, media_panel_width_spin,
+                  tracks_combo, project_panel_width_spin, edit_panel_width_spin, media_panel_width_spin,
                   layout_monitor, filter_select_width_spin)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/projectaction.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/projectaction.py Changed

@@ -29,6 +29,8 @@
     import mlt7 as mlt
 except:
     import mlt
+
+import copy
 import os
 from os import listdir
 from os.path import isfile, join, expanduser
@@ -58,6 +60,7 @@
 import guicomponents
 import guipopover
 import guiutils
+import gtkbuilder
 import edit
 import editorstate
 from editorstate import current_sequence
@@ -67,6 +70,7 @@
 from editorstate import MONITOR_MEDIA_FILE
 from editorstate import EDIT_MODE
 import editorpersistance
+import jobs
 import kftoolmode
 import medialinker
 import medialog
@@ -1016,6 +1020,7 @@
         proxyediting.create_proxy_files_pressed(True)
     elif msg == "select all":
         gui.media_list_view.select_all()
+        gui.media_list_view.selected_objects0.widget.grab_focus()
     elif msg == "select none":
         gui.media_list_view.clear_selection()
     elif msg == "append all":
@@ -1031,6 +1036,8 @@
         dialogs.set_bin_grfx_default_length_dialog( current_bin(),
                                                     current_default_length,
                                                     _set_bin_grfx_default_length_callback)
+    elif msg == "delete":
+        delete_media_files()
     else:
         target_bin_index = int(msg)
         
@@ -1395,9 +1402,13 @@
     if media_file.type == appconsts.VIDEO:
         match_profile_index = mltprofiles.get_closest_matching_profile_index(info)
         match_profile_name =  mltprofiles.get_profile_name_for_index(match_profile_index)
+        pixel_format = info"pixel_format"
+        colorspace = info"colorspace"
     else:
         match_profile_name = _("N/A")
-    
+        pixel_format = _("N/A")
+        colorspace = _("N/A")
+
     if media_file.type == appconsts.VIDEO:
         if media_file.matches_project_profile():
             matches_project_profile = _("Yes")
@@ -1412,8 +1423,10 @@
         fps = utils.get_fps_str_with_two_decimals(str(float(num/den)))
     except:
         fps = _("N/A")
-    
-    dialogs.file_properties_dialog((media_file, img, size, length, vcodec, acodec, channels, frequency, fps, match_profile_name, matches_project_profile))
+
+    dialogs.file_properties_dialog((media_file, img, size, length, vcodec, acodec, 
+                                    channels, frequency, fps, match_profile_name, 
+                                    matches_project_profile, pixel_format, colorspace))
 
 def remove_unused_media():
     unused = PROJECT().get_unused_media()
@@ -1426,7 +1439,7 @@
 
 def _media_filtering_selector_item_activated(action, new_value_variant):
     try:
-        index = int( new_value_variant.get_string())
+        index = int(new_value_variant.get_string())
     except:
         # This is ratings selection
         _ratings_filtering_item_activated(action, new_value_variant)
@@ -1479,33 +1492,17 @@
 def _media_import_data_ready():
     files_list = projectmediaimport.get_imported_media()
     generators_list = projectmediaimport.get_imported_generators()
-    
-    if len(generators_list) > 0:
-        global media_import_data
-        media_import_data = (files_list, generators_list, 0)
-        _media_import_with_generators()
-    else:
-        # No need to do complex callbacks to get generators imported.
-        open_file_names(files_list)
 
-def _media_import_with_generators():
-    # import generators from list recursively using existing code in containerclip.py
-    global media_import_data
-    files_list, generators_list, index = media_import_data
-    if index == len(generators_list):
+    if len(files_list) > 0:
         open_file_names(files_list)
-    else:
-        container_data = generators_listindex
-        index += 1
-        media_import_data = (files_list, generators_list, index)
-    
-        script_file, screenshot_file, plugin_data = mediaplugin.create_plugin_assests_for_media_import(container_data)
-    
-        containerclip.create_fluxity_media_item_from_plugin(    script_file, 
-                                                                screenshot_file, 
-                                                                plugin_data, 
-                                                                _media_import_with_generators)
         
+    if len(generators_list) > 0:
+        primary_txt = _("Generators are not imported from another Projects!")
+        secondary_text = _("You attempted to import %s Generator/s.\n\nPlease use <b>Project/Add Generator.../Save/Load Generator Template</b> -feature\nto create reusable Generators.") 
+        secondary_text = secondary_text  % (str(len(generators_list)))
+
+        dialogutils.info_message(primary_txt, secondary_text, gui.editor_window.window)
+
 def create_selection_compound_clip():
     if movemodes.selected_track == -1:
         # info window no clips selected?
@@ -1573,8 +1570,6 @@
     default_name = _("sequence_") + _get_compound_clip_default_name_date_str()
     dialogs.compound_clip_name_dialog(_do_create_sequence_compound_clip, default_name, _("Save Sequence Container Clip"))
 
-
-
 def _do_create_sequence_compound_clip(dialog, response_id, name_entry):
     if response_id != Gtk.ResponseType.ACCEPT:
         dialog.destroy()
@@ -1617,7 +1612,27 @@
                                                     (write_file, media_name), selected_sequence, 
                                                     PROJECT(), PLAYER())
     render_player.start()
+
+
+def create_sequence_link_container_clip_from_selected():
+    selection = gui.sequence_list_view.treeview.get_selection()
+    model, iter = selection.get_selected()
+    (model, rows) = selection.get_selected_rows()
+    row = max(rows0)
+    selected_sequence = PROJECT().sequencesrow
+
+    media_name = selected_sequence.name + _(" LINK")
+
+    # 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"
     
+    render_player = renderconsumer.XMLRenderPlayer( write_file, _sequence_link_xml_render_done_callback, 
+                                                    (selected_sequence, write_file, media_name), selected_sequence, 
+                                                    PROJECT(), PLAYER())
+    render_player.start()
+
 def create_sequence_freeze_frame_compound_clip():
     # lets's just set something unique-ish 
     default_name = _("frame_") + utils.get_tc_string_with_fps_for_filename(PLAYER().current_frame(), utils.fps()) + ".xml"
@@ -1651,6 +1666,39 @@
 def _get_compound_clip_default_name_date_str():
     return str(datetime.date.today()) + "_" + time.strftime("%H%M%S")
 
+def create_sequence_link_container():
+    dialogs.select_link_sequence_for_container(_do_create_sequence_link_container)
+
+def _do_create_sequence_link_container(dialog, response_id, data):
+    if response_id != Gtk.ResponseType.ACCEPT:
+        dialog.destroy()
+        return
+    
+    sequences_combo, selection_data = data
+    selected_sequence = selection_datasequences_combo.get_active()
+    media_name = selected_sequence.name + _(" LINK")
+
+    dialog.destroy()
+
+    # 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"
+    
+    render_player = renderconsumer.XMLRenderPlayer( write_file, _sequence_link_xml_render_done_callback, 
+                                                    (selected_sequence, write_file, media_name), selected_sequence, 
+                                                    PROJECT(), PLAYER())
+    render_player.start()
+
+def _sequence_link_xml_render_done_callback(data):
+    # We do GUI updates on add, so we need GLib thread.
+    selected_sequence, write_file, media_name = data
+    GLib.idle_add(_do_sequence_link_item_add, data)
+
+def _do_sequence_link_item_add(data):
+    selected_sequence, xml_file_path, media_name = data
+    containerclip.create_sequence_link_media_item(xml_file_path, media_name, selected_sequence.uid)
+    
 def append_all_media_clips_into_timeline():
     media_files = 
     for file_id in PROJECT().c_bin.file_ids:
@@ -1876,9 +1924,11 @@
         delete_selected_sequence()

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/projectdata.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/projectdata.py Changed

@@ -100,6 +100,7 @@
                                                   # 1.10 needed that data for the first time and required recreating it correctly for older projects
         self.project_properties = {} # Key value pair for misc persistent properties, dict is used that we can add these without worrying loading
         self.tracking_data = {}
+        self.container_default_encoding = None # Set in coantaineractions.py by user.
 
         self.vault_folder = None
         self.project_data_id = None
@@ -204,6 +205,10 @@
         
     def add_container_clip_media_object(self, media_object):
         self._add_media_object(media_object)
+
+    def add_sequence_link_media_object(self, media_object, link_seq_uid):
+        media_object.link_seq_data = link_seq_uid
+        self._add_media_object(media_object)
         
     def _add_media_object(self, media_object, target_bin=None):
         """
@@ -272,7 +277,6 @@
 
         self.c_bin.file_ids.pop(media_file.id)
 
-
     def get_unused_media(self):
         # Create path -> media item dict
         path_to_media_object = {}
@@ -323,6 +327,12 @@
         name = _("sequence_") + str(self.next_seq_number)
         self.add_named_sequence(name)
 
+    def get_sequence_for_uid(self, seq_uid):
+        for seq in self.sequences:
+            if seq.uid == seq_uid:
+                return seq
+        return None
+
     def get_current_bin_graphics_default_length(self):
         try:
             return self.bins_graphics_default_lengthsself.c_bin.uid
@@ -434,6 +444,14 @@
         self.tracking_datadata_uid = (final_label, data_file_path)
         return final_label
 
+    def delete_tracking_data(self, tracking_data_id):
+        final_label, data_file_path = self.tracking_datatracking_data_id
+        try:
+            os.remove(data_file_path)
+        except:
+            print("ProjectData.delete_tracking_data(): trying to delete non-existing data") 
+        del self.tracking_datatracking_data_id
+
     def _tracking_data_label_exists(self, data_label):
         for item in self.tracking_data.items():
             label, data_path = item
@@ -466,6 +484,7 @@
 
         self.container_data = None
         self.titler_data = None
+        self.link_seq_data = None
         
         self.info = info
         self.rating = appconsts.MEDIA_FILE_UNRATED

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/projectdatavault.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/projectdatavault.py Changed

@@ -40,7 +40,7 @@
 from editorstate import PROJECT
 
 # Project data folder path is accessed with PROJECT() in main application, but 
-# render processses receive it as parameter and set it here in init. 
+# render processes receive it as parameter and set it here in init. 
 _project_data_folder = None
 
 # User folder locations
@@ -85,7 +85,7 @@
 
 # ------------------------------------------------------------------------ init
 def init(_current_project_data_folder=None):
-    # This data is duplicated with userfolders.py but thats really not an issue.
+    # This data is duplicated with userfolders.py but that's really not an issue.
     global _xdg_config_dir, _xdg_data_dir, _xdg_cache_dir, _project_data_folder
 
     # XDG folders
@@ -152,7 +152,7 @@
 def get_project_data_folder():
     # Render processes don't have access to project data folder path via 'PROJECT()',
     # so they sometimes use '_project_data_folder' which set is in main() to be available
-    # when neeeded.
+    # when needed.
 
     try:
         path = PROJECT().vault_folder + "/" + PROJECT().project_data_id + "/"

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/projectdatavaultgui.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/projectdatavaultgui.py Changed

@@ -547,7 +547,7 @@
         name = vaults_obj.get_user_vaults_data()self.view_vault_index - 1"name" # -1 because first vault is the default vault
         name_label = Gtk.Label(label=name)
 
-        data_label = Gtk.Label(label=_("Data inside folder will NOT be destroyd."))
+        data_label = Gtk.Label(label=_("Data inside folder will NOT be destroyed."))
         data_label.set_margin_top(24)
 
                 
@@ -568,7 +568,7 @@
         drop_index = self.view_vault_index - 1 # -1 because 0 the default vault, 1 - n user vaults
                                                # and we are always dropping _user_ vault.
         
-        # We need to get activa vault path before deleting anythin because active 
+        # We need to get activa vault path before deleting anything because active 
         # vault is saved as index and deleting anything can mess that up
         # and we need to restore correct active vault after droip.
 
@@ -876,7 +876,7 @@
             self.info_label.set_use_markup(True)
 
     def cloning_completed(self):
-        self.info_label.set_text("<small>Project cloned succesfully.</small>")
+        self.info_label.set_text("<small>Project cloned successfully.</small>")
         self.info_label.set_use_markup(True)
         self.create_button.set_sensitive(False)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/projectmediaimport.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/projectmediaimport.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/propertyeditorbuilder.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/propertyeditorbuilder.py Changed

@@ -82,8 +82,8 @@
 REGION_EDITOR_BUILDER = "region_properties"                 # Creates a single row editor for multiple properties of region transition
 ROTATION_GEOMETRY_EDITOR_BUILDER = "rotation_geometry_editor" # Creates a single editor for multiple geometry values
 INFOANDTIPS = "infotips"                                    # Displays link to docs Info & Tips page 
-ANALYZE_STABILIZE = "analyzestabilize"                      # Launches stabilizing analyzis for clip
-ANALYZE_MOTION = "analyzemotion"                            # Launches motion tracking analyzis for clip
+ANALYZE_STABILIZE = "analyzestabilize"                      # Launches stabilizing analysis for clip
+ANALYZE_MOTION = "analyzemotion"                            # Launches motion tracking analysis for clip
 APPLY_MOTION = "applymotion"                                # Applies motion tracking as source image movement.
 APPLY_FILTER_MASK_MOTION = "applyfiltermaskmotion"          # Applies motion tracking as filter mask.
 SCALE_DIGITS = "scale_digits"                               # Number of decimal digits displayed in a widget
@@ -684,9 +684,6 @@
 def _get_fade_length_editor(editable_property):
     return FadeLengthEditor(editable_property)
 
-
-
-
 def _get_file_select_editor(editable_property):
     """
     Returns GUI component for selecting file of determined type
@@ -716,7 +713,7 @@
     file_select_button.set_size_request(210, 28)
     # TODO: check this out
     if hasattr(editable_property, "value") and editable_property.value != '' and editable_property.value != '""':
-        file_select_button.set_uri(GLib.filename_to_uri(editable_property.value))
+        file_select_button.set_filename(editable_property.value)
 
     file_select_label = Gtk.Label(label=editable_property.get_display_name())

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/propertyparse.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/propertyparse.py Changed

@@ -39,7 +39,7 @@
 ARGS = appconsts.ARGS
 SCREENSIZE = "SCREENSIZE"                                   # replace with "WIDTHxHEIGHT" of profile screensize in pix
 SCREENSIZE2 = "Screensize2"                                 # replace with "WIDTH HEIGHT" of profile screensize in pix
-WIPE_PATH = "WIPE_PATH"                                     # path to folder contining wipe resource images
+WIPE_PATH = "WIPE_PATH"                                     # path to folder containing wipe resource images
 SCREENSIZE_WIDTH = "SCREENSIZE_WIDTH"                       # replace with width of profile screensize in pix
 SCREENSIZE_HEIGHT = "SCREENSIZE_HEIGHT"                     # replace with height of profile screensize in pix
 VALUE_REPLACEMENT = "value_replacement"                     # attr name for replacing value after clip is known
@@ -362,7 +362,7 @@
     
 def rotating_geom_keyframes_value_string_to_geom_kf_array(keyframes_str, out_to_in_func):
     # THIS WAS CREATED FOR frei0r cairoaffineblend FILTER. That filter has to use a very particular parameter values
-    # scheme to satisty the frei0r requirement of all float values being in range 0.0 - 1.0.
+    # scheme to satisfy the frei0r requirement of all float values being in range 0.0 - 1.0.
     #
     # Parse extraeditor value properties value string into (frame, x, y, x_scale, y_scale, rotation, opacity)
     # keyframe tuples used by keyframeeditorcanvas.RotatingEditCanvas editor.
@@ -423,7 +423,7 @@
         # and rotate image automatically around its tramslated center point.
         #
         # So the we need to add half of width and height to mlt values AND 
-        # addional linear correction based on applied scaling when creating
+        # additional linear correction based on applied scaling when creating
         # keyframes for keyframecanvas.RotatingEditCanvas editor.
         x = float(values0) + float(screen_width) / 2.0 + \
             ((x_scale * screen_width) - screen_width) / 2.0

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/render.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/render.py Changed

@@ -52,7 +52,7 @@
 import userfolders
 import utils
 
-# User defined render agrs file extension
+# User defined render args file extension
 FFMPEG_OPTS_SAVE_FILE_EXTENSION = ".rargs"
 
 # These consts only applicable here, used in timeline clip slowmotion and reverse code.
@@ -414,7 +414,7 @@
     dialog.destroy()
 
     # Get render range for new media and information needed for clip.slowmo_data 
-    # used to eanble further slowmo renders to produce timeline clips with the 
+    # used to enable further slowmo renders to produce timeline clips with the 
     # same content area.
     if clip.slowmo_data == None:
         orig_file_path = clip.path
@@ -428,7 +428,7 @@
                                           orig_media_out, speed,
                                           range_selection)
     else:
-        # clip.slowmo_data is set after succesful slowmo render when new rendered clip
+        # clip.slowmo_data is set after successful slowmo render when new rendered clip
         # is placed on timeline.
         slowmo_type, orig_file_path, slowmo_clip_media_area, current_speed, orig_media_in, orig_media_out = clip.slowmo_data
 
@@ -549,7 +549,7 @@
             _compute_reverse_render_range(media_file_length, producer_length, orig_media_in, \
                                           orig_media_out, speed, range_selection)
     else:
-        # clip.slowmo_data is set after succesful slowmo render when new rendered clip
+        # clip.slowmo_data is set after successful slowmo render when new rendered clip
         # is placed on timeline.
         slowmo_type, orig_file_path, slowmo_clip_media_area, current_speed, orig_media_in, orig_media_out = clip.slowmo_data

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/rendergui.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/rendergui.py Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/css3/bold-text-class.css Added

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/css3/middlebar-id.css Added

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/css3/player-bar-id.css Added

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

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

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/container_sequence_link_icon.png Added

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/filters_down_arrow.png Added

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/filters_up_arrow.png Added

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_clear_xs.png Added

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_s.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_in_xs.png Added

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_out_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_out_s.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/mark_out_xs.png Added

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/marks_clear_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/marks_clear_s.png Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/next_frame_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/next_frame_s.png Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/play_2_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/play_2_s.png Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/prev_frame_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/prev_frame_s.png Changed

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

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/set_track_sync.png Added

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/slowmo.png Added

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/stop_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/stop_s.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/sync_menu_launch.png Added

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/to_mark_in_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/to_mark_in_s.png Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/darktheme/to_mark_out_s.png -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/to_mark_out_s.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/darktheme/track_sync_icon.png Added

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/filters/filters.xml -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/filters/filters.xml Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/advanced.html Added

@@ -0,0 +1,1165 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Advanced Editing</title>
+  <link rel="stylesheet" href="style.css">
+<script src="toc.js" type="text/javascript"></script>
+</head>
+
+<body>
+
+<div id="content">
+<img src="header_text_5.png">
+
+<script src="tocgen.js"></script>
+
+<div id="toccontent">
+
+<div id="advtoc">
+<div class="subject-header">Advanced Editing Features</div>
+</div>
+
+<div id="toc"></div>
+
+
+
+<h2>1. Sync Editing</h2>
+<p>
+In Flowblade Movie Editor sync editing workflow is to <b>set clip's positions to follow another clip's positions</b> on request.
+</p>
+<ul>
+<li> Sync relation between two clips is set by either setting relation individually, doing audio splits or setting sync relation for all clips on a track or a box selection in single action </li>
+<li> Clips that have lost sync with their parent clips can be resynced one or more at a time or by resyncing a whole track in single action.</li>
+</ul>
+
+<p>
+Below we give suggested workflows for three typical use cases for utilizing Flowblade's sync editing features.
+</p>
+<ul>
+<li> Generic work preserving sync editing. </li>
+<li> Editing to audio, such as when creating music videos or voice over driven programs. </li>
+<li> Dialogue editing. </li>
+</ul>
+
+
+
+<h3>Setting up Sync Relations</h3>
+
+<p>
+There are three ways to set up a sync relation between clips: 
+</p>
+
+<h4>Clip Parenting</h4>
+
+<p>
+Explicitly set Sync relation between two clips set up by selecting a <b>Sync Parent Clip</b> for a <b>Sync Child Clip</b>.
+</p>
+
+<ul>
+<li> Click <b>Right Mouse</b> on clip and select <b>Edit->Select Sync Parent Clip...</b>.</li>
+<li> Or Click <b>Right Mouse</b> on clip that is part of a multiclip selection and and select <b>Select Sync Parent Clip...</b>.</li>
+<li> Cursor turns into a Target Cross. Click on a clip to select it as <b>Sync Parent Clip</b>.</li>
+</ul>
+
+<h4>Audio Splitting</h4>
+
+<p>
+Split a video clip into two clips: a muted video clip as <b>Sync Parent Clip</b> and an audio clip as <b>Sync Child Clip</b>.
+</p>
+
+<ul>
+<li> Click <b>Right Mouse</b> on clip and select <b>Audio Edit->Split Audio Synched</b>.
+<li> When multple Clips are selected click <b>Right Mouse</b> on clip and select <b>Split Audio Synched</b>.
+<li>A new synched Audio Clip/s is placed on audio Track, either on V1 or mirrored track based on current preference.</li>
+<li> If you select from <b>Sync Properties</b> menu property <b>Auto Sync Split Video Clips on Add</b> video clips will be split automatically when added to certain tracks. 
+</li>
+</ul>
+
+<h4>Track Auto Parenting</h4>
+<p>
+Set all clips on track as <b>Sync Child Clips</b> to closest clips on the selected Track as <b>Sync Parent Clips</b>. 
+</p>
+<ul>
+<li> Click <b>Right Mouse</b> on a Track in the left side Tracks Column area and select <b>Sync All Clips To Track... </b>.</li>
+<ul>
+<li>Select sync parenting target Track using the dialog window.</li>
+<li>A sync relation is created for all Clips on Track.</li>
+<li>An icon appers on Track Head in in the Tracks Column to indicate that updating sync is now posibble.</li>
+</ul>
+<li>Once a Track has been auto parented it remembers the target Track and parenting can be updated by clicking <b>Right Mouse</b> on a Track Head and selecting <b>Update Sync to Clips' Current Positions</b>.</li>
+<li> Click <b>Right Mouse</b> on a Track Head and select <b>Clear Sync</b> to clear all sync relations on a Track and info on parenting target Track.</li>
+</ul>
+
+
+<h3>Resyncing</h3>
+
+<h4>Single Clip</h4>
+<ul>
+<li> Click <b>Right Mouse</b> on Sync Child Clip and select <b>Edit->Resync</b> from popup menu to resync single clip.</li>
+<li> Press <b>Resync Selected Clips</b> Button to resync single clip.</li>
+</li>
+</ul>
+
+<h4>Multiple Clips</h4>
+<ul>
+<li> Press <b>Resync Selected Clips</b> Button to resync selected clips clip.</li>
+<li> Click <b>Right Mouse</b> on <b>Sync Child Clip</b> that is part of a multiclip selection and and select <b>Resync</b> from popup menu to resync single clip.</li>
+</li>
+</ul>
+
+<h4>All Clips on a Track</h4>
+<ul>
+<li> Select from application menu <b>Edit->Resync Track</b> to resync all clips in the track containing currently selected clip.</li>
+<li> Press <b>Resync Track Containing Selected Clip</b> Button to resync all clips in the track containing currently selected clip.</li>
+</ul>
+
+<h3>Clearing Sync Parent Relations </h3>
+<ul>
+<li> Click <b>Right Mouse</b> on Sync Child Clip and select <b>Edit->Clear Sync Relation</b>.</li>
+<li> Or Click <b>Right Mouse</b> on clip that is part of a multiclip selection and and select <b>>Clear Sync Relations</b>.</li>
+</ul>
+
+<h3>Workflows</h3>
+
+<h4> Generic work preserving sync editing</h4>
+<p>
+Most edits require clips on different tracks to maintain positions relative to each other, such as a title placed on top of a video clip.
+</p>
+<p>
+Many edit actions necessarily change the positions of clips differently on different tracks. Sync editing tools provide quick workflow to regain sync between clips.
+</p>
+<ul>
+<li> It is often useful to treat track <b>V1</b> as a master track, and have all other tracks relate positions to track <b>V1</b>.</li>
+<li> Set sync relations for individual or multiple selected clips.</li>
+<li> If there exists many clips of similar type that require synching, dedicate a track to that type of clips and use track syncing features to keep that track in sync.</li>
+<li> If program features multiple clearly defined complex scenes one approach is to:
+    <ul>
+    <li> Parent first clip of the scene on each track to the first clip of scene on track <b>V1</b>.</li>
+    <li> Use <b>Spacer</b> tool with <b>Control</b> modifier to sync tracks manually at scene start when needed.</li>
+    <li> Or use track syncing.</li>
+    </ul>
+</li>
+</ul>
+
+
+<h4>Editing to audio</h4>
+<p>
+When creating music videos or voice over driven programs it is useful to use a single audio track as sync target track for most ar all other element in the sequence.</li>
+</p>
+
+<ul>
+<li> Place the program defining audio of track <b>A1</b> and treat that as a master track.</li>
+<li> Have all other tracks and clips relate their positions to track <b>A1</b>.</li>
+<li> With music videos it is useful to use a large number of track dedicated to invidual types of visual elements, and use excusively track syncing featues instead of setting sync to individual clips.</li>
+</ul>
+
+<h4> Dialogue editing</h4>
+<p>
+Editing dialogue scenes frequently require actor's voice to start before or end after the image of the character speaking. These types of edit are knowns as J- and L-cuts.
+</p>
+<ul>
+<li> Dedicate tracks <b>V1</b>, <b>V2</b>, <b>A1</b> and <b>A2</b> to dialoque video and audio.</li>
+<li> Select from <b>Sync Properties</b> menu on the left behaviour that suits your preferences.
+    <ul>
+    <li> <b>Auto Sync Split Video Clips on Add</b> has multiple options to select which tracks do this.</li>
+    <li> <b>Audio Split To Mirrored Track</b> behaviour can be turned on and off.</li>
+    </ul>
+</li>
+<li> When creating J- or L-cuts use methods that maintain sync to minimize the need to resync:
+    <ul>
+    <li> When using <b>Trim</b> tool, use <i>Two Roll Trim</i> instead of <i>One Roll Trim</i>.</li>
+    <li> When dragging clip ends use <b>Alt</b> modifier to do <b>Clip End Overwrite Drag</b> actions.</li>
+    </ul>
+</li>
+<li> Use exclusively track resyncing actions to keep audio on tracks <b>A1</b> and <b>A2</b> synced.</li>
+</ul>
+
+
+<h3>Sync UX</h3>
+<h4>Buttons</h4>
+
+<p>
+There are 4 buttons in the <b>Middlebar</b>, from left to right:
+</p>
+    <ul>
+     <li><b>Split Audio Synched</b></li>
+     <li><b>Set Sync for All Clips on Track Containing Selected Clip/s</b></li>
+     <li><b>Resync Track Containing Selected Clip/s</b></li>
+     <li><b>Resync Selected Clips</b></li>
+     </ul>
+<h4>Menus</h4>
+<p>
+There are 4 menus available at various places to provide sync editing functionality:
+</p>
+<ul>
+ <li><b>Sync Properties Menu</b> above <b>Tracks Column</b> allows for setting sync editing properties.</li>
+ <li><b>Track Menu</b> available in <b>Tracks Column</b> provides Track sync actions.</li>
+ <li><b>Clip Menu</b> provides sync actions applied to single clips.</li>
+ <li><b>Multi Clip Selection Menu</b> provides sync actions applied to multiple clips.</li>
+ </ul>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/all_comp.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/basic_editing.html Added

@@ -0,0 +1,329 @@
+ <!DOCTYPE html>
+<html>
+<head>
+  <title>Basic Editing</title>
+  <link rel="stylesheet" href="style.css">
+</head>
+
+<body>
+
+<div id="content">
+<img src="header_text_5.png" >
+
+<script src="tocgen.js"></script>
+
+<div class="subject-header">Basic Editing</div>
+
+<p>
+This section describes the minimal workflow for making a movie using only a single track.
+</p>
+<div id="toc"></div>
+
+<div id="toccontent">
+
+<h3>Creating a New Project</h3>
+<p>
+Flowblade Movie Editor saves work in project files.
+</p>
+<p>
+To create a new Project:
+</p>
+<ul>
+<li> <b>Menu:</b> Select <b>File -> New</b> from menu.</li>
+<li> <b>Keyboard Shortcut:</b> Press <b>Control+N</b>.</li>
+</ul>
+<p>
+A project contains:
+</p>
+ <ul>
+<li> one or more Sequences of edited media</li>
+<li> a collection of Media Files stored in Bins.</li>
+</ul>
+<p>
+There are two parameters that can be selected for a new project:
+</p>
+<ul style="list-style-type:none">
+<li> <b>Project Profile</b> Project Profile determines frame rate per second, image size in pixels and pixel aspect ratio.</li>
+<li> <b>Tracks count</b> 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.</li>
+<li> <b>Data Store</b> Thumbnails, Generator and Rendered Transitions, stabilizing and motion tracking data, proxy files etc. are stored here in a <b>Data Store</b>, see chapter: <a href="datastores.html">Data Stores</a>.
+
+
+</ul>
+
+<div class="note">
+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.
+</div>
+<div class="note">
+For <b>best possible quality</b> the <b>input material, Project Profile and Rendering Profile</b> should <b>all have the same pixel dimensions</b> and pixel aspect ratio.
+</div>
+
+<h3>Adding and removing new Sequences</h3>
+<p>
+A Project contains one or more Sequences. The term Sequence refers to the full contents of the timeline forming a program, a movie.
+</p>
+
+<p>
+For complex projects it is sometimes best to use multiple sequences for creating and managing different parts of the finished product.
+</p>
+
+<p>
+<b>Adding Sequences:</b>
+</p>
+<ul>
+<li> <b>Default layout:</b> Press <b>Right Mouse</b> popup menu on Sequences area and select menu item <b>Add New Sequence</b>..</li>
+<li> <b>Small screen layout:</b> Press <b>Right Mouse</b> popup menu in the <b>Project</b> tab <b>Sequences</b> area and select menu item <b>Add New Sequence</b>.</li>
+<li> Or select  <b>Project -> Sequence -> Add New Sequence</b> from application menu.</li>
+</ul>
+
+
+<p>
+<b>Deleting Sequences</b> can be done with menu actions accessed in the same places.
+</p>
+
+<div class="note">
+<p>
+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.
+</p>
+</div>
+
+<h3>Working with Media Files</h3>
+
+<p>
+Flowblade Movie Editor holds files in <b>Media</b> tab. Files are listed in unnamed table that displays contents of the currently selected Bin. Bins are listed in the <b>Bins</b> table.
+</p>
+
+<p>
+<b>Opening Media Files:</b>
+</p>
+
+<ol>
+<li> Press <b>Right Mouse</b> on <b>Media</b> tab empty area and select menu item <b>Add Video, Audio or Image...</b>.
+<li> Or select  <b>Project -> Add Video, Audio or Image...</b> from application menu.
+<li> Use dialog to find and select files.</li>
+<li> Files are displayed as thumbnails.</li>
+<li> Note that creating thumbnails for opened files will take some time.</li>
+</ol>
+
+<div class="note">
+<h3 style="margin-top:10px">Project Media: Absolute and relative paths</h3>
+<ul>
+<li> Flowblade <b>saves references</b> to media files used in a project as <b>absolute paths</b>.</li>
+<li> If a media is <b>not found on load</b>, Flowblade attempts to find a media file with the same name in subfolders relative to the project file.</li>
+<li> If all media used by a project is saved in subfolders relative to project file, <b>project file and media can moved as a unit</b> and the project will load successfully after data is copied to a different place</li>
+<li> <b>Rendered files</b> like transitions are saved by default in a <b>Data Store</b>, see chapter: <a href="datastores.html">Data Stores</a>.</li>
+<li> <b>Load order</b> between absolute and relative paths can be set in preferences window</li>
+<li> <b>Media Relinker</b> tool can be used to fix problems that may occur </li>
+</ul>
+</div>
+
+<h3>Working with Bins</h3>
+
+<p>
+In video editing a bin is a named location for storing media. The term is used in Avid and was earlier used by film editors.
+</p>
+
+<p>
+    <b>Adding a Bin:</b>
+<p>
+<ul>
+<li> <b>Default layout:</b> Press <b>Right Mouse</b> on Bin area to launch a popup menu and select menu item <b>Add Bin</b>.</li>
+<li> <b>Small screen layout:</b> Press <b>Right Mouse</b> in the <b>Media</b> tab <b>Bins</b> panel to launch a popup menu and select menu item <b>Add Bin</b>.</li>
+<li> Or select  <b>Project -> Bin -> Add Bin</b> from application menu.</li>
+</ul>
+
+<p><b>Deleting a Bin</b>: Delete actions can be accessed from the same places as above.</p>
+<p><b>Renaming a Bin</b>: Click on the Bin name, type new name and press <b>Enter</b>.</p>
+<p><b>Moving files to another Bin:</b></p>
+<ul>
+<li> Select and drag files on top of the Bin you wish to move the files into.</li>
+<li> Select files and open <b>Hamburger menu</b> in <b>Media</b> panel and select menu item <b>Move Selected media to Bin</b> and then the menu item with the Bins name.</li>
+</ul>
+<div class="tabbed">
+
+</div>
+
+<h4>Filtering Bin View</h4>
+<p>
+    Bins can be made to display only subset of media items they contain. Press on filtering button in <b>Media Panel</b> bottom row next <b>Hamburger</b> and <b>columns</b> buttons.
+<p>
+    <ul>
+    <li> <b>Filtering by media type.</b> Select one of options <i>All Files, Video Files Audio Files, Graphics Files, Image Sequences, Pattern Producers, Unused Files</i>.</li>
+    <li> <b>Filtering by ratings.</b> Select one of options in submenu <i>Ratings</i>, either <i>Show All Ratings, Show Favorites, Hide bad</i>. Each media item can be given a rating in context popover submenu <i>Rating</i>.</li>
+    </ul>
+    
+<h3>Using Timeline</h3>
+
+<h4>Scrolling Timeline</h4>
+<ul>
+<li> Press and Drag <b>Scrollbar</b> below Timeline</li>
+<li> Scroll <b>Mouse Middle</b> button + <b>CTRL</b> key while on top of Timeline</li>
+</ul>
+
+<h4>Zooming Timeline</h4>
+<ul>
+<li> Click <b>Zoom In</b>, <b>Zoom Out</b> or <b>Zoom Length</b> buttons.</li>
+<li> Scroll <b>Mouse Middle</b> button on top of Timeline </li>
+</ul>
+
+<h4>Changing Current Frame</h4>
+<ul>
+<li> Drag with <b>Right Mouse</b> button starting from  an empty space in the Timeline.</li>
+<li> Drag with <b>Left Mouse</b> button on the Frame Scale.</li>
+<li> Drag with <b>Left Mouse</b> on the Monitor Position Bar.</li>
+<li> Click <b>Left Arrow</b> key or <b>Right Arrow</b> key to move to next or previous frame.</li>
+<li> Click <b>Up Arrow</b> key or <b>Down Arrow</b> key to move to next or previous cut on topmost active track.</li>
+<li> Click <b>Next</b> or <b>Prev</b> button in Monitor Buttons area to move to next or previous frame.</li>
+</ul>
+
+<h4>Changing Current Frame when Clip is displayed on Monitor</h4>
+<ul>
+<li> Drag with <b>Left Mouse</b> on the Monitor Position Bar.</li>
+<li> Click <b>Left Arrow</b> key or <b>Right Arrow</b> key to move to next or previous frame.</li>
+<li> Click <b>Up Arrow</b> key or <b>Down Arrow</b> key to move to next or previous of the following: Mark In/Mark Out/Start/End</li>
+<li> Click <b>Next</b> or <b>Prev</b> button in Monitor Buttons area to move to next or previous frame.</li>
+</ul>
+
+<h4>Switching between Timeline and Clip Display</h4>
+<ul>
+<li> Click buttons with icons representing sequence or single clip in Monitor Buttons area.</li>
+<li> Drag Media File on top of <b>Monitor</b> to display Clip.</li>
+</ul>
+
+<h4>Setting Active Tracks</h4>
+<ul>
+<li> Click <b>Track Active Switch</b> on the right side of Tracks Column area. Topmost  <b>Track Active Switch</b> displays arrow pointing downwards indicating that <b>Insert From Monitor</b> and other buttons place clips on that track.</li>
+</ul>
+
+<div class="note">
+<h4>Effects of Track Active State</h4>
+<ul>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/blender_clip_editor.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/blender_color_editor.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/blender_script.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/blender_string_editor.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/comp_clips.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/compositor.html Added

@@ -0,0 +1,221 @@
+ <!DOCTYPE html>
+<html>
+<head>
+  <title>Creating Composited Images</title>
+  <link rel="stylesheet" href="style.css">
+</head>
+
+<body>
+
+<div id="content">
+<img src="header_text_5.png" >
+
+<script src="tocgen.js"></script>
+
+<div id="toccontent">
+
+<div class="subject-header">Creating Composited Images</div>
+
+<p>
+Flowblade Movie Editor uses Compositors to mix images from two different tracks.
+</p>
+
+<div id="toc"></div>
+
+<h3>Compositing Modes</h3>
+<p>
+The way that Compositors work is defined by a Compositing Mode. Users can select Compositing Mode to suit their preference or editing needs of a particular Sequence.
+</p>
+<p>
+<b>To set Compositing Mode</b> for a Sequence select it from <b><i>Sequence -> Compositing Mode</i></b> sub menu.
+</p>
+
+<h4>Standard Full Track</h4>
+<p>
+This is the most simple and easiest to use Compositing Mode. No Compositors are needed. Fade In/Outs, Wipes and transforms are created with Filters. Some compositing functionality is not available. It is not possible to create node tree compositions
+</p>
+<h4>Compositor Free Move</h4>
+<p>
+This is the most powerful and complex Compositing Mode. Users can set destination tracks and positions of Compositors freely and create node tree compositions if needed.
+</p>
+
+<h2>Standard Full Track Compositing Mode</h2>
+<p>
+Compositing in Standard Full Track mode is similar to using layers in applications like Gimp and Photoshop.
+
+
+<h3>Workflow</h3>
+<h4>Creating layered compositions</h4>
+
+<ul>
+<li> Add Clips on Timeline on different tracks.</li>
+<li> Images are composited in bottom to top order.</li>
+<li> Images with alpha channel are composited with transparency as defined by alpha channel.</li>
+<li> Use Filters to create Dissolves, Wipes, Blends and affine transforms.</li>
+</ul>
+
+<h4>Dissolves</h4>
+<ul>
+<li> Add Clips on Timeline on different tracks.</li>
+<li> Add <b>Fade In</b> or <b>Fade Out</b> Filters to Clip on the upper track to create Dissolves with Clip on the lower track.</li>
+<li> <b>Fade In</b> and <b>Fade Out</b> Filters are in <b>Fade</b> Filter category.</li>
+</ul>
+
+<h4>Dissolves - Rendered Transition</h4>
+
+<ul>
+<li> Select two Clips on the same track.</li>
+<li> Press <b>Add Rendered Transition</b> button in middlebar.</li>
+<li> Give length of rendered transition and press <b>Render</b> button.</li>
+</ul>
+
+<h4>Blends</h4>
+<ul>
+<li> Add Clips on Timeline on different tracks.</li>
+<li> Add <b>Blend</b> Filter to Clip on the upper track to control blend mode used when compositing image on top of the Clip on the lower track.</li>
+<li> <b>Blend</b> Filters can be combined with other Filters to create compositions as wished.</li>
+<li> <b>Blend</b> Filters are in <b>Blend</b> Filter category.</li>
+</ul>
+
+<h4>Wipes</h4>
+<ul>
+<li> Add Clips on Timeline on different tracks.</li>
+<li> Add <b>Wipe</b> Filters to the top Clip to create wipe transitions.</li>
+<li> <b>Wipe</b> Filters are in <b>Blend</b> Filter category.</li>
+</ul>
+
+<h4>Alpha channel manipulation: Keys, Rotomasks etc.</h4>
+<ul>
+<li> Add Clips on Timeline on different tracks.</li>
+<li> Use appropriate Filters in <b>Alpha</b> Filter category to create more complex compositing operations such as color keys, shaped masks or animated masks.</li>
+</ul>
+
+<h4>Transforms</h4>
+<ul>
+<li> Add Clips on Timeline on different tracks.</li>
+<li> Add <b>Position Scale</b> or <b>Position Scale Rotation</b> Filters to the top Clip to move, rotate and scale image before it is composited on lower track.</li>
+<li> These Filters are in <b>Transform</b> Filter category.</li>
+</ul>
+
+<h2>Compositor Free Move Compositing mode</h2>
+<p>
+In this modes Compositors have a Source track and a Destination track.</p>
+</p>
+<p>
+On the Timeline a Compositor is displayed as a rectangular object on top of two tracks. Source track is always the one above Compositor, but Destination track may be any of the tracks below it.
+</p>
+<p>
+Parameters defining the resulting image are edited in the <b>Edit</b> tab.
+</p>
+
+<h3>Workflow</h3>
+<p>
+By combining multiple tracks and multiple Compositors complex composite images can be achieved.
+</p>
+<ol>
+<li>Creating a Compositor
+<ul>
+<li> Click <b>Right Mouse</b> on any clip on tracks from V5 to V2 and select for example <b>Add Compositor -> Dissolve</b> or <b>Add Blender -> Softlight</b> from popupmenu to create a new Compositor.</li>
+</ul>
+<li>Trimmimg or Moving a Compositor</li>
+<ul>
+<li> To trim Compositor start and end points: Press and drag <b>Left Mouse</b> near either end of Compositor on Timeline.</li>
+<li> To move Compositor: Press and drag <b>Left Mouse</b> in the middle of Compositor on Timeline.</li>
+</ul>
+<li>Editing Compositor Parameters in Compositors Tab</li>
+<ul>
+<li> Double click Compositor with <b>Left Mouse</b>.</li>
+<li> Click <b>Right Mouse</b> on any Compositor and select Open In Compositor Editor</li>
+<li> Edit parameters using value editors.</li>
+</ul>
+<li>Deleting Compositor</li>
+<ul>
+<li> Click <b>Left Mouse</b> on any Compositor to select it and press <b>Delete</b> key.</li>
+</ul>
+</ol>
+
+<h3>Compositor are executed from top to bottom in Top Down Compositing modes</h3>
+In Flowblade Movie Editor <b>the order of rendering is top-to-bottom</b>,
+instead of bottom-to-top like in Gimp or Photoshop.
+
+When attempting certain type of multilayer composites this yields results that seem unintuitive,
+unless the user is aware of rendering order of Compositors.
+
+<h4>Rendering A Composited Frame</h4>
+<ol>
+<li>For each frame it is checked if there is a Compositor covering this frame on the top most track.</li>
+<li>If such Compositor is found, do composite on Destination track.</li>
+<li>Frame on Destination track is now altered and if that frame is used as source the altered version is used</li>
+<li>Check if frame on next track below has compositor and if Compositor is found render the composite image</li>
+<li>This is done for each track.</li>
+<li>Output image on is from the topmost track that has media on the frame and does not have a compostor on the frame.</li>
+</ol>
+
+<h3>Using Filters</h3>
+<p> Except for <b>Blend</b> Filter, all filters can used in the same way to achieve compositions as in <b>Standard Free Move</b> compositing mode.</p>
+
+<h3>EXAMPLE: Creating a 3-layer composite</h3>
+<p style="margin-bottom:45px" >
+In this example we demonstrate how top-to-bottom Compositor
+order affects compositing. We are trying to make word 'GO' appear on top of 2-color
+background made by combining red and blue Color Clips using 'Free Stripes' wipe.
+</p>
+<h4>Media Items and desired result</h4>
+<p>
+To make alpha transparency work the GO.PNG graphic has to composited using 'Dissolve'.
+</p>
+<p>
+<i><b>Clips: RED and BLUE Color Clips and GO.PNG graphic with alpha transparency</b></i>
+</p>
+<img src="comp_clips.png">
+
+<p>
+<i><b>Desired result</b></i>
+</p>
+
+<img style="margin-bottom:45px" src="correct_comp.png">
+
+<h4>Gimp/Photoshop style layer order yields wrong result</h4>
+<p>
+Here we have arranged clips on the tracks as we would arrange layers in Gimp.
+</p>
+<p>
+<i><b>Gimp style layer order</b></i>
+</p>
+<img src="wrong_timeline.png">
+
+<p>
+What happens here is that first 'GO.PNG' is composited on 'RED' Color Clip, and the resulting image is composited using 'Free Stripes' wipe on top of 'BLUE' Color Clip. We get the wrong result.
+</p>
+<p>
+<i><b>Wrong result</b></i>
+</p>
+<img  style="margin-bottom:45px" src="wrong_comp.png">
+<h4>Correct layer order when compositing order is top-to-bottom</h4>
+<p>
+Here we have arranged clips in correct order for the desired result.
+</p>
+<p>
+<i><b>Correct layer order</b></i>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/container_clips.html Added

@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+ 
+<html>
+<head>
+  <title>Container Clips</title>
+  <link rel="stylesheet" href="style.css">
+<script src="toc.js" type="text/javascript"></script>
+</head>
+
+<body>
+
+<div id="content">
+<img src="header_text_5.png">
+
+<script src="tocgen.js"></script>
+
+<div id="toccontent">
+
+<div class="subject-header">Container Clips</div>
+
+
+
+<div id="toc"></div>
+
+<h2>Container Clips Concept</h2>
+<p>
+A <b>Container Clip</b> is a Media Item and the Timeline Clip made from it that has three items packed together as a single entity: <i>Program, Unrendered Media</i> and <i>Rendered Media</i>.
+</p>
+<h3>Components</h3>
+<ol>
+<li><b>Unrendered Media</b> This is what is displayed on timeline if container clip media is not rendered.</li>
+<li><b>Program</b> This data is used to render a media clip on timeline, sometimes using unrendered media as input.</li>
+<li><b>Rendered Media</b> This is what is displayed on timeline when Container Clip is rendered.</li>
+</ol>
+
+<h2>Selection Container Clips</h2>
+<h5>Components</h5>
+<p>
+<ul style="list-style-type:none">
+<li><b>Unrendered Media</b> A MLT XML vdieo clip created from selection or sequence like Compound clips previously.</li>
+<li><b>Program</b> A MLT XML video clip created from selection or sequence like Compound clips previously. Here Program is the same as unrendered media.</li>
+<li><b>Rendered Media</b> Clip Rendered from MLT XML Clip.</li>
+</ul>
+</p>
+<h5>Use Cases</h5>
+
+<ul>
+<li>Make possible to create Media items from selections and full Sequences.</li>
+<li>Give better timeline performance for complex multitrack container clips by pre-rendering them on timeline.</li>
+</ul>
+
+<h5> Creating Selection Container Clip from Selection</h5>
+
+<ol>
+<li> Select 2 or more adjacent clips from a single track.</li>
+<li> Select <b>Project->Create Container Clip->From Selected Clips</b></li>
+<li> A new Media Item appears in the current Bin.</li>
+</ol>
+
+<h5> Creating Selection Container Clip from Sequence</h5>
+
+<ol>
+<li> Select <b>Project->Create Container Clip->From Current Sequence</b></li>
+<li> A new Media Item appears in the current Bin.</li>
+</ol>
+
+<h5> Creating audio synced Selection Container Clip from two Media Items</h5>
+
+<ol>
+<li> Select 2 Media Items in Media panel.</b>
+	<ul>
+	<li> The expected case is to select <b>1 Video and 1 Audio Clip</b>.</li>
+	<li> If you select <b>2 Video Clips</b> then which is used as video depends on selection order.</li>
+	<li> Audio from clip treated as video is muted.</li>
+	</ul>
+</li>
+<li> Select <b>Project->Create Compound Clip->Audio Sync Merge Clip From 2 Media Items</b></li>
+<li> If audio sync is successful a dialog appears. Give a name for the new Media Item in the dialog.</li>
+<li> A new Media Item appears in the current Bin.</li>
+</ol>
+
+<div class="note">
+Audio syncing looks for best mathemathical match between two audio waveforms, so <b>audio syncing non-matching audio will produce random results.</b>
+</div>
+
+<h2>Generator Container Clips</h2>
+<p>
+<b>Generators</b> are Container Clips too, see more info in chapter <a href="generatorsfluxity.html">Generators and Fluxity API</a>
+</p>
+
+<h2>Sequence Link Container Clips</h2>
+
+<p>
+<ul style="list-style-type:none">
+<li><b>Unrendered Media</b> A MLT XML video clip created or recreated from Contents of a Sequence on request</li>
+<li><b>Program</b>  Contents of a Sequence.</li>
+<li><b>Rendered Media</b> Clip Rendered from MLT XML Clip.</li>
+</ul>
+</p>
+
+<h5>Use Cases</h5>
+<ul>
+<li>Provide a convenient way to use Sequences as parts of a master Sequence.</li>
+</ul>
+
+<h5> Creating Sequence Link Container Clips</h5>
+<ul>
+<li>Select from menu <b>Project->Add Sequence Link Container Clip</b> to create a <b>Sequence Link Container Clip</b> media item.</li>
+<li>Drag <b>Sequence Link Container Clip</b> Media Item on Timeline to create a clip.</li>
+<li><b>Sequence Link Container Clips</b> can't be placed on Sequences they link to and creating cyclic dependencies between sequencse using <b>Sequence Link Container Clips</b> is not allowed.</li>
+</ul>
+<h5> Updating Sequence Link Container Clips</h5>
+<ul>
+<li>Click <b>Right Mouse</b> on clip and select <b>Update Sequence Link Clip</b> to update clip to display current contents of Sequence it is linked to.</li>
+</ul>
+<h5> Replacing Sequence Link Container Clip with Sequence Contents</h5>
+<ul>
+<li>Place Playhead at the beginning of <b>Sequence Link Container Clip</b>.</li>
+<li>Select from menu <b>Sequence->Import Another Sequence Into This Sequence...</b> and select option <b>Insert Sequence at Playhead position</b> and do import.</li>
+<li>Delete <b>Sequence Link Container Clip</b>.</li>
+</ul>
+
+<h2>G'Mic Script Container Clips</h2>
+
+<h5>Components</h5>
+<p>
+<ul style="list-style-type:none">
+<li><b>Unrendered Media</b> Video Clip.</li>
+<li><b>Program</b> G'Mic script created and saved from G'Mic tool.</li>
+<li><b>Rendered Media</b> A clip rendered with G'mic effect.</li>
+</ul>
+</p>
+<p>
+<h5>Use Cases</h5>
+<ul>
+<li>Render G'Mic effects only on clip ranges used on timeline.</li>
+<li>Make easier to use single user defined G'Mic effect on multiple clips.</li>
+</ul>
+
+<h5> Creating G'Mic Script Container Clips</h5>
+
+<ol>
+<li>Open <b>G'Mic tool</b>.</li>
+<li>Create G'Mic effect script. See section on <b>G'Mic Effects</b> in Chapter <b>Tools</b>.</li>
+<li>Press <b>Save Script</b> button in bottom left corner and save effect.</li>
+<li>Select menu item <b>Project -> Create Container Clip -> From G'Mic Script</b>.</li>
+<li>Select the script you saved and the clip that it will be applied on to create Container Clip.</li>
+</ol>
+
+<h2>Rendering Container Clips</h2>
+<h4>Container Clip Render Actions</h4>
+<p> Render actions are available from Clip <b>Right Mouse</b> context menu in <b>Generator and Container Rendering</b> submenu.
+<ul>
+<li><b>Render Clip...</b> Renders Clip and stops using <b>Unrendered Media</b> on timeline.</li>
+<li><b>Render Settings...</b> Allows setting how and where a clip is rendered.</li>
+<li><b>Switch to Unrendered Media</b> Switch to using <b>Unrendered Media</b> and drops the current <b>Rendered Media</b> version of <b>Program</b>.</li>
+<li><b>Set Default Encoding...</b> Allows setting encoding format that is used for all <b>Container Clips</b> and <b>Generator</b> as default video encoding.</li>
+</ul>
+
+</div>
+
+</div>
+</div>
+
+</body>
+
+</html>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/correct_comp.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/correct_dest.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/correct_timeline.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/datastores.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/edit_tools.html Added

@@ -0,0 +1,259 @@
+ <!DOCTYPE html>
+<html>
+<head>
+  <title>Timeline Edit Tools</title>
+  <link rel="stylesheet" href="style.css">
+  <META CHARSET="UTF-8">
+</head>
+
+<body>
+
+<div id="content">
+
+<img src="header_text_5.png" >
+
+<script src="tocgen.js"></script>
+
+<div class="subject-header">Timeline Edit Tools</div>
+
+<p>
+Flowblade Movie Editor has 6 edit tools for doing timeline edits.
+</p>
+
+<div id="toccontent">
+<div id="toc"></div>
+
+<h2>Selecting Tools</h2>
+
+<p>
+Use <b>Tool Switcher</b> button drop menu or press key <b>1 - 6</b>  to pick a tool.
+</p>
+
+<p>
+It is also possible to use Tool Dock instead of <b>Tool Switcher</b> button by selecting <b>Dock</b> in <b>View->Edit Tool Selection Widget</b>.
+</p>
+
+
+<div class="note">
+<b>Use Keyboard Shortcuts!</b> It is much faster to use keys <b>1 - 6</b> to change tools. Note that keys 1-6 only change tools if timeline has keyboard focus. 
+</div>
+
+
+<h2>Move Tools</h2>
+
+
+<a id="overwrite"></a>
+<h3>Move</h3>
+
+<p>
+Lift out one or more clips and insert them at any point to overwrite on any track.
+</p>
+
+<ol>
+<li>Select clip
+	<ul>
+	<li><b> Click </b>Left Mouse on a clip.</li>
+	</ul>
+</li>
+<li>Select other end of clip range if moving multiple clips
+	<ul>
+	<li> Click <b>CTRL+Left Mouse</b> on the clip you wish to be the other end of move clip range.</li>
+	</ul>
+</li>
+<li>Drag Clip(s) to new position
+	<ul>
+	<li> Press <b>Left Mouse</b> on a selected clip and drag clip/s to a new position.</li>
+	<li> Red shadow clips show overwrite area.</li>
+	<li> You can also move clips to a different track.</li>
+	</ul>
+</li>
+</ol>
+
+<p>
+Drag clip ends to change clip length.
+</p>
+
+<ol>
+<li>Place cursor near clip end
+	<ul>
+	<li>When cursor changes to horizontal arrow with vertical bar you can start clip end drag edit.</li>
+	</ul>
+</li>
+<li>Drag clip end with <b>Left Mouse</b>.
+	<ul>
+	<li> Added clip length will perform overwrite on blanks and empty space</li>
+	</ul>
+	<ul>
+	<li> Added clip length will perform insert on other clips</li>
+	</ul>
+	<ul>
+	<li> Decreased clip length will perform splice out.</li>
+	</ul>
+</li>
+<li>Drag clip end with <b>CTRL + Left Mouse</b>.
+	<ul>
+	<li> Added clip length will perform overwrite on all clips up length of the adjacent clip.</li>
+	</ul>
+	<ul>
+	<li> Decreased clip length will add material as much as possible from the adjacent clip.</li>
+	</ul>
+</li>
+</ol> 
+
+<p>
+Select and overwrite move all Timeline items contained in a box selection.
+</p>
+
+<ol>
+<li>Select an area on Timeline by dragging a box selection with <b>Left Mouse</b> around all items you wish to move and release mouse button.</li>
+<li>Press <b>Left Mouse</b> inside the box selection and drag the box into new position on timeline and release mouse.</li>
+<li>Box contents are overwritten on new position and Compositors are moved.</li>
+
+</ol>
+
+
+<a id="insert"></a>
+<h3>Insert</h3>
+
+<p>
+Splice out one or more clips and insert them at desired cut on any track.
+</p>
+
+<ol>
+<li>Select clip
+	<ul>
+	<li> Click <b>Left Mouse</b> on a clip.</li>
+	</ul>
+</li>
+<li>Select other end of clip range if moving multiple clips
+	<ul>
+	<li> Click <b>CTRL+Left Mouse</b> on the clip you wish to be the other end of move clip range.</li>
+	</ul>
+</li>
+<li>Drag Clip(s) to new position
+	<ul>
+	<li> Press <b>Left Mouse</b> on a selected clip and drag clip/s to a new position.</li>
+	<li> Yellow arrow displays insert point.</li>
+	<li> You can also move clips to a different track.</li>
+	</ul>
+</li>
+</ol>
+
+<p>
+Drag clip ends to change clip length.
+</p>
+
+<ol>
+<li>Place cursor near clip end 
+	<ul>
+	<li>When cursor changes to horizontal arrow with vertical bar you can start clip end drag edit.</li>
+	</ul>
+</li>
+<li>Drag clip end with <b>Left Mouse</b>.
+	<ul>
+	<li> Added clip length will perform overwrite on blanks and empty space</li>
+	</ul>
+	<ul>
+	<li> Added clip length will perform insert on other clips</li>
+	</ul>
+	<ul>
+	<li> Decreased clip length will perform splice out.</li>
+	</ul>
+</li>
+
+</ol> 
+
+
+
+
+
+
+<a id="spacer"></a>
+<h3>Spacer</h3>
+
+<p>Move all Timeline items after pressed frame on all tracks or on a single track</p>
+<ol>
+<li>Select a clip on Timeline and move it and all items to the right of it
+	<ul>
+	<li> Press <b>Left Mouse</b> on a clip.</li>
+	<li> Continue to <b>Left drag</b> clip and all clips and compositors to right of it into a new position</li>
+	<li> It is not possible to move items on top of clips. Items can only be moved on top of empty space </li>
+		</ul>
+	<li>Use <b>Control</b> button to only affect items on a single track</li>
+		<ul>
+	<li> Press <b>Control</b> and use <b>Left Mouse</b> to move all items on single track to the right of the selected clip</li>
+	</ul>
+</li>
+</ol>
+
+
+ 
+ 
+<h2>Trim Tools</h2>
+
+<a id="multitrim"></a>
+<h3>Multitrim</h3>
+<p>
+Do  <b>Trim</b>, <b>Roll</b> or <b>Slip</b> tool edits based on cursor position on timeline.
+</p>
+<ol>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/encoding.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/filter_mask.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/filtering.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/filters_list.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/fluxity.html Added

@@ -0,0 +1,3836 @@
+<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
+<meta name="generator" content="pdoc 0.10.0" />
+<title>fluxity API documentation</title>
+<meta name="description" content="GPL Licence text …" />
+<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/sanitize.min.css" integrity="sha256-PK9q560IAAa6WVRRh76LtCaI8pjTJ2z11v0miyNNjrs=" crossorigin>
+<link rel="preload stylesheet" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/10up-sanitize.css/11.0.1/typography.min.css" integrity="sha256-7l/o7C8jubJiy74VsKTidCy1yBkRtiUGbVkYBylBqUg=" crossorigin>
+<link rel="stylesheet preload" as="style" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/styles/github.min.css" crossorigin>
+<style>:root{--highlight-color:#fe9}.flex{display:flex !important}body{line-height:1.5em}#content{padding:20px}#sidebar{padding:30px;overflow:hidden}#sidebar > *:last-child{margin-bottom:2cm}.http-server-breadcrumbs{font-size:130%;margin:0 0 15px 0}#footer{font-size:.75em;padding:5px 30px;border-top:1px solid #ddd;text-align:right}#footer p{margin:0 0 0 1em;display:inline-block}#footer p:last-child{margin-right:30px}h1,h2,h3,h4,h5{font-weight:300}h1{font-size:2.5em;line-height:1.1em}h2{font-size:1.75em;margin:1em 0 .50em 0}h3{font-size:1.4em;margin:25px 0 10px 0}h4{margin:0;font-size:105%}h1:target,h2:target,h3:target,h4:target,h5:target,h6:target{background:var(--highlight-color);padding:.2em 0}a{color:#058;text-decoration:none;transition:color .3s ease-in-out}a:hover{color:#e82}.title code{font-weight:bold}h2id^="header-"{margin-top:2em}.ident{color:#900}pre code{background:#f8f8f8;font-size:.8em;line-height:1.4em}code{background:#f2f2f1;padding:1px 4px;overflow-wrap:break-word}h1 code{background:transparent}pre{background:#f8f8f8;border:0;border-top:1px solid #ccc;border-bottom:1px solid #ccc;margin:1em 0;padding:1ex}#http-server-module-list{display:flex;flex-flow:column}#http-server-module-list div{display:flex}#http-server-module-list dt{min-width:10%}#http-server-module-list p{margin-top:0}.toc ul,#index{list-style-type:none;margin:0;padding:0}#index code{background:transparent}#index h3{border-bottom:1px solid #ddd}#index ul{padding:0}#index h4{margin-top:.6em;font-weight:bold}@media (min-width:200ex){#index .two-column{column-count:2}}@media (min-width:300ex){#index .two-column{column-count:3}}dl{margin-bottom:2em}dl dl:last-child{margin-bottom:4em}dd{margin:0 0 1em 3em}#header-classes + dl > dd{margin-bottom:3em}dd dd{margin-left:2em}dd p{margin:10px 0}.name{background:#eee;font-weight:bold;font-size:.85em;padding:5px 10px;display:inline-block;min-width:40%}.name:hover{background:#e0e0e0}dt:target .name{background:var(--highlight-color)}.name > span:first-child{white-space:nowrap}.name.class > span:nth-child(2){margin-left:.4em}.inherited{color:#999;border-left:5px solid #eee;padding-left:1em}.inheritance em{font-style:normal;font-weight:bold}.desc h2{font-weight:400;font-size:1.25em}.desc h3{font-size:1em}.desc dt code{background:inherit}.source summary,.git-link-div{color:#666;text-align:right;font-weight:400;font-size:.8em;text-transform:uppercase}.source summary > *{white-space:nowrap;cursor:pointer}.git-link{color:inherit;margin-left:1em}.source pre{max-height:500px;overflow:auto;margin:0}.source pre code{font-size:12px;overflow:visible}.hlist{list-style:none}.hlist li{display:inline}.hlist li:after{content:',\2002'}.hlist li:last-child:after{content:none}.hlist .hlist{display:inline;padding-left:1em}img{max-width:100%}td{padding:0 .5em}.admonition{padding:.1em .5em;margin-bottom:1em}.admonition-title{font-weight:bold}.admonition.note,.admonition.info,.admonition.important{background:#aef}.admonition.todo,.admonition.versionadded,.admonition.tip,.admonition.hint{background:#dfd}.admonition.warning,.admonition.versionchanged,.admonition.deprecated{background:#fd4}.admonition.error,.admonition.danger,.admonition.caution{background:lightpink}</style>
+<style media="screen and (min-width: 700px)">@media screen and (min-width:700px){#sidebar{width:30%;height:100vh;overflow:auto;position:sticky;top:0}#content{width:70%;max-width:100ch;padding:3em 4em;border-left:1px solid #ddd}pre code{font-size:1em}.item .name{font-size:1em}main{display:flex;flex-direction:row-reverse;justify-content:flex-end}.toc ul ul,#index ul{padding-left:1.5em}.toc > ul > li{margin-top:.5em}}</style>
+<style media="print">@media print{#sidebar h1{page-break-before:always}.source{display:none}}@media print{*{background:transparent !important;color:#000 !important;box-shadow:none !important;text-shadow:none !important}ahref:after{content:" (" attr(href) ")";font-size:90%}ahreftitle:after{content:none}abbrtitle:after{content:" (" attr(title) ")"}.ir a:after,ahref^="javascript:":after,ahref^="#":after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,h3{orphans:3;widows:3}h1,h2,h3,h4,h5,h6{page-break-after:avoid}}</style>
+<script defer src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.1.1/highlight.min.js" integrity="sha256-Uv3H6lx7dJmRfRvH8TH6kJD1TSK1aFcwgx+mdg3epi8=" crossorigin></script>
+<script>window.addEventListener('DOMContentLoaded', () => hljs.initHighlighting())</script>
+</head>
+<body>
+<main>
+<article id="content">
+<header>
+<h1 class="title">Module <code>fluxity</code></h1>
+</header>
+<section id="section-intro">
+<h3 id="gpl-licence-text">GPL Licence text</h3>
+<p>Flowblade Movie Editor is a nonlinear video editor.
+Copyright 2021 Janne Liljeblad.</p>
+<p>This file is part of Flowblade Movie Editor <a href="https://github.com/jliljebl/flowblade/">https://github.com/jliljebl/flowblade/</a>.</p>
+<p>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.</p>
+<p>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.</p>
+<p>You should have received a copy of the GNU General Public License
+along with Flowblade Movie Editor. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
+<h1 id="fluxity-scripting">FLUXITY SCRIPTING AND API</h1>
+<p>Fluxity scripting is a <strong>Python scripting solution</strong> created to provide <strong>Flowblade Movie Editor</strong> with a <em>Plugin API</em>.
+Currently <em>Fluxity API</em>
+is used by Flowblade <em>Generators</em> feature.</p>
+<p><em>Fluxity API</em> is made available to scripts mainly by <em>fluxity.FluxityContext</em> object and its methods.
+This object is created to communicate with the script before calling any of the methods of the script.</p>
+<p>Some constants mentioned in this source file - such as <code><a title="fluxity.EDITOR_FLOAT" href="#fluxity.EDITOR_FLOAT">EDITOR_FLOAT</a></code> or <code><a title="fluxity.PROFILE_WIDTH" href="#fluxity.PROFILE_WIDTH">PROFILE_WIDTH</a></code> - can also be used by scripts. </p>
+<p>See below for <em>fluxity.FluxityContext</em> object API details.</p>
+<h2 id="script-interface">SCRIPT INTERFACE</h2>
+<p>A Python script needs to have the following functions to load and run without crashing as a Fluxity API conforming script.</p>
+<pre><code>def init_script(fctx):
+    pass
+
+def init_render(fctx):
+    pass
+
+def render_frame(frame, fctx, w, h):
+    pass
+</code></pre>
+<h2 id="script-lifecycle">SCRIPT LIFECYCLE</h2>
+<p><strong><code>init_script(fctx):</code></strong> This method is called when script is first loaded by Flowblade to create data structures with info on editors and script metadata. </p>
+<p><strong><code>init_render(fctx):</code></strong> This method is called before a render is started to get user input from editors and possibly to create some additional data structures.</p>
+<p><strong><code>render_frame(frame, fctx, w, h):</code></strong> This method is called for each frame rendered to create an output image for that frame.</p>
+<p>Object <strong><code>fctx</code></strong> is object of class <strong><code>fluxity.FluxityContext</code></strong>.</p>
+<h2 id="example-script">EXAMPLE SCRIPT</h2>
+<h3 id="init_script">init_script()</h3>
+<pre><code>import cairo
+import numpy as np
+import random
+import math
+
+import fluxity
+
+def init_script(fctx):
+    fctx.set_name(&quot;Floating Balls&quot;)
+    fctx.set_version(1)
+    fctx.set_author(&quot;Janne Liljeblad&quot;)
+
+    fctx.add_editor(&quot;Hue&quot;, fluxity.EDITOR_COLOR, (0.8, 0.50, 0.3, 1.0))
+    fctx.add_editor(&quot;Speed&quot;, fluxity.EDITOR_FLOAT_RANGE, (1.0, -5.0, 5.0))
+    fctx.add_editor(&quot;Speed Variation %&quot;, fluxity.EDITOR_INT_RANGE, (40, 0, 99))
+    fctx.add_editor(&quot;Number of Items&quot;, fluxity.EDITOR_INT_RANGE, (50, 10, 500))
+    fctx.add_editor(&quot;Size&quot;, fluxity.EDITOR_INT_RANGE, (330, 10, 800))
+    fctx.add_editor(&quot;Size Variation %&quot;, fluxity.EDITOR_INT_RANGE, (0, 0, 80))
+    fctx.add_editor(&quot;Opacity&quot;, fluxity.EDITOR_INT_RANGE, (100, 5, 100))
+    fctx.add_editor(&quot;Random Seed&quot;, fluxity.EDITOR_INT, 42)
+</code></pre>
+<p>In <em>init_script()</em> we define the editors that will be presented to the user and set some metadata like the name of the script displayed to the user and the script author.</p>
+<p>Object <strong><code>fctx</code></strong> is object of class <strong><code>fluxity.FluxityContext</code></strong>.</p>
+<h3 id="init_render">init_render()</h3>
+<pre><code>def init_render(fctx):
+    # The script is possibly rendered using multiple processes and we need to have the
+    # same sequence of random numbers in all processes. If we don't set seed we'll get completely different
+    # ball positions, colors and speeds in different rendering processes.
+    random.seed(fctx.get_editor_value(&quot;Random Seed&quot;))
+
+    # Ball colors data structure
+    hue = fctx.get_editor_value(&quot;Hue&quot;)
+    hr, hg, hb, alpha = hue
+    fctx.set_data_obj(&quot;hue_tuple&quot;, hue)
+    color_array = list(hue)
+    ball_colors = 
+    color_mult = 1.05
+    opacity = float(fctx.get_editor_value(&quot;Opacity&quot;)) / 100.0
+
+    for i in range(0, 10):
+        array = np.array(color_array) * color_mult
+        r, g, b, a = array
+        ball_colors.append(cairo.SolidPattern(_clamp(r), _clamp(g), _clamp(b), opacity))
+        color_array = array
+    fctx.set_data_obj(&quot;ball_colors&quot;, ball_colors)
+
+    # Ball animations data structure
+    ball_data = 
+    number_of_balls = fctx.get_editor_value(&quot;Number of Items&quot;)
+    speed = fctx.get_editor_value(&quot;Speed&quot;)
+    speed_var_size_precentage = fctx.get_editor_value(&quot;Speed Variation %&quot;)
+    speed_var_max = speed * (speed_var_size_precentage  / 100.0)
+    size = fctx.get_editor_value(&quot;Size&quot;)
+    size_var_size_precentage = fctx.get_editor_value(&quot;Size Variation %&quot;)
+    size_var_max = size * (size_var_size_precentage / 100.0)
+    size_max = size + size_var_max
+    fctx.set_data_obj(&quot;size_max&quot;, size_max)
+
+    for i in range(0, number_of_balls):
+        path_pos = random.uniform(0.0, 1.0)
+        y = random.randint(-330, 1080 + 330)
+        speed_var = random.uniform(-1.0, 1.0)
+
+        ball_speed = speed + (speed_var * speed_var_max)
+        size_var = random.uniform(-1.0, 1.0)
+        ball_size = size + (size_var * size_var_max)
+        color_index = random.randint(0, 9)
+        ball_data.append((path_pos, y, ball_speed, ball_size, color_index))
+
+    fctx.set_data_obj(&quot;ball_data&quot;, ball_data)
+</code></pre>
+<p>In <em>init_render() </em> we read editor values set by the user and create some data structures for moving ball animations based on that data.</p>
+<p>Also note that <strong>we need to set seed for Pythom module 'random'</strong> because when a frame sequence is rendered using multiple processes we need the exact same sequence of random numbers produced in every process. </p>
+<p>Object <strong><code>fctx</code></strong> is object of class <strong><code>fluxity.FluxityContext</code></strong>.</p>
+<h3 id="render_frame">render_frame()</h3>
+<pre><code>def render_frame(frame, fctx, w, h):
+    cr = fctx.get_frame_cr()
+
+    # Draw bg
+    bg_color = cairo.SolidPattern(*fctx.get_data_obj(&quot;hue_tuple&quot;))
+    ball_colors = fctx.get_data_obj(&quot;ball_colors&quot;)
+    ball_data = fctx.get_data_obj(&quot;ball_data&quot;)
+
+    cr.set_source(bg_color)
+    cr.rectangle(0, 0, w, h)
+    cr.fill()
+
+    # Draw balls
+    number_of_balls = fctx.get_editor_value(&quot;Number of Items&quot;)
+    size_max = fctx.get_data_obj(&quot;size_max&quot;)
+    path_start_x = - size_max
+    path_end_x =  w + size_max
+    path_len = path_end_x - path_start_x
+    SPEED_NORM_PER_FRAME = 15.0 / float(w) # Speed value 1.0 gets 15 pixels of movement per frame.
+    for i in range(0, number_of_balls):
+        path_pos, y, ball_speed, ball_size, color_index = ball_datai
+        xc = ball_size / 2.0
+        yc = ball_size / 2.0
+        xpos_norm = path_pos + (float(frame) * ball_speed * SPEED_NORM_PER_FRAME)
+        while xpos_norm &gt; 1.0:
+            xpos_norm = xpos_norm - 1.0
+        x = path_start_x + path_len * xpos_norm
+        cr.save()
+        cr.translate(x, y)
+        cr.arc(xc, yc, ball_size / 4.0, 0.0, 2.0 * math.pi)
+        cr.set_source(ball_colorscolor_index)
+        cr.fill()
+        cr.restore()
+
+# ----------------------- helper func
+def _clamp(v):
+    return max(min(v, 1.0), 0.0)
+
+</code></pre>
+<p>In <em>render_frame()</em> we first acquire <em>Cairo.Context</em> object that can be drawn onto to create output for the frame.</p>
+<p>After that the data structures created in <em>init_render()</em> are accessed and image is drawn.</p>
+<p>There is a helper function <em>_clamp(v)</em> used to make sure that all color values are in range 0-1. Any number of helper functions, objects and data structures can be created.</p>
+<h2 id="developing-fluxity-scripts">DEVELOPING FLUXITY SCRIPTS</h2>
+<p><strong>Flowblade</strong> comes with a simple GUI tool for developing Fluxity scripts. It can be accessed from menu <strong>Tools-&gt;Generator Script Editor</strong>.</p>
+<p>Using the development tool you can edit scripts, render output from them, and get receive error messages when something goes wrong. From hamburger menu you can open and save your own scripts, access this document, and open and inspect example code of the <em>Generators</em> distributed with Flowblade. </p>
+<p>Since the text editor in the development tool is quite rudimentary <em>(with a future GTK4 port we may get improvement here)</em>, it can be a useful workflow to use an external text editor to edit the scripts, and press <em>Reload Script</em> button to update text area contents before attempting render.</p>
+<h1 id="fluxity-api_1">FLUXITY API</h1>
+<details class="source">
+<summary>
+<span>Expand source code</span>
+</summary>
+<pre><code class="python">&#34;&#34;&#34;
+    ### GPL Licence text
+
+    Flowblade Movie Editor is a nonlinear video editor.
+    Copyright 2021 Janne Liljeblad.
+
+    This file is part of Flowblade Movie Editor &lt;https://github.com/jliljebl/flowblade/&gt;.
+

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/generatorsfluxity.html Added

@@ -0,0 +1,129 @@
+<!DOCTYPE html>
+ 
+<html>
+<head>
+  <title>Generators</title>
+  <link rel="stylesheet" href="style.css">
+<script src="toc.js" type="text/javascript"></script>
+</head>
+
+<body>
+
+<div id="content">
+
+<img src="header_text_5.png">
+
+<script src="tocgen.js"></script>
+
+<div id="toccontent">
+
+<div class="subject-header">Generators</div>
+
+<div id="toc"></div>
+
+<p>
+<b>Generators</b> are <b>Media Items</b> that render into animated media clips when placed on timeline.
+</p>
+
+<p>
+Currently there are three different types of <b>Generators</b> available:
+<ul style="list-style-type:none">
+<li><b>Backgrounds</b> Animated backgrounds.</li>
+<li><b>Texts</b> Animated texts.</li>
+<li><b>Cover Transitions</b> Incoming shapes cover frame fully and then disappear creating a transition.</li>
+</ul>
+
+</p>
+
+<p>
+Flowblade <b>Generators</b> are implemented as Python scripts using <i>Fluxity API</i> <i>(see below)</i> packed inside <a href="container_clips.html">Container Clips.</a>
+</p>
+
+
+<h3>Using Generators</h3>
+
+<h4>Adding Generators</h4>
+<ol>
+<li>Select menu item <b>Project -> Add Generator</b>.</li>
+<li>Select <b>Generator</b> using <b>Generator</b> drop down menu.</li>
+<li>Set properties using left side panel, select frame using <b>Clip Frame</b> spin button and press <b>Preview</b> button to view results.</li>
+<li>Use <b>Generator Length</b> spin button to set generator maximum length. Use <b>Import Action</b> drop down menu to either add as <b>Media Item</b> or render a video clip.</b></li>
+<li>Use <b>Add Generator</b> button to complete <b>Generator</b> creation.</li>
+</ol>
+
+<h4>Editing Generator Clips</h4>
+<ol>
+<li>Open timeline clip <b>Right Mouse</b> pop-up menu and select item <b>Edit Generator Properties...</b>.</li>
+<li>Set <b>Generator</b> properties using editors opened in <b>Edit</b> panel.</li>
+<li>Select frame using spin button and press <b>Preview</b> button to view results.</li>
+<li>Use <b>Apply</b> button to re-render timeline clip using edited properties.</li>
+</ol>
+
+<h3>Generators List</h3>
+ <table>
+  <tr>
+    <th>Category</th>
+    <th>Name</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td><i>Backgrounds</i></td>
+    <td><b>Floating Balls</b></td>
+    <td>Colored balls moving horizontally with differing sizes and speeds.</td>
+  </tr>
+  <tr>
+    <td><i>Backgrounds</i></td>
+    <td><b>Hex Colors</b></td>
+    <td>Colored hexagonals of selected size changing color at selected speed.</td>
+  </tr>
+  <tr>
+    <td><i>Texts</i></td>
+    <td><b>Multiline text</b></td>
+    <td>Animated lines of text with multiple in and out animation types, with optional lines or rectangle background.</td>
+  </tr>
+  <tr>
+    <td><i>Texts</i></td>
+    <td><b>TypeWriter</b></td>
+    <td>Text typewriter effect with steps of adding a letter, word or line.</td>
+  </tr>
+  <tr>
+    <td><i>Cover Transitions</i></td>
+    <td><b>Lines Sweep</b></td>
+    <td>Cover transition with horizontally moving colored lines.</td>
+  </tr>
+   <tr>
+    <td><i>Cover Transitions</i></td>
+    <td><b>Hex Overlay</b></td>
+    <td>Cover transition with apperaing and disappearing hexagonals.</td>
+  </tr>
+</table> 
+
+<h2>Fluxity Scripting</h2>
+<p>Fluxity scripting is a <strong>Python scripting solution</strong> created to provide <strong>Flowblade Movie Editor</strong> with a <em>Plugin API</em> used to create <em>Generators</em> providing means to create e.g. animated text and animated background clips.</p>
+
+
+<h3>Fluxity API</h3>
+<p>Instructions on how to create <strong>Generators</strong> using <strong>Fluxity API</strong> <a href="fluxity.html">here.</a></p>
+
+<h2>Render Actions</h2>
+<h4>Applying Property Edits</h4>
+
+<ul>
+<li>Use <b>Apply</b> button in <b>Edit</b> panel to re-render timeline clip using edited properties, see above.</li>
+</ul>
+
+<h4>Container Clip Render Actions</h4>
+<p> Render actions are available from Clip <b>Right Mouse</b> context menu in <b>Generator and Container Rendering</b> submenu.
+<ul>
+<li><b>Render Clip...</b> Renders Clip and stops using <b>Unrendered Media</b> on timeline.</li>
+<li><b>Render Settings...</b> Allows setting how and where a clip is rendered.</li>
+<li><b>Switch to Unrendered Media</b> Switch to using <b>Unrendered Media</b> and drops the current <b>Rendered Media</b> version of <b>Program</b>.</li>
+<li><b>Set Default Encoding...</b> Allows setting encoding format that is used for all <b>Container Clips</b> and <b>Generator</b> as default video encoding.</li>
+</ul>
+
+</div>
+</div>
+
+</body>
+
+</html>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/header_text_5.png Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/help/help.html -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/help.html Changed

@@ -1,17 +1,85 @@
-<!DOCTYPE html>
+ <!DOCTYPE html>
 <html>
 <head>
-<title>Flowblade help</title>
-<script type="text/javascript">
-var lang=(navigator.language||navigator.systemLanguage||navigator.userLanguage).substr(0, 2).toLowerCase();
-function actLang() {
-if (lang=='en') {nameweb='en/help.html';}
-else if (lang=='ru') {nameweb='ru/help.html';}
-else if (lang=='your_lang') {nameweb='your_lang/help.html';}
-else {nameweb='en/help.html';}
-parent.location=nameweb;
-return true;}
-actLang()
-</script>
+  <title>Flowblade Reference Guide</title>
+  <link rel="stylesheet" href="style.css">
+<script src="toc.js" type="text/javascript"></script>
 </head>
-<body></script></body></html>
+
+<body>
+
+<div id="content">
+<img src="header_text_5.png" >
+
+<a class="french-link" href="https://github.com/jliljebl/flowblade/blob/master/flowblade-trunk/docs/FLOWBLADE_manuel_fr.pdf">Manuel en français</a>
+
+<div id="help-index">
+		<div class="subject-cell">
+			<a href="intro.html">Introduction</a>
+		</div>
+
+		<div class="subject-cell">
+			<a href="basic_editing.html">Basic Editing</a> 
+		</div>
+
+		<div class="subject-cell">
+			<a href="edit_tools.html">Timeline Edit Tools</a> 
+		</div> 
+
+		<div class="subject-cell">
+			<a href="compositor.html">Creating Composited Images</a>
+		</div>
+
+		<div class="subject-cell">
+ 			<a href="filtering.html">Filtering image and audio</a> 
+		</div>
+
+		<div class="subject-cell">
+ 			<a href="advanced.html">Advanced Editing Features</a> 
+		</div> 
+
+		<div class="subject-cell">
+			<a href="range_log.html">Range Log</a>
+		</div>
+
+		<div class="subject-cell">
+ 			<a href="proxy.html">Proxy Editing</a>
+		</div>
+		
+		<div class="subject-cell">
+ 			<a href="container_clips.html">Container Clips</a>
+		</div>
+
+		<div class="subject-cell">
+			 <a href="generatorsfluxity.html">Generators</a>
+		</div>
+
+		<div class="subject-cell">
+ 			<a href="tools.html">Tools</a>
+		</div>
+		
+		<div class="subject-cell">
+			 <a href="rendering.html">Rendering</a>
+		</div>
+
+		<div class="subject-cell">
+ 			<a href="datastores.html">Data Stores</a>
+		</div>
+
+        <div class="subject-cell">
+ 			<a href="infotips.html">Info & Tips</a>
+		</div>
+        
+</div>
+
+<h6 class="appendix-title">Appendices:</h6>
+<a class="appendix-index" href="filters_list.html">Filters list</a>
+<a class="appendix-index" href="fluxity.html">Fluxity API doc</a>
+<a class="appendix-index" href="kbshortcuts.html">Keyboard Shortcuts</a>
+
+<div class="copyright-info">Flowblade Reference Guide v 3.0 9-3-2017.</div> 
+
+</div>
+</body>
+
+</html>

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/infotips.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/intro.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/kbshortcuts.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/only_one_comp.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/proxy.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/range_log.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/rendering.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/style.css Added

@@ -0,0 +1,330 @@
+html {
+	font-size: 100%;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
+}
+
+body {
+ 	font-family: Georgia, "Times New Roman", Times, serif;
+	color:#222222;
+	background-color: #ffffff; 
+	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
+	font-family: sans-serif;
+	word-wrap: break-word;
+	line-height: 1.4;
+	vertical-align: baseline;
+}
+
+#content {
+  width: 700px ;
+  margin-left: auto ;
+  margin-right: auto ;
+}
+
+#help-index{
+	margin-top: 80px;
+	width: 900px;
+	margin-bottom: 80px;
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+	text-align: center;
+}
+
+.appendix-index{
+	margin-top: 10px;
+	width: 900px;
+	margin-bottom: 10px;
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+	text-align: left;
+	color: #666666;
+	font-size:18px;
+}
+
+.french-link{
+	margin-top: 40px;
+	width: 900px;
+	margin-bottom: 0px;
+	display: flex;
+	justify-content: center;
+	flex-direction: column;
+	text-align: left;
+	font-size:18px;
+}
+
+.subject-cell {
+	padding-right: 20px;
+	color:#222222;
+	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
+	font-family: sans-serif;
+	word-wrap: break-word;
+	line-height: 1.4;
+	vertical-align: baseline;
+	font-weight:400;
+	font-size:30px;
+	margin-bottom: 35px;
+}
+
+.grid-container {
+	margin-top: 80px;
+        width: 700px;
+	margin-bottom: 80px;
+}
+
+.row:before, 
+.row:after {
+	content:"";
+	display: table ;
+	clear:both;
+}
+
+.column4 {
+	float: left; 
+	width: 33.3%;
+	margin-bottom: 50px;
+}
+
+.subject-cell {
+	padding-right: 20px;
+	color:#222222;
+	/*font:normal 400 14px/1 'robotoregular', Arial, sans-serif;*/
+	font-family: sans-serif;
+	word-wrap: break-word;
+	line-height: 1.4;
+	vertical-align: baseline;
+	font-weight:400;
+	font-size:22px;
+	text-transform: uppercase;
+}
+
+.appendix-pad {
+	color: #666666;
+	font-size:14px;
+}
+.appendix-title {
+	color: #666666;
+	font-size:20px;
+}
+
+.note {
+	background-color: #f3f3f0;
+	padding: 25px;
+	margin-bottom: 10px ;
+}
+
+.important {
+	background-color: #f5d77d;
+	padding: 25px;
+	margin-bottom: 10px ;
+}
+
+.tabbed {
+	padding-left: 25px;
+	margin-bottom: 10px ;
+}
+
+.tabbed_line {
+	padding-left: 25px;
+}
+
+.tocitem {
+	font-size:12px;
+	line-height: 1.0;
+
+}
+
+.tocli {
+	list-style-type: none;
+}
+
+.copyright-info {
+ 	font-family: Georgia, "Times New Roman", Times, serif;
+	margin-top:80px;
+	color: #444444;
+	font-weight:400;
+	font-size:12px;
+}
+
+.code-text {
+	font-family: "Lucida Console", "Courier New", monospace;
+	background-color: #f3f3f0;
+	padding: 10px;
+	margin-bottom: 5px ;
+	line-height: 10px
+}
+
+.subject-header {
+	text-transform: uppercase;
+	margin-top:10px;
+	color: #000000;
+	font-weight:400;
+	font-size:26px;
+}
+
+.filter {
+	margin-bottom: 25px;
+	color: #000000;
+	font-weight:400;
+	font-family: sans-serif;
+	word-wrap: break-word;
+	line-height: 1.4;
+	vertical-align: baseline;
+}
+
+.filter-name {
+	padding-left: 20px;
+}
+
+.filter-property {
+	padding-left: 50px;
+	font-size:12px;
+}
+.filter-value {
+	display:inline-block;
+	color: #0000bb;
+	font-size: 8;
+}
+
+.filter-group {
+	color: #000000;
+	font-size: 26;
+	text-transform: uppercase;
+	margin-top: 50px;
+	margin-bottom: 10px;
+}
+
+.r-widget {
+	display: inline-block;

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/tlinerender.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/tocgen.js Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/tools.html Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/workflow.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/wrong_comp.png Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/help/wrong_timeline.png Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/animations_1/floating_boxes.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/animations_1/floating_boxes.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/animations_2/hex_colors.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/animations_2/hex_colors.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/fluxity.html -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/fluxity.html Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/text_3/credit_scroll.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/text_3/credit_scroll.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/transitions_2/hex_overlay.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/res/mediaplugins/transitions_2/hex_overlay.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/respaths.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/respaths.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/resync.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/resync.py Changed

@@ -63,20 +63,21 @@
     calculate_and_set_child_clip_sync_states()
 
 def calculate_and_set_child_clip_sync_states():
-    parent_track = current_sequence().first_video_track()
     for child_clip, track in sync_children.items():
         child_index = track.clips.index(child_clip)
         child_clip_start = track.clip_start(child_index) - child_clip.clip_in
 
         parent_clip = child_clip.sync_data.master_clip
+        parent_track = child_clip.sync_data.master_clip_track 
         try:
             parent_index = parent_track.clips.index(parent_clip)
         except:
             child_clip.sync_data.sync_state = appconsts.SYNC_PARENT_GONE
             continue
-        parent_clip_start = parent_track.clip_start(parent_index) - parent_clip.clip_in
 
+        parent_clip_start = parent_track.clip_start(parent_index) - parent_clip.clip_in
         pos_offset = child_clip_start - parent_clip_start
+
         if pos_offset == child_clip.sync_data.pos_offset:
             child_clip.sync_data.sync_state = appconsts.SYNC_CORRECT
         else:
@@ -89,7 +90,7 @@
     # Returns list of tuples with data needed to do resync.
     # Return tuples are of type (clip, track, index, child_clip_start_on_timeline, pos_off)
     resync_data = 
-    parent_track = current_sequence().first_video_track()
+
     for clip_track_tuple in clips_list:
         child_clip, track = clip_track_tuple
         child_index = track.clips.index(child_clip)
@@ -97,13 +98,14 @@
         child_clip_start = child_clip_pos_on_tline - child_clip.clip_in
 
         parent_clip = child_clip.sync_data.master_clip
+        parent_track = child_clip.sync_data.master_clip_track
         try:
             parent_index = parent_track.clips.index(parent_clip)
         except:
             # Parent clip no longer awailable
             continue
+            
         parent_clip_start = parent_track.clip_start(parent_index) - parent_clip.clip_in
-
         pos_offset = child_clip_start - parent_clip_start
 
         resync_data.append((child_clip, track, child_index, child_clip_pos_on_tline, pos_offset))
@@ -119,6 +121,35 @@
     
     return clips_data
 
+def get_track_all_resync_action_data(child_track, parent_track):
+    orig_sync_data = {}
+    for clip in child_track.clips:
+        if clip.is_blanck_clip == True:
+            continue
+        orig_sync_dataclip = clip.sync_data
+    
+    new_sync_data = {}
+    for i in range(0, len(child_track.clips)):
+        clip = child_track.clipsi
+        if clip.is_blanck_clip == True:
+            continue
+        clip_start_frame = child_track.clip_start(i)
+        parent_clip = current_sequence().find_parent_clip_for_clip_start(parent_track, clip_start_frame)
+        if parent_clip != None:
+            parent_index = parent_track.clips.index(parent_clip)
+
+            # Get offset
+            child_clip_start = clip_start_frame - clip.clip_in
+            parent_clip_start = parent_track.clip_start(parent_index) - parent_clip.clip_in
+            pos_offset = child_clip_start - parent_clip_start
+            sync_data = (pos_offset, parent_clip, parent_track)
+        else:
+            sync_data = (None, None, None)
+            
+        new_sync_dataclip = sync_data
+    
+    return (orig_sync_data, new_sync_data)
+
 def print_sync_children():
     for child_clip, track in sync_children.items():
         print(child_clip.id)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/sequence.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/sequence.py Changed

@@ -26,6 +26,8 @@
     import mlt7 as mlt
 except:
     import mlt
+
+import hashlib
 import os
 
 import appconsts
@@ -116,7 +118,8 @@
         self.watermark_file_path = None
         self.seq_len = 0 # used in trim crash hack, remove when fixed
         self.compositing_mode = initial_comp_mode
-
+        self.uid = hashlib.md5(str(os.urandom(32)).encode('utf-8')).hexdigest()
+ 
         # MLT objects for a multitrack sequence
         self.init_mlt_objects()
         
@@ -257,6 +260,7 @@
         
         # Add method that returns track name
         new_track.get_name = lambda : utils.get_track_name(new_track, self) 
+        new_track.parent_track = None
         
         return new_track
 
@@ -505,6 +509,7 @@
         clip.titler_data = None # titler_data != None defines clips as a title clip that can be edited in Titler.
         clip.slowmo_data = None # tuple (slowmo_type, orig_media_file_path, slowmo_clip_media_area, slowmo_speed_data,
                                 #        orig_media_in, orig_media_out)
+        clip.link_seq_data = None # link_seq_data is uid of linked sequence
 
     def clone_track_clip(self, track, index):
         orig_clip = track.clipsindex
@@ -518,6 +523,7 @@
         if clip.media_type != appconsts.PATTERN_PRODUCER:
             clone_clip = self.create_file_producer_clip(clip.path, None, False, clip.ttl) # file producer
         else:
+            # Pattern producers are deprecated, look to remove this.
             clone_clip = self.create_pattern_producer(clip.create_data) # pattern producer
         self.clone_clip_and_filters(clip, clone_clip)
         return clone_clip
@@ -528,10 +534,11 @@
         used in another clip's place, but not id, master_clip and selection
         properties that are part of original clips state in sequence.
         """
+        clone_clip.name = clip.name
         clone_clip.clip_in = clip.clip_in
         clone_clip.clip_out = clip.clip_out
         clone_clip.filters = 
-        
+    
         for f in clip.filters:
             clone_filter = mltfilters.clone_filter_object(f, self.profile)
             clone_clip.attach(clone_filter.mlt_filter)
@@ -1020,6 +1027,33 @@
                 
         return cut_frame
 
+    def find_parent_clip_for_clip_start(self, parent_track, clip_start_frame):
+        parent_clip = None
+        last_pos_diff = None
+        for i in range(0, len(parent_track.clips)):
+
+            clip = parent_track.clipsi            
+            parent_clip_start_frame = parent_track.clip_start(i)
+            if clip.is_blanck_clip == True:
+                continue
+            
+            new_diff = parent_clip_start_frame - clip_start_frame
+
+            if parent_clip == None:
+                parent_clip = clip
+                last_pos_diff = new_diff
+            else:
+                if new_diff >= 0:
+                    if abs(new_diff) <= abs(last_pos_diff):
+                        return clip
+                    else:
+                        return parent_clip
+                else:
+                    parent_clip = clip
+                    last_pos_diff = new_diff
+
+        return parent_clip
+
     def find_prev_cut_frame(self, tline_frame):
         """
         Returns frame of next cut in active tracks relative to timeline.

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/syncsplitevent.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/syncsplitevent.py Changed

@@ -22,15 +22,18 @@
 Module handles events related to audiosplits and setting clip sync relationships.
 """
 
-from gi.repository import Gdk
+from gi.repository import Gdk, GLib, Gtk
 
 import appconsts
+import dialogs
 import dialogutils
 import edit
 import editorstate
 from editorstate import current_sequence
 from editorstate import get_track
+import editorpersistance
 import gui
+import guipopover
 import movemodes
 import resync
 import tlinewidgets
@@ -40,6 +43,9 @@
 
 parent_selection_data = None
 
+CHILD_SELECTION_SINGLE = 1
+CHILD_SELECTION_MULTIPLE = 2
+
 
 # ----------------------------------- split audio
 def split_audio_synched(popup_data):
@@ -57,7 +63,7 @@
         
     split_action, parent_clip, child_clip, child_clip_track = _get_split_audio_edit_action(popup_data)
     split_action.do_edit()
-    sync_action = _get_set_sync_action(child_clip_track, child_clip, parent_clip)
+    sync_action = _get_set_sync_action(child_clip_track, child_clip, parent_clip, track)
     sync_action.do_edit()
 
 def split_audio_synched_from_clips_list(clips, track):
@@ -88,15 +94,44 @@
     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)
+        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 _get_set_sync_action(child_clip_track, child_clip, parent_clip):
-    # This is quarenteed because GUI option to do this is only available on this track
-    parent_track = current_sequence().trackscurrent_sequence().first_video_index
+
+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)
+
+def _sync_property_item_activated(action, event, msg):
+    new_state = not(action.get_state().get_boolean())
+
+    if msg == "autosplit":
+        editorpersistance.prefs.sync_autosplit = new_state
+    elif msg == "dualtrim":
+        editorpersistance.prefs.sync_dualtrim = new_state
+    elif msg == "showsync":
+        editorpersistance.prefs.show_sync = new_state
+        
+    action.set_state(GLib.Variant.new_boolean(new_state))
+
+def _sync_split_property_activated(action, variant):
+    if variant.get_string() == "splitmirror":
+        editorpersistance.prefs.sync_mirror = True
+    else:
+        editorpersistance.prefs.sync_mirror = False
+
+    action.set_state(variant)
+    editorpersistance.save()
+    #guipopover._tline_properties_popover.hide()
+
+def _auto_sync_split_menu_item_item_activated(action, new_value_variant):
+    msg = int(new_value_variant.get_string())
+    editorpersistance.prefs.sync_autosplit = msg
+    editorpersistance.save()
+    action.set_state(new_value_variant)
+
+def _get_set_sync_action(child_clip_track, child_clip, parent_clip, parent_track):
     child_index = child_clip_track.clips.index(child_clip)
     parent_clip_index = parent_track.clips.index(parent_clip)
     
@@ -144,10 +179,16 @@
     return _get_split_audio_edit_action(popup_data)
 
 def _get_split_audio_edit_action(popup_data):
-    # NOTE: THIS HARD CODES ALL SPLITS TO HAPPEN TO TRACK A1, THIS MAY CHANGE
-    to_track = current_sequence().trackscurrent_sequence().first_video_index - 1
-
     clip, track, item_id, x = popup_data
+
+    if editorpersistance.prefs.sync_mirror == False:
+        to_track = current_sequence().trackscurrent_sequence().first_video_index - 1
+    else:
+        to_track_id = (current_sequence().first_video_index - 1) - (track.id - current_sequence().first_video_index)
+        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)
@@ -165,30 +206,119 @@
     
     return (action, clip, audio_clip, to_track)
 
-# ---------------------------------------------- sync parent clips
-def init_select_master_clip(popup_data):
-    clip, track, item_id, x = popup_data
-    frame = tlinewidgets.get_frame(x)
-    child_index = current_sequence().get_clip_index(track, frame)
+def get_synched_split_action_for_clip_and_track(clip, track):
+    if editorpersistance.prefs.sync_mirror == False:
+        to_track = current_sequence().trackscurrent_sequence().first_video_index - 1
+    else:
+        to_track_id = (current_sequence().first_video_index - 1) - (track.id - current_sequence().first_video_index)
+        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)
+
+    audio_clip = current_sequence().create_file_producer_clip(clip.path, None, False, clip.ttl)
+    audio_clip.media_type = appconsts.AUDIO
+    split_length = clip.clip_out - clip.clip_in + 1 # +1 out is inclusive and we're looking for length
+    data = { "parent_clip":clip,
+             "audio_clip":audio_clip,
+             "over_in":frame,
+             "over_out":frame + split_length,
+             "to_track":to_track,
+             "track":track}
+
+    action = edit.audio_synched_splice_action(data)
+    return action
 
-    if not (track.clipschild_index == clip):
-        # This should never happen 
-        print("big fu at _init_select_master_clip(...)")
+def set_track_clips_sync(child_track):
+    dialogs.set_parent_track_dialog(child_track, _parent_track_selected)
+ 
+def _parent_track_selected(dialog, response_id, data):
+    if response_id == Gtk.ResponseType.ACCEPT:
+        child_track, selection_data, tracks_combo = data
+        parent_track = selection_datatracks_combo.get_active()
+        
+        dialog.destroy()
+        
+        do_set_track_clips_sync(child_track, parent_track)
+        child_track.parent_track = parent_track
+    else:
+        dialog.destroy()
+
+def do_set_track_clips_sync(child_track, parent_track):
+    if len(parent_track.clips) == 0:
+        return
+    if len(child_track.clips) == 0:
+        return
+        
+    orig_sync_data, new_sync_data = resync.get_track_all_resync_action_data(child_track, parent_track)
+    
+    data = {"child_track":child_track,
+            "orig_sync_data":orig_sync_data,
+            "new_sync_data":new_sync_data}
+    
+    action = edit.set_track_sync_action(data)
+    action.do_edit()
+
+def clear_track_clips_sync(child_track):
+    orig_sync_data = {}
+    sync_data_exists = False
+    for clip in child_track.clips:
+        if clip.is_blanck_clip == True:
+            continue
+        if  clip.sync_data != None:
+            sync_data_exists = True
+        
+        orig_sync_dataclip = clip.sync_data
+    
+    # Let's not put noop edits in undo stack.
+    if sync_data_exists == False:
         return
 
+    data = {"child_track":child_track,
+            "orig_sync_data":orig_sync_data}
+    
+    action = edit.clear_track_sync_action(data)
+    action.do_edit()
+
+
+# ---------------------------------------------- sync parent clips
+def init_select_master_clip(popup_data):

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tlineaction.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tlineaction.py Changed

@@ -377,6 +377,10 @@
     Removes 1 - n long continuous clip range from track and closes
     the created gap.
     """
+    if boxmove.box_selection_data != None:
+        boxmove.box_selection_splice_out()
+        return
+
     if movemodes.selected_track == -1:
         return
 
@@ -457,7 +461,7 @@
         cover_form_clip = track.clipsmovemodes.selected_range_in - 1
         cover_to_clip = track.clipsmovemodes.selected_range_in + 1
         
-        real_length = clip.get_length() # this the mlt finction giving media length, not length on timeline
+        real_length = clip.get_length() # this the mlt function giving media length, not length on timeline
 
         to_part = real_length // 2
         from_part = real_length - to_part
@@ -497,6 +501,10 @@
     Removes 1 - n long continuous clip range from track and fills
     the created gap with a blank clip
     """
+    if boxmove.box_selection_data != None:
+        boxmove.box_selection_lift()
+        return
+
     if movemodes.selected_track == -1:
         return
 
@@ -831,6 +839,16 @@
 def resync_track_button_pressed():
     syncsplitevent.resync_track()
 
+def set_track_sync_button_pressed():
+    if movemodes.selected_track != -1:
+        child_track = current_sequence().tracksmovemodes.selected_track
+        syncsplitevent.set_track_clips_sync(child_track)
+
+def clear_track_sync_button_pressed():
+    if movemodes.selected_track != -1:
+        child_track = current_sequence().tracksmovemodes.selected_track
+        syncsplitevent.clear_track_clips_sync(child_track)
+        
 def sync_compositor(compositor):
     track = current_sequence().trackscompositor.transition.b_track # b_track is source track where origin clip is
     origin_clip = None
@@ -1014,7 +1032,12 @@
         
         # Paste clips.
         # Clips are pasted after track content end.
-        if track.get_length() < tline_pos:
+        if track.get_length() - 2 < tline_pos:
+            data = {"track":track,
+                    "clips":new_clips}
+            action = edit.append_multiple_action(data)
+            action.do_edit()
+        elif track.get_length() < tline_pos:
             blank_length = tline_pos - track.get_length() 
             # Do edit
             data = {"track":track,
@@ -1037,12 +1060,25 @@
             if paste_on_cut == True:
                 editevent.do_multiple_clip_insert(track, paste_clips, tline_pos)
             else:
-                cut_action = cut_pressed(True)
+                # Get index and clip
+                index = track.get_clip_index_at(int(tline_pos))
+                clip = track.clipsindex            
+
+                # Get cut frame in clip frames
+                clip_start_in_tline = track.clip_start(index)
+                clip_frame = tline_pos - clip_start_in_tline + clip.clip_in
+
+                # Do edit
+                data = {"track":track,
+                        "index":index,
+                        "clip":clip,
+                        "clip_cut_frame":clip_frame}
+                cut_action = edit.cut_action(data)
+        
                 multi_insert_action = editevent.do_multiple_clip_insert(track, paste_clips, tline_pos, True)
                 actions = cut_action, multi_insert_action
                 consolidated_action = edit.ConsolidatedEditAction(actions)
                 consolidated_action.do_consolidated_edit()
-                #editevent.do_multiple_clip_insert(track, paste_clips, tline_pos)
     else:
         # Paste clips
         editevent.do_multiple_clip_insert(track, paste_clips, tline_pos)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tlinewidgets.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tlinewidgets.py Changed

@@ -105,7 +105,8 @@
 INSRT_ICON_POS_HIGH = (108, 32)
 INSRT_ICON_POS = (108, 18)
 INSRT_ICON_POS_SMALL = (108, 6)
-
+SYNC_ICON_POS_HIGH = (88, 12)
+ 
 # tracks column icons
 FULL_LOCK_ICON = None
 TRACK_BG_ICON = None
@@ -115,6 +116,7 @@
 MUTE_ALL_ICON = None
 TRACK_ALL_ON_V_ICON = None
 TRACK_ALL_ON_A_ICON = None
+SYNC_ICON = None
 
 # clip icons
 FILTER_CLIP_ICON = None
@@ -262,7 +264,8 @@
 INSERT_MODE_COLOR = (0.9,0.9,0.0)
 OVERWRITE_MODE_COLOR = (0.9,0.0,0.0)
 OVERLAY_TRIM_COLOR = (0.81, 0.82, 0.3)
-BOX_BOUND_COLOR =(0.137, 0.80, 0.85)
+OVERLAY_TRIM_OVERWRITE_COLOR = (0.81, 0.3, 0.3)
+BOX_BOUND_COLOR =(0.8, 0.8, 0.8, 0.3)
 TRIM_MAX_RED = (1.0,0.1,0.1)
 
 POINTER_TRIANGLE_COLOR = (0.6, 0.7, 0.8, 0.7)
@@ -313,7 +316,8 @@
 pointer_context = appconsts.POINTER_CONTEXT_NONE
 DRAG_SENSITIVITY_AREA_WIDTH_PIX = 6
 MULTI_TRIM_ROLL_SENSITIVITY_AREA_WIDTH_PIX = 2
-MULTI_TRIM_SLIP_SENSITIVITY_AREA_WIDTH_PIX = 14
+MULTI_TRIM_SLIP_SENSITIVITY_AREA_WIDTH_PIX = 20
+MULTI_TRIM_ENDS_SENSITIVITY_AREA_WIDTH_PIX = 18
 
 # ref to singleton TimeLineCanvas instance for mode setting and some position
 # calculations.
@@ -342,7 +346,7 @@
     VIDEO_MUTE_ICON, ALL_MUTE_ICON, TRACK_BG_ICON, MUTE_AUDIO_ICON, MUTE_VIDEO_ICON, MUTE_ALL_ICON, \
     TRACK_ALL_ON_V_ICON, TRACK_ALL_ON_A_ICON, MUTE_AUDIO_A_ICON, TC_POINTER_HEAD, EDIT_INDICATOR, \
     LEVELS_RENDER_ICON, SNAP_ICON, KEYBOARD_ICON, CLOSE_MATCH_ICON, CLIP_MARKER_ICON, \
-    INSERT_ARROW_ICON_INACTIVE, INSERT_ARROW_ICON_UP_INACTIVE, TITLE_ICON 
+    INSERT_ARROW_ICON_INACTIVE, INSERT_ARROW_ICON_UP_INACTIVE, TITLE_ICON, SYNC_ICON 
 
     FULL_LOCK_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "full_lock.png")
     FILTER_CLIP_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "filter_clip_icon_sharp.png")
@@ -360,6 +364,7 @@
     KEYBOARD_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "keyb_trim.png")
     CLOSE_MATCH_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "close_match.png")
     CLIP_MARKER_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "clip_marker.png")
+    SYNC_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "track_sync_icon.png")
     COMPOSITOR_ICON = guiutils.get_cairo_image("compositor_icon")
     TITLE_ICON = guiutils.get_cairo_image("open_titler")
         
@@ -690,6 +695,7 @@
         s_data = data"box_selection_data"
 
         # Draw moved clips
+        cr.set_source_rgba(*BOX_BOUND_COLOR)
         for i in range(0, len(s_data.track_selections)):
             track_selection = s_data.track_selectionsi
             y = _get_track_y(track_selection.track_id)
@@ -724,7 +730,7 @@
                     
         # Draw bounding box
         cr.set_line_width(6.0)
-        cr.set_source_rgb(*BOX_BOUND_COLOR)
+        cr.set_source_rgba(*BOX_BOUND_COLOR)
         x = (s_data.topleft_frame  - pos + data"delta") * pix_per_frame
         w = s_data.width_frames * pix_per_frame
         y = _get_track_y(s_data.topleft_track)
@@ -1167,10 +1173,10 @@
 def draw_clip_end_drag_overlay(cr, data):
     if data"editing_clip_end" == True:
         end = data"frame"  - pos
-        start = data"bound_start"  - pos
+        start = data"clip_start"  - pos
     else:
         start = data"frame"  - pos
-        end = data"bound_end"  - pos
+        end = data"clip_end"  - pos
 
     y = _get_track_y(data"track".id)
     
@@ -1186,7 +1192,10 @@
     cr.rectangle(scale_in, int(y) + 1.5, int(scale_length), track_height - 2.0)
     cr.set_source_rgba(*CLIP_END_DRAG_OVERLAY_COLOR)
     cr.fill_preserve()
-    cr.set_source_rgb(*OVERLAY_TRIM_COLOR)
+    if data"submode" == 0: # INSERT 
+        cr.set_source_rgb(*OVERLAY_TRIM_COLOR)
+    else:
+        cr.set_source_rgb(*OVERLAY_TRIM_OVERWRITE_COLOR)
     cr.stroke()
 
     if editorpersistance.prefs.delta_overlay == True:
@@ -1549,12 +1558,13 @@
         
         # INSERT, OVERWRITE
         if (EDIT_MODE() == editorstate.INSERT_MOVE or EDIT_MODE() == editorstate.OVERWRITE_MOVE) and editorstate.overwrite_mode_box == False:
-            # the + 4 is attempt to center sensitivity area at cut. Because we are doing sensitivity testing on opposite sides of a single clip, not on
-            # both sides of a cut we are having trouble centering the sensitivity area. 
-            if abs(x - _get_frame_x(clip_start_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX + 4:
-                return appconsts.POINTER_CONTEXT_END_DRAG_LEFT
-            if abs(x + 4 - _get_frame_x(clip_end_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX:
-                return appconsts.POINTER_CONTEXT_END_DRAG_RIGHT
+            if not(editorpersistance.prefs.disable_drag_when_selected == True and clip.selected == True):
+                # the + 4 is attempt to center sensitivity area at cut. Because we are doing sensitivity testing on opposite sides of a single clip, not on
+                # both sides of a cut we are having trouble centering the sensitivity area. 
+                if abs(x - _get_frame_x(clip_start_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX + 4:
+                    return appconsts.POINTER_CONTEXT_END_DRAG_LEFT
+                if abs(x + 4 - _get_frame_x(clip_end_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX:
+                    return appconsts.POINTER_CONTEXT_END_DRAG_RIGHT
             
             return appconsts.POINTER_CONTEXT_NONE
         # TRIM
@@ -1583,19 +1593,35 @@
                 return appconsts.POINTER_CONTEXT_MULTI_ROLL
             elif abs(x - clip_end_frame_x) < MULTI_TRIM_ROLL_SENSITIVITY_AREA_WIDTH_PIX:
                 return appconsts.POINTER_CONTEXT_MULTI_ROLL
-            elif abs(x - clip_center_x) < MULTI_TRIM_SLIP_SENSITIVITY_AREA_WIDTH_PIX:
-                if clip.is_blanck_clip == True:
-                     return appconsts.POINTER_CONTEXT_NONE
-                return appconsts.POINTER_CONTEXT_MULTI_SLIP
-            elif abs(frame - clip_start_frame) < abs(frame - clip_end_frame):
-                if clip.is_blanck_clip == True:
-                     return appconsts.POINTER_CONTEXT_NONE
-                return appconsts.POINTER_CONTEXT_TRIM_LEFT
+            
+            if editorpersistance.prefs.wide_multitrim_slip == False:
+                if abs(x - clip_center_x) < MULTI_TRIM_SLIP_SENSITIVITY_AREA_WIDTH_PIX:
+                    if clip.is_blanck_clip == True:
+                         return appconsts.POINTER_CONTEXT_NONE
+                    return appconsts.POINTER_CONTEXT_MULTI_SLIP
+                elif abs(frame - clip_start_frame) < abs(frame - clip_end_frame):
+                    if clip.is_blanck_clip == True:
+                         return appconsts.POINTER_CONTEXT_NONE
+                    return appconsts.POINTER_CONTEXT_TRIM_LEFT
+                else:
+                    if clip.is_blanck_clip == True:
+                         return appconsts.POINTER_CONTEXT_NONE
+                    return appconsts.POINTER_CONTEXT_TRIM_RIGHT
             else:
-                if clip.is_blanck_clip == True:
-                     return appconsts.POINTER_CONTEXT_NONE
-                return appconsts.POINTER_CONTEXT_TRIM_RIGHT
-                
+                # Wide slip trim activation area.                        
+                if abs(x - clip_start_frame_x) < MULTI_TRIM_ENDS_SENSITIVITY_AREA_WIDTH_PIX:
+                    if clip.is_blanck_clip == True:
+                         return appconsts.POINTER_CONTEXT_NONE
+                    return appconsts.POINTER_CONTEXT_TRIM_LEFT
+                elif abs(x - clip_end_frame_x) < MULTI_TRIM_ENDS_SENSITIVITY_AREA_WIDTH_PIX:
+                    if clip.is_blanck_clip == True:
+                         return appconsts.POINTER_CONTEXT_NONE
+                    return appconsts.POINTER_CONTEXT_TRIM_RIGHT
+                else:
+                    if clip.is_blanck_clip == True:
+                         return appconsts.POINTER_CONTEXT_NONE
+                    return appconsts.POINTER_CONTEXT_MULTI_SLIP
+
         return appconsts.POINTER_CONTEXT_NONE
 
     def connect_mouse_events(self):
@@ -1717,11 +1743,6 @@
         # the first maybe partially displayed clip.
         clip_start_frame = clip_start_in_tline - pos
 
-        # Check if we need to collect positions for drawing sync relations 
-        collect_positions = False
-        if track.id == current_sequence().first_video_index:
-            collect_positions = True
-
         proxy_paths = current_proxy_media_paths()
 
         global clip_thumbnails
@@ -1739,8 +1760,8 @@
             scale_in = clip_start_frame * pix_per_frame
             
             # Collect positions for drawing sync relations 
-            if collect_positions:
-                self.parent_positionsclip.id = scale_in
+            #if collect_positions:
+            self.parent_positionsclip.id = (scale_in, track.id)
             
             # Fill clip bg 
             if scale_length > FILL_MIN:
@@ -1921,8 +1942,29 @@
                     except: # thumbnail not found  in dict, get it and  paint it.
                         try:
                             if clip.container_data == None:
-                                media_file = PROJECT().get_media_file_for_path(clip.path)
-                                thumb_img = media_file.icon
+                                if clip.slowmo_data == None:
+                                    # normal clip
+                                    media_file = PROJECT().get_media_file_for_path(clip.path)
+                                    thumb_img = media_file.icon
+                                else:
+                                    # slowmo clip

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/batchrendering.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/batchrendering.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/ccrutils.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/ccrutils.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/fluxity.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/fluxity.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/mltxmlheadless.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/mltxmlheadless.py Changed

@@ -45,6 +45,7 @@
 
 _render_thread = None
 
+NO_RENDER_TARGET_FILE_SPECIFIED = "###¤¤%%NOTARGET%%¤¤##"
 
 # ----------------------------------------------------- module interface with message files
 # We are using message files to communicate with application.
@@ -70,23 +71,24 @@
 
 
 # --------------------------------------------------- render thread launch
-def main(root_path, session_id, parent_folder, xml_file_path, range_in, range_out, profile_desc):
+def main(root_path, session_id, parent_folder, xml_file_path, video_file_name, range_in, range_out, profile_desc):
     
     render_data = mltheadlessutils.mlt_env_init(root_path, parent_folder, session_id)
 
     global _render_thread
-    _render_thread = MLTXMLHeadlessRunnerThread(render_data, xml_file_path, range_in, range_out, profile_desc)
+    _render_thread = MLTXMLHeadlessRunnerThread(render_data, xml_file_path, video_file_name, range_in, range_out, profile_desc)
     _render_thread.start()
 
        
 
 class MLTXMLHeadlessRunnerThread(threading.Thread):
 
-    def __init__(self, render_data, xml_file_path, range_in, range_out, profile_desc):
+    def __init__(self, render_data, xml_file_path, video_file_name, range_in, range_out, profile_desc):
         threading.Thread.__init__(self)
 
         self.render_data = render_data # toolsencoding.ToolsRenderData object
         self.xml_file_path = xml_file_path
+        self.video_file_name = video_file_name
         self.range_in = int(range_in)
         self.range_out = int(range_out)
         self.length = self.range_out - self.range_in + 1
@@ -106,9 +108,14 @@
         # Video clip consumer
         if self.render_data.do_video_render == True:
             if self.render_data.save_internally == True:
-                file_path = ccrutils.session_folder_saved_global() + "/" + appconsts.CONTAINER_CLIP_VIDEO_CLIP_NAME + self.render_data.file_extension
+                # "video_file_name" is used to to create differently named versions of internally saved video clips for sequence link containers. 
+                if self.video_file_name == NO_RENDER_TARGET_FILE_SPECIFIED:
+                    video_file_name = appconsts.CONTAINER_CLIP_VIDEO_CLIP_NAME
+                else:
+                    video_file_name = self.video_file_name
+                file_path = ccrutils.session_folder_saved_global() + "/" + video_file_name + self.render_data.file_extension
             else:
-                file_path = self.render_data.render_dir +  "/" + self.render_data.file_name + self.render_data.file_extension
+                file_path = self.render_data.render_dir + "/" + self.render_data.file_name + self.render_data.file_extension
 
             consumer = renderconsumer.get_mlt_render_consumer(file_path, profile, args_vals_list)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/scripttool.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/scripttool.py Changed

_service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/stabilizedvideoheadless.py Added

@@ -0,0 +1,141 @@
+"""
+    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/>.
+"""
+
+try:
+    import mlt7 as mlt
+except:
+    import mlt
+    
+import os
+import threading
+import time
+
+import ccrutils
+import mltheadlessutils
+import mltprofiles
+import renderconsumer
+
+_render_thread = None
+
+
+# ----------------------------------------------------- module interface with message files
+# We are using message files to communicate with application.
+def session_render_complete(parent_folder, session_id):
+    return ccrutils.session_render_complete(parent_folder, session_id)
+
+def get_session_status(parent_folder, session_id):
+    msg = ccrutils.get_session_status_message(parent_folder, session_id)
+    if msg == None:
+        return None
+    fraction, elapsed = msg.split(" ")
+    return (fraction, elapsed)
+    
+def abort_render(parent_folder, session_id):
+    ccrutils.abort_render(parent_folder, session_id)
+
+def delete_session_folders(parent_folder, session_id):
+     ccrutils.delete_internal_folders(parent_folder, session_id)
+
+# --------------------------------------------------- render thread launch
+def main(root_path, session_id, parent_folder, write_file, results_file, 
+         profile_desc, encoding_option_index, quality_option_index, source_path):
+        
+    mltheadlessutils.mlt_env_init(root_path, parent_folder, session_id)
+
+    global _render_thread
+    _render_thread = StaxbilizedVideoRenderThread(  write_file, results_file, profile_desc, encoding_option_index,
+                                                    quality_option_index, source_path)
+    _render_thread.start()
+
+       
+
+class StaxbilizedVideoRenderThread(threading.Thread):
+
+    def __init__(self, write_file, results_file, profile_desc, encoding_option_index,
+                                                    quality_option_index, source_path):
+        threading.Thread.__init__(self)
+
+        self.write_file = write_file
+        self.profile_desc = profile_desc
+        self.encoding_option_index = int(encoding_option_index)
+        self.quality_option_index = int(quality_option_index)
+        self.source_path = source_path
+        self.results_file = results_file
+
+        self.abort = False
+
+    def run(self):
+        self.start_time = time.monotonic()
+
+        profile = mltprofiles.get_profile(self.profile_desc) 
+        producer = mlt.Producer(profile, str(self.source_path)) # this runs 0.5s+ on some clips
+        
+        stabilize_filter = mlt.Filter(profile, "vidstab")
+        stabilize_filter.set("results", str(self.results_file))
+
+        # Add filter to producer.
+        producer.attach(stabilize_filter)
+
+        # Create tractor and track to get right length
+        tractor = renderconsumer.get_producer_as_tractor(producer, producer.get_length() - 1)
+        consumer = renderconsumer.get_render_consumer_for_encoding_and_quality(self.write_file, profile, self.encoding_option_index, self.quality_option_index)
+        
+        # start and end frames, renderer stop behaviour
+        start_frame = 0
+        end_frame = producer.get_length() - 1
+
+        # Launch render
+        self.render_player = renderconsumer.FileRenderPlayer(self.write_file, tractor, consumer, start_frame, end_frame)
+        self.render_player.wait_for_producer_end_stop = True
+        self.render_player.start()
+
+        while self.render_player.stopped == False:
+            
+            self.check_abort_requested()
+            
+            if self.abort == True:
+                self.render_player.shutdown()
+                os._exit(0) # We are having some issues with causing prosessor usage even after reaching here.
+                return
+            
+            fraction = self.render_player.get_render_fraction()
+            self.render_update(fraction)
+
+            time.sleep(0.3)
+
+        # Write out completed flag file.
+        ccrutils.write_completed_message()
+
+        global _render_thread
+        _render_thread = None
+
+        self.render_player.shutdown()        
+        os._exit(0) # We are having some issues with causing prosessor usage even after reaching here.
+                
+    def check_abort_requested(self):
+        self.abort = ccrutils.abort_requested()
+
+    def render_update(self, fraction):
+        elapsed = time.monotonic() - self.start_time
+        msg = str(fraction) + " " + str(elapsed)
+        ccrutils.write_status_message(msg)
+
+
+

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/stabilizeheadless.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/stabilizeheadless.py Changed

@@ -52,24 +52,26 @@
      ccrutils.delete_internal_folders(parent_folder, session_id)
 
 # --------------------------------------------------- render thread launch
-def main(root_path, session_id, parent_folder, profile_desc, write_file, clip_path, accuracy, shakiness):
+def main(root_path, session_id, parent_folder, profile_desc, write_file, clip_path, accuracy, shakiness, smoothing, zoom):
     
     mltheadlessutils.mlt_env_init(root_path, parent_folder, session_id)
 
     global _render_thread
-    _render_thread = StabilizeHeadlessRunnerThread(profile_desc, write_file, clip_path, accuracy, shakiness)
+    _render_thread = StabilizeHeadlessRunnerThread(profile_desc, write_file, clip_path, accuracy, shakiness,  smoothing, zoom)
     _render_thread.start()
 
 
 class StabilizeHeadlessRunnerThread(threading.Thread):
 
-    def __init__(self, profile_desc, write_file, clip_path, accuracy, shakiness):
+    def __init__(self, profile_desc, write_file, clip_path, accuracy, shakiness, smoothing, zoom):
         threading.Thread.__init__(self)
 
         self.write_file = write_file
         self.clip_path = clip_path
         self.shakiness = shakiness
         self.accuracy = accuracy
+        self.smoothing = smoothing
+        self.zoom = zoom
         self.profile_desc = profile_desc
         self.abort = False
 
@@ -80,7 +82,7 @@
         producer = mlt.Producer(profile, str(self.clip_path)) # this runs 0.5s+ on some clips
         
         stabilize_filter = mlt.Filter(profile, "vidstab")
-        # Init values, these may actually be defaults and not needed.
+        # Initial values.
         stabilize_filter.set("stepsize", "6")
         stabilize_filter.set("algo", "1")
         stabilize_filter.set("mincontrast", 0.3)
@@ -97,12 +99,13 @@
         stabilize_filter.set("zoomspeed", "0.25")
         stabilize_filter.set("reload", "0")
         stabilize_filter.set("analyze", "0")
-        #stabilize_filter.set("results", "")
 
         # Apply user set analyze parameters
         stabilize_filter.set("filename", str(self.write_file))
         stabilize_filter.set("shakiness", str(self.shakiness))
         stabilize_filter.set("accuracy", str(self.accuracy))
+        stabilize_filter.set("smoothing", str(self.smoothing))
+        stabilize_filter.set("zoom", str(self.zoom))
 
         # Add filter to producer.
         producer.attach(stabilize_filter)

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/titler.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/titler.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/toolsencoding.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/toolsencoding.py Changed

@@ -24,6 +24,7 @@
 import os
 
 import appconsts
+from editorstate import PROJECT
 import guiutils
 import gtkbuilder
 import mltprofiles
@@ -53,7 +54,7 @@
     """
     def __init__(self):
         self.profile_index = None
-        # The DEPRECATED values are part of save data and cannot be removed without braking save files.
+        # The DEPRECATED values are part of save data and cannot be removed without breaking save files.
         self.use_default_profile = None # DEPRECATED, 'profile_index' is used.
         self.use_preset_encodings = None  # DEPRECATED 'encoding_option_index', 'quality_option_index' are used.
         self.presets_index = None  # DEPRECATED, 'encoding_option_index', 'quality_option_index' are used.
@@ -99,6 +100,15 @@
     render_data.file_name = appconsts.CONTAINER_CLIP_VIDEO_CLIP_NAME
     render_data.file_extension = ".mp4"
 
+    # Set default encoding if available. Only main app usage has not-None PROJECT().
+    # Gmic and scriptool TOOLS don't get this data, but when rendered as timeline caontainer clips, data is used. 
+    if PROJECT() != None:
+        default_encoding = PROJECT().container_default_encoding
+        if default_encoding != None:
+            enc_index, q_index = default_encoding
+            render_data.encoding_option_index = enc_index
+            render_data.quality_option_index = q_index
+
     return render_data
 
 def create_container_clip_default_alpha_render_data_object(profile):
@@ -135,6 +145,8 @@
 def create_widgets(def_profile_index, disable_audio=True, create_container_file_panel=False):
     """
     Widgets for editing render properties and viewing render progress.
+    
+    These are RE_INITIALIZED always when using this module from main app.
     """
     global widgets, disable_audio_encoding, default_profile_index
     default_profile_index = def_profile_index
@@ -183,7 +195,8 @@
         widgets.file_panel.movie_name.set_text(render_data.file_name)
         widgets.file_panel.extension_label.set_text(render_data.file_extension)
         widgets.file_panel.out_folder.set_current_folder(render_data.render_dir + "/")
-        widgets.encoding_panel.encoding_selector.categorised_combo.set_selected(mltprofiles.get_profile_for_index(render_data.encoding_option_index).description())
+        enc_opt = renderconsumer.encoding_optionsrender_data.encoding_option_index
+        widgets.encoding_panel.encoding_selector.categorised_combo.set_selected(enc_opt.name)
         widgets.encoding_panel.quality_selector.widget.set_active(render_data.quality_option_index)
         profile_desc = mltprofiles.get_profile_for_index(render_data.profile_index).description()
         widgets.profile_panel.out_profile_combo.categories_combo.set_selected(profile_desc)
@@ -199,9 +212,26 @@
             widgets.video_clip_panel.video_clip_combo.set_active(video_clip_combo_index)
             widgets.file_panel.render_location_combo.set_active(render_location_combo_index)
             widgets.file_panel.frame_name.set_text(render_data.frame_name)
-            
+    else:
+        if PROJECT() != None:
+            if PROJECT().container_default_encoding != None:
+                encoding_option_index, quality_option_index =  PROJECT().container_default_encoding 
+                enc_opt = renderconsumer.encoding_optionsencoding_option_index
+                widgets.encoding_panel.encoding_selector.categorised_combo.set_selected(enc_opt.name)
+                widgets.encoding_panel.quality_selector.widget.set_active(quality_option_index)
+
     return render_panel
 
+def get_default_encoding_setting_panel(default_encoding):
+    encoding_panel = guiutils.get_named_frame(_("Encoding Format"), widgets.encoding_panel.vbox, 4)
+    if default_encoding != None:
+        encoding_option_index, quality_option_index = default_encoding
+        enc_opt = renderconsumer.encoding_optionsencoding_option_index
+        widgets.encoding_panel.encoding_selector.categorised_combo.set_selected(enc_opt.name)
+        widgets.encoding_panel.quality_selector.widget.set_active(quality_option_index)
+
+    return encoding_panel
+
 def get_profile_info_small_box(profile):
     text = get_profile_info_text(profile)
     label = Gtk.Label(label=text)
@@ -369,10 +399,8 @@
         encoding_vbox.pack_start(encoding_panel, False, False, 0)
 
         encoding_hbox = Gtk.HBox(False, 2)
-        encoding_hbox.pack_start(guiutils.pad_label(12, 12), False, False, 0)
         encoding_hbox.pack_start(encoding_vbox, True, True, 0)
 
-        
         self.vbox = Gtk.VBox(False, 2)
         self.vbox.pack_start(self.video_clip_combo, False, False, 0)
         self.vbox.pack_start(guiutils.pad_label(12, 24), False, False, 0)
@@ -449,7 +477,7 @@
     
     def __init__(self, extension_label):
         self.quality_selector = RenderQualitySelector()
-        self.quality_selector.widget.set_size_request(110, 34)
+        self.quality_selector.widget.set_size_request(140, 34)
         self.quality_selector.update_quality_selection(0)
         self.audio_desc = Gtk.Label()
         self.encoding_selector = RenderEncodingSelector(self.quality_selector,
@@ -459,10 +487,14 @@
 
         quality_row  = Gtk.HBox()
         quality_row.pack_start(self.quality_selector.widget, False, False, 0)
-        quality_row.pack_start(Gtk.Label(), True, False, 0)
+        quality_row.pack_start(Gtk.Label(), True, True, 0)
 
+        enconding_row  = Gtk.HBox()
+        enconding_row.pack_start(self.encoding_selector.widget, False, False, 0)
+        enconding_row.pack_start(Gtk.Label(), True, True, 0)
+        
         self.vbox = Gtk.VBox(False, 2)
-        self.vbox.pack_start(self.encoding_selector.widget, False, False, 0)
+        self.vbox.pack_start(enconding_row, False, False, 0)
         self.vbox.pack_start(quality_row, False, False, 0)
 
     def set_sensitive(self, value):

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/tools/trackingheadless.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/tools/trackingheadless.py Changed

@@ -81,6 +81,7 @@
         self.abort = False
 
     def run(self):
+        global _render_thread
         self.start_time = time.monotonic()
 
         profile = mltprofiles.get_profile(self.profile_desc) 
@@ -96,10 +97,6 @@
         tracker_filter.set("steps", str(self.steps))
         tracker_filter.set("algo", str(self.algo))
         tracker_filter.set("disable", 0)
-        #tracker_filter.clear("results")
-
-        #tracker_filter.set("in", str(self.clip_in))
-        #tracker_filter.set("out", str(self.clip_out))
 
         # Add filter to producer.
         producer.attach(tracker_filter)
@@ -125,11 +122,26 @@
         xml_consumer.start()
         tractor.set_speed(1)
 
+        self.producer = producer
+        self.consumer = xml_consumer
+
         # Wait until done
         while xml_consumer.is_stopped() == False:
+
+            self.check_abort_requested()
+            
+            if self.abort == True:
+                ccrutils.write_completed_message()
+                self.shutdown()
+                _render_thread = None
+                os._exit(0)
+                return
+
             render_fraction = float(tractor.frame()) / float(producer.get_length())
             self.render_update(render_fraction)
             time.sleep(0.3)
+
+        self.shutdown()
         
         # Write out results.
         results = tracker_filter.get("results")
@@ -143,6 +155,9 @@
         # Write out completed flag file.
         ccrutils.write_completed_message()
 
+        _render_thread = None
+        os._exit(0) # We are having some issues with causing prosessor usage even after reaching here.
+        
     def check_abort_requested(self):
         self.abort = ccrutils.abort_requested()
 
@@ -151,7 +166,9 @@
         msg = str(fraction) + " " + str(elapsed)
         ccrutils.write_status_message(msg)
 
-
-
+    def shutdown(self):
+        self.consumer.stop()
+        self.producer.set_speed(0)
+

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/trackaction.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/trackaction.py Changed

@@ -37,12 +37,14 @@
 import movemodes
 import projectaction
 import snapping
+import syncsplitevent
 import tlinewidgets
 import updater
 
 
 _menu_track_index = None
-        
+
+
 # --------------------------------------- menu events
 def _track_menu_item_activated(widget, action, data):
     track, item_id, selection_data = data
@@ -74,6 +76,32 @@
     track.edit_freedom = appconsts.FREE
     updater.repaint_tline()
 
+
+def set_track_sync(track_index):
+    child_track = get_track(track_index)
+    syncsplitevent.set_track_clips_sync(child_track)
+
+def reset_treack_sync(track_index):
+    child_track = get_track(track_index)
+    parent_track = child_track.parent_track
+    syncsplitevent.do_set_track_clips_sync(child_track, parent_track)
+
+def clear_track_sync(track_index):
+    track = get_track(track_index)
+    if len(track.clips) == 0:
+        track.parent_track = None
+        updater.repaint_tline()
+        return
+
+    syncsplitevent.clear_track_clips_sync(track)
+
+def resync_track(track_index):
+    track = get_track(track_index)
+    if len(track.clips) == 0:
+        return
+
+    syncsplitevent.resync_selected_track(track)
+
 def toggle_track_output():
     if movemodes.selected_track == -1:
         return
@@ -273,6 +301,12 @@
         editorpersistance.prefs.audio_scrubbing = new_state
         editorpersistance.save()
         PLAYER().set_scrubbing(new_state)
+    elif msg == "wideslip":
+        editorpersistance.prefs.wide_multitrim_slip = new_state
+        editorpersistance.save()
+    elif msg == "disabledrag":
+        editorpersistance.prefs.disable_drag_when_selected = new_state
+        editorpersistance.save()
     else: # media thumbnails
         editorstate.display_clip_media_thumbnails = new_state
         updater.repaint_tline()
@@ -327,9 +361,7 @@
         y_off = press_y - tlinewidgets._get_track_y(track.id)
         ICON_WIDTH = 14
         ICON_HEIGHT = 10
-        if editorpersistance.prefs.double_track_hights == True:
-            ICON_WIDTH = 28
-            ICON_HEIGHT = 20
+
         X_CORR_OFF = 4 # icon edge not on image left edge
         if press_x > tlinewidgets.COLUMN_LEFT_PAD + X_CORR_OFF and press_x < tlinewidgets.COLUMN_LEFT_PAD + ICON_WIDTH + X_CORR_OFF:
             # Mute icon x area hit
@@ -391,4 +423,8 @@
 
 POPUP_HANDLERS = {"lock":lock_track,
                   "unlock":unlock_track,
-                  "mute_track":mute_track}
+                  "mute_track":mute_track,
+                  "clearsync":clear_track_sync,
+                  "resync":resync_track,
+                  "setsync":set_track_sync,
+                  "ressetsync":reset_treack_sync}

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/translations.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/translations.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/undo.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/undo.py Changed

@@ -22,8 +22,14 @@
 Module manages undo and redo stacks and executes edit actions from them
 on user requests.
 """
+import gi
+from gi.repository import GLib
+
 import time
+
+import callbackbridge
 import editorstate
+import utils
 
 set_post_undo_redo_edit_mode = None # This is set at startup to avoid circular imports.
 repaint_tline = None
@@ -164,3 +170,82 @@
             do_redo()
 
             time.sleep(delay)
+
+# ------------------------------------------- LINKED SEQUENCE CYCLIC TESTING
+WHITE = 0
+GREY = 1
+BLACK = 2
+
+is_cyclic = False
+
+class LinkNode:
+    
+    def __init__(self, seq):
+        self.seq = seq
+        self.targets = 
+        self.color = WHITE
+
+    def get_target_nodes(self, nodes):
+        target_nodes = 
+        for node in nodes:
+            if node.seq.uid in self.targets:
+                target_nodes.append(node)
+        return target_nodes
+
+def force_revert_if_cyclic_seq_links(project):
+    test_thread = utils.LaunchThread(project, _run_seq_link_cyclic_test)
+    test_thread.run()
+
+def _run_seq_link_cyclic_test(project):
+    global is_cyclic
+    is_cyclic = False
+    nodes = 
+    
+    for seq in project.sequences:
+        node = LinkNode(seq)
+        nodes.append(node)
+        for track in seq.tracks:
+            for clip in track.clips:
+                if clip.link_seq_data == None:
+                    continue
+                else:
+                    try:
+                        node.targets.append(clip.link_seq_data)
+                    except AttributeError:
+                        # Is already a set.
+                        node.targets.add(clip.link_seq_data)
+                    node.targets = set(node.targets) 
+
+    for node in nodes:
+        _visitDFS(node, nodes)
+        
+    if is_cyclic == True:
+        GLib.idle_add(_do_force_undo_with_pop)
+
+def _visitDFS(node, nodes):
+    global is_cyclic
+    
+    node.color = GREY
+
+    target_nodes = node.get_target_nodes(nodes)
+
+    for target_node in target_nodes:
+        if target_node.color == GREY:
+            is_cyclic = True
+        if target_node.color == WHITE:
+            _visitDFS(target_node, nodes)
+
+    node.color = BLACK
+
+
+def _do_force_undo_with_pop():
+    global undo_stack, index
+    
+    # Revert edit 
+    do_undo()
+    
+    # Delete edit action creating cyclic state.
+    if index != len(undo_stack) and (len(undo_stack) != 0):
+        del undo_stackindex:
+
+    callbackbridge.dialogs_show_cyclic_error()

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/updater.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/updater.py Changed

@@ -462,7 +462,11 @@
             PLAYER().seek_frame(0)
                     
     display_marks_tc()
-    
+
+    css_str = "#player-bar { background-color: #464646; border-radius: 10px;}"
+    gui.apply_widget_css_class_style_from_string(gui.editor_window.player_buttons_row, css_str)
+    gui.editor_window.monitor_clip_type.widget.queue_draw()
+
     gui.pos_bar.widget.grab_focus()
     gui.media_list_view.widget.queue_draw()    
     gui.monitor_switch.widget.queue_draw()
@@ -470,7 +474,6 @@
 
 def display_monitor_clip_name():#we're displaying length and range length also
     clip_len = utils.get_tc_string(gui.pos_bar.producer.get_length())
-    range_info = _get_marks_range_info(MONITOR_MEDIA_FILE().mark_in, MONITOR_MEDIA_FILE().mark_out)
 
     gui.editor_window.monitor_tc_info.set_source_name(MONITOR_MEDIA_FILE().name + " - ")
     gui.editor_window.monitor_tc_info.set_source_tc(clip_len)
@@ -492,7 +495,7 @@
         (f_oath, ext) = MONITOR_MEDIA_FILE().path.split(".")
         gui.editor_window.monitor_desc_label.set_text(ext + "(image sequence)")
 
-    gui.editor_window.monitor_tc_info.set_range_info(*range_info)
+    gui.editor_window.monitor_tc_info.set_range_info(MONITOR_MEDIA_FILE().mark_in, MONITOR_MEDIA_FILE().mark_out)
 
 def display_sequence_in_monitor():
     """
@@ -519,6 +522,10 @@
     gui.pos_bar.update_display_from_producer(PLAYER().producer)
     display_marks_tc()
 
+    css_str = "#player-bar { background-color: #363636; border-radius: 10px;}"
+    gui.apply_widget_css_class_style_from_string(gui.editor_window.player_buttons_row, css_str)
+    gui.editor_window.monitor_clip_type.widget.queue_draw()
+
     gui.monitor_switch.widget.queue_draw()
     repaint_tline()
 
@@ -535,28 +542,7 @@
     profile = PROJECT().profile
     gui.editor_window.monitor_desc_label.set_text(profile.description())
     
-    range_info = _get_marks_range_info(PLAYER().producer.mark_in, PLAYER().producer.mark_out)
-    gui.editor_window.monitor_tc_info.set_range_info(*range_info)
-
-def _get_marks_range_info(mark_in, mark_out):
-
-    if mark_in != -1:
-        mark_in_info = utils.get_tc_string(mark_in)
-    else:
-        mark_in_info = "--:--:--:--" 
-
-    if mark_out != -1:
-        mark_out_info = utils.get_tc_string(mark_out)
-    else:
-        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)
-    else:
-        range_info = "--:--:--:--" 
-    
-    return (mark_in_info, mark_out_info, range_info)
+    gui.editor_window.monitor_tc_info.set_range_info(PLAYER().producer.mark_in, PLAYER().producer.mark_out)
 
 def switch_monitor_display():
     monitorevent.stop_pressed()

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/usbhid.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/usbhid.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/userfolders.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/userfolders.py Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/utils.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/utils.py Changed

@@ -90,7 +90,8 @@
         
     def run(self):
         self.callback(self.data)
-        
+
+
 # -------------------------------- UTIL FUNCTIONS
 def fps():
     return editorstate.PROJECT().profile.fps()
@@ -189,6 +190,66 @@
     mins = mins % 60
     return "%02d:%02d:%02d:%02d" % (hours, mins, sec, fr)
 
+def get_tc_zeros_overlay(frame):
+    return get_tc_zeros_overlay_string_with_fps_v2(frame, fps())
+
+def get_tc_zeros_overlay_fine_grained(frame):
+    return get_tc_zeros_overlay_string_with_fps(frame, fps())
+    
+def get_tc_zeros_overlay_string_with_fps(frame, frames_per_sec):
+    # convert fractional frame rates (like 23.976) into integers,
+    # otherwise the timeline will slowly drift over time
+    frames_per_sec = int(round(frames_per_sec))
+
+    fr = frame % frames_per_sec
+    sec = frame // frames_per_sec
+    mins = sec // 60
+    sec = sec % 60
+    hours = mins // 60
+    mins = mins % 60
+
+    if hours > 9:
+        return ""
+    elif hours > 0:
+        return "0"
+    elif hours == 0 and mins > 9:
+        return "00:"
+    elif mins > 0:
+        return "00:0"
+    elif sec > 9:
+        return "00:00:"
+    elif sec > 0:
+        return "00:00:0"
+    elif fr > 9:
+        return "00:00:00:"
+    elif fr > 0:
+        return "00:00:00:0"
+    else:
+        return "00:00:00:00"
+
+def get_tc_zeros_overlay_string_with_fps_v2(frame, frames_per_sec):
+    # convert fractional frame rates (like 23.976) into integers,
+    # otherwise the timeline will slowly drift over time
+    frames_per_sec = int(round(frames_per_sec))
+
+    fr = frame % frames_per_sec
+    sec = frame // frames_per_sec
+    mins = sec // 60
+    sec = sec % 60
+    hours = mins // 60
+    mins = mins % 60
+
+    if hours > 0:
+        return ""
+    elif mins > 0:
+        return "00:"
+    elif sec > 0:
+        return "00:00:"
+    elif fr > 0:
+        return "00:00:00:"
+    else:
+        return "00:00:00:00"
+        
 def get_tc_string_with_fps_for_filename(frame, frames_per_sec):
     frames_per_sec = int(round(frames_per_sec))
 
@@ -199,7 +260,7 @@
     hours = mins / 60
     mins = mins % 60
     return "%02d-%02d-%02d-%02d" % (hours, mins, sec, fr)
-    
+
 def get_time_str_for_sec_float(sec):
     mins = sec / 60
     sec = sec % 60
@@ -387,7 +448,7 @@
     info = {}
     info"width" = clip.get_int("width")
     info"height" = clip.get_int("height")
-    info"length"  = clip.get_length()
+    info"length" = clip.get_length()
     
     video_index = clip.get_int("video_index")
     audio_index = clip.get_int("audio_index")
@@ -395,7 +456,9 @@
     long_audio_property = "meta.media." + str(audio_index) + ".codec.long_name"
     sample_rate_property = "meta.media." + str(audio_index) + ".codec.sample_rate"
     channels_property = "meta.media." + str(audio_index) +  ".codec.channels"
-    
+    pix_ftm_property = "meta.media." + str(video_index) + ".codec.pix_fmt"
+    color_space_property = "meta.media." + str(video_index) + ".codec.colorspace"
+
     info"vcodec" = clip.get(str(long_video_property))
     info"acodec" = clip.get(str(long_audio_property))
     info"channels" = clip.get_int(str(channels_property))
@@ -405,7 +468,9 @@
     info"fps_den" = frame.get_double("meta.media.frame_rate_den")
     info"progressive" = frame.get_int("meta.media.progressive") == 1
     info"top_field_first" = frame.get_int("meta.media.top_field_first") == 1
-    
+    info"pixel_format" = clip.get(str(pix_ftm_property))
+    info"colorspace" = clip.get(str(color_space_property))
+
     resource = clip.get("resource")
     name, ext = os.path.splitext(resource)
     ext = ext.lstrip(".")
@@ -453,7 +518,7 @@
 
     return False
     
-# File exntension lists
+# File extension lists
 _audio_file_extensions =   "act",
                             "aif",
                             "aiff",

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/Flowblade/workflow.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/Flowblade/workflow.py Changed

@@ -78,7 +78,7 @@
                   }
                   
     _TOOL_TIPS =  { appconsts.TLINE_TOOL_INSERT:        _("<b>Left Mouse</b> to move and insert single clip between clips.\n<b>CTRL + Left Mouse</b> to select and move clip range.\n\n<b>Left Mouse</b> on clip ends to trim clip length."),
-                    appconsts.TLINE_TOOL_OVERWRITE:     _("<b>Left Mouse</b> to select a clip, or to move clip or clip range into new position.\n<b>CTRL + Left Mouse</b> to select a clip range.\n\n<b>Left Mouse</b> near clip's end to trim clip length.<b>\n\nLeft Mouse Drag</b> to draw a box to select a group of clips. Multitrack selection disallows moving clips to another track."),
+                    appconsts.TLINE_TOOL_OVERWRITE:     _("<b>Left Mouse</b> to select a clip, or to move clip or clip range into new position.\n<b>CTRL + Left Mouse</b> to select a clip range.\n\n<b>Left Mouse</b> near clip's end to trim clip length.n\n<b>ALT + Left Mouse</b> near clip's end to overwrite trim clip length.<b>\n\nLeft Mouse Drag</b> to draw a box to select a group of clips. Multitrack selection disallows moving clips to another track."),
                     appconsts.TLINE_TOOL_TRIM:          _("<b>Left Mouse</b> to trim closest clip end.\n<b>Left or Right Arrow Key</b> + <b>Enter Key</b> to do the edit using keyboard."), 
                     appconsts.TLINE_TOOL_ROLL:          _("<b>Left Mouse</b> to move closest edit point between 2 clips.\n<b>Left or Right Arrow Key</b> + <b>Enter Key</b> to do the edit using keyboard."), 
                     appconsts.TLINE_TOOL_SLIP:          _("<b>Left Mouse</b> to move clip contents within clip.\n<b>Left or Right Arrow Key</b> + <b>Enter Key</b> to do the edit using keyboard."),

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/docs/CONTRIBUTING.md -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/docs/CONTRIBUTING.md Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/docs/FAQ.md -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/docs/FAQ.md Changed

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/docs/Migrating_from_GTK_3_to_GTK_4.md -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/docs/Migrating_from_GTK_3_to_GTK_4.md Changed

@@ -43,7 +43,7 @@
 | 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 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 succesfully 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.                                                                                                                                                                                                                                                                        |
 | 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”. |

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/docs/RELEASE_NOTES.md -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/docs/RELEASE_NOTES.md Changed

@@ -1,5 +1,224 @@
 # Release Notes
 
+## FLOWBLADE 2.20
+Date: March 25, 2025
+
+We have now moved to SDL2 video playback for Flatpak and all systems with MLT 7.30 or higher. 
+
+Video playback for native Wayland without XWayland or for Gtk 4 (that does not support the per widget Xwindow paradigm) does not currently seem possible with SDL. Moving forward we will develop some alternative video display approach. 
+
+### Sync editing improvements
+
+A large number of changes were made to improve Flowblade sync editing worflow:
+
+* New track sync actions:
+  
+  * **Sync All Clips Action...** sets all clips in Track to be parented to closest clip on target Track. Target Track is remembered to enable single action update feature, see below.
+  * **Update Sync to Clips' Positions** updates parenting sync to current positions to relative to Track that was previous selected as parenting target Track.
+
+* Sync parent clips can now be on any track, not just V1. Track V1 can now also contain child clips.
+
+* Clips can now be automatically audio sync split when added to user defined set of Tracks.
+
+* Audio splits can be set to go on mirrored tracks instead of always going on track A1
+
+* Clip multiselection popup offers now *Resync*, *Clear Sync* or *Set Parent Clip* actions.
+
+* New delete edits:
+  
+  * Box selection delete and lift.
+  * Single and  multiselection Ripple Delete Range action.
+
+* Clip end trims can now be done in *overwrite* mode which help maintaining sync between tracks. 
+
+### Sequence Link Container Clips
+
+New **Sequence Link Container Clips** feature streamlines workflow where *Sequences* are used as parts of another *Sequence*. **Sequence Link Container Clips** can be updated to display changed contents of another *Sequence* without having to manually create a new clip and replace old clip on *Timeline*.
+
+### Preset keyframe animations
+
+Filters **Position Scale** and **Position Scale Rotate** have a new feature making it possible to add some frequently needed animations such as slide-ins and zooms in a single action.
+
+Feature is available in keyframe editor hamburger menu when selecting item **Add Preset Keyframed Movement...**.
+
+#### Monitor player buttons Row UX update
+
+Though perfectly functional, the monitor player buttons row was always visually a bit rough. We did a visual and functional update in this area, switched to a using single centered Play/Stop button, moved marks buttons to the side and made larger the visual difference between displaying Timeline and Clips in the monitor. 
+
+In a related update the timecode displays were made to display the active part of timecode in a brighter color to improve readability.   
+
+### New features
+
+* Rendered **Stabilized Media Item** creation is now possible.
+* **Duplicate Sequence** feature allows creating copies of *Sequences*.
+* **Generator Templates** feature makes possible to create **Generators** with user set properties to avoid having to set properties multiple times when creating **Generators**.
+
+### Double sized icons deprecated
+
+Double sized icons preference was removed. The results were always visually unsatisfactory. Tracks scaling preference remains, and when used in combination with scaling options provided by desktop environments it be possible to always achieve good results.
+
+### Contributions
+
+* **luzpaz** contributed a patch fixing large number of typos.
+
+### New small features and bug fixes
+
+* Zoom and shakiness parameters were activated for Stabilization filter.
+* Add multi-item popup menu to Media Panel.
+* Add 'Delete' item to Media Panel hamburger menu.
+* Add feature to open keyframe editor params parameter in Keyframe Tool.
+* Add Open in Edit Panel feature to Keyframe Tool.
+* Add disable clip end drags when selected feature to improve targeting small clips.
+* Add wide Slip trim activation area preference.
+* Feature to delete motion tracking data to make motion tracking more manageable.
+* Fix off by one issue with track syncs.
+* Make Media Items grab keyboard focus when selected with hamburger menu.
+* Add pixel format and colorspace info to file properties dialog.
+* Clone sync data for cut clip clones.
+* Fix Credit Scroll typo.
+* Drop cyan color from box selection display.
+* Updated create bindings documentation.
+* Make second window part of applica too to fix non-working menu actions.
+* Replace Pattern Producer file filering item with Container option.
+* Process shutdown fixes.
+* Show consumer type in env dialog.
+* Delete consumer start/stop hack.
+* Fix media item gmic icon bug.
+* Fix paste append off by one and multitrack bugs.
+* Add Filter Stack move arrows.
+* Fix Filter editing file select button replacement.
+* Add default container encoding options feature.
+* Fix Container Clips losing sync on render.
+
+## FLOWBLADE 2.18.1
+Date: February 17, 2025
+
+Flatpak fix for Credit Scroll generator.
+
+## FLOWBLADE 2.18
+Date: December 18, 2024
+
+With this release we worked on gradual improvement on features, correctness and code structure. We had some great progress in moving forward from SDL 1 video display, but there were still some issues, so that was postponed for now.
+
+
+### Timeline Clip slowmotion
+
+Previously Flowblade only offered workflow in which slowmotion needed to be created by adding new rendered Media Items.
+
+With this release Timeline Clips can be directly turned into slowmotion or reversed clips, a more interactive and responsive workflow requested by users.
+
+### Generator work
+
+- **Credits Scroll Generator** With this new generator scrolled or paged credit sequences can be created easily and with great amount of control over presentation. Text presentation and layout changes are controlled using a bit of MarkDown inspired markup, see documentation. Users can set initial layout parameters with GUI editors.
+
+**Other improvements:**
+
+- Upgrade **Hex Colors** generator to do boxes and triangles too, changed generator name to **Color Polygons**.
+  
+- Added **From Left Solid** and **From Right Solid** background types to **Multiline Animation** generator.
+  
+- Made generators use appropriate video clip default renders instead of frame sequences. This provided a nice performance for text animation generators.
+  
+- Made new HTML Link Button editor available to be used with generator to link to outside resources for e.g. added documentation.
+  
+
+### Alpha video rendering
+
+Support for rendering VP9 WebM videos with alpha channel included was added.
+
+### Gtk 4 work
+
+Object creation for quite many often used widgets is subtly different between Gtk3 and Gtk4.
+
+We added a builder module so that when we make the eventual switch we can only edit a few tens of lines of code instead of hundrends code points at widget creation sites.
+
+Work was started by porting Gtk.HPaned / Vpaned and Gtk.FileChooserButton widgets to use the new module, and for the next few cycles will work to include all possible widgets.
+
+### GUI / UX updates
+
+- Add new Project Info and Data -dialog
+  
+- Move to 3-column view for Jobs whendisplayed in left column panel
+  
+- Make Media panel minimum size configurable
+  
+- Display Project Profile in topbar
+  
+- Add box selection functionality to Insert tool
+  
+- Add mute and unmute actions to multiclip popup
+  
+- Add keyboard shortcuts for showing vector scope and rgbparade
+  
+- Improve filter edit panels expanded states initialization after moves or mask adds
+  
+
+### Contributions
+
+- Updated Polish translation by Stanisław Polak, who also provided a lot of valuable help in finding and fixing some missing translations.
+  
+- Typo fix from user Surfoo.
+  
+- Spanish translation update by David Gámiz Jiménez.
+  
+
+### Bug fixes, UX updates and other work
+
+- Fix motion several tracking bugs
+  
+- Fix non-updating numerical entry values when swicthing keyframes in GUI canvas editors
+  
+- Fix save bug when image sequence being displayed on monitor
+  
+- Fix cloning to default XDG Data Store
+  
+- Fix project Data Store clone selection combo creation bug
+  
+- Fix default renders for generator clones
+  
+- Fix media item popover initialization
+  
+- Fix mouse scrolling for GeometryNoKeyframes editor
+  
+- Fix multiclip menu delete action
+  
+- Fix multiclip menu add filter action
+  
+- Fix SyntaxWarnings for regexes
+  
+- Fix G'Mic launch visual glitch
+  
+- Fix G'Mic containers
+  
+- Update Compositing chapter in docs
+  
+- Create shortcutsdialog.py module
+  
+- Add arg to launch all tools
+  
+- Code cleanups, move monkeypatches to dedicated bridge modules

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/docs/creating_user_folder_bindings.md -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/docs/creating_user_folder_bindings.md Changed

@@ -6,13 +6,13 @@
 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 dependecies to run Flowblade and use MLT. *(Note that Flatpak install does not work here because dependencies when installed by Flatpak will not be avilable to the local install of MLT we are creating)*
+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
+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 
@@ -31,7 +31,7 @@
 #### Configure and build
 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=OFF -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 -S ./mlt -B ./build
 
 cmake --build ./build --config Release
 ```

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/flowblade -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/flowblade Changed

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

_service:obs_scm:flowblade-2.18.1.obscpio/flowblade-trunk/setup.py -> _service:obs_scm:flowblade-2.20.obscpio/flowblade-trunk/setup.py Changed

_service:obs_scm:flowblade.obsinfo Changed