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 7

flowblade.changes Changed

flowblade.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package flowblade
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,48 +15,47 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define prjname Flowblade
+
 Name:           flowblade
-Version:        1.14
+Version:        1.16
 Release:        0
 Summary:        Multitrack non-linear video editor
-License:        GPL-3.0
+License:        GPL-3.0-only
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            https://code.google.com/p/flowblade/
+URL:            http://jliljebl.github.io/flowblade
 Source:         https://github.com/jliljebl/flowblade/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  python-devel >= 2.7.0
-BuildRequires:  update-desktop-files
-BuildRequires:  shared-mime-info
 BuildRequires:  fdupes
 BuildRequires:  frei0r-plugins >= 1.4
-# Check list of dependencies:
-BuildRequires:  pkgconfig(cairomm-1.0)
-BuildRequires:  pkgconfig(librsvg-2.0)
-BuildRequires:  libmlt6-modules
-BuildRequires:  dbus-1-python
-BuildRequires:  python-cairo
-BuildRequires:  python-gnomevfs
-BuildRequires:  python-imaging
-BuildRequires:  python-mlt
-BuildRequires:  python-numpy
+BuildRequires:  gobject-introspection
+BuildRequires:  python-devel >= 2.7.0
+BuildRequires:  shared-mime-info
+BuildRequires:  update-desktop-files
 Requires:       dbus-1-python
 Requires:       ffmpeg
 Requires:       frei0r-plugins >= 1.4
 Requires:       ladspa
 Requires:       ladspa-swh-plugins
+Requires:       libmlt6-data
 Requires:       libmlt6-modules
 Requires:       python-cairo
-Requires:       python-gnomevfs
-Requires:       python-gobject-Gdk
 Requires:       python-gobject
+Requires:       python-gobject-Gdk
 Requires:       python-imaging
 Requires:       python-mlt
 Requires:       python-numpy
+Requires:       rsvg-view
 Requires:       sox
-Requires:       %(rpm -qf $(readlink -qne %{_libdir}/libcairomm-1.0.so) --qf '%{NAME} >= %{VERSION}')
-Requires:       %(rpm -qf $(readlink -qne %{_libdir}/librsvg-2.so) --qf '%{NAME} >= %{VERSION}')
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Recommends:     gmic
 BuildArch:      noarch
+# SECTION Check dependencies:
+BuildRequires:  dbus-1-python
+BuildRequires:  libmlt6-modules >= 6.6.0
+BuildRequires:  python-cairo
+BuildRequires:  python-imaging
+BuildRequires:  python-mlt
+BuildRequires:  python-numpy
+BuildRequires:  rsvg-view
+# / SECTION
 
 %description
 Flowblade is designed to provide a fast, precise and robust editing experience.
@@ -72,6 +71,9 @@
 %prep
 %setup -q -n %{name}-%{version}/%{name}-trunk
 
+# Check MLT build with SDL 1.2
+rpm -qR libmlt6-modules | grep -w libSDL || 'SDL 1.2 not found' 2> /dev/null
+#
 sed -i 's|%{_datadir}/pyshared|%{python_sitelib}|' %{name}
 
 %build
@@ -81,14 +83,25 @@
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 mkdir -p %{buildroot}%{_datadir}/locale
-mv %{buildroot}{%{python_sitelib}/%{prjname}/locale/*,%{_datadir}/locale/}
+mv %{buildroot}{%{python_sitelib}/Flowblade/locale/*,%{_datadir}/locale/}
 find %{buildroot} -type f -name "*.po*" -delete -print
 
 rm -rf %{buildroot}%{_libexecdir}/mime/packages/%{name}
 
-%fdupes -s %{buildroot}%{python_sitelib}
+%fdupes %{buildroot}%{python_sitelib}
 %find_lang %{name}
 
+# Fix: non-executable-script
+pushd %{buildroot}
+for _file in $(grep -rl '^\#\!\/'); do
+    ! echo $_file | grep '\/usr\/bin\|\/launch' || chmod 0755 $_file 
+    find -name ${_file##*/} -type f -perm 644 -exec sed '/^\#\!/d' -i {} \+
+    find -name ${_file##*/} -type f -perm 755 -exec sed '/^\#\!\/.\+py/c\#\!%{_bindir}/python' -i {} \+
+    find -name ${_file##*/} -type f -perm 755 -exec sed '/^\#\!\/.\+sh/c\#\!/bin/bash' -i {} \+
+done
+%py_compile .%{python_sitelib}
+popd
+
 %post
 %mime_database_post
 %desktop_database_post
@@ -98,18 +111,16 @@
 %desktop_database_postun
 
 %files
-%defattr(0644,root,root)
-%doc AUTHORS COPYING README docs/RELEASE_NOTES*
-%attr(0755,root,root) %{_bindir}/%{name}
+%license COPYING
+%doc AUTHORS README docs/RELEASE_NOTES*
+%{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_mandir}/man?/%{name}.?%{ext_info}
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.??g
 %{_datadir}/mime/packages/%{name}.xml
-%{python_sitelib}/%{prjname}
-%attr(0755,root,root) %{python_sitelib}/%{prjname}/launch/%{name}*
-%{python_sitelib}/%{name}-*.egg-info
+%{_mandir}/man?/%{name}.?%{ext_info}
+%{python_sitelib}/Flowblade/
+%{python_sitelib}/%{name}*info
 
 %files lang -f %{name}.lang
-%defattr(0644,root,root)
 
 %changelog

flowblade-1.14.tar.gz/README.md -> flowblade-1.16.tar.gz/README.md Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/app.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/app.py Changed

@@ -105,6 +105,7 @@
 BATCH_DIR = "batchrender/"
 autosave_timeout_id = -1
 recovery_dialog_id = -1
+sdl2_timeout_id = -1
 loaded_autosave_file = None
 
 splash_screen = None
@@ -147,6 +148,9 @@
     except:
         editorstate.mlt_version = "0.0.99" # magic string for "not found"
 
+
+    #print "SDL version:", str(editorstate.get_sdl_version())
+    
     # passing -xdg as a flag will change the user_dir location with XDG_CONFIG_HOME
     # For full xdg-app support all the launch processes need to add this too, currently not impl.
 
@@ -329,12 +333,19 @@
     # maintain a simpler and/or non-circular import structure
     monkeypatch_callbacks()
 
+    # File in assoc_file_path is opened after very short delay
     if not(check_crash == True and len(autosave_files) > 0):
         if assoc_file_path != None:
             print "Launch assoc file:", assoc_file_path
             global assoc_timeout_id
             assoc_timeout_id = GObject.timeout_add(10, open_assoc_file)
-       
+
+    # SDL 2 consumer needs to created after Gtk.main() has run enough for window to be visble
+    #if editorstate.get_sdl_version() == editorstate.SDL_2: # needs more state considerion still
+    #    print "SDL2 timeout launch"
+    #    global sdl2_timeout_id
+    #    sdl2_timeout_id = GObject.timeout_add(1500, create_sdl_2_consumer)
+            
     # Launch gtk+ main loop
     Gtk.main()
 
@@ -376,6 +387,12 @@
 
     # These provide clues for further module refactoring 
 
+# ---------------------------------- SDL2 consumer
+#def create_sdl_2_consumer():
+#    GObject.source_remove(sdl2_timeout_id)
+#    print "Creating SDL2 consumer..."
+#    editorstate.PLAYER().create_sdl2_video_consumer()
+
 # ---------------------------------- program, sequence and project init
 def get_assoc_file_path():
     """
@@ -567,7 +584,8 @@
 
     editorstate.project = new_project
     editorstate.media_view_filter = appconsts.SHOW_ALL_FILES
-    
+    editorstate.auto_follow = editorstate.project.get_project_property(appconsts.P_PROP_AUTO_FOLLOW)
+
     # Inits widgets with project data
     init_project_gui()

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/appconsts.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/appconsts.py Changed

@@ -35,7 +35,7 @@
 FILE_DOES_NOT_EXIST = 7
 IMAGE_SEQUENCE = 8
 
-# Mediaview filtering options
+# Media view filtering options
 SHOW_ALL_FILES = 0
 SHOW_VIDEO_FILES = 1
 SHOW_AUDIO_FILES = 2
@@ -43,7 +43,7 @@
 SHOW_IMAGE_SEQUENCES = 4
 SHOW_PATTERN_PRODUCERS = 5
 
-# Used to draw indicators that tell if more frames are available while trimming
+# These are used to draw indicators that tell if more frames are available while trimming
 ON_FIRST_FRAME = 0
 ON_LAST_FRAME = 1
 ON_BETWEEN_FRAME = 2
@@ -68,11 +68,11 @@
 # Display heights for tracks and timeline.
 TRACK_HEIGHT_NORMAL = 50 # track height in canvas and column
 TRACK_HEIGHT_SMALL = 25 # track height in canvas and column
-TRACK_HEIGHT_SMALLEST = 25 # maybe remove as it is no longer meaningful
+TRACK_HEIGHT_SMALLEST = 25 # maybe remove this as it is no longer used
 TLINE_HEIGHT = 260
 
 # Notebook widths
-NOTEBOOK_WIDTH = 600 # defines app min width with MONITOR_AREA_WIDTH
+NOTEBOOK_WIDTH = 600 # defines app min width together with MONITOR_AREA_WIDTH
 NOTEBOOK_WIDTH_WIDESCREEN = 500
 TOP_ROW_HEIGHT = 500
 
@@ -100,7 +100,7 @@
 MLT_SERVICE = "mlt_service"
 EXTRA_EDITOR = "extraeditor"
 
-# Available tracks max for flowblade
+# Available tracks maximum for Flowblade
 MAX_TRACKS = 9
 
 # Thumbnail image dimensions
@@ -118,7 +118,7 @@
 MIDBAR_COLOR = "#bdbdbd"
 
 # Media log event types
-MEDIA_LOG_ALL = -1 # no MediaLogEvent has this type, this used when filtering events for display
+MEDIA_LOG_ALL = -1 # no MediaLogEvent has this type, this is used when filtering events for display
 MEDIA_LOG_INSERT = 0
 MEDIA_LOG_MARKS_SET = 1
 
@@ -170,7 +170,6 @@
 # Jack options (not used currently)
 JACK_ON_START_UP_NO = 0
 JACK_ON_START_UP_YES = 1
-
 JACK_OUT_AUDIO = 0
 JACK_OUT_SYNC = 0
 
@@ -184,7 +183,7 @@
 TRIM_VIEW_SINGLE = 1
 TRIM_VIEW_OFF = 2
 
-# MIdbar layout
+# Midbar layout
 MIDBAR_TC_LEFT = 0
 MIDBAR_TC_CENTER = 1
 MIDBAR_COMPONENTS_CENTERED = 2
@@ -207,3 +206,15 @@
 P_PROP_TLINE_SHRINK_VERTICAL = "tline_shrink_vertical"
 P_PROP_LAST_RENDER_SELECTIONS = "P_PROP_LAST_RENDER_SELECTIONS"
 P_PROP_TRANSITION_ENCODING = "P_PROP_TRANSITION_ENCODING"
+P_PROP_AUTO_FOLLOW = "P_PROP_AUTO_FOLLOW"
+
+# A context defining action taken when mouse press happens based on edit mode ands mouse position
+POINTER_CONTEXT_NONE = 0
+POINTER_CONTEXT_END_DRAG_LEFT = 1
+POINTER_CONTEXT_END_DRAG_RIGHT = 2
+POINTER_CONTEXT_COMPOSITOR_MOVE = 3
+POINTER_CONTEXT_COMPOSITOR_END_DRAG_LEFT = 4
+POINTER_CONTEXT_COMPOSITOR_END_DRAG_RIGHT = 5
+POINTER_CONTEXT_TRIM_LEFT = 6
+POINTER_CONTEXT_TRIM_RIGHT = 7
+POINTER_CONTEXT_BOX_SIDEWAYS = 8

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/atomicfile.py Added

@@ -0,0 +1,180 @@
+"""
+    Flowblade Movie Editor is a nonlinear video editor.
+    Copyright 2017 Janne Liljeblad and contributors.
+
+    This file is part of Flowblade Movie Editor <http://code.google.com/p/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/>.
+"""
+
+"""
+Atomic file write support.
+"""
+
+import md5
+import os
+import shutil
+
+MAX_CREATE_FILE_ATTEMPTS = 10
+
+class AtomicFileWriteError(Exception):
+    def __init__(self, value):
+        self.value = value
+    def __str__(self):
+        return repr(self.value)
+
+
+class AtomicFileWriter(object):
+    """
+    Context manager for writing files atomically.
+
+    Usage:
+
+        with AtomicFileWriter("/path/to/file") as afw:
+            f = afw.get_file()
+
+            # do stuff with writable file object
+            f.write("hello world\n")
+
+    Behind the scenes, a temp file will be created in /path/to/, and when
+    the context manager block goes out of scope, the temp file will be
+    atomically renamed to /path/to/file.
+
+    Because of the atomic nature of this write, /path/to/file will either
+    contain the complete contents of the written file, or retain its
+    previous state.
+    """
+
+    def __init__(self, file_path, mode=None):
+        """
+        AtomicFileWriter constructor.
+
+        Accepts a file path to write to (eventually)
+        """
+
+        # absolute path to the temp file used for writing
+        self.tmp_file_path = None
+
+        if mode is None:
+            self.mode = "w"
+        elif (mode == "w") or (mode == "wb"):
+            self.mode = mode
+        else:
+            raise ValueError("AtomicFileWriter only accepts 'w' or 'wb' as valid modes")
+
+        # absolute path to the file that the caller eventually wants to write
+        self.dest_file_path = os.path.abspath(file_path)
+
+        # absolute path to the directory containing the files
+        self.dir_path = os.path.dirname(file_path)
+
+        # destination base filename (without the parent path)
+        self.basename = os.path.basename(file_path)
+
+        # temp file object
+        self.file_obj = None
+
+    def __enter__(self):
+        """
+        Context manager starting point.
+
+        Creates a temp file, and returns a reference to this instance.
+        """
+
+        # try several times to create a new temp file
+        for i in range(MAX_CREATE_FILE_ATTEMPTS):
+            # pick a temp filename that we hope is unique
+            maybe_tmp_file_path = self.__get_random_filename(self.basename)
+
+            try:
+                # create the temp file, with a guarantee that it didn't exist before
+                # this returns a numeric file descriptor
+                # the mode of 666 is passed in because it will be filtered by the user's umask
+                fd = os.open(maybe_tmp_file_path, os.O_WRONLY|os.O_CREAT|os.O_EXCL, 0o666)
+
+                # if we didn't get an OSError by now, turn the numeric
+                # file descriptor into a Python file object
+                self.file_obj = os.fdopen(fd, "w")
+
+                # remember the temp file path
+                self.tmp_file_path = maybe_tmp_file_path
+
+                # we created a file, stop trying
+                break
+
+            except OSError:
+                pass
+
+        # if we were unable to create a temp file, raise an error
+        if not self.tmp_file_path:
+            raise AtomicFileWriteError("could not open '%s' for writing" % (self.dest_file_path,))
+
+        # return a reference to this instance so it can be used as a context manager
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        """
+        Context manager cleanup.
+
+        Flushes and closes the temp file (if necessary),
+        and atomically renames it into place.
+        """
+
+        # if we caught an exception from inside the context manager block,
+        # then remove the temp file and let the exception bubble up
+        if exception_type:
+            try:
+                # close the temp file if necessary
+                if not self.file_obj.closed:
+                    self.file_obj.close()
+
+                # remove the temp file
+                os.unlink(self.tmp_file_path)
+
+            except:
+                print "Error cleaning up temp file: " + self.tmp_file_path
+
+            # let the original exception that was passed into this method bubble up
+            return False
+
+        # if the caller didn't already close the file
+        if not self.file_obj.closed:
+            # flush the file buffer to disk
+            self.file_obj.flush()
+
+            # close the file
+            self.file_obj.close()
+
+        # rename the temp file into the final destination
+        # Issue 459, uncomment os.... if problems
+        #os.rename(self.tmp_file_path, self.dest_file_path)
+        shutil.move(self.tmp_file_path, self.dest_file_path)
+
+    def get_file(self):
+        """
+        Get a reference to the writable temp file object.
+
+        This returns a regular Python file object.
+        """
+
+        return self.file_obj
+
+    def __get_random_filename(self, basepath):
+        """
+        Create a candidate temp filename, without touching the filesystem.
+        """
+
+        uuid_str = md5.new(str(os.urandom(32))).hexdigest()
+        return ".tmp-" + uuid_str + "-" + basepath
+

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/audiomonitoring.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/audiomonitoring.py Changed

@@ -141,6 +141,10 @@
 
     _update_ticker.start_ticker()
 
+def update_mute_states():
+    if _monitor_window != None:
+        _monitor_window.update_tracks_mute_states()
+
 def close():
     close_audio_monitor()
     close_master_meter()
@@ -322,6 +326,7 @@
     return level_float
 
 
+
 class AudioMonitorWindow(Gtk.Window):
     def __init__(self):
         GObject.GObject.__init__(self)
@@ -361,6 +366,11 @@
         self.set_resizable(False)
         self.set_keep_above(True) # Perhaps configurable later
 
+    def update_tracks_mute_states(self):
+        for i in range(1, len(self.gain_controls)):
+            self.gain_controls[i].mute_changed()
+
+
 
 class MetersArea:
     def __init__(self, meters_count):
@@ -400,6 +410,7 @@
             meter.display_value(cr, x, l_value, r_value, grad)
 
 
+
 class AudioMeter:
     def __init__(self, height):
         self.left_channel = ChannelMeter(height, "L")
@@ -419,7 +430,8 @@
         cr.set_line_width(self.meter_width)
         self.right_channel.display_value(cr, x + self.x_pad_r, value_right)
 
-        
+
+
 class ChannelMeter:
     def __init__(self, height, channel_text):
         self.height = height
@@ -514,6 +526,7 @@
         PangoCairo.show_layout(cr, layout)
 
 
+
 class GainControl(Gtk.Frame):
     def __init__(self, name, seq, producer, is_master=False):
         GObject.GObject.__init__(self)
@@ -571,6 +584,8 @@
         self.add(vbox)
         self.set_size_request(SLOT_W, CONTROL_SLOT_H)
 
+        self.mute_changed()
+
     def gain_changed(self, slider):
         gain = slider.get_value() / 100.0
         if self.is_master == True:
@@ -598,6 +613,18 @@
         else:
             self.seq.set_track_pan_value(self.producer, pan_value)
 
+    def mute_changed(self):
+        if self.is_master == False:
+            if hasattr(self.producer, "mute_state"):
+                if self.producer.mute_state == appconsts.TRACK_MUTE_NOTHING or self.producer.mute_state == appconsts.TRACK_MUTE_VIDEO:
+                    self.slider.set_sensitive(True)
+                    self.pan_slider.set_sensitive(True)
+                    self.pan_button.set_sensitive(True)
+                else:
+                    self.slider.set_sensitive(False)
+                    self.pan_slider.set_sensitive(False)
+                    self.pan_button.set_sensitive(False)
+                    
 
 
 class MasterVolumeMeter:

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/audiosync.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/audiosync.py Changed

@@ -138,8 +138,8 @@
     
     if utils.is_mlt_xml_file(sync_clip.path) == True:
         # This isn't translated because 1.14 translation window is close, translation coming for 1.16
-        dialogutils.warning_message("Cannot Timeline Audio Sync with Compound Clips!", 
-                                    "Audio syncing for Compound Clips is not supported.",
+        dialogutils.warning_message(_("Cannot Timeline Audio Sync with Compound Clips!"), 
+                                    _("Audio syncing for Compound Clips is not supported."),
                                     gui.editor_window.window,
                                     True)
         return
@@ -260,8 +260,8 @@
     # Can't sync coumpound clips
     if utils.is_mlt_xml_file(video_file.path) == True or utils.is_mlt_xml_file(audio_file.path) == True:
         # This isn't translated because 1.14 translation window is close, translation coming for 1.16
-        dialogutils.warning_message("Cannot Create Audio Sync Compound Clip from Compound Clips!", 
-                                    "Audio syncing Compound Clips is not supported.",
+        dialogutils.warning_message(_("Cannot Create Audio Sync Compound Clip from Compound Clips!"), 
+                                    _("Audio syncing Compound Clips is not supported."),
                                     gui.editor_window.window,
                                     True)
         return
@@ -269,8 +269,8 @@
     # Can't sync 2 audio clips
     if video_file.type == appconsts.AUDIO and audio_file.type == appconsts.AUDIO:
         # This isn't translated because 1.14 translation window is close, translation coming for 1.16
-        dialogutils.warning_message("Cannot Create Audio Sync Compound Clip from 2 Audio Clips!", 
-                                    "One of the media items needs to be a video clip.",
+        dialogutils.warning_message(_("Cannot Create Audio Sync Compound Clip from 2 Audio Clips!"), 
+                                    _("One of the media items needs to be a video clip."),
                                     gui.editor_window.window,
                                     True)
         return

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/boxmove.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/boxmove.py Changed

@@ -19,7 +19,7 @@
 """
 
 """
-Handles Overwrite Box tool functionality.
+Handles Box tool functionality.
 """
 
 import edit
@@ -32,23 +32,23 @@
 edit_data = None
 
 def clear_data():
-    # these need to cleared when box move tool is activated
+    # These need to cleared when box tool is activated
     global box_selection_data, edit_data
     box_selection_data = None
     edit_data = None
      
 def mouse_press(event, frame):
     global edit_data, box_selection_data
-    if box_selection_data == None: # mouse action to select
+    if box_selection_data == None: # mouse action is to select
         press_point = (event.x, event.y)
         
         edit_data = {"action_on":True,
                      "press_point":press_point,
                      "mouse_point":press_point,
                      "box_selection_data":None}
-    else: # mouse action to move
+    else: # mouse action is to move
         if box_selection_data.is_hit(event.x, event.y) == False:
-            # Back to start state
+            # Back to start state if selection box missed
             edit_data = None
             box_selection_data = None
         else:
@@ -64,10 +64,10 @@
     global edit_data
     if edit_data == None:
         return
-    if box_selection_data == None: # mouse action to select
+    if box_selection_data == None: # mouse action is to select
         edit_data["mouse_point"] = (x, y)
        
-    else: # mouse move to move
+    else: # mouse action is to move
         delta = frame - edit_data["press_frame"]
         edit_data["delta"] = delta
 
@@ -79,7 +79,7 @@
     if edit_data == None:
         return
         
-    if box_selection_data == None: # mouse action to select
+    if box_selection_data == None: # mouse action is to select
         box_selection_data = BoxMoveData(edit_data["press_point"], (x, y))
         if box_selection_data.is_empty() == False:
             edit_data = {"action_on":True,
@@ -92,7 +92,7 @@
                          "press_frame":-1,
                          "delta":0,
                          "box_selection_data":box_selection_data}
-    else: # mouse action to move
+    else: # mouse action is to move
         delta = frame - edit_data["press_frame"]
         edit_data["delta"] = delta
 
@@ -112,7 +112,7 @@
 
 class BoxMoveData:
     """
-    This class collects and data needed for boxovewrite moves.
+    This class collects data needed for Box tool edits.
     """
     def __init__(self, p1, p2):
         self.topleft_frame = -1
@@ -213,7 +213,7 @@
 
 class BoxTrackSelection:
     """
-    This class collects data on track's box selected clips.
+    This class collects data on track's Box selected clips.
     """
     def __init__(self, i, start_frame, end_frame):
         self.track_id = i
@@ -238,7 +238,7 @@
                 return # box selection was on last clip, nothing is elected
         else:
             if start_frame == 0:
-                self.selected_range_in = 0 # first clip on timeline can be selected by selecting frame 0
+                self.selected_range_in = 0 # first clip on timeline can be selected by selecting frame 0, no outer selection required here
             else:
                 self.selected_range_in = start_bound_index + 1
                 if self.selected_range_in == len(current_sequence().tracks):

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/cairoarea.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/cairoarea.py Changed

@@ -19,8 +19,8 @@
 """
 
 """
-Module contains CairoDrawableArea widget. You can draw onto it using 
-Cairo, and listen to its mouse and keyboard events.
+Module contains CairoDrawableArea2 widget. You can draw onto it using 
+Cairo by setting the raw function on ceation, and listen to its mouse and keyboard events.
 """
 
 from gi.repository import Gtk
@@ -73,14 +73,18 @@
         self.set_property("can-focus",  True)
         self.grab_focus_on_press = True
 
+    def add_pointer_motion_mask(self):
+        self.add_events(Gdk.EventMask.POINTER_MOTION_MASK)
+        #self.connect('pointer-motion-event', listener)
+
     def set_pref_size(self, pref_width, pref_height):
         self.set_size_request(pref_width, pref_height)
 
     def _draw_event(self, widget, cr):
         a = self.get_allocation()       
-        self._draw_func(None, cr, (a.x, a.y, a.width, a.height)) # 'None' is event object that was used to pass through here. Can be removed.
+        self._draw_func(None, cr, (a.x, a.y, a.width, a.height)) # 'None' is event object that was used to pass through here.
                                                                   # GTK2 used a tuple for allocation and all draw funcs expect it, so we provide
-                                                                  # allocation as tuple
+                                                                  # allocation as tuple.
         return False
 
     # ------------------------------------------------------------ Signal listeners

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/clipeffectseditor.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/clipeffectseditor.py Changed

@@ -22,13 +22,19 @@
 Module handles clip effects editing logic and gui
 """
 
-
+import cairo
+import copy
 from gi.repository import GLib
 from gi.repository import Gtk
+import pickle
 import time
 
+import atomicfile
+import dialogs
+import dialogutils
 import dnd
 import edit
+import editorpersistance
 import editorstate
 from editorstate import PROJECT
 import gui
@@ -48,6 +54,7 @@
 track = None # Track of the clip being editeds
 clip_index = None # Index of clip being edited
 block_changed_update = False # Used to block unwanted callback update from "changed", hack and a broken one, look to fix
+current_filter_index = -1 # Needed to find right filter object when saving/loading effect values
 
 # This is updated when filter panel is displayed and cleared when removed.
 # Used to update kfeditors with external tline frame position changes
@@ -292,6 +299,10 @@
 
 def get_filter_add_action(filter_info, target_clip):
     if filter_info.multipart_filter == False:
+        # Maybe show info on using alpha filters
+        if filter_info.group == "Alpha":
+            GLib.idle_add(_alpha_filter_add_maybe_info, filter_info)
+    
         data = {"clip":target_clip, 
                 "filter_info":filter_info,
                 "filter_edit_done_func":filter_edit_done}
@@ -303,6 +314,17 @@
         action = edit.add_multipart_filter_action(data)
     return action
 
+def _alpha_filter_add_maybe_info(filter_info):
+    if editorpersistance.prefs.show_alpha_info_message == True:
+        dialogs.alpha_info_msg(_alpha_info_dialog_cb, translations.get_filter_name(filter_info.name))
+
+def _alpha_info_dialog_cb(dialog, response_id, dont_show_check):
+    if dont_show_check.get_active() == True:
+        editorpersistance.prefs.show_alpha_info_message = False
+        editorpersistance.save()
+
+    dialog.destroy()
+
 def get_selected_filter_info():
     # Get current selection on effects treeview - that's a vertical list.
     treeselection = gui.effect_select_list_view.treeview.get_selection()
@@ -324,7 +346,8 @@
     # Block updates until we have set selected row
     global edit_effect_update_blocked
     edit_effect_update_blocked = True
-
+    
+    """
     treeselection = widgets.effect_stack_view.treeview.get_selection()
     (model, rows) = treeselection.get_selected_rows()
     
@@ -332,10 +355,11 @@
         row = rows[0]
     except:
         return # This fails when there are filters but no rows are selected
-        
-    row_index = max(row)
+    """
+    
+    #row_index = current_filter_index
     data = {"clip":clip,
-            "index":row_index,
+            "index":current_filter_index,
             "filter_edit_done_func":filter_edit_done}
     action = edit.remove_filter_action(data)
     action.do_edit()
@@ -462,6 +486,9 @@
 
     filter_object = clip.filters[filter_index]
     
+    global current_filter_index
+    current_filter_index = filter_index
+    
     # Create EditableProperty wrappers for properties
     editable_properties = propertyedit.get_filter_editable_properties(
                                                                clip, 
@@ -517,8 +544,16 @@
             vbox.pack_start(editor_row, False, False, 0)
             if not hasattr(editor_row, "no_separator"):
                 vbox.pack_start(guicomponents.EditorSeparator().widget, False, False, 0)
+        vbox.pack_start(guiutils.pad_label(12,12), False, False, 0)
+                
+        hamburger_launcher_surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "hamburger_big.png")
+        hamburger_launcher = guicomponents.PressLaunch(_hamburger_launch_pressed, hamburger_launcher_surface, 24, 24)
+        
+        sl_row = guiutils.get_left_justified_box([hamburger_launcher.widget])
+        vbox.pack_start(sl_row, False, False, 0)
         
         vbox.pack_start(Gtk.Label(), True, True, 0)
+
     else:
         vbox.pack_start(Gtk.Label(label=_("No editable parameters")), True, True, 0)
     vbox.show_all()
@@ -566,3 +601,101 @@
         return
     for kf_widget in keyframe_editor_widgets:
         kf_widget.update_clip_pos()
+
+# ------------------------------------------------ SAVE; LOAD etc. from hamburger menu
+def _hamburger_launch_pressed(widget, event):
+    guicomponents.get_clip_effects_editor_hamburger_menu(event, _clip_hamburger_item_activated)
+    
+def _clip_hamburger_item_activated(widget, msg):
+    if msg == "save":
+        filter_object = clip.filters[current_filter_index]
+        default_name = filter_object.info.name + _("_effect_values") + ".data"
+        dialogs.save_effects_compositors_values(_save_effect_values_dialog_callback, default_name)
+    elif msg == "load":
+        dialogs.load_effects_compositors_values_dialog(_load_effect_values_dialog_callback)
+    elif msg == "reset":
+        _reset_filter_values()
+    elif msg == "delete":
+        _delete_effect()
+        
+def _save_effect_values_dialog_callback(dialog, response_id):
+    if response_id == Gtk.ResponseType.ACCEPT:
+        save_path = dialog.get_filenames()[0]
+        filter_object = clip.filters[current_filter_index]
+        effect_data = EffectValuesSaveData(filter_object)
+        effect_data.save(save_path)
+    
+    dialog.destroy()
+
+def _load_effect_values_dialog_callback(dialog, response_id):
+    if response_id == Gtk.ResponseType.ACCEPT:
+        load_path = dialog.get_filenames()[0]
+        f = open(load_path)
+        effect_data = pickle.load(f)
+        
+        filter_object = clip.filters[current_filter_index]
+        
+        if effect_data.data_applicable(filter_object.info):
+            effect_data.set_effect_values(filter_object)
+            effect_selection_changed()
+        else:
+            # Info window
+            saved_effect_name = effect_data.info.name
+            current_effect_name = filter_object.info.name
+            primary_txt = _("Saved Filter data not applicaple for this Filter!")
+            secondary_txt = _("Saved data is for ") + saved_effect_name + " Filter,\n" + _("current edited Filter is ") + current_effect_name + "."
+            dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window)
+    
+    dialog.destroy()
+
+def _reset_filter_values():
+    filter_object = clip.filters[current_filter_index]
+    info = filter_object.info
+    if filter_object.info.multipart_filter == True:
+        filter_object.value = info.multipart_value
+
+    filter_object.properties = copy.deepcopy(info.properties)
+    filter_object.non_mlt_properties = copy.deepcopy(info.non_mlt_properties)
+        
+    effect_selection_changed()
+
+def _delete_effect():
+    delete_effect_pressed()
+
+
+class EffectValuesSaveData:
+    
+    def __init__(self, filter_object):
+        self.info = filter_object.info
+        self.multipart_filter = self.info.multipart_filter
+
+        # Values of these are edited by the user.
+        self.properties = copy.deepcopy(filter_object.properties)
+        try:
+            self.non_mlt_properties = copy.deepcopy(filter_object.non_mlt_properties)
+        except:
+            self.non_mlt_properties = [] # Versions prior 0.14 do not have non_mlt_properties and fail here on load
+
+        if self.multipart_filter == True:
+            self.value = filter_object.value
+        else:
+            self.value = None
+        
+    def save(self, save_path):
+        with atomicfile.AtomicFileWriter(save_path, "wb") as afw:
+            write_file = afw.get_file()
+            pickle.dump(self, write_file)
+        
+    def data_applicable(self, filter_info):

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/clipenddragmode.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/clipenddragmode.py Changed

@@ -19,9 +19,11 @@
 """
 
 """
-Module handles clip effects editing logic and gui
+Module handles clip end dragging edits.
 """
 
+
+import appconsts
 import gui
 import edit
 from editorstate import current_sequence
@@ -89,6 +91,13 @@
 
     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.set_cursor_to_mode()
 
 def mouse_press(event, frame):
@@ -174,7 +183,8 @@
     # Go back to enter mode
     editorstate.edit_mode = _enter_mode
     tlinewidgets.set_edit_mode(None, _enter_draw_func)
-        
+    tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_NONE
+    
     gui.editor_window.set_cursor_to_mode()
     updater.repaint_tline()

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/clipmenuaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/clipmenuaction.py Changed

@@ -28,6 +28,7 @@
 from gi.repository import Gtk
 
 import mlt
+from operator import itemgetter
 import os
 import shutil
 import time
@@ -46,6 +47,8 @@
 from editorstate import current_sequence
 from editorstate import get_track
 from editorstate import PROJECT
+from editorstate import PLAYER
+import mlttransitions
 import movemodes
 import syncsplitevent
 import tlinewidgets
@@ -101,6 +104,9 @@
         action.do_edit()
     elif action_id == "sync with origin":
         tlineaction.sync_compositor(compositor)
+    elif action_id == "set auto follow":
+        compositor.obey_autofollow = widget.get_active()
+        updater.repaint_tline()
         
 def _open_clip_in_effects_editor(data):
     updater.open_clip_in_effects_editor(data)
@@ -253,7 +259,17 @@
     action.do_edit()
     
     updater.repaint_tline()
-    
+
+
+def _re_render_transition_or_fade(data):
+    clip, track, item_id, item_data = data
+    from_clip_id, to_clip_id, from_out, from_in, to_out, to_in, transition_type_index, sorted_wipe_luma_index, color_str = clip.creation_data
+    name, type_id = mlttransitions.rendered_transitions[transition_type_index]
+    if type_id < appconsts.RENDERED_FADE_IN:
+        tlineaction.re_render_transition(data)
+    else:
+        tlineaction.re_render_fade(data)
+        
 def _mute_clip(data):
     clip, track, item_id, item_data = data
     set_clip_muted = item_data
@@ -262,7 +278,7 @@
         data = {"clip":clip}
         action = edit.mute_clip(data)
         action.do_edit()
-    else:# then we're stting clip unmuted
+    else:# then we're sitting clip unmuted
         data = {"clip":clip}
         action = edit.unmute_clip(data)
         action.do_edit()
@@ -366,7 +382,7 @@
     if not called_from_next_clip:
         clip_index = movemodes.selected_range_out + 1
         blank_index = movemodes.selected_range_in
-        if clip_index < 0: # we're not getting legal clip index
+        if clip_index < 0: # we are not getting a legal clip index
             return
         cover_clip = track.clips[clip_index]
     else:
@@ -478,7 +494,8 @@
     tlinewidgets.set_match_frame(-1, -1, True)
     gui.monitor_widget.set_default_view_force()
     updater.repaint_tline()
-        
+
+
 class MatchFrameWriter:
     def __init__(self, clip, clip_frame, track, display_on_right):
         self.clip = clip
@@ -531,7 +548,79 @@
         # Update view
         updater.repaint_tline()
 
+
+def _add_clip_marker(data):
+    clip, track, item_id, item_data = data
+    current_frame = PLAYER().current_frame()
+
+    playhead_on_popup_clip = True
+    try:
+        current_frame_clip_index = track.get_clip_index_at(current_frame)
+        current_frame_clip = track.clips[current_frame_clip_index]
+    except:
+        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)
+    clip_frame = current_frame - clip_start_in_tline + clip.clip_in
+    
+    dialogs.clip_marker_name_dialog(utils.get_tc_string(clip_frame), utils.get_tc_string(current_frame), _clip_marker_add_dialog_callback, (clip, track, clip_frame))
+
+def _clip_marker_add_dialog_callback(dialog, response_id, name_entry, data):
+    clip, track, clip_frame = data
+    name = name_entry.get_text()
+    dialog.destroy()
+    
+    # remove older on same frame
+    dupl_index = -1
+    for i in range(0, len(clip.markers)):
+        marker_name, frame = clip.markers[i]
+        if frame == clip_frame:
+            dupl_index = i
+    if dupl_index != -1:
+        current_sequence().markers.pop(dupl_index)
+
+    clip.markers.append((name, clip_frame))
+    clip.markers = sorted(clip.markers, key=itemgetter(1))
+    updater.repaint_tline()
+
+def _go_to_clip_marker(data):
+    clip, track, item_id, item_data = data
+    marker = clip.markers[int(item_data)]
+    name, clip_frame = marker
     
+    clip_start_in_tline = track.clip_start(track.clips.index(clip))
+    marker_frame = clip_start_in_tline + clip_frame - clip.clip_in
+
+    PLAYER().seek_frame(marker_frame)
+
+def _delete_clip_marker(data):
+    clip, track, item_id, item_data = data
+
+    clip_start_in_tline = track.clip_start(track.clips.index(clip))
+    current_frame = PLAYER().current_frame()
+
+    mrk_index = -1
+    for i in range(0, len(clip.markers)):
+        name, marker_clip_frame = clip.markers[i]
+        marker_tline_frame = clip_start_in_tline + marker_clip_frame - clip.clip_in
+        if marker_tline_frame == current_frame:
+            mrk_index = i
+    if mrk_index != -1:
+        clip.markers.pop(mrk_index)
+        updater.repaint_tline()
+
+def _delete_all_clip_markers(data):
+    clip, track, item_id, item_data = data
+    clip.markers = []
+    updater.repaint_tline()
+
+
+
 # Functions to handle popup menu selections for strings 
 # set as activation messages in guicomponents.py
 # activation_message -> _handler_func
@@ -569,4 +658,9 @@
                   "stretch_next":_stretch_next, 
                   "stretch_prev":_stretch_prev,
                   "add_autofade":_add_autofade,
-                  "set_audio_sync_clip":audiosync.init_select_tline_sync_clip}
+                  "set_audio_sync_clip":audiosync.init_select_tline_sync_clip,
+                  "re_render":_re_render_transition_or_fade,
+                  "add_clip_marker":_add_clip_marker,
+                  "go_to_clip_marker":_go_to_clip_marker,
+                  "delete_clip_marker":_delete_clip_marker,
+                  "deleteall_clip_markers":_delete_all_clip_markers}

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py Changed

@@ -22,15 +22,20 @@
 Module handles Compositors edit panel.
 """
 
+import cairo
 import copy
-
 from gi.repository import Gtk
+import pickle
 
+import atomicfile
 import compositorfades
+import dialogs
+import dialogutils
 import gui
 import guicomponents
 import guiutils
 import edit
+import editorstate
 from editorstate import current_sequence
 import editorpersistance
 import keyframeeditor
@@ -38,6 +43,7 @@
 import propertyeditorbuilder
 import propertyedit
 import propertyparse
+import respaths
 import utils
 
 COMPOSITOR_PANEL_LEFT_WIDTH = 160
@@ -84,20 +90,25 @@
 
 def get_compositor_clip_panel():
     create_widgets()
+    small = (editorstate.SCREEN_HEIGHT < 1000)
     
     compositor_vbox = Gtk.VBox(False, 2)
     compositor_vbox.pack_start(widgets.compositor_info, False, False, 0)
-    compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)
+    if not small:
+        compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)
     compositor_vbox.pack_start(widgets.fade_in_b, False, False, 0)
     compositor_vbox.pack_start(widgets.fade_in_spin, False, False, 0)
-    compositor_vbox.pack_start(guiutils.get_pad_label(5, 12), False, False, 0)
+    if not small:
+        compositor_vbox.pack_start(guiutils.get_pad_label(5, 12), False, False, 0)
     compositor_vbox.pack_start(widgets.fade_out_b, False, False, 0)
     compositor_vbox.pack_start(widgets.fade_out_spin, False, False, 0)
-    compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)
+    if not small:
+        compositor_vbox.pack_start(guiutils.get_pad_label(5, 24), False, False, 0)
     compositor_vbox.pack_start(Gtk.Label(), True, True, 0)
     compositor_vbox.pack_start(widgets.reset_b, False, False, 0)
-    compositor_vbox.pack_start(widgets.delete_b, False, False, 0)
-    compositor_vbox.pack_start(guiutils.get_pad_label(5, 3), False, False, 0)
+    if not small:
+        compositor_vbox.pack_start(widgets.delete_b, False, False, 0)
+        compositor_vbox.pack_start(guiutils.get_pad_label(5, 3), False, False, 0)
 
     set_enabled(False)
     
@@ -242,12 +253,17 @@
     editor_rows = propertyeditorbuilder.get_transition_extra_editor_rows(compositor, t_editable_properties)
     for editor_row in editor_rows:
         # These are added to keyframe editor based on editor type, not based on EditableProperty type as above
-        # because one editor set values for multiple EditableProperty objects
+        # because one editor sets values for multiple EditableProperty objects
         if editor_row.__class__ == keyframeeditor.RotatingGeometryEditor:
             keyframe_editor_widgets.append(editor_row)
         vbox.pack_start(editor_row, False, False, 0)
         vbox.pack_start(guicomponents.EditorSeparator().widget, False, False, 0)
-    
+
+    hamburger_launcher_surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "hamburger_big.png")
+    hamburger_launcher = guicomponents.PressLaunch(_hamburger_launch_pressed, hamburger_launcher_surface, 24, 24)
+    sl_row = guiutils.get_left_justified_box([hamburger_launcher.widget])
+    vbox.pack_start(sl_row, False, False, 0)
+        
     vbox.pack_start(Gtk.Label(), True, True, 0)  
     vbox.show_all()
 
@@ -275,3 +291,67 @@
 def update_kfeditors_positions():
     for kf_widget in keyframe_editor_widgets:
         kf_widget.update_clip_pos()
+
+# ----------------------------------------------------------- hamburger menu
+def _hamburger_launch_pressed(widget, event):
+    guicomponents.get_compositor_editor_hamburger_menu(event, _compositor_hamburger_item_activated)
+
+def _compositor_hamburger_item_activated(widget, msg):
+    if msg == "save":
+        comp_name = mlttransitions.name_for_type[compositor.transition.info.name]
+        default_name = comp_name.replace(" ", "_") + _("_compositor_values") + ".data"
+        dialogs.save_effects_compositors_values(_save_compositor_values_dialog_callback, default_name, False)
+    elif msg == "load":
+        dialogs.load_effects_compositors_values_dialog(_load_compositor_values_dialog_callback, False)
+    elif msg == "reset":
+        _reset_compositor_pressed()
+    elif msg == "delete":
+        _delete_compositor_pressed()
+
+def _save_compositor_values_dialog_callback(dialog, response_id):
+    if response_id == Gtk.ResponseType.ACCEPT:
+        save_path = dialog.get_filenames()[0]
+        compositor_data = CompositorValuesSaveData(compositor.transition.info, compositor.transition.properties)
+        compositor_data.save(save_path)
+    
+    dialog.destroy()
+
+def _load_compositor_values_dialog_callback(dialog, response_id):
+    if response_id == Gtk.ResponseType.ACCEPT:
+        load_path = dialog.get_filenames()[0]
+        f = open(load_path)
+        compositor_data = pickle.load(f)
+
+        if compositor_data.data_applicable(compositor.transition.info):
+            compositor_data.set_values(compositor)
+            set_compositor(compositor)
+        else:
+            saved_name_comp_name = mlttransitions.name_for_type[compositor_data.info.name]
+            current_comp_name = mlttransitions.name_for_type[compositor.transition.info.name]
+            primary_txt = _("Saved Compositor data not applicaple for this compositor!")
+            secondary_txt = _("Saved data is for ") + saved_name_comp_name + " compositor,\n" + _(", current compositor is ") + current_comp_name + "."
+            dialogutils.warning_message(primary_txt, secondary_txt, gui.editor_window.window)
+
+    dialog.destroy()
+
+
+class CompositorValuesSaveData:
+    
+    def __init__(self, info, properties):
+        self.info = info
+        self.properties = copy.deepcopy(properties)
+
+    def save(self, save_path):
+        with atomicfile.AtomicFileWriter(save_path, "wb") as afw:
+            write_file = afw.get_file()
+            pickle.dump(self, write_file)
+        
+    def data_applicable(self, compositor_info):        
+        if isinstance(self.info, compositor_info.__class__):
+            return self.info.__dict__ == compositor_info.__dict__
+        return False
+        
+    def set_values(self, compositor):
+        compositor.transition.properties = copy.deepcopy(self.properties)
+        compositor.transition.update_editable_mlt_properties()
+

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/compositormodes.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/compositormodes.py Changed

@@ -21,6 +21,7 @@
 """
 Module handles editing positions and clip ends of compositors on timeline.
 """
+import appconsts
 import gui
 import edit
 import editorstate
@@ -111,6 +112,14 @@
         sub_mode = MOVE_EDIT
     updater.repaint_tline()
 
+def get_pointer_context(compositor, x):   
+    if abs(x - tlinewidgets._get_frame_x(compositor.clip_in)) < TRIM_HANDLE_WIDTH:
+        return appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_LEFT
+    elif abs(x - tlinewidgets._get_frame_x(compositor.clip_out + 1)) < TRIM_HANDLE_WIDTH:
+        return appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_RIGHT
+    else:
+        return appconsts.POINTER_CONTEXT_COMPOSITOR_MOVE
+        
 def mouse_move(x, y, frame, state):
     global edit_data
     if sub_mode == TRIM_EDIT:
@@ -122,7 +131,8 @@
     
 def mouse_release(x, y, frame, state):
     global sub_mode
-    
+    tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_NONE
+
     editorstate.edit_mode = prev_edit_mode
     if editorstate.edit_mode == editorstate.INSERT_MOVE:
         tlinewidgets.set_edit_mode(None, tlinewidgets.draw_insert_overlay)

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/dialogs.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/dialogs.py Changed

@@ -294,6 +294,51 @@
     dialog.connect('response', callback)
     dialog.show()
 
+def save_effects_compositors_values(callback, default_name, saving_effect=True):
+    parent = gui.editor_window.window
+
+    if saving_effect == True:
+        title = _("Save Effect Values Data")
+    else:
+        title = _("Save Compositor Values Data")
+        
+    dialog = Gtk.FileChooserDialog(title, parent,
+                                   Gtk.FileChooserAction.SAVE,
+                                   (_("Cancel").encode('utf-8'), Gtk.ResponseType.CANCEL,
+                                    _("Save").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+    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(_("Effect/Compositor Values Data"))
+    file_filter.add_pattern("*" + "data")
+    dialog.add_filter(file_filter)
+    dialog.connect('response', callback)
+    dialog.show()
+
+def load_effects_compositors_values_dialog(callback, loading_effect=True):
+    parent = gui.editor_window.window
+
+    if loading_effect == True:
+        title_text = _("Load Effect Values Data")
+    else:
+        title_text = _("Load Compositor Values Data") 
+
+    dialog = Gtk.FileChooserDialog(title_text, parent,
+                                   Gtk.FileChooserAction.OPEN,
+                                   (_("Cancel").encode('utf-8'), Gtk.ResponseType.CANCEL,
+                                    _("OK").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+    dialog.set_action(Gtk.FileChooserAction.OPEN)
+    dialog.set_select_multiple(False)
+    file_filter = Gtk.FileFilter()
+    file_filter.set_name(_("Effect/Compositor Values Data"))
+    file_filter.add_pattern("*" + "data")
+    dialog.add_filter(file_filter)
+    dialog.connect('response', callback)
+    dialog.show()
+    
 def export_xml_dialog(callback, project_name):
     _export_file_name_dialog(callback, project_name, _("Export Project as XML to"))
 
@@ -443,8 +488,8 @@
     # 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="1.14.0")
-    janne_label = Gtk.Label(label="Copyright 2017 Janne Liljeblad and contributors")
+    ver_label = Gtk.Label(label="1.16.0")
+    janne_label = Gtk.Label(label="Copyright 2018 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)
     flow_label.modify_font(Pango.FontDescription("sans bold 14"))
@@ -847,9 +892,9 @@
     autosaves_view.set_size_request(300, 300)
     autosaves_view.fill_data_model(autosaves)
 
-    delete_all = Gtk.Button("Delete all autosaves")
+    delete_all = Gtk.Button(_("Delete all autosaves"))
     delete_all.connect("clicked", lambda w : _autosaves_delete_all_clicked(autosaves, autosaves_view, dialog))
-    delete_all_but_selected = Gtk.Button("Delete all but selected autosave")
+    delete_all_but_selected = Gtk.Button(_("Delete all but selected autosave"))
     delete_all_but_selected.connect("clicked", lambda w : _autosaves_delete_unselected(autosaves, autosaves_view))
 
     delete_buttons_vbox = Gtk.HBox()
@@ -1108,6 +1153,71 @@
     dialog.connect('response', callback, name_entry)
     dialog.show_all()
 
+def clip_marker_name_dialog(clip_frame_str, tline_frame_str, callback, data):
+    dialog = Gtk.Dialog(_("New Marker"),  gui.editor_window.window,
+                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                        (_("Add Marker").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+
+    tline_frame_info = guiutils.get_left_justified_box([Gtk.Label(_("Timeline position: ") + tline_frame_str),Gtk.Label()])
+
+    name_entry = Gtk.Entry()
+    name_entry.set_width_chars(30)
+    name_entry.set_text("")
+    name_entry.set_activates_default(True)
+
+    name_select = panels.get_two_column_box(Gtk.Label(label=_("Name for clip marker at ") + clip_frame_str),
+                                               name_entry,
+                                               250)
+
+    rows_vbox = Gtk.VBox(False, 2)
+    rows_vbox.pack_start(tline_frame_info, False, False, 0)
+    rows_vbox.pack_start(name_select, False, False, 0)
+    #rows_vbox.pack_start(guiutils.get_pad_label(12, 2), False, False, 0)
+    
+    alignment = dialogutils.get_default_alignment(rows_vbox)
+        
+    dialog.vbox.pack_start(alignment, True, True, 0)
+    dialogutils.set_outer_margins(dialog.vbox)
+    dialog.set_default_response(Gtk.ResponseType.ACCEPT)
+    _default_behaviour(dialog)
+    dialog.connect('response', callback, name_entry, data)
+    dialog.show_all()
+
+def alpha_info_msg(callback, filter_name):
+    dialog = Gtk.Dialog(_("Alpha Filters Info"),  gui.editor_window.window,
+                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                        (_("Ok").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+
+    line_label = Gtk.Label(_("You are adding <b>Alpha Filter '") + filter_name + _("'</b> into a clip. Here is some info on how <b>Alpha Filters</b> work on Flowblade:"))
+    line_label.set_use_markup(True)
+    row1 = guiutils.get_left_justified_box([line_label])
+    
+    info_text = u"\u2022" + _(" <b>Alpha Filters</b> work by modifying image's alpha channel.\n") + \
+                u"\u2022" + _(" To see the effect of <b>Alpha Filter</b> you need composite this clip on track below by adding a <b>Compositor like 'Dissolve'</b> into this clip.\n") + \
+                u"\u2022" + _(" <b>Alpha Filters</b> on clips on <b>Track V1</b> have no effect.")
+    info_label = Gtk.Label(label=info_text)
+    info_label.set_use_markup(True)
+    info_box = guiutils.get_left_justified_box([info_label])
+
+    dont_show_check = Gtk.CheckButton.new_with_label (_("Don't show this message again."))
+    row2 = guiutils.get_left_justified_box([dont_show_check])
+
+    vbox = Gtk.VBox(False, 2)
+    vbox.pack_start(row1, False, False, 0)
+    vbox.pack_start(guiutils.pad_label(24, 12), False, False, 0)
+    vbox.pack_start(info_box, False, False, 0)
+    vbox.pack_start(guiutils.pad_label(24, 24), False, False, 0)
+    vbox.pack_start(row2, False, False, 0)
+    
+    alignment = dialogutils.get_default_alignment(vbox)
+
+    dialog.vbox.pack_start(alignment, True, True, 0)
+    dialogutils.set_outer_margins(dialog.vbox)
+    dialog.set_default_response(Gtk.ResponseType.ACCEPT)
+    _default_behaviour(dialog)
+    dialog.connect('response', callback, dont_show_check)
+    dialog.show_all()
+
 def open_image_sequence_dialog(callback, parent_window):
     cancel_str = _("Cancel").encode('utf-8')
     ok_str = _("Ok").encode('utf-8')
@@ -1173,6 +1283,48 @@
     _default_behaviour(dialog)
     dialog.show_all()
 
+def transition_re_render_dialog(callback, transition_data):
+    dialog = Gtk.Dialog(_("Rerender Transition").encode('utf-8'),  gui.editor_window.window,
+                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                        (_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,
+                        _("Rerender").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+
+    alignment, encodings_cb, quality_cb = panels.get_transition_re_render_panel(transition_data)
+    widgets = (encodings_cb, quality_cb)
+    dialog.connect('response', callback, widgets, transition_data)
+    dialog.vbox.pack_start(alignment, True, True, 0)
+    dialogutils.set_outer_margins(dialog.vbox)
+    _default_behaviour(dialog)
+    dialog.show_all()
+
+def fade_re_render_dialog(callback, fade_data):
+    dialog = Gtk.Dialog(_("Rerender Fade").encode('utf-8'),  gui.editor_window.window,
+                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                        (_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,
+                        _("Rerender").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+
+    alignment, encodings_cb, quality_cb = panels.get_fade_re_render_panel(fade_data)
+    widgets = (encodings_cb, quality_cb)
+    dialog.connect('response', callback, widgets, fade_data)
+    dialog.vbox.pack_start(alignment, True, True, 0)
+    dialogutils.set_outer_margins(dialog.vbox)
+    _default_behaviour(dialog)
+    dialog.show_all()
+
+def re_render_all_dialog(callback, rerender_list, unrenderable):
+    dialog = Gtk.Dialog(_("Rerender All Transitions and Fades").encode('utf-8'),  gui.editor_window.window,
+                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                        (_("Cancel").encode('utf-8'), Gtk.ResponseType.REJECT,
+                        _("Rerender All").encode('utf-8'), Gtk.ResponseType.ACCEPT))
+
+    alignment, encodings_cb, quality_cb = panels.get_re_render_all_panel(rerender_list, unrenderable)
+    widgets = (encodings_cb, quality_cb)
+    dialog.connect('response', callback, widgets, rerender_list)
+    dialog.vbox.pack_start(alignment, True, True, 0)
+    dialogutils.set_outer_margins(dialog.vbox)
+    _default_behaviour(dialog)
+    dialog.show_all()
+
 def fade_edit_dialog(callback, transition_data):
     dialog = Gtk.Dialog(_("Add Fade"),  gui.editor_window.window,
                         Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
@@ -1385,7 +1537,7 @@
     add_button = Gtk.Button(_("Set Watermark File"))
     remove_button = Gtk.Button(_("Remove Watermark"))
     if editorstate.current_sequence().watermark_file_path == None:

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/dnd.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/dnd.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/edit.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/edit.py Changed

@@ -33,6 +33,7 @@
 from editorstate import current_sequence
 from editorstate import get_track
 from editorstate import PLAYER
+from editorstate import auto_follow_active
 import mltfilters
 import movemodes
 import resync
@@ -172,7 +173,7 @@
 
 def _create_clip_clone(clip):
     if clip.media_type != appconsts.PATTERN_PRODUCER:
-        new_clip = current_sequence().create_file_producer_clip(clip.path)
+        new_clip = current_sequence().create_file_producer_clip(clip.path, None, False, clip.ttl)
     else:
         new_clip = current_sequence().create_pattern_producer(clip.create_data)
     new_clip.name = clip.name
@@ -293,6 +294,9 @@
         # Grabs data as object members.
         self.__dict__.update(data)
         
+        # Compositor auto follow is saved with each edit and is computed on first do and later done on redo/undo
+        self.compositor_autofollow_data = None
+        
         # Other then actual trim edits, attempting all edits exits active trimodes and enters <X>_NO_EDIT trim mode.
         self.exit_active_trimmode_on_edit = True
         
@@ -321,6 +325,16 @@
         if self.turn_on_stop_for_edit:
             self.stop_for_edit = True
 
+        # Create autofollow data if needed and update GUI.
+        # If autofollow and no data, then GUI update happens in do_edit()
+        # Added complexity here is to avoid two GUI updates
+        if auto_follow_active() == True:
+            self.compositor_autofollow_data = get_full_compositor_sync_data()
+            self.redo_auto_follow()
+            # This wasn'rt done in redo() because no auto follow data available
+            if do_gui_update:
+                self._update_gui()
+
     def undo(self):
         PLAYER().stop_playback()
 
@@ -338,6 +352,9 @@
 
         resync.calculate_and_set_child_clip_sync_states()
 
+        if self.compositor_autofollow_data != None:
+            self.undo_auto_follow()
+            
         # HACK, see above.
         if self.stop_for_edit:
             PLAYER().consumer.start()
@@ -360,15 +377,37 @@
         _remove_trailing_blanks_redo(self)
         resync.calculate_and_set_child_clip_sync_states()
 
+        if self.compositor_autofollow_data != None:
+            self.redo_auto_follow()
+
         tlinewidgets.set_match_frame(-1, -1, True)
 
         # HACK, see above.
         if self.stop_for_edit:
             PLAYER().consumer.start()
 
-        if do_gui_update:
+        # Update GUI if no autofollow or if autofollow data is available.
+        # If autofollow and no data, then GUI update happens in do_edit()
+        # Added complexity here is to avoid two GUI updates
+        if ((do_gui_update and auto_follow_active() == False) or 
+           (do_gui_update and auto_follow_active() == True and self.compositor_autofollow_data != None)):
             self._update_gui()
 
+    def undo_auto_follow(self):
+        for sync_item in self.compositor_autofollow_data:
+            # real compositor objects get recreated and destroyed all the time and in redo/undo they need to identified by destroy_id
+            destroy_id, orig_in, orig_out, clip_start, clip_end = sync_item
+            try:
+                sync_compositor = current_sequence().get_compositor_for_destroy_id(destroy_id)
+                if sync_compositor.obey_autofollow == True:
+                    sync_compositor.set_in_and_out(orig_in, orig_out)   
+            except:
+                # Compositor or clip not found
+                pass
+
+    def redo_auto_follow(self):
+        do_autofollow_redo(self.compositor_autofollow_data)
+        
     def _update_gui(self): # This copied  with small modifications into projectaction.py for sequence imports, update there too if needed...yeah.
         updater.update_tline_scrollbar() # Slider needs to adjust to possily new program length.
                                          # This REPAINTS TIMELINE as a side effect.
@@ -384,6 +423,68 @@
 
         updater. update_seqence_info_text()
 
+# ---------------------------------------------------- compositor sync util methods
+def get_full_compositor_sync_data():
+    # Returns list of tuples in form (compositor, orig_in, orig_out, clip_start, clip_end)
+    # Pair all compositors with their origin clips ids
+    comp_clip_pairings = {}
+    for compositor in current_sequence().compositors:
+        if compositor.origin_clip_id in comp_clip_pairings:
+            comp_clip_pairings[compositor.origin_clip_id].append(compositor)
+        else:
+            comp_clip_pairings[compositor.origin_clip_id] = [compositor]
+    
+    # Create resync list
+    resync_list = []
+    for i in range(current_sequence().first_video_index, len(current_sequence().tracks) - 1): # -1, there is a topmost hidden track 
+        track = current_sequence().tracks[i] # b_track is source track where origin clip is
+        for j in range(0, len(track.clips)):
+            clip = track.clips[j]
+            if clip.id in comp_clip_pairings:
+                compositor_list = comp_clip_pairings[clip.id]
+                for compositor in compositor_list:
+                    resync_list.append((clip, track, j, compositor))
+                    
+    # Create full data
+    full_sync_data = []
+    for resync_item in resync_list:
+        try:
+            clip, track, clip_index, compositor = resync_item
+            clip_start = track.clip_start(clip_index)
+            clip_end = clip_start + clip.clip_out - clip.clip_in
+            
+            # Auto fades need to go to start or end of clips and maintain their lengths
+            if compositor.transition.info.auto_fade_compositor == True:
+                if compositor.transition.info.name == "##auto_fade_in":
+                    clip_end = clip_start + compositor.get_length() - 1
+                else:
+                    clip_start = clip_end - compositor.get_length() + 1
+            
+            orig_in = compositor.clip_in
+            orig_out = compositor.clip_out
+            
+            destroy_id = compositor.destroy_id
+            
+            full_sync_data_item = (destroy_id, orig_in, orig_out, clip_start, clip_end)
+            full_sync_data.append(full_sync_data_item)
+        except:
+            # Clip is probably deleted
+            pass
+            
+    return full_sync_data
+
+def do_autofollow_redo(compositor_autofollow_data):
+    for sync_item in compositor_autofollow_data:
+        # real compositor objects get recreated and destroyed all the time and in redo/undo they need to identified by destroy_id
+        destroy_id, orig_in, orig_out, clip_start, clip_end = sync_item
+        try:
+            sync_compositor = current_sequence().get_compositor_for_destroy_id(destroy_id)
+            if sync_compositor.obey_autofollow == True:
+                sync_compositor.set_in_and_out(clip_start, clip_end)
+        except:
+            # Compositor or clip not found
+            pass
+                
 # ---------------------------------------------------- SYNC DATA
 class SyncData:
     """
@@ -666,7 +767,6 @@
 def _gap_append_redo(self):
     pass
         
-
 #----------------- TWO_ROLL_TRIM
 # "track","index","from_clip","to_clip","delta","edit_done_callback"
 # "cut_frame"
@@ -2411,7 +2511,47 @@
     _insert_clip(track, transition_clip, 
                  self.transition_index, 1, # first frame is dropped as it is 100% from clip
                  transition_clip.get_length() - 1)
-   
+
+
+#------------------- REPLACE CENTERED TRANSITION
+# "track", "transition_clip","transition_index"
+def replace_centered_transition_action(data):
+    action = EditAction(_replace_centered_transition_undo, _replace_centered_transition_redo, data)
+    return action
+
+def _replace_centered_transition_undo(self):
+    # Remove new
+    _remove_clip(self.track, self.transition_index)
+
+    # Insert old 
+    _insert_clip(self.track, self.removed_clip, 
+                 self.transition_index, 1, # first frame is dropped as it is 100% from clip
+                 self.removed_clip.clip_out)
+
+def _replace_centered_transition_redo(self):
+    # Remove old   
+    self.removed_clip = _remove_clip(self.track, self.transition_index)
+    
+    # Insert new 
+    _insert_clip(self.track, self.transition_clip, 
+                 self.transition_index, 1, # first frame is dropped as it is 100% from clip
+                 self.transition_clip.clip_out)

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editevent.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editevent.py Changed

@@ -37,6 +37,7 @@
 import clipenddragmode
 import compositeeditor
 import compositormodes
+import dialogs
 import dialogutils
 import edit
 import editorstate
@@ -546,7 +547,7 @@
         audiosync.select_sync_clip_mouse_pressed(event, frame)
         mouse_disabled = True
         # Set INSERT_MODE
-        set_default_edit_mode()  
+        set_default_edit_mode()
         return
         
     # Hitting timeline in clip display mode displays timeline in
@@ -583,30 +584,38 @@
             updater.repaint_tline()
             return
 
-    #  Check if compositor is hit and if so handle compositor editing
+    #  Check if compositor is hit and if so, handle compositor editing
     if editorstate.current_is_move_mode() and timeline_visible():
         hit_compositor = tlinewidgets.compositor_hit(frame, event.y, current_sequence().compositors)
-        if hit_compositor != None:
-            movemodes.clear_selected_clips()
-            if event.button == 1 or (event.button == 3 and event.get_state() & Gdk.ModifierType.CONTROL_MASK):
-                compositormodes.set_compositor_mode(hit_compositor)
-                mode_funcs = EDIT_MODE_FUNCS[editorstate.COMPOSITOR_EDIT]
-                press_func = mode_funcs[TL_MOUSE_PRESS]
-                press_func(event, frame)
-            elif event.button == 3:
+        if hit_compositor != None:         
+            if editorstate.auto_follow == False or hit_compositor.obey_autofollow == False:
+                movemodes.clear_selected_clips()
+                if event.button == 1 or (event.button == 3 and event.get_state() & Gdk.ModifierType.CONTROL_MASK):
+                    compositormodes.set_compositor_mode(hit_compositor)
+                    mode_funcs = EDIT_MODE_FUNCS[editorstate.COMPOSITOR_EDIT]
+                    press_func = mode_funcs[TL_MOUSE_PRESS]
+                    press_func(event, frame)
+                    return
+            if event.button == 3:
                 mouse_disabled == True
                 compositormodes.set_compositor_selected(hit_compositor)
                 guicomponents.display_compositor_popup_menu(event, hit_compositor,
                                                             compositor_menu_item_activated)
+                return
             elif event.button == 2:
                 updater.zoom_project_length()
-            return
+                return
 
     compositormodes.clear_compositor_selection()
 
-    # Check if we should enter clip end drag mode.
+    # Check if we should enter clip end drag mode
     if (event.button == 3 and editorstate.current_is_move_mode()
         and timeline_visible() and (event.get_state() & Gdk.ModifierType.CONTROL_MASK)):
+        # with CTRL right mouse
+        clipenddragmode.maybe_init_for_mouse_press(event, frame)
+    elif (timeline_visible() and (EDIT_MODE() == editorstate.INSERT_MOVE or EDIT_MODE() == editorstate.OVERWRITE_MOVE)
+        and (tlinewidgets.pointer_context == appconsts.POINTER_CONTEXT_END_DRAG_LEFT or tlinewidgets.pointer_context == appconsts.POINTER_CONTEXT_END_DRAG_RIGHT)):
+        # with pointer context
         clipenddragmode.maybe_init_for_mouse_press(event, frame)
 
     # Handle mouse button presses depending which button was pressed and
@@ -618,17 +627,16 @@
                 success = display_clip_menu_pop_up(event.y, event, frame)
                 if not success:
                     PLAYER().seek_frame(frame)
-            #else:
-            #    PLAYER().seek_frame(frame) 
         else:
             # For trim modes set <X>_NO_EDIT edit mode and seek frame. and seek frame
             trimmodes.set_no_edit_trim_mode()
             PLAYER().seek_frame(frame)
         return
     # LEFT BUTTON + CTRL: Select new trimmed clip in one roll trim mode
-    elif (event.button == 1 
+    elif ((event.button == 1 
           and (event.get_state() & Gdk.ModifierType.CONTROL_MASK)
-          and EDIT_MODE() == editorstate.ONE_ROLL_TRIM):
+          and EDIT_MODE() == editorstate.ONE_ROLL_TRIM) or 
+        (event.button == 1 and editorstate.cursor_is_tline_sensitive == True and EDIT_MODE() == editorstate.ONE_ROLL_TRIM)):
         track = tlinewidgets.get_track(event.y)
         if track == None:
             if editorpersistance.prefs.empty_click_exits_trims == True:
@@ -638,7 +646,12 @@
         if (not success) and editorpersistance.prefs.empty_click_exits_trims == True:
             set_default_edit_mode(True)
             return
-        gui.editor_window.set_cursor_to_mode()
+            
+        if trimmodes.edit_data["to_side_being_edited"] == True:
+            pointer_context = appconsts.POINTER_CONTEXT_TRIM_LEFT
+        else:
+            pointer_context = appconsts.POINTER_CONTEXT_TRIM_RIGHT
+        gui.editor_window.set_tline_cursor_to_context(pointer_context)
         gui.editor_window.set_mode_selector_to_mode()
         if not editorpersistance.prefs.quick_enter_trims:
             mouse_disabled = True
@@ -755,6 +768,7 @@
     data = (clip, track, None, x)
     updater.open_clip_in_effects_editor(data)
 
+
 # -------------------------------------------------- DND release event callbacks
 def tline_effect_drop(x, y):
     clip, track, index = tlinewidgets.get_clip_track_and_index_for_pos(x, y)
@@ -789,7 +803,7 @@
     
     # Create new clip.
     if media_file.type != appconsts.PATTERN_PRODUCER:
-        new_clip = current_sequence().create_file_producer_clip(media_file.path, media_file.name)
+        new_clip = current_sequence().create_file_producer_clip(media_file.path, media_file.name, False, media_file.ttl)
     else:
         new_clip = current_sequence().create_pattern_producer(media_file)

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py Changed

@@ -173,16 +173,17 @@
 
 def update_prefs_from_widgets(widgets_tuples_tuple):
     # Unpack widgets
-    gen_opts_widgets, edit_prefs_widgets, view_prefs_widgets, performance_widgets = widgets_tuples_tuple
+    gen_opts_widgets, edit_prefs_widgets, playback_prefs_widgets, view_prefs_widgets, performance_widgets = widgets_tuples_tuple
 
     default_profile_combo, open_in_last_opened_check, open_in_last_rendered_check, undo_max_spin, load_order_combo = gen_opts_widgets
     
     # Jul-2016 - SvdB - Added play_pause_button
     # Apr-2017 - SvdB - Added ffwd / rev values
-    auto_play_in_clip_monitor_check, auto_center_check, grfx_insert_length_spin, \
-        trim_exit_click, trim_quick_enter, remember_clip_frame, overwrite_clip_drop, cover_delete, \
-        play_pause_button, mouse_scroll_action, hide_file_ext_button, auto_center_on_updown, \
-        ffwd_rev_shift, ffwd_rev_ctrl, ffwd_rev_caps = edit_prefs_widgets
+    gfx_length_spin, trim_exit_on_empty, trim_quick_enter, remember_clip_frame, \
+    overwrite_clip_drop, cover_delete, mouse_scroll_action, hide_file_ext_button = edit_prefs_widgets
+    
+    auto_play_in_clip_monitor_check, auto_center_check, play_pause_button, auto_center_on_updown, \
+    ffwd_rev_shift_spin, ffwd_rev_ctrl_spin, ffwd_rev_caps_spin = playback_prefs_widgets
     
     use_english, disp_splash, buttons_style, dark_theme, theme_combo, audio_levels_combo, window_mode_combo, full_names, double_track_hights = view_prefs_widgets
 
@@ -201,8 +202,8 @@
 
     prefs.auto_play_in_clip_monitor = auto_play_in_clip_monitor_check.get_active()
     prefs.auto_center_on_play_stop = auto_center_check.get_active()
-    prefs.default_grfx_length = int(grfx_insert_length_spin.get_adjustment().get_value())
-    prefs.empty_click_exits_trims = trim_exit_click.get_active()
+    prefs.default_grfx_length = int(gfx_length_spin.get_adjustment().get_value())
+    prefs.empty_click_exits_trims = trim_exit_on_empty.get_active()
     prefs.quick_enter_trims = trim_quick_enter.get_active()
     prefs.remember_monitor_clip_frame = remember_clip_frame.get_active()
     prefs.overwrite_clip_drop = (overwrite_clip_drop.get_active() == 0)
@@ -212,9 +213,9 @@
     prefs.hide_file_ext = hide_file_ext_button.get_active()
     prefs.mouse_scroll_action_is_zoom = (mouse_scroll_action.get_active() == 0)
     # Apr-2017 - SvdB - ffwd / rev values
-    prefs.ffwd_rev_shift = int(ffwd_rev_shift.get_adjustment().get_value())
-    prefs.ffwd_rev_ctrl = int(ffwd_rev_ctrl.get_adjustment().get_value())
-    prefs.ffwd_rev_caps = int(ffwd_rev_caps.get_adjustment().get_value())
+    prefs.ffwd_rev_shift = int(ffwd_rev_shift_spin.get_adjustment().get_value())
+    prefs.ffwd_rev_ctrl = int(ffwd_rev_ctrl_spin.get_adjustment().get_value())
+    prefs.ffwd_rev_caps = int(ffwd_rev_caps_spin.get_adjustment().get_value())
     
     prefs.use_english_always = use_english.get_active()
     prefs.display_splash_screen = disp_splash.get_active()
@@ -327,3 +328,4 @@
         self.shortcuts = "flowblade.xml"
         self.double_track_hights = False
         self.delta_overlay = True
+        self.show_alpha_info_message = True

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editorstate.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editorstate.py Changed

@@ -44,6 +44,11 @@
 CLIP_END_DRAG = 11
 SELECT_TLINE_SYNC_CLIP = 12
 
+
+# SDL version (Not used currently)
+SDL_1 = 1
+SDL_2 = 2
+
 # Project being edited
 project = None
 
@@ -53,6 +58,9 @@
 # Current edit mode
 edit_mode = INSERT_MOVE
 
+# Compositor autofollow state. If true when edit is performed, all compositors are auto resynced on first do, redo and undo actions.
+auto_follow = False
+
 # Trim tool ripple mode is expressed as a flag
 trim_mode_ripple = False
 
@@ -94,8 +102,9 @@
 # Whether to let the user set their user_dir using XDG Base dir spec
 use_xdg = False
 
-# Cursor pos
+# Cursor position and sensitivity
 cursor_on_tline = False
+cursor_is_tline_sensitive = True
 
 # Flag for running JACK audio server. If this is on when SDLConsumer created in mltplayer.py
 # jack rack filter will bw taached to it
@@ -115,7 +124,7 @@
 # Trim view mode
 show_trim_view = appconsts.TRIM_VIEW_OFF
 
-# Remember fade and transition lengths
+# Remember fade and transition lengths for next invocation, users prefer this over one default value.
 fade_length = -1
 transition_length = -1
 
@@ -163,6 +172,9 @@
 def MONITOR_MEDIA_FILE():
     return _monitor_media_file
 
+def auto_follow_active():
+    return auto_follow
+
 def get_track(index):
     return project.c_seq.tracks[index]
 
@@ -180,6 +192,21 @@
     
     return False
 
+def mlt_version_is_equal_or_greater_correct(test_version):
+    runtime_ver = mlt_version.split(".")
+    test_ver = test_version.split(".")
+    
+    if runtime_ver[0] > test_ver[0]:
+        return True
+    elif runtime_ver[0] == test_ver[0]:
+        if runtime_ver[1] > test_ver[1]:
+            return True
+        elif runtime_ver[1] == test_ver[1]:
+            if  runtime_ver[2] >  test_ver[2]:
+                return True
+    
+    return False
+    
 def set_copy_paste_objects(objs):
     global _copy_paste_objects
     _copy_paste_objects = objs
@@ -208,6 +235,12 @@
     
     return False
 
+def screen_size_small_height():
+    if SCREEN_HEIGHT < 898:
+        return True
+    else:
+        return False
+
 def get_cached_trim_clip(path):
     try:
         return _trim_clips_cache[path]
@@ -220,3 +253,13 @@
 def clear_trim_clip_cache():
     global _trim_clips_cache
     _trim_clips_cache = {}
+
+"""
+def get_sdl_version(): # This ain't true anymore, 6.6.0 has both available
+    if mlt_version_is_equal_or_greater_correct("6.4.2") == True:
+        return SDL_2
+    else:
+        return SDL_1
+"""
+        
+

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/editorwindow.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/editorwindow.py Changed

@@ -138,6 +138,16 @@
         ONEROLL_TOOL = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "oneroll_tool.png")
         OVERWRITE_TOOL =  cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "overwrite_tool.png")
 
+        # Context cursors 
+        self.context_cursors = {appconsts.POINTER_CONTEXT_END_DRAG_LEFT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_left.png"), 3, 7),
+                                appconsts.POINTER_CONTEXT_END_DRAG_RIGHT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_right.png"), 14, 7),
+                                appconsts.POINTER_CONTEXT_TRIM_LEFT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_trim_left.png"), 9, 9),
+                                appconsts.POINTER_CONTEXT_TRIM_RIGHT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_trim_right.png"), 9, 9),
+                                appconsts.POINTER_CONTEXT_BOX_SIDEWAYS:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_sideways.png"), 9, 9),
+                                appconsts.POINTER_CONTEXT_COMPOSITOR_MOVE:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_sideways.png"), 9, 9),
+                                appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_LEFT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_left.png"), 9, 9),
+                                appconsts.POINTER_CONTEXT_COMPOSITOR_END_DRAG_RIGHT:(cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "ctx_drag_right.png"), 9, 9)}
+
         # Window
         self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL)
         self.window.set_icon_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")
@@ -228,6 +238,7 @@
             ('RenderMenu', None, _('Render')),
             ('AddToQueue', None, _('Add To Batch Render Queue...'), None, None, lambda a:projectaction.add_to_render_queue()),
             ('BatchRender', None, _('Batch Render Queue'), None, None, lambda a:batchrendering.launch_batch_rendering()),
+            ('ReRenderTransitionsFades', None, _('Rerender All Rendered Transitions And Fades '), None, None, lambda a:tlineaction.rerender_all_rendered_transitions_and_fades()),
             ('Render', None, _('Render Timeline'), None, None, lambda a:projectaction.do_rendering()),
             ('ToolsMenu', None, _('Tools')),
             ('Titler', None, _('Titler'), None, None, lambda a:titler.show_titler()),
@@ -342,6 +353,8 @@
                     <menuitem action='AddToQueue'/>
                     <menuitem action='BatchRender'/>
                     <separator/>
+                    <menuitem action='ReRenderTransitionsFades'/>
+                    <separator/>
                     <menuitem action='Render'/>
                 </menu>
                 <menu action='ToolsMenu'>
@@ -1121,16 +1134,16 @@
             cursor = self.get_own_cursor(display, INSERTMOVE_CURSOR, 0, 0)
         elif mode == editorstate.OVERWRITE_MOVE:
             if editorstate.overwrite_mode_box == False:
-                cursor = self.get_own_cursor(display, OVERWRITE_CURSOR, 6, 15)
+                cursor = self.get_own_cursor(display, OVERWRITE_CURSOR, 0, 0)
             else:
                 cursor = self.get_own_cursor(display, OVERWRITE_BOX_CURSOR, 6, 15)
         elif mode == editorstate.TWO_ROLL_TRIM:
-            cursor = self.get_own_cursor(display, TWOROLL_CURSOR, 11, 9)
+            cursor = self.get_own_cursor(display, TWOROLL_NO_EDIT_CURSOR, 11, 9) 
         elif mode == editorstate.TWO_ROLL_TRIM_NO_EDIT:
             cursor = self.get_own_cursor(display, TWOROLL_NO_EDIT_CURSOR, 11, 9)
         elif mode == editorstate.ONE_ROLL_TRIM:
             if editorstate.trim_mode_ripple == False:
-                cursor = self.get_own_cursor(display, ONEROLL_CURSOR, 9, 9)
+                cursor = self.get_own_cursor(display, ONEROLL_NO_EDIT_CURSOR, 9, 9)
             else:
                 cursor = self.get_own_cursor(display, ONEROLL_RIPPLE_CURSOR, 9, 9)
         elif mode == editorstate.ONE_ROLL_TRIM_NO_EDIT:
@@ -1139,7 +1152,7 @@
             else:
                 cursor = self.get_own_cursor(display, ONEROLL_RIPPLE_CURSOR, 9, 9)
         elif mode == editorstate.SLIDE_TRIM:
-            cursor = self.get_own_cursor(display, SLIDE_CURSOR, 9, 9)
+            cursor = self.get_own_cursor(display, SLIDE_NO_EDIT_CURSOR, 9, 9)
         elif mode == editorstate.SLIDE_TRIM_NO_EDIT:
             cursor = self.get_own_cursor(display, SLIDE_NO_EDIT_CURSOR, 9, 9)
         elif mode == editorstate.SELECT_PARENT_CLIP:
@@ -1149,12 +1162,22 @@
         elif mode == editorstate.MULTI_MOVE:
             cursor = self.get_own_cursor(display, MULTIMOVE_CURSOR, 4, 8)
         elif mode == editorstate.CLIP_END_DRAG:
-            cursor = Gdk.Cursor.new(Gdk.CursorType.SB_H_DOUBLE_ARROW)
+            surface, px, py = self.context_cursors[tlinewidgets.pointer_context]
+            cursor = self.get_own_cursor(display, surface, px, py)
+            #cursor = Gdk.Cursor.new(Gdk.CursorType.SB_H_DOUBLE_ARROW)
         else:
             cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)
         
         gdk_window.set_cursor(cursor)  
-            
+
+    def set_tline_cursor_to_context(self, pointer_context):
+        display = Gdk.Display.get_default()
+        gdk_window = self.window.get_window()
+        
+        surface, px, py = self.context_cursors[pointer_context]
+        cursor = self.get_own_cursor(display, surface, px, py)
+        gdk_window.set_cursor(cursor)
+
     def set_mode_selector_to_mode(self):
         if editorstate.EDIT_MODE() == editorstate.INSERT_MOVE:
             self.modes_selector.set_pixbuf(0)

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/exporting.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/exporting.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/extraeditors.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/extraeditors.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/guicomponents.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/guicomponents.py Changed

@@ -33,6 +33,7 @@
 from gi.repository import Gdk
 from gi.repository import Pango
 from gi.repository import PangoCairo
+from gi.repository import GLib
 
 import appconsts
 import cairoarea
@@ -108,6 +109,7 @@
 media_linker_popup_menu = Gtk.Menu()
 log_event_popup_menu = Gtk.Menu()
 levels_menu = Gtk.Menu()
+clip_effects_hamburger_menu = Gtk.Menu()
 
 # ------------------------------------------------- item lists
 class ImageTextTextListView(Gtk.VBox):
@@ -573,7 +575,7 @@
         self.storemodel.clear()
         for autosave_object in autosaves:
             since_time_str = utils.get_time_str_for_sec_float(autosave_object.age)
-            row_data = ["Autosave created " + since_time_str + " ago."]
+            row_data = [_("Autosave created ") + since_time_str + _(" ago.")]
             self.storemodel.append(row_data)
 
         self.treeview.set_cursor("0")
@@ -768,7 +770,12 @@
     def media_object_selected(self, media_object, widget, event):
         if event.type == Gdk.EventType._2BUTTON_PRESS:
             widget.grab_focus()
-            self.double_click_cb(media_object.media_file)
+            self.clear_selection()
+            media_object.widget.override_background_color(Gtk.StateType.NORMAL, gui.get_selected_bg_color())
+            self.selected_objects.append(media_object)
+            self.widget.queue_draw()
+            GLib.idle_add(self.double_click_cb, media_object.media_file)
+            return
 
         # HACK! We're using event times to exclude double events when icon is pressed
         now = time.time()
@@ -787,7 +794,7 @@
                     self.selected_objects.remove(media_object)
                     bg_color = gui.get_bg_color()
                     media_object.widget.override_background_color(Gtk.StateType.NORMAL, bg_color)
-                    return True
+                    return
                 except:
                     self.selected_objects.append(media_object)
             else:
@@ -1148,13 +1155,17 @@
         _add_separetor(clip_menu)
         
     if track.type == appconsts.VIDEO:
-
+        active = True
+        if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
+            active = False
         clip_menu.add(_get_menu_item(_("Split Audio"), callback,\
-                      (clip, track, "split_audio", event.x), True))
+                      (clip, track, "split_audio", event.x), active))
         if track.id == current_sequence().first_video_index:
             active = True
         else:
             active = False
+        if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
+            active = False
         clip_menu.add(_get_menu_item(_("Split Audio Synched"), callback,\
               (clip, track, "split_audio_synched", event.x), active))
 
@@ -1171,6 +1182,9 @@
     audio_sync_item = _get_menu_item(_("Select Clip to Audio Sync With..."), callback, (clip, track, "set_audio_sync_clip", event.x))
     if utils.is_mlt_xml_file(clip.path) == True:
         audio_sync_item.set_sensitive(False)
+    if clip.media_type == appconsts.IMAGE_SEQUENCE or clip.media_type == appconsts.IMAGE or clip.media_type == appconsts.PATTERN_PRODUCER:
+        audio_sync_item.set_sensitive(False)
+ 
     clip_menu.add(audio_sync_item)
             
     _add_separetor(clip_menu)
@@ -1204,10 +1218,8 @@
     clip_menu.add(_get_menu_item(_("Clear Filters"), callback, (clip, track, "clear_filters", event.x)))
 
     _add_separetor(clip_menu)
-
-    clip_menu.add(_get_menu_item(_("Rename Clip"), callback,\
-                      (clip, track, "rename_clip", event.x)))
-    clip_menu.add(_get_color_menu_item(clip, track, callback))
+    clip_menu.add(_get_clip_properties_menu_item(event, clip, track, callback))
+    clip_menu.add(_get_clip_markers_menu_item(event, clip, track, callback))
     clip_menu.add(_get_menu_item(_("Clip Info"), callback,\
                   (clip, track, "clip_info", event.x)))
 
@@ -1224,11 +1236,12 @@
 
     clip_menu.popup(None, None, None, None, event.button, event.time)
 
-
 def display_transition_clip_popup_menu(event, clip, track, callback):
     clip_menu = transition_clip_menu
     guiutils.remove_children(clip_menu)
 
+    clip_menu.add(_get_menu_item(_("Rerender"), callback, (clip, track, "re_render", event.x)))
+    
     clip_menu.add(_get_menu_item(_("Open in Filters Editor"), callback, (clip, track, "open_in_editor", event.x)))
 
     _add_separetor(clip_menu)
@@ -1325,6 +1338,16 @@
     compositor_menu.add(_get_menu_item(_("Open In Compositor Editor"), callback, ("open in editor",compositor)))
     _add_separetor(compositor_menu)
     compositor_menu.add(_get_menu_item(_("Sync with Origin Clip"), callback, ("sync with origin",compositor)))
+
+    autofollow_item = Gtk.CheckMenuItem()
+    autofollow_item.set_label(_("Obey Auto Follow"))
+    autofollow_item.set_active(compositor.obey_autofollow)
+    autofollow_item.connect("activate", callback, ("set auto follow", compositor))
+    autofollow_item.set_sensitive(editorstate.auto_follow_active())
+    autofollow_item.show()
+
+    compositor_menu.append(autofollow_item)
+    
     _add_separetor(compositor_menu)
     compositor_menu.add(_get_menu_item(_("Delete"), callback, ("delete",compositor)))
     compositor_menu.popup(None, None, None, None, event.button, event.time)
@@ -1517,7 +1540,7 @@
     sub_menu.append(lift_item)
     
     _add_separetor(sub_menu)
-
+    
     length_item = _get_menu_item(_("Set Clip Length..."), callback, (clip, track, "length", event.x))
     sub_menu.append(length_item)
 
@@ -1610,6 +1633,16 @@
     menu_item.show()
     return menu_item
 
+def _get_clip_properties_menu_item(event, clip, track, callback):
+    properties_menu_item = Gtk.MenuItem(_("Properties"))
+    properties_menu =  Gtk.Menu()
+    properties_menu.add(_get_menu_item(_("Rename Clip"), callback,\
+                      (clip, track, "rename_clip", event.x)))
+    properties_menu.add(_get_color_menu_item(clip, track, callback))
+    properties_menu_item.set_submenu(properties_menu)
+    properties_menu_item.show_all()
+    return properties_menu_item
+
 def _get_color_menu_item(clip, track, callback):
     color_menu_item = Gtk.MenuItem(_("Clip Color"))
     color_menu =  Gtk.Menu()
@@ -1624,6 +1657,33 @@
     color_menu_item.show_all()
     return color_menu_item
 
+def _get_clip_markers_menu_item(event, clip, track, callback):
+    markers_menu_item = Gtk.MenuItem(_("Markers"))
+    markers_menu =  Gtk.Menu()
+    markers_exist = len(clip.markers) != 0
+    #menu = markers_menu
+    #guiutils.remove_children(menu)
+    if markers_exist:
+        for i in range(0, len(clip.markers)):
+            marker = clip.markers[i]
+            name, frame = marker
+            item_str = utils.get_tc_string(frame) + " " + name
+            markers_menu.add(_get_menu_item(item_str, callback, (clip, track, "go_to_clip_marker", str(i))))
+        _add_separetor(markers_menu)
+    else:
+        no_markers_item = _get_menu_item(_("No Clip Markers"), callback, "dummy", False)
+        markers_menu.add(no_markers_item)
+        _add_separetor(markers_menu)
+        
+    markers_menu.add(_get_menu_item(_("Add Clip Marker At Playhead Position"), callback, (clip, track, "add_clip_marker", None)))
+    del_item = _get_menu_item(_("Delete Clip Marker At Playhead Position"), callback, (clip, track, "delete_clip_marker", None), markers_exist==True)
+    markers_menu.add(del_item)
+    del_all_item = _get_menu_item(_("Delete All Clip Markers"), callback, (clip, track, "deleteall_clip_markers", None), markers_exist==True)
+    markers_menu.add(del_all_item)
+    markers_menu_item.set_submenu(markers_menu)
+    markers_menu_item.show_all()
+    return markers_menu_item
+
 def _set_non_sensitive_if_state_matches(mutable, item, state):
     if mutable.mute_state == state:
         item.set_sensitive(False)
@@ -2255,9 +2315,28 @@
     menu.popup(None, None, None, None, event.button, event.time)
 
 def get_audio_levels_popup_menu(event, callback):
+    # needs renaming
     menu = levels_menu
     guiutils.remove_children(menu)
 
+    autofollow_item = Gtk.CheckMenuItem()
+    autofollow_item.set_label(_("Compositors Auto Follow"))
+    autofollow_item.set_active(editorstate.auto_follow_active())
+    autofollow_item.connect("activate", callback, "autofollow")
+
+    menu.append(autofollow_item)
+
+    _add_separetor(menu)
+
+    ponter_sensitive_item = Gtk.CheckMenuItem()

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/guiutils.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/guiutils.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot -> flowblade-1.16.tar.gz/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: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,23 +17,23 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr ""
 
-#: app.py:783
+#: app.py:801
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr ""
 
-#: app.py:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr ""
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr ""
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 
@@ -100,6 +100,12 @@
 "\n"
 msgstr ""
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr ""
@@ -110,55 +116,55 @@
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr ""
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr ""
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr ""
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr ""
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr ""
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr ""
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr ""
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr ""
 
-#: projectaction.py:753
+#: projectaction.py:732
 msgid "Render target file exists!"
 msgstr ""
 
-#: projectaction.py:754
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr ""
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -167,483 +173,488 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr ""
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr ""
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr ""
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr ""
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr ""
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr ""
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
 msgstr ""
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr ""
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr ""
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr ""
 
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107
-#: projectaction.py:1115 projectaction.py:1122
+#: projectaction.py:1075 projectaction.py:1077 projectaction.py:1086
+#: projectaction.py:1094 projectaction.py:1101 clipmenuaction.py:144
+#: clipmenuaction.py:146
 msgid "N/A"

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/create_pot -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/create_pot Changed

@@ -7,4 +7,4 @@
 ROOT_DIR=$(pwd)
 
 # Creates .pot file that can be turned to .po file for each language
-xgettext -o locale/Flowblade/flowblade.pot app.py projectaction.py editorwindow.py clipeffectseditor.py compositeeditor.py dialogs.py editevent.py editorpersistance.py guicomponents.py movemodes.py panels.py persistance.py projectdata.py render.py syncsplitevent.py translations.py mlttransitions.py propertyeditorbuilder.py keyframeeditor.py middlebar.py medialog.py projectinfogui.py tools/titler.py rendergui.py profilesmanager.py preferenceswindow.py tools/batchrendering.py proxyediting.py tlineaction.py extraeditors.py trackaction.py medialinker.py patternproducer.py tools/gmic.py tools/gmic.py tools/toolsencoding.py monitorevent.py compositorfades.py audiosync.py diskcachemanagement.py toolsintegration.py projectmediaimport.py shortcuts.py
+xgettext -o locale/Flowblade/flowblade.pot app.py projectaction.py editorwindow.py clipeffectseditor.py compositeeditor.py dialogs.py editevent.py editorpersistance.py guicomponents.py movemodes.py panels.py persistance.py projectdata.py render.py syncsplitevent.py translations.py mlttransitions.py propertyeditorbuilder.py keyframeeditor.py middlebar.py medialog.py projectinfogui.py tools/titler.py rendergui.py profilesmanager.py preferenceswindow.py tools/batchrendering.py proxyediting.py tlineaction.py extraeditors.py trackaction.py medialinker.py patternproducer.py tools/gmic.py tools/gmic.py tools/toolsencoding.py monitorevent.py compositorfades.py audiosync.py diskcachemanagement.py toolsintegration.py projectmediaimport.py shortcuts.py clipmenuaction.py dialogutils.py trimmodes.py menuactions.py exporting.py

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/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: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2017-09-09 21:07+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -19,23 +19,23 @@
 "X-Language: cs_CZ\n"
 "X-Source-Language: C\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Příliš malá obrazovka pro tento program."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Rozměry vaší obrazovky jsou "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Projekt předtím byl uložen"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Uložte projekt před zavření pomocí Soubor → Uložit."
 
@@ -111,6 +111,12 @@
 "Soubory již přítomné:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "Vybraná složka obsahuje soubory"
@@ -122,55 +128,55 @@
 msgstr ""
 "Při ukládání záložního snímku projektu musí být vybraná složka prázdná."
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr "Kopírují se položky záznamů projektu"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "Ukládá se soubor s projektem"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Projekt nebyl na disku nalezen"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "Projekt nelze nahrát."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Projekt nebyl od té doby, co byl otevřen, uložen."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Projekt byl uložen před méně než minutou."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Projekt byl uložen před jednou minutou."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Projekt byl uložen před "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " minutami"
 
-#: projectaction.py:753
+#: projectaction.py:732
 msgid "Render target file exists!"
 msgstr "Cílový soubor se zpracováním existuje!!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr "Potvrdit přepsání stávajícího souboru."
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr "Projekt nyní používá náhradní záznam!"
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -185,27 +191,27 @@
 "\n"
 "Vyberte Potvrdit, aby se přesto provedlo zpracování z náhradního záznamu."
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr "Spuštění zpracování se nezdařilo!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "Zpráva o chybě: "
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "Přidání položky do řady ke zpracování se nezdařilo!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Otevřít..."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr "Otevření souboru .mlt nebo .xml jako záznamu nebylo povoleno!"
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
@@ -215,19 +221,19 @@
 "souborů XML MLT\n"
 "není tyto soubory povoleno otevírat jako záznamy."
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Nebyl vybrán žádný soubor"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "Vyberte číslovaný soubor pro přidání obrázkové řady do projektu."
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "Není souborem řady!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -235,73 +241,74 @@
 "Vybraný soubor nemá ve svém názvu část s číslem.\n"
 "Nemůže to tedy být soubor obrázkové řady."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "Nelze udělat složku pro náhledy z domovské složky"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Vytvořte a vyberte, prosím, nějakou jinou složku než '"
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr "' jako složku pro náhledy"
 
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107
-#: projectaction.py:1115 projectaction.py:1122
+#: projectaction.py:1075 projectaction.py:1077 projectaction.py:1086

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2014-11-23 14:22+0100\n"
 "Last-Translator: Mario Dejanovic <mario.dejanovic@gmx.at>\n"
 "Language-Team: German\n"
@@ -19,23 +19,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Zu kleiner Bildschirm für diese Applikation."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Ihre Auflösung beträgt "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Projekt wurde noch nicht gesichert"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Projekt vor dem Schließen sichern mit 'Datei -> Sichern als...'."
 
@@ -111,6 +111,12 @@
 "Bereits vorhandene Dateien:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "Gewählter Ordner enthält Dateien"
@@ -123,57 +129,57 @@
 "Für das Sichern einer Sicherungskopie muss der gewählte Ordner\n"
 "leer sein."
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr "Kopiere Projektmediendaten"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "Sichere Projektdatei"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Projekt nicht gefunden"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "Projekt kann nicht geladen werden."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Projekt wurde seit dem Öffnen nicht gesichert."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Projekt wurde vor weniger als einer Minute gesichert."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Projekt wurde vor einer Minute gesichert."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Projekt wurde vor "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " Minuten gesichert."
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "Renderbereich nicht definiert!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 #, fuzzy
 msgid "Confirm overwriting existing file."
 msgstr "Wollen Sie die existierende Datei überschreiben?"
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -182,46 +188,46 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr "Renderstart fehlgeschlagen!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "Fehlermeldung: "
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "Hinzufügen eines Elements zur Warteschlange fehlgeschlagen!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Öffnen.."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Keine Datei ausgewählt"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "Datei mit Ziffern wählen, um Bildsequenz in Projekt einzufügen."
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "Keine Sequenz-Datei!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -229,76 +235,77 @@
 "Ausgewählte Datei enthält keine Ziffern,\n"
 "so dass sie keine Bildsequenz-Datei sein kann."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "Kann Ordner für Miniaturen nicht anlegen"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Bitte anderen Ordner erzeugen und wählen, als '"
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr "' für Miniatur-Ordner"
 
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107
-#: projectaction.py:1115 projectaction.py:1122

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2014-02-21 12:08+0200\n"
 "Last-Translator: David Gámiz Jiménez <david.gamiz@gmail.com>\n"
 "Language-Team: David Gamiz Jimenez\n"
@@ -18,24 +18,24 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.0\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "La pantalla es demasiado pequeña para esta aplicación."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Las dimensiones de su pantalla son "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "El proyecto no se ha salvado antes"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Salvar el proyecto en un Archivo -> Salvar como antes de cerrar."
 
@@ -107,6 +107,12 @@
 "\n"
 msgstr " ya existe!"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 #, fuzzy
 msgid "Selected folder contains files"
@@ -118,58 +124,58 @@
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:572
+#: projectaction.py:551
 #, fuzzy
 msgid "Saving project file"
 msgstr "¿Guardar proyecto '"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "El proyecto no se encuentra en el disco"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "El proyecto no puede ser cargado."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "El proyecto no ha sido salvado desde que se abrió."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "El proyecto fue salvado hace menos de un minuto."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "El proyecto fue salvado hace un minuto."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "El proyecto salvado "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " hace minutos."
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "Render rango no definido!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 #, fuzzy
 msgid "Confirm overwriting existing file."
 msgstr "¿Usted desea sobrescribir el archivo existente?"
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -178,49 +184,49 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 #, fuzzy
 msgid "Render launch failed!"
 msgstr "Render rango no definido!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "Mensaje de error:"
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "¡Fallo al añadir un elemento a la cola de renderizado!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Abrir…"
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Ningún archivo seleccionado."
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr ""
 "Seleccione un archivo numerado para agregar una secuencia de imágenes de "
 "Proyecto."
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "¡No hay archivo de secuencia!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -228,76 +234,77 @@
 "El archivo seleccionado no tiene un número de parte en el mismo, \n"
 " so no puede ser un archivo de secuencia de imágenes."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "No se puede hacer la carpeta miniaturas de carpeta home"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Por favor, crear y seleccionar otra carpeta y luego '"
 
-#: projectaction.py:978
+#: projectaction.py:957

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po Changed

@@ -1,39 +1,31 @@
-# Finnish translations for PACKAGE package.
-# Copyright (C) 2011 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Janne Liljeblad <janne@janne-kx557aa-uuw-a6521-sc>, 2011.
-#
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Flowblade\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
-"PO-Revision-Date: 2011-12-13 23:55+0200\n"
-"Last-Translator: Janne Liljeblad <janne@janne-kx557aa-uuw-a6521-sc>\n"
-"Language-Team: Finnish\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: POEditor.com\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Näyttö on liian pieni tälle ohjelmalle."
 
-#: app.py:783
+#: app.py:801
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Minimi näyttökoko tällle ohjelmalle on 1152 x 768.\n"
 
-#: app.py:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Sinun näyttösi koko on "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Projektia ei ole tallennettu aikaisemmin"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 "Tallenna projekti valinnalla Tiedosto -> Tallenna nimellä ennen sulkemista."
@@ -44,21 +36,24 @@
 
 #: projectaction.py:122
 msgid "Path of missing asset:"
-msgstr ""
+msgstr "Puuttuvan median polku:"
 
 #: projectaction.py:123
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
+"Puuttuvien tiedostojen korvausetsintä projektitiedoston alikansioista "
+"epäonnistui."
 
 #: projectaction.py:124
 msgid "To load the project you will need to either:"
-msgstr ""
+msgstr "Ladataksesi projektin tarvitset joko:"
 
 #: projectaction.py:125
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
+"Avaa projekti median uudelleenlinkitys työkalussa ja linkkaa tiedostot, tai"
 
 #: projectaction.py:126
 msgid "Place a file with the same exact name and path on the hard drive"
@@ -67,7 +62,7 @@
 
 #: projectaction.py:127
 msgid "Open project in Media Relinker tool"
-msgstr ""
+msgstr "Avaa projekti Median uudelleenlinkitys työkalussa"
 
 #: projectaction.py:146
 msgid "Profile with Description: '"
@@ -89,7 +84,7 @@
 
 #: projectaction.py:148
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
-msgstr ""
+msgstr "Käyttäjäprofiili luodaan valitsemalla 'Muokkaa->Profiili'"
 
 #: projectaction.py:155
 msgid "Opening"
@@ -97,7 +92,7 @@
 
 #: projectaction.py:288
 msgid "Media files already present in project were opened!"
-msgstr "Avattiin media tiedostoja, jotka jo ovat projektissa"
+msgstr "Avattiin mediatiedostoja, jotka jo ovat projektissa"
 
 #: projectaction.py:294
 msgid ""
@@ -107,6 +102,14 @@
 "Projektissa jo olevat tiedostot:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+"\n"
+"Kaksoiskappaleita mediatiedostoista ei lisätty projektiin."
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "Valitussa kansiossa on tiedostoja"
@@ -119,57 +122,55 @@
 "Kun tallennetaan projektia ja mediaa yhtä aikaa\n"
 "täytyy kansion olla tyhjä."
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr "Kopioidaan mediaa"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "Tallennetaan projektia"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Projektia ei löytynyt kovalevyltä"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "Projektia ei voida ladata."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Projektia ei ole tallennettu aikaisemmin."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Projekti tallennettiin viimeksi alle minuutti sitten."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Projekti tallennettiin viimeksi minuutti sitten."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Projektia ei ole tallennettu aikaisemmin"
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " minuuttia sitten."
 
-#: projectaction.py:753
-#, fuzzy
+#: projectaction.py:732
 msgid "Render target file exists!"
-msgstr "Renderöinti alue ei ole määritelty"
+msgstr "Renderöinti tiedosto on jo olemassa!"
 
-#: projectaction.py:754
-#, fuzzy
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr "Haluatko kirjoittaa olemassa olevan tiedoston päälle?"
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
-msgstr ""
+msgstr "Projekti käyttää proxytiedostoja!"
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -177,47 +178,53 @@
 "\n"
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
+"Proxymediasta rendaaminen tuottaa huonomman lopputuloksen kuin "
+"alkuperäisestä mediasta rendaaminen.\n"
+"\n"
+"Valitse 'Vahvista' rendataksesi proxytiedostoista."
 
-#: projectaction.py:838

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2013-09-20 18:54+0200\n"
 "Last-Translator: Loïc Vanderstichelen <lv@loicvanderstichelen.com>\n"
 "Language-Team: French\n"
@@ -17,23 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Votre écran est trop petit pour cette application."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Votre résolution actuelle est "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Le projet n'a jamais été sauvegardé"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Sauvegardez le projet avec Fichier -> Enregistrer sous."
 
@@ -104,6 +104,12 @@
 "\n"
 msgstr " existe déjà!"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 #, fuzzy
 msgid "Selected folder contains files"
@@ -115,58 +121,58 @@
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:572
+#: projectaction.py:551
 #, fuzzy
 msgid "Saving project file"
 msgstr "Sauvegarder le projet '"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Le projet n'a pas été trouvé sur le disque"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "Le projet ne peut pas être chargé."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Ce projet n'a pas été enregistré depuis qu'il a été ouvert."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Le projet a été sauvegardé il y a moins d'une minute."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Le projet a été sauvegardé il y a une minute."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Le projet a été sauvegardé il y a "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " minutes."
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "Zone de rendu non définie!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 #, fuzzy
 msgid "Confirm overwriting existing file."
 msgstr "Voulez-vous écraser le fichier existant?"
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -175,50 +181,50 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 #, fuzzy
 msgid "Render launch failed!"
 msgstr "Zone de rendu non définie!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 #, fuzzy
 msgid "Error message: "
 msgstr "Message d'erreur: "
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "Echec de l'ajout d'élément à la liste de rendu!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Ouvrir..."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Aucun fichier sélectionné"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr ""
 "Sélectionnez un fichier numéroté pour ajouter une séquence d'images au "
 "projet."
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "Ce n'est pas un fichier de séquence!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -226,76 +232,77 @@
 "Le fichier sélectionné ne contient pas de numérotation,\n"
 "il ne peut donc pas constituer une séquence d'images."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "Le dossier home ne peut pas être le dossier des miniatures"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Créez et sélectionnez un autre dossier '"
 
-#: projectaction.py:978
+#: projectaction.py:957

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/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: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2017-03-24 08:40+0100\n"
 "Last-Translator: Péter Gábor <ptrg@freemail.hu>\n"
 "Language-Team: \n"
@@ -17,23 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Túl kicsi a képernyő az alkalmazás számára."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Az ön képernyőjének felbontása "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "A projekt korábban még nem volt mentve"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 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 "
@@ -113,6 +113,12 @@
 "Már jelenlévő fájlok:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "A választott könyvtár fájlokat tartalmaz"
@@ -125,56 +131,56 @@
 "Egy projekt állapotának mentésekor a választott mappának\n"
 "üresnek kell lennie."
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr "A projekt média összetevőinek másolása"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "Projekt fájl mentése"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "A projekt nem található a lemezen"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "A projekt nem tölthető be."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "A projekt még nem volt mentve a megnyitás óta."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "A projekt kevesebb mint egy perce volt mentve"
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "A projekt egy perce volt mentve."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "A projekt mentése "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " perce történt."
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "Renderelendő tartomány nincs meghatározva!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr ""
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -183,47 +189,47 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr "Nem sikerült elindítani a renderelést!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "Hibaüzenet: "
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "Nem sikerült hozzáadni az elemet a renderelés várólistájához!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Megnyitás..."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Nem lett fájl kiválasztva"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr ""
 "Válasszon egy sorszámozott fájlt, hogy képsorozatot adjon a projekthez."
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "Nem jelenetfájl!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -231,75 +237,76 @@
 "A kiválasztott fájl nem tartalmaz számot a nevében,\n"
 "így nem is lehet képsorozat része."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "A \"Saját mappa\" nem állítható be a bélyegképek mappájaként"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Hozzon létre és válasszon egy másik mappát e helyett '"
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr "' a bélyegképek számára"
 
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107
-#: projectaction.py:1115 projectaction.py:1122

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Floblade Italian Translation 0.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2014-09-15 23:42+0100\n"
 "Last-Translator: Massimo Stella <info@massimostella.it>\n"
 "Language-Team: Italiano\n"
@@ -18,23 +18,23 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Lo schermo è troppo piccolo per questa applicazione."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "La risoluzione corrente è"
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Il progetto non è mai stato salvato"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Salva il progetto da File -> Salva con nome"
 
@@ -106,6 +106,12 @@
 "File già esistenti:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 #, fuzzy
 msgid "Selected folder contains files"
@@ -117,58 +123,58 @@
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:572
+#: projectaction.py:551
 #, fuzzy
 msgid "Saving project file"
 msgstr "Salvo il progetto '"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Il progetto non è stato trovato sul disco"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "Il progetto non può essere caricato."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Questo progetto non è ancora stato salvato dall'apertura."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Il progetto è stato salvato meno di un minuto fa."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Il progetto è stato salvato un minuto fa."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Il progetto è stato salvato"
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " minuti fa."
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "Area di calcolo non definita!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 #, fuzzy
 msgid "Confirm overwriting existing file."
 msgstr "Vuoi sovrascriverlo?"
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -177,47 +183,47 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 #, fuzzy
 msgid "Render launch failed!"
 msgstr "Area di calcolo non definita!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "Messaggio d'errore: "
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "Aggiunta alla coda dei render fallita!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Apri..."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Nessun file selezionato"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "Selezionare un file numerato per aggiungere una sequenza di immagini"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "Questa non è una sequenza!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -225,76 +231,77 @@
 "Il file selezionato non è numerato, \n"
 "quindi non può essere una sequenza di immagini."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "Non si può usare la carella Home per le miniature"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Creare e selezionare una cartella differente da '"
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr "' per le miniature"

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/pl/LC_MESSAGES/flowblade.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2017-05-27 08:50+0200\n"
 "Last-Translator: Stanislaw Polak <polak@icsr.agh.edu.pl>\n"
 "Language-Team: Polish\n"
@@ -17,23 +17,23 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Zbyt mały ekran dla tej aplikacji."
 
-#: app.py:783
+#: app.py:801
 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:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "Wymiary twojego ekranu to "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Projekt nie został wcześniej zapisany"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Przed zamknięciem, zapisz projekt za pomocą Plik -> Zapisz jako."
 
@@ -110,6 +110,12 @@
 "Pliki, które już występują:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "Wybrany folder zawiera pliki"
@@ -122,56 +128,56 @@
 "Podczas zapisywania kopii migawkowej projektu, wybrany folder\n"
 "musi być pusty."
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr "Kopiowanie zasobów multimedialnych projektu"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "Zapisywanie pliku projektu"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Nie znaleziono projektu na dysku"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "Nie można załadować projektu."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Od czasu jego otwarcia projekt nie został zapisany."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Projekt został zapisany mniej niż minutę temu."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Projekt został zapisany minutę temu."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Projekt został zapisany "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " minut temu."
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "Niezdefiniowany zakres renderowania"
 
-#: projectaction.py:754
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr ""
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -180,27 +186,27 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr "Renderowanie nie powiodło się!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "Komunikat o błędzie: "
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "Dodawanie elementu do kolejki renderowania nie powiodło się!"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "Otwórz.."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr "Otwarcie pliku .mlt lub .xml jako multimediów było niedozwolone!"
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
@@ -210,19 +216,19 @@
 "projektu, podczas otwierania plików MLT XML\n"
 "nie wolno otwierać tych plików jako multimediów."
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "Nie wybrano żadnego pliku"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "Wybierz numerowany plik, aby dodać sekwencję obrazów do projektu."
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "Nie jest plikem sekwencji!"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -230,75 +236,76 @@
 "Wybrany plik nie posiada numerów,\n"
 "więc nie może on być plikiem sekwencji obrazów."
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "Nie można utworzyć folderu miniatur"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "Proszę utworzyć i wybrać inny folder niż '"
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr "' jako folder miniatur"
 
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107
-#: projectaction.py:1115 projectaction.py:1122

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/ru/LC_MESSAGES/flowblade.po Changed

@@ -1,40 +1,41 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Николай Смольянинов <smolianinow.colya2016@yandex.ru>, 2017.
+# Russian translations for Flowblade package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Flowblade package.
+# Николай Смольянинов <smolianinow.colya2016@yandex.ru>, 2017, 2018.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Flowblade\n"
+"Project-Id-Version: Flowblade 1.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-04 15:30+0300\n"
-"PO-Revision-Date: 2017-09-17 22:05+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
+"PO-Revision-Date: 2018-03-06 11:31+0300\n"
 "Last-Translator: Николай Смольянинов <smolianinow.colya2016@yandex.ru>\n"
-"Language-Team: Russian\n"
+"Language-Team: vk.com/flowblade\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 2.0.6\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "Недостаточное разрешение экрана."
 
-#: app.py:783
+#: app.py:801
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "Разрешение экрана должно быть не ниже 1152 х 768.\n"
 
-#: app.py:784
+#: app.py:802
 msgid "Your screen dimensions are "
-msgstr "Ваше разрешение экрана"
+msgstr "Ваше разрешение экрана "
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "Проект не был сохранён"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "Сохраните проект перед закрытием (Файл ⇨ Сохранить как...)."
 
@@ -44,33 +45,32 @@
 
 #: projectaction.py:122
 msgid "Path of missing asset:"
-msgstr "Путь к недостающему активу"
+msgstr "Путь к недостающему активу:"
 
 #: projectaction.py:123
 msgid ""
 "Relative search for replacement file in sub folders of project file failed."
 msgstr ""
-"Относительный поиск пути для замены файла во вложенных папках файла проекта "
-"не удался."
+"Поиск по относительному пути для замены файла в подпапках проекта не удался."
 
 #: projectaction.py:124
 msgid "To load the project you will need to either:"
-msgstr "Для загрузки проекта требуется, либо:"
+msgstr "Для загрузки проекта выполните одно из действий:"
 
 #: projectaction.py:125
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
-"Откройте проект в инструменте \"Перелинковщике медиа\" для повторной связи "
-"ресурсов медиа с новыми файлами или"
+"Откройте проект в инструменте \"Перелинковщик медиа\" для повторной связи "
+"ресурсов медиа с новыми файлами"
 
 #: projectaction.py:126
 msgid "Place a file with the same exact name and path on the hard drive"
-msgstr "Создать резервный файл с тем же именем и содержанием"
+msgstr "Создайте резервный файл с тем же именем и содержанием"
 
 #: projectaction.py:127
 msgid "Open project in Media Relinker tool"
-msgstr "Проект открыт в Перелинковщике медиа"
+msgstr "Открыть проект в Перелинковщике медиа"
 
 #: projectaction.py:146
 msgid "Profile with Description: '"
@@ -112,6 +112,14 @@
 "Файлы уже присутствуют:\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+"\n"
+"Дублирующие медиафайлы не были добавлены в проект."
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "Выбранная папка содержит файлы"
@@ -124,55 +132,55 @@
 "При сохранении резервной копии проекта, выбираемая папка\n"
 "должна быть пустой."
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
-msgstr "Копирование медиа-активов проекта"
+msgstr "Копирование медиа активов проекта"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "Сохранение файла проекта"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "Проект не найден"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
-msgstr "Невозможно загрузить проект"
+msgstr "Невозможно загрузить проект."
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "Открыт несохранённый проект."
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "Проект был сохранён менее минуты назад."
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "Проект был сохранён минуту назад."
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "Проект был сохранён "
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr " минут назад."
 
-#: projectaction.py:753
+#: projectaction.py:732
 msgid "Render target file exists!"
 msgstr "Целевой файл существует!"
 
-#: projectaction.py:754
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr "Подтвердите перезапись существующего файла."
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr "В проекте используются прокси-клипы!"
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -183,32 +191,32 @@
 "Качество выходного видео собранного из прокси-клипов будет ниже, чем "
 "собранного из\n"
 " оригинальных клипов. Для улучшения качества сборки в Менеджере прокси "
-"выберете \n"
+"выберите \n"
 "Использование оригинальных клипов. \n"
 "\n"
 "Выберите «Подтвердить» для сборки из прокси-клипов."
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr "Не удалось запустить сборку!"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.mo -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.mo Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/locale/zh_CN/LC_MESSAGES/flowblade.po -> flowblade-1.16.tar.gz/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: 2017-10-04 15:30+0300\n"
+"POT-Creation-Date: 2018-03-31 17:55+0300\n"
 "PO-Revision-Date: 2017-04-15 18:47+0800\n"
 "Last-Translator: wu <laowudebox@126.com>\n"
 "Language-Team: Language LANGUAGE\n"
@@ -16,23 +16,23 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.py:780
+#: app.py:798
 msgid "Too small screen for this application."
 msgstr "对于这个应用，画面太小。"
 
-#: app.py:783
+#: app.py:801
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr "对于这个应用，最小画面尺寸是1152 x 768.\n"
 
-#: app.py:784
+#: app.py:802
 msgid "Your screen dimensions are "
 msgstr "你的画面尺寸是"
 
-#: app.py:817 projectaction.py:380 projectaction.py:714
+#: app.py:835 projectaction.py:380 projectaction.py:693
 msgid "Project has not been saved previously"
 msgstr "项目还未被保存过"
 
-#: app.py:818 projectaction.py:381 projectaction.py:715
+#: app.py:836 projectaction.py:381 projectaction.py:694
 msgid "Save project with File -> Save As before closing."
 msgstr "保存项目为 -> 与关闭之前一致"
 
@@ -103,6 +103,12 @@
 "文件已经发送\n"
 "\n"
 
+#: projectaction.py:301
+msgid ""
+"\n"
+"No duplicate media items were added to project."
+msgstr ""
+
 #: projectaction.py:495
 msgid "Selected folder contains files"
 msgstr "选中的目录包含文件"
@@ -115,56 +121,56 @@
 "当保存一个项目的快照备份时，被选中的目录\n"
 "必须为空。"
 
-#: projectaction.py:571
+#: projectaction.py:550
 msgid "Copying project media assets"
 msgstr "正在复制相关项目媒体"
 
-#: projectaction.py:572
+#: projectaction.py:551
 msgid "Saving project file"
 msgstr "正在保存项目文件"
 
-#: projectaction.py:727
+#: projectaction.py:706
 msgid "Project not found on disk"
 msgstr "项目未在磁盘找到"
 
-#: projectaction.py:728
+#: projectaction.py:707
 msgid "Project can't be loaded."
 msgstr "项目不能被加载。"
 
-#: projectaction.py:736
+#: projectaction.py:715
 msgid "Project has not been saved since it was opened."
 msgstr "由于被打开，项目未被保存"
 
-#: projectaction.py:741
+#: projectaction.py:720
 msgid "Project was saved less than a minute ago."
 msgstr "不到1分钟之前，项目已被保存"
 
-#: projectaction.py:744
+#: projectaction.py:723
 msgid "Project was saved one minute ago."
 msgstr "1分钟之前，项目已被保存"
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid "Project was saved "
 msgstr "项目已被保存"
 
-#: projectaction.py:746
+#: projectaction.py:725
 msgid " minutes ago."
 msgstr "几分钟之前"
 
-#: projectaction.py:753
+#: projectaction.py:732
 #, fuzzy
 msgid "Render target file exists!"
 msgstr "渲染范围未明确"
 
-#: projectaction.py:754
+#: projectaction.py:733
 msgid "Confirm overwriting existing file."
 msgstr ""
 
-#: projectaction.py:760
+#: projectaction.py:739
 msgid "Project is currently using proxy media!"
 msgstr ""
 
-#: projectaction.py:761
+#: projectaction.py:740
 msgid ""
 "Rendering from proxy media will produce worse quality than rendering from "
 "original media.\n"
@@ -173,46 +179,46 @@
 "Select 'Confirm' to render from proxy media anyway."
 msgstr ""
 
-#: projectaction.py:838
+#: projectaction.py:817
 msgid "Render launch failed!"
 msgstr "导致启动失败！"
 
-#: projectaction.py:839 projectaction.py:853 tools/batchrendering.py:299
+#: projectaction.py:818 projectaction.py:832 tools/batchrendering.py:301
 msgid "Error message: "
 msgstr "错误信息"
 
-#: projectaction.py:852
+#: projectaction.py:831
 msgid "Adding item to render queue failed!"
 msgstr "添加条款导致列队失败！"
 
-#: projectaction.py:871
+#: projectaction.py:850
 msgid "Open.."
 msgstr "打开.."
 
-#: projectaction.py:896
+#: projectaction.py:875
 msgid "Opening .mlt or .xml file as media was disallowed!"
 msgstr ""
 
-#: projectaction.py:897
+#: projectaction.py:876
 msgid ""
 "Because of current MLT behaviour of overwriting projct properties when "
 "opening MLT XML files\n"
 "it is not allowed to open these files as media."
 msgstr ""
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "No file was selected"
 msgstr "未选中文件"
 
-#: projectaction.py:917
+#: projectaction.py:896
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "选择一个编号的文件，给项目添加一个影像序列。"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid "Not a sequence file!"
 msgstr "不是序列文件！"
 
-#: projectaction.py:925
+#: projectaction.py:904
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -220,73 +226,74 @@
 "选择的文件没有编号部分。\n"
 "所以它不能作为一个影像序列文件。"
 
-#: projectaction.py:976
+#: projectaction.py:955
 msgid "Can't make home folder thumbnails folder"
 msgstr "不能生成家目录缩略图目录"
 
-#: projectaction.py:977 dialogs.py:395
+#: projectaction.py:956 dialogs.py:440
 msgid "Please create and select some other folder then '"
 msgstr "请之后创建和选择其他一些目录'"
 
-#: projectaction.py:978
+#: projectaction.py:957
 msgid "' as thumbnails folder"
 msgstr "'作为缩略图目录’"
 
-#: projectaction.py:1096 projectaction.py:1098 projectaction.py:1107
-#: projectaction.py:1115 projectaction.py:1122
+#: projectaction.py:1075 projectaction.py:1077 projectaction.py:1086

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/medialinker.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/medialinker.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/medialog.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/medialog.py Changed

@@ -90,12 +90,13 @@
 # ----------------------------------------------------------- dnd drop
 def clips_drop(clips):
     for clip in clips:
-        if clip.media_type == appconsts.VIDEO or clip.media_type == appconsts.AUDIO:
+        if clip.media_type == appconsts.VIDEO or clip.media_type == appconsts.AUDIO or clip.media_type == appconsts.IMAGE_SEQUENCE:
             log_event = MediaLogEvent(  appconsts.MEDIA_LOG_MARKS_SET,
                                         clip.clip_in,
                                         clip.clip_out,
                                         clip.name,
                                         clip.path)
+            log_event.ttl = clip.ttl
             editorstate.PROJECT().media_log.append(log_event)
     _update_list_view(log_event)
     
@@ -137,6 +138,8 @@
                                 media_file.mark_out,
                                 media_file.name,
                                 media_file.path)
+    log_event.ttl = media_file.ttl
+
     editorstate.PROJECT().media_log.append(log_event)
     editorstate.PROJECT().add_to_group(_get_current_group_index(), [log_event])
     _update_list_view(log_event)
@@ -270,8 +273,12 @@
     do_multiple_clip_insert_func(track, clips, tline_pos)
 
 def get_log_event_clip(log_event):
-    # currently quarateed not to be a pattern producer
-    new_clip = editorstate.current_sequence().create_file_producer_clip(log_event.path)
+    # pre versions 1.16 do not have this attr in log_event objects
+    if not hasattr(log_event, "ttl"):
+        log_event.ttl = None
+
+    # currently quaranteed not to be a pattern producer
+    new_clip = editorstate.current_sequence().create_file_producer_clip(log_event.path, None, False, log_event.ttl)
         
     # Set clip in and out points
     new_clip.clip_in = log_event.mark_in

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/menuactions.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/menuactions.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/mltfilters.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/mltfilters.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/mltplayer.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/mltplayer.py Changed

@@ -43,7 +43,8 @@
 class Player:
     
     def __init__(self, profile):
-    
+        #self.consumer = None
+
         self.init_for_profile(profile)
         
         self.ticker = utils.Ticker(self._ticker_event, TICKER_DELAY)
@@ -73,6 +74,12 @@
         """
         Creates consumer with sdl output to a gtk+ widget.
         """
+        # SDL 2 consumer is created after
+        #if editorstate.get_sdl_version() == editorstate.SDL_2:
+        #    print "refuse SDL1 consumer"
+        #    return
+
+        print "Create SDL1 consumer..."
         # Create consumer and set params
         self.consumer = mlt.Consumer(self.profile, "sdl")
         self.consumer.set("real_time", 1)
@@ -82,14 +89,39 @@
 
         # Hold ref to switch back from rendering
         self.sdl_consumer = self.consumer 
+
+    """
+    def create_sdl2_video_consumer(self):
+
+        widget = gui.editor_window.tline_display
+        self.set_sdl_xwindow(widget)
+        
+        # Create consumer and set params
+        self.consumer = mlt.Consumer(self.profile, "sdl")
+        self.consumer.set("real_time", 1)
+        self.consumer.set("rescale", "bicubic") # MLT options "nearest", "bilinear", "bicubic", "hyper"
+        self.consumer.set("resize", 1)
+        self.consumer.set("progressive", 1)
+        self.consumer.set("window_id", str(self.xid))
+        alloc = gui.editor_window.tline_display.get_allocation()
+        self.consumer.set("window_width", str(alloc.width))
+        self.consumer.set("window_height", str(alloc.height))
+        self.consumer.set("window_type", "widget")
+        self.consumer.set("renderer_type", "software")
+        # Hold ref to switch back from rendering
+        self.sdl_consumer = self.consumer 
         
+        self.connect_and_start()
+    """
+    
     def set_sdl_xwindow(self, widget):
         """
         Connects SDL output to display widget's xwindow
         """
         os.putenv('SDL_WINDOWID', str(widget.get_window().get_xid()))
+        #self.xid = widget.get_window().get_xid()
         Gdk.flush()
-    
+
     def set_tracktor_producer(self, tractor):
         """
         Sets a MLT producer from multitrack timeline to be displayed.
@@ -104,7 +136,22 @@
     def refresh(self): # Window events need this to get picture back
         self.consumer.stop()
         self.consumer.start()
-
+   
+        """
+        if self.consumer == None:
+            return 
+        if editorstate.get_sdl_version() == editorstate.SDL_2:
+            alloc = gui.editor_window.tline_display.get_allocation()
+            self.consumer.set("window_width", str(alloc.width))
+            self.consumer.set("window_height", str(alloc.height))
+            
+            self.consumer.stop()
+            self.consumer.start()
+        else:
+            self.consumer.stop()
+            self.consumer.start()
+        """
+        
     def is_stopped(self):
         return (self.producer.get_speed() == 0)
         
@@ -116,6 +163,9 @@
         """
         Connects current procer and consumer and
         """
+        #if self.consumer == None:
+        #    return 
+
         self.consumer.purge()
         self.producer.set_speed(0)
         self.consumer.connect(self.producer)
@@ -241,6 +291,9 @@
         return (self.producer.get_speed() != 0)
 
     def _ticker_event(self):
+        #if self.consumer == None:
+        #    return 
+            
         # Stop ticker if playback has stopped.
         if (self.consumer.is_stopped() or self.producer.get_speed() == 0):
             self.ticker.stop_ticker()

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/mlttransitions.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/mlttransitions.py Changed

@@ -169,7 +169,7 @@
         name, comp_type = fade
         name_for_type[comp_type] = name
         
-    # change this, tuples are not need we only need list of translatd names
+    # Rendered transition names and types
     rendered_transitions = [  (_("Dissolve"), RENDERED_DISSOLVE), 
                               (_("Wipe"), RENDERED_WIPE),
                               (_("Color Dip"), RENDERED_COLOR_DIP),
@@ -199,7 +199,7 @@
         # Property args saved in propertyname -> propertyargs_string dict
         self.property_args = propertyparse.node_list_to_args_dict(p_node_list)
         
-        #  Extra editors that handle properties that have been set "no_editor"
+        #  Extra editors handle properties that have been set "no_editor"
         e_node_list = compositor_node.getElementsByTagName(EXTRA_EDITOR)
         self.extra_editors = propertyparse.node_list_to_extraeditors_array(e_node_list)  
 
@@ -288,7 +288,6 @@
         self.mlt_transition.set("a_track", str(a_track))
         self.mlt_transition.set("b_track", str(b_track))
 
-
     def set_target_track(self, a_track, force_track):
         self.a_track = a_track
         self.mlt_transition.set("a_track", str(a_track))
@@ -323,7 +322,8 @@
         self.name = None # ducktyping as clip for property editors
         self.selected = False
         self.origin_clip_id = None
-        
+        self.obey_autofollow = True
+    
         self.destroy_id = os.urandom(16) # HACK, HACK, HACK - find a way to remove this stuff  
                                          # Compositors are recreated often in Sequence.restack_compositors()
                                          # and cannot be destroyd in undo/redo with object identidy.
@@ -450,7 +450,7 @@
     
     # New from clip
     if orig_from.media_type != appconsts.PATTERN_PRODUCER:
-        from_clip = current_sequence.create_file_producer_clip(orig_from.path)# File producer
+        from_clip = current_sequence.create_file_producer_clip(orig_from.path, None, False, orig_from.ttl)# File producer
     else:
         from_clip = current_sequence.create_pattern_producer(orig_from.create_data) # pattern producer
     current_sequence.clone_clip_and_filters(orig_from, from_clip)
@@ -458,7 +458,7 @@
     # New to clip
     if not(transition_type == RENDERED_FADE_IN or transition_type == RENDERED_FADE_OUT): # fades to not use to_clip
         if orig_to.media_type != appconsts.PATTERN_PRODUCER:
-            to_clip = current_sequence.create_file_producer_clip(orig_to.path)# File producer
+            to_clip = current_sequence.create_file_producer_clip(orig_to.path, None, False, orig_to.ttl)# File producer
         else:
             to_clip = current_sequence.create_pattern_producer(orig_to.create_data) # pattern producer
         current_sequence.clone_clip_and_filters(orig_to, to_clip)
@@ -488,7 +488,7 @@
             from_clip.clip_in = 0
             from_clip.clip_out = length
             
-    # Add clips to tracks and create keyframe string to contron mixing
+    # Add clips to tracks and create keyframe string for mixing
     if transition_type == RENDERED_DISSOLVE or transition_type == RENDERED_WIPE:
         # Add clips. Images and pattern producers always fill full track.
         if from_clip.media_type != appconsts.IMAGE and from_clip.media_type != appconsts.PATTERN_PRODUCER:

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/panels.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/panels.py Changed

@@ -409,6 +409,123 @@
 
     return (alignment, type_combo_box, length_entry, encodings_cb, quality_cb, wipe_luma_combo_box, color_button)
 
+def get_transition_re_render_panel(trans_data):
+    transition_length = trans_data["clip"] .clip_out - trans_data["clip"].clip_in + 1 # +1 out inclusive
+    transition_length_label = Gtk.Label(label=_("Length:"))
+    transition_length_value = Gtk.Label(label=str(transition_length))
+    transition_length_row = get_two_column_box(transition_length_label, transition_length_value)
+
+    # Encoding widgets
+    encodings_cb = Gtk.ComboBoxText()
+    for encoding in renderconsumer.encoding_options:
+        encodings_cb.append_text(encoding.name)
+    encodings_cb.set_active(0)
+
+    quality_cb = Gtk.ComboBoxText()
+    transition_widgets = (encodings_cb, quality_cb)
+    encodings_cb.connect("changed", 
+                              lambda w,e: _transition_encoding_changed(transition_widgets), 
+                              None)
+    _fill_transition_quality_combo_box(transition_widgets, 10)
+    
+    _set_saved_encoding(transition_widgets)
+
+    transition_vbox = Gtk.VBox(False, 2)
+    transition_vbox.pack_start(transition_length_row, False, False, 0)
+   
+    enconding_vbox = Gtk.VBox(False, 2)
+    enconding_vbox.pack_start(encodings_cb, False, False, 0)
+    enconding_vbox.pack_start(quality_cb, False, False, 0)
+    
+    vbox = Gtk.VBox(False, 2)
+    vbox.pack_start(get_named_frame(_("Transition"),  transition_vbox), True, True, 0)
+    vbox.pack_start(get_named_frame(_("Encoding"),  enconding_vbox), True, True, 0)
+
+    alignment = guiutils.set_margins(vbox, 12, 24, 12, 12)
+    alignment.set_size_request(450, 200)
+    
+    return (alignment, encodings_cb, quality_cb)
+
+def get_fade_re_render_panel(trans_data):
+    fade_length = trans_data["clip"] .clip_out - trans_data["clip"].clip_in + 1 # +1 out inclusive
+    fade_length_label = Gtk.Label(label=_("Length:"))
+    fade_length_value = Gtk.Label(label=str(fade_length))
+    fade_length_row = get_two_column_box(fade_length_label, fade_length_value)
+
+    # Encoding widgets
+    encodings_cb = Gtk.ComboBoxText()
+    for encoding in renderconsumer.encoding_options:
+        encodings_cb.append_text(encoding.name)
+    encodings_cb.set_active(0)
+
+    quality_cb = Gtk.ComboBoxText()
+    transition_widgets = (encodings_cb, quality_cb)
+    encodings_cb.connect("changed", 
+                              lambda w,e: _transition_encoding_changed(transition_widgets), 
+                              None)
+    _fill_transition_quality_combo_box(transition_widgets, 10)
+    
+    _set_saved_encoding(transition_widgets)
+
+    fade_vbox = Gtk.VBox(False, 2)
+    fade_vbox.pack_start(fade_length_row, False, False, 0)
+   
+    enconding_vbox = Gtk.VBox(False, 2)
+    enconding_vbox.pack_start(encodings_cb, False, False, 0)
+    enconding_vbox.pack_start(quality_cb, False, False, 0)
+    
+    vbox = Gtk.VBox(False, 2)
+    vbox.pack_start(get_named_frame(_("Fade"),  fade_vbox), True, True, 0)
+    vbox.pack_start(get_named_frame(_("Encoding"),  enconding_vbox), True, True, 0)
+
+    alignment = guiutils.set_margins(vbox, 12, 24, 12, 12)
+    alignment.set_size_request(450, 200)
+    
+    return (alignment, encodings_cb, quality_cb)
+
+def get_re_render_all_panel(rerender_list, unrenderable):
+    rerendercount_label = Gtk.Label(label=_("Transitions / Fades to be rerendered:"))
+    rerendercount_value = Gtk.Label(label=str(len(rerender_list)))
+    rerendercount_row = get_two_column_box(rerendercount_label, rerendercount_value)
+    
+    if unrenderable > 0:
+        unrenderable_info = _("There are ") + str(unrenderable) + _(" Transitions / Fades that cannot be rerendered, either because they are\ncreated with Flowblade version <=1.14 or the source clips are no longer on timeline.")
+        unrenderable_info_label = Gtk.Label(unrenderable_info)
+        
+    info_vbox = Gtk.VBox(False, 2)
+    info_vbox.pack_start(rerendercount_row, False, False, 0)
+    if unrenderable > 0:
+        info_vbox.pack_start(guiutils.pad_label(12,12), False, False, 0)
+        info_vbox.pack_start(unrenderable_info_label, False, False, 0)
+    
+    # Encoding widgets
+    encodings_cb = Gtk.ComboBoxText()
+    for encoding in renderconsumer.encoding_options:
+        encodings_cb.append_text(encoding.name)
+    encodings_cb.set_active(0)
+
+    quality_cb = Gtk.ComboBoxText()
+    transition_widgets = (encodings_cb, quality_cb)
+    encodings_cb.connect("changed", 
+                              lambda w,e: _transition_encoding_changed(transition_widgets), 
+                              None)
+    _fill_transition_quality_combo_box(transition_widgets, 10)
+    
+    _set_saved_encoding(transition_widgets)
+   
+    enconding_vbox = Gtk.VBox(False, 2)
+    enconding_vbox.pack_start(encodings_cb, False, False, 0)
+    enconding_vbox.pack_start(quality_cb, False, False, 0)
+    
+    vbox = Gtk.VBox(False, 2)
+    vbox.pack_start(get_named_frame(_("Info"),  info_vbox), True, True, 0)
+    vbox.pack_start(get_named_frame(_("Encoding"),  enconding_vbox), True, True, 0)
+
+    alignment = guiutils.set_margins(vbox, 12, 24, 12, 12)
+    alignment.set_size_request(450, 120)
+    
+    return (alignment, encodings_cb, quality_cb)
+    
 def get_fade_panel(fade_data):
     type_combo_box = Gtk.ComboBoxText()    
     type_combo_box.append_text(_("Fade In"))

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/persistance.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/persistance.py Changed

@@ -38,6 +38,7 @@
 from gi.repository import Gdk
 
 import appconsts
+import atomicfile
 import editorstate
 import editorpersistance
 import mltprofiles
@@ -115,7 +116,7 @@
     """
     Creates pickleable project object
     """
-    print "Save project " + os.path.basename(file_path)
+    print "Saving project..."  # + os.path.basename(file_path)
     
     # Get shallow copy
     s_proj = copy.copy(project)
@@ -128,8 +129,8 @@
         s_proj.profile_desc = changed_profile_desc
         _xml_new_paths_for_profile_change = {} # dict acts also as a flag to show that profile change save is happening
         new_profile = mltprofiles.get_profile(changed_profile_desc)
-        print "Saving changed profile project: ", changed_profile_desc
-        print "FPS conversion multiplier:", _fps_conv_mult
+        #print "Saving changed profile project: ", changed_profile_desc
+        #print "FPS conversion multiplier:", _fps_conv_mult
     else:
         _xml_new_paths_for_profile_change = None # None value acts also as a flag to show that profile change save is _not_ happening
 
@@ -157,7 +158,7 @@
             new_xml_file_path = _save_changed_xml_file(s_media_file, new_profile)
             _xml_new_paths_for_profile_change[s_media_file.path] = new_xml_file_path
             s_media_file.path = new_xml_file_path
-            print "XML path replace for media:", s_media_file.path,  new_xml_file_path
+            #print "XML path replace for media:", s_media_file.path,  new_xml_file_path
 
         # Remove unpicleable attrs
         remove_attrs(s_media_file, MEDIA_FILE_REMOVE)
@@ -194,8 +195,9 @@
     remove_attrs(s_proj, PROJECT_REMOVE)
 
     # Write out file.
-    write_file = file(file_path, "wb")
-    pickle.dump(s_proj, write_file)
+    with atomicfile.AtomicFileWriter(file_path, "wb") as afw:
+        write_file = afw.get_file()
+        pickle.dump(s_proj, write_file)
 
 def get_p_sequence(sequence):
     """
@@ -250,11 +252,12 @@
     if _xml_new_paths_for_profile_change != None and hasattr(s_clip, "path") and s_clip.path != None and utils.is_mlt_xml_file(s_clip.path) == True:
         try:
             new_path = _xml_new_paths_for_profile_change[s_clip.path]
-            print "XML path replace for clip:", s_clip.path, new_path
+            #print "XML path replace for clip:", s_clip.path, new_path
             s_clip.path = new_path
         except:
             # Something is really wrong, this should not be possible
-            print "Failed to find a new XML file for path:", s_clip.path
+            # print "Failed to find a new XML file for path:", s_clip.path
+            pass 
 
     # Set 'type' attribute for MLT object type
     # This IS NOT USED anywhere anymore and should be removed.
@@ -376,9 +379,9 @@
     uuid_str = md5.new(str(os.urandom(32))).hexdigest()
     new_xml_file_path = folder + "/"+ uuid_str + ".xml"
 
-    new_xml_file = open(new_xml_file_path, "w")
-    new_xml_file.write(new_xml_text)
-    new_xml_file.close()
+    with atomicfile.AtomicFileWriter(new_xml_file_path, "w") as afw:
+        new_xml_file = afw.get_file()
+        new_xml_file.write(new_xml_text)
     
     return new_xml_file_path
 
@@ -418,9 +421,10 @@
 
     # Add MLT objects to sequences.
     global all_clips, sync_clips
+    seq_count = 1
     for seq in project.sequences:
         FIX_N_TO_3_SEQUENCE_COMPATIBILITY(seq)
-        _show_msg(_("Building sequence ") + seq.name)
+        _show_msg(_("Building sequence ") + str(seq_count))
         all_clips = {}
         sync_clips = []
                 
@@ -432,6 +436,8 @@
         if not hasattr(seq, "seq_len"):
             seq.update_edit_tracks_length()
 
+        seq_count = seq_count + 1
+
     all_clips = {}
     sync_clips = []
 
@@ -451,7 +457,10 @@
         # This attr was added for 1.8. It is not computed for older projects.
         if (not hasattr(media_file, "info")):
             media_file.info = None
-    
+        # We need this in all media files, used only by img seq media
+        if not hasattr(media_file, "ttl"):
+            media_file.ttl = None
+                
     if(not hasattr(project, "update_media_lengths_on_load")):
         project.update_media_lengths_on_load = True # old projects < 1.10 had wrong media length data which just was never used.
                                                     # 1.10 needed that data for the first time and required recreating it correctly for older projects
@@ -498,7 +507,9 @@
             # Keeping backwards compability
             if SAVEFILE_VERSION < 3:
                 FIX_N_TO_3_COMPOSITOR_COMPABILITY(py_compositor, SAVEFILE_VERSION)
-        
+            if not hasattr(py_compositor, "obey_autofollow"): # "obey_autofollow" attr was added for 1.16
+                py_compositor.obey_autofollow = True
+                
             # Create new compositor object
             compositor = mlttransitions.create_compositor(py_compositor.type_id)                                        
             compositor.create_mlt_objects(seq.profile)
@@ -511,6 +522,7 @@
             compositor.transition.set_tracks(py_compositor.transition.a_track, py_compositor.transition.b_track)
             compositor.set_in_and_out(py_compositor.clip_in, py_compositor.clip_out)
             compositor.origin_clip_id = py_compositor.origin_clip_id
+            compositor.obey_autofollow = py_compositor.obey_autofollow
            
             mlt_compositors.append(compositor)
 
@@ -553,7 +565,15 @@
         # Add color attribute if not found
         if not hasattr(clip, "color"):
             clip.color = None
+            
+        # Add markers list if not found
+        if not hasattr(clip, "markers"):
+            clip.markers = []
 
+        # Add img seq ttl value for all clips if not found, we need this present in every clip so we test for 'clip.ttl == None' to get stuff working
+        if not hasattr(clip, "ttl"):
+            clip.ttl = None
+            
         # normal clip
         if (clip.is_blanck_clip == False and (clip.media_type != appconsts.PATTERN_PRODUCER)):
             orig_path = clip.path # Save the path for error message
@@ -563,7 +583,8 @@
             else:
                 clip.path = get_img_seq_media_path(clip.path, _load_file_path)
                 
-            mlt_clip = sequence.create_file_producer_clip(clip.path)
+            mlt_clip = sequence.create_file_producer_clip(clip.path, None, False, clip.ttl)
+            
             if mlt_clip == None:
                 raise FileProducerNotFoundError(orig_path)
             mlt_clip.__dict__.update(clip.__dict__)
@@ -699,11 +720,11 @@
         for filename in fnmatch.filter(filenames, asset_file_name):
             matches.append(os.path.join(root, filename))
     if len(matches) == 1:
-        print "relative path for: ", asset_file_name
+        #print "relative path for: ", asset_file_name
         return matches[0]
     elif  len(matches) > 1:
         # some error handling may be needed?
-        print "relative path for: ", asset_file_name
+        #print "relative path for: ", asset_file_name
         return matches[0]
     else:
         return NOT_FOUND # no relative path found
@@ -721,7 +742,7 @@
         look_up_path = root + "/" + look_up_file_name
         listing = glob.glob(look_up_path)
         if len(listing) > 0:
-            print "relative path for: ", asset_file_name
+            #print "relative path for: ", asset_file_name
             return root + "/" + asset_file_name
 
     return NOT_FOUND # no relative path found

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py Changed

@@ -50,6 +50,7 @@
 
     gen_opts_panel, gen_opts_widgets = _general_options_panel(_thumbs_select_clicked, _renders_select_clicked)
     edit_prefs_panel, edit_prefs_widgets = _edit_prefs_panel()
+    playback_prefs_panel, playback_prefs_widgets  = _playback_prefs_panel()
     view_pres_panel, view_pref_widgets = _view_prefs_panel()
     # Jan-2017 - SvdB
     performance_panel, performance_widgets = _performance_panel()
@@ -60,12 +61,13 @@
     notebook.set_size_request(PREFERENCES_WIDTH, PREFERENCES_HEIGHT)
     notebook.append_page(gen_opts_panel, Gtk.Label(label=_("General")))
     notebook.append_page(edit_prefs_panel, Gtk.Label(label=_("Editing")))
+    notebook.append_page(playback_prefs_panel, Gtk.Label(label=_("Playback")))
     notebook.append_page(view_pres_panel, Gtk.Label(label=_("View")))
     notebook.append_page(performance_panel, Gtk.Label(label=_("Performance")))
     #notebook.append_page(shortcuts_panel, Gtk.Label(label=_("Shortcuts")))
     guiutils.set_margins(notebook, 4, 24, 6, 0)
 
-    dialog.connect('response', _preferences_dialog_callback, (gen_opts_widgets, edit_prefs_widgets, view_pref_widgets, \
+    dialog.connect('response', _preferences_dialog_callback, (gen_opts_widgets, edit_prefs_widgets, playback_prefs_widgets, view_pref_widgets, \
         performance_widgets))
     dialog.vbox.pack_start(notebook, True, True, 0)
     dialogutils.set_outer_margins(dialog.vbox)
@@ -162,12 +164,6 @@
     prefs = editorpersistance.prefs
 
     # Widgets
-    auto_play_in_clip_monitor = Gtk.CheckButton()
-    auto_play_in_clip_monitor.set_active(prefs.auto_play_in_clip_monitor)
-
-    auto_center_on_stop = Gtk.CheckButton()
-    auto_center_on_stop.set_active(prefs.auto_center_on_play_stop)
-
     spin_adj = Gtk.Adjustment(prefs.default_grfx_length, 1, 15000, 1)
     gfx_length_spin = Gtk.SpinButton()
     gfx_length_spin.set_adjustment(spin_adj)
@@ -193,12 +189,6 @@
     cover_delete = Gtk.CheckButton()
     cover_delete.set_active(prefs.trans_cover_delete)
     
-    # Jul-2016 - SvdB - For play_pause button
-    play_pause_button = Gtk.CheckButton()
-    # The following test is to make sure play_pause can be used for the initial value. If not found, then leave uninitialized
-    if hasattr(prefs, 'play_pause'):
-        play_pause_button.set_active(prefs.play_pause)    
-    
     active = 0
     if prefs.mouse_scroll_action_is_zoom == False:
         active = 1
@@ -210,7 +200,53 @@
     hide_file_ext_button = Gtk.CheckButton()
     if hasattr(prefs, 'hide_file_ext'):
         hide_file_ext_button.set_active(prefs.hide_file_ext)
+    
+    # Layout
+    row4 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Graphics default length:")), gfx_length_spin, PREFERENCES_LEFT))
+    row5 = _row(guiutils.get_checkbox_row_box(trim_exit_on_empty, Gtk.Label(label=_("Trim Modes exit on empty click"))))
+    row6 = _row(guiutils.get_checkbox_row_box(quick_enter_trim, Gtk.Label(label=_("Quick enter Trim Modes"))))
+    row7 = _row(guiutils.get_checkbox_row_box(remember_clip_frame, Gtk.Label(label=_("Remember Monitor Clip Frame"))))
+    row8 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Media drag'n'drop action on non-V1 tracks")), overwrite_clip_drop, PREFERENCES_LEFT))
+    row9 = _row(guiutils.get_checkbox_row_box(cover_delete, Gtk.Label(label=_("Cover Transition/Fade clips on delete if possible"))))
+    # Jul-2016 - SvdB - For play_pause button
+    row11 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Mouse Middle Button Scroll Action")), mouse_scroll_action, PREFERENCES_LEFT))
+    row12 = _row(guiutils.get_checkbox_row_box(hide_file_ext_button, Gtk.Label(label=_("Hide file extensions when importing Clips"))))
+    # Apr-2017 - SvdB - For Fast Forward / Reverse options
+    
+    vbox = Gtk.VBox(False, 2)
+    vbox.pack_start(row5, False, False, 0)
+    vbox.pack_start(row6, False, False, 0)
+    vbox.pack_start(row4, False, False, 0)
+    vbox.pack_start(row7, False, False, 0)
+    vbox.pack_start(row9, False, False, 0)
+    vbox.pack_start(row8, False, False, 0)
+    vbox.pack_start(row11, False, False, 0)
+    vbox.pack_start(row12, False, False, 0)
+    vbox.pack_start(Gtk.Label(), True, True, 0)
+
+    guiutils.set_margins(vbox, 12, 0, 12, 12)
+
+    # Jul-2016 - SvdB - Added play_pause_button
+    # Apr-2017 - SvdB - Added ffwd / rev values
+    return vbox, (gfx_length_spin, trim_exit_on_empty, quick_enter_trim, remember_clip_frame, overwrite_clip_drop, cover_delete,
+                  mouse_scroll_action, hide_file_ext_button)
+
+def _playback_prefs_panel():
+    prefs = editorpersistance.prefs
+
+    # Widgets
+    auto_play_in_clip_monitor = Gtk.CheckButton()
+    auto_play_in_clip_monitor.set_active(prefs.auto_play_in_clip_monitor)
 
+    auto_center_on_stop = Gtk.CheckButton()
+    auto_center_on_stop.set_active(prefs.auto_center_on_play_stop)
+    
+    # Jul-2016 - SvdB - For play_pause button
+    play_pause_button = Gtk.CheckButton()
+    # The following test is to make sure play_pause can be used for the initial value. If not found, then leave uninitialized
+    if hasattr(prefs, 'play_pause'):
+        play_pause_button.set_active(prefs.play_pause)    
+    
     auto_center_on_updown = Gtk.CheckButton()
     auto_center_on_updown.set_active(prefs.center_on_arrow_move)
     
@@ -243,16 +279,8 @@
     row1 = _row(guiutils.get_checkbox_row_box(auto_play_in_clip_monitor, Gtk.Label(label=_("Autoplay new Clips in Clip Monitor"))))
     row2 = _row(guiutils.get_checkbox_row_box(auto_center_on_stop, Gtk.Label(label=_("Center Current Frame on Playback Stop"))))
     row13 = _row(guiutils.get_checkbox_row_box(auto_center_on_updown, Gtk.Label(label=_("Center Current Frame after Up/Down Arrow"))))
-    row4 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Graphics default length:")), gfx_length_spin, PREFERENCES_LEFT))
-    row5 = _row(guiutils.get_checkbox_row_box(trim_exit_on_empty, Gtk.Label(label=_("Trim Modes exit on empty click"))))
-    row6 = _row(guiutils.get_checkbox_row_box(quick_enter_trim, Gtk.Label(label=_("Quick enter Trim Modes"))))
-    row7 = _row(guiutils.get_checkbox_row_box(remember_clip_frame, Gtk.Label(label=_("Remember Monitor Clip Frame"))))
-    row8 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Media drag'n'drop action on non-V1 tracks")), overwrite_clip_drop, PREFERENCES_LEFT))
-    row9 = _row(guiutils.get_checkbox_row_box(cover_delete, Gtk.Label(label=_("Cover Transition/Fade clips on delete if possible"))))
     # Jul-2016 - SvdB - For play_pause button
     row10 = _row(guiutils.get_checkbox_row_box(play_pause_button, Gtk.Label(label=_("Enable single Play/Pause button"))))
-    row11 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Mouse Middle Button Scroll Action")), mouse_scroll_action, PREFERENCES_LEFT))
-    row12 = _row(guiutils.get_checkbox_row_box(hide_file_ext_button, Gtk.Label(label=_("Hide file extensions when importing Clips"))))
     # Apr-2017 - SvdB - For Fast Forward / Reverse options
     row14 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Fast Forward / Reverse Speed for Shift Key:")), ffwd_rev_shift_spin, PREFERENCES_LEFT))
     row14.set_tooltip_text(_("Speed of Forward / Reverse will be multiplied by this value if Shift Key is held (Only using KEYS).\n" \
@@ -266,19 +294,11 @@
     row16.set_tooltip_text(_("Speed of Forward / Reverse will be multiplied by this value if Caps Lock is set (Only using KEYS)."))
     
     vbox = Gtk.VBox(False, 2)
-    vbox.pack_start(row5, False, False, 0)
-    vbox.pack_start(row6, False, False, 0)
     vbox.pack_start(row1, False, False, 0)
     vbox.pack_start(row2, False, False, 0)
     vbox.pack_start(row13, False, False, 0)
-    vbox.pack_start(row4, False, False, 0)
-    vbox.pack_start(row7, False, False, 0)
-    vbox.pack_start(row8, False, False, 0)
-    vbox.pack_start(row9, False, False, 0)
     # Jul-2016 - SvdB - For play_pause button
     vbox.pack_start(row10, False, False, 0)
-    vbox.pack_start(row11, False, False, 0)
-    vbox.pack_start(row12, False, False, 0)
     # Apr-2017 - SvdB - For ffwd / rev speed
     vbox.pack_start(row14, False, False, 0)
     vbox.pack_start(row15, False, False, 0)
@@ -289,11 +309,10 @@
 
     # Jul-2016 - SvdB - Added play_pause_button
     # Apr-2017 - SvdB - Added ffwd / rev values
-    return vbox, (auto_play_in_clip_monitor, auto_center_on_stop, gfx_length_spin,
-                  trim_exit_on_empty, quick_enter_trim, remember_clip_frame, overwrite_clip_drop, cover_delete,
-                  play_pause_button, mouse_scroll_action, hide_file_ext_button, auto_center_on_updown,
+    return vbox, (auto_play_in_clip_monitor, auto_center_on_stop, 
+                  play_pause_button, auto_center_on_updown,
                   ffwd_rev_shift_spin, ffwd_rev_ctrl_spin, ffwd_rev_caps_spin)
-
+                  
 def _view_prefs_panel():
     prefs = editorpersistance.prefs

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/projectaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/projectaction.py Changed

@@ -298,7 +298,7 @@
     if len(duplicates) > MAX_DISPLAYED_ITEMS:
         secondary_txt = secondary_txt + "\n" + "and " + str(len(duplicates) - MAX_DISPLAYED_ITEMS) + " other items.\n"
     
-    secondary_txt = secondary_txt +  "\nNo duplicate media items were added to project."
+    secondary_txt = secondary_txt +  _("\nNo duplicate media items were added to project.")
     
     dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
     return False
@@ -538,27 +538,6 @@
     else:
         dialog.destroy()
         
-""" Feature disabled, maybe reactivated later
-def change_profile_to_match_media(media_file):
-    dialogs.change_profile_project_to_match_media_dialog(PROJECT(), media_file, _change_project_profile_to_match_media_callback)
-
-def _change_project_profile_to_match_media_callback(dialog, response_id, match_profile_index, out_folder, project_name_entry):
-    if response_id == Gtk.ResponseType.ACCEPT:
-        folder = "/" + out_folder.get_uri().lstrip("file:/")
-        name = project_name_entry.get_text()
-        profile = mltprofiles.get_profile_for_index(match_profile_index)
-        path = folder + "/" + name
-        
-        PROJECT().update_media_lengths_on_load = True # saved version needs to do this
-        
-        persistance.save_project(PROJECT(), path, profile.description()) #<----- HERE
-
-        PROJECT().update_media_lengths_on_load = False
-
-        dialog.destroy()
-    else:
-        dialog.destroy()
-"""
 
 class SnaphotSaveThread(threading.Thread):
     
@@ -911,7 +890,7 @@
 
     file_chooser, spin = data
     frame_file = file_chooser.get_filename()
-    dialog.destroy()
+    ttl = int(spin.get_value())
     
     if frame_file == None:
         dialogutils.info_message(_("No file was selected"), _("Select a numbered file to add an Image Sequence to Project."), gui.editor_window.window)
@@ -953,9 +932,9 @@
     dialog.destroy()
 
     resource_path = folder + "/" + resource_name_str
-    length = highest_number_part - int(number_part)
+    length = (highest_number_part - int(number_part)) * ttl
 
-    PROJECT().add_image_sequence_media_object(resource_path, file_name + "(img_seq)", length)
+    PROJECT().add_image_sequence_media_object(resource_path, file_name + "(img_seq)", length, ttl)
 
     gui.media_list_view.fill_data_model()
     gui.bin_list_view.fill_data_model()
@@ -1072,7 +1051,7 @@
 
 def _display_file_info(media_file):
     # get info
-    clip = current_sequence().create_file_producer_clip(media_file.path)
+    clip = current_sequence().create_file_producer_clip(media_file.path, None, False, media_file.ttl)
     info = utils.get_file_producer_info(clip)
 
     width = info["width"]

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/projectdata.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/projectdata.py Changed

@@ -61,13 +61,14 @@
 
 thumbnailer = None
 
-_project_properties_default_values = {appconsts.P_PROP_TLINE_SHRINK_VERTICAL:False,
-                                      appconsts.P_PROP_DISSOLVE_GROUP_FADE_IN:-1,
-                                      appconsts.P_PROP_DISSOLVE_GROUP_FADE_OUT:-1,
-                                      appconsts.P_PROP_ANIM_GROUP_FADE_IN:-1,
-                                      appconsts.P_PROP_ANIM_GROUP_FADE_OUT:-1,
-                                      appconsts.P_PROP_LAST_RENDER_SELECTIONS: None,
-                                      appconsts.P_PROP_TRANSITION_ENCODING: None}
+_project_properties_default_values = {appconsts.P_PROP_TLINE_SHRINK_VERTICAL:False, # Shink timeline max height if < 9 tracks
+                                      appconsts.P_PROP_DISSOLVE_GROUP_FADE_IN:-1, # not used, dropped feature (auto fades on creation)
+                                      appconsts.P_PROP_DISSOLVE_GROUP_FADE_OUT:-1, # not used, dropped feature (auto fades on creation)
+                                      appconsts.P_PROP_ANIM_GROUP_FADE_IN:-1, # not used, dropped feature (auto fades on creation)
+                                      appconsts.P_PROP_ANIM_GROUP_FADE_OUT:-1, # not used, dropped feature (auto fades on creation)
+                                      appconsts.P_PROP_LAST_RENDER_SELECTIONS: None, # tuple for last render selections data
+                                      appconsts.P_PROP_TRANSITION_ENCODING: None,  # tuple for last renderered transition render selections data
+                                      appconsts.P_PROP_AUTO_FOLLOW: False} # Global compositor auto follow
 
 class Project:
     """
@@ -112,10 +113,12 @@
         thumbnailer = Thumbnailer()
         thumbnailer.set_context(self.profile)
 
-    def add_image_sequence_media_object(self, resource_path, name, length):
+    def add_image_sequence_media_object(self, resource_path, name, length, ttl):
+        print resource_path
         media_object = self.add_media_file(resource_path)
         media_object.length = length
         media_object.name = name
+        media_object.ttl = ttl
 
     def add_media_file(self, file_path, compound_clip_name=None):
         """
@@ -148,6 +151,7 @@
         # Create media file object
         media_object = MediaFile(self.next_media_file_id, file_path, 
                                  clip_name, media_type, length, icon_path, info)
+        media_object.ttl = None
 
         self._add_media_object(media_object)
         
@@ -299,8 +303,8 @@
             except:
                 return None # No default values for all properties exist, action value decided at callsite in that case
 
-    def set_project_property(self, key, value):
-        self.project_properties[key] = value
+    def set_project_property(self, property_name, value):
+        self.project_properties[property_name] = value
 
             
 class MediaFile:

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/proxyediting.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/proxyediting.py Changed

@@ -448,18 +448,30 @@
             if is_proxy_file > 0:
                 text = _("You are trying to create proxies for ") + str(not_video_files) + _(" proxy file(s).\n")
                 rows = rows + self.issues_str() + text
-            issues_box = dialogutils.get_warning_message_dialog_panel("There are some issues with proxy render request", 
+            issues_box = dialogutils.get_warning_message_dialog_panel(_("There are some issues with proxy render request"), 
                                                                     rows,
                                                                     True)
+  
+            proxy_mode = editorstate.PROJECT().proxy_data.proxy_mode
+            if proxy_mode == appconsts.USE_PROXY_MEDIA:
+                info_label = Gtk.Label(_("<b>Rerendering proxies currently not possible!</b>\nChange to 'Use Original Media' mode to rerender proxies."))
+                info_label.set_use_markup(True)
+                info_row = guiutils.get_left_justified_box([guiutils.get_pad_label(24, 10), info_label])
+
             self.action_select = Gtk.ComboBoxText()
 
             self.action_select.append_text(_("Render Unrendered Possible & Use existing"))
-            self.action_select.append_text(_("Rerender All Possible" ))
+            if proxy_mode != appconsts.USE_PROXY_MEDIA:
+                self.action_select.append_text(_("Rerender All Possible" ))
             self.action_select.set_active(0)
+                            
             action_row = guiutils.get_left_justified_box([guiutils.get_pad_label(24, 10), Gtk.Label(label=_("Select Render Action: ")), self.action_select])
 
             info_box = Gtk.VBox()
             info_box.pack_start(issues_box, False, False, 0)
+            if proxy_mode == appconsts.USE_PROXY_MEDIA:
+                info_box.pack_start(info_row, False, False, 0)
+                info_box.pack_start(guiutils.get_pad_label(12, 24), False, False, 0)
             info_box.pack_start(action_row, False, False, 0)
 
         guiutils.set_margins(info_box, 12, 48, 12, 0)

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/render.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/render.py Changed

@@ -312,9 +312,10 @@
         _preset_selection_changed()
         widgets.args_panel.opts_save_button.set_sensitive(False)
         widgets.args_panel.opts_load_button.set_sensitive(False)
-        widgets.args_panel.load_selection_button.set_sensitive(False)
-        widgets.args_panel.opts_view.set_sensitive(False)
-        widgets.args_panel.opts_view.get_buffer().set_text("")
+        if editorstate.screen_size_small_height() == False:
+            widgets.args_panel.load_selection_button.set_sensitive(False)
+            widgets.args_panel.opts_view.set_sensitive(False)
+            widgets.args_panel.opts_view.get_buffer().set_text("")
 
 def _out_profile_changed():
     selected_index = widgets.profile_panel.out_profile_combo.widget.get_active()
@@ -410,8 +411,13 @@
         if media_file.is_proxy_file == True:
             source_path = media_file.second_file_path
 
-        fr_path = "framebuffer:" + source_path + "?" + str(speed)
-        motion_producer = mlt.Producer(profile, None, str(fr_path))
+        motion_producer = mlt.Producer(profile, None, str("timewarp:" + str(speed) + ":" + str(source_path)))
+        if motion_producer.is_valid() == False:
+            print "Using framebuffer producer, no sound."
+            fr_path = "framebuffer:" + source_path + "?" + str(speed)
+            motion_producer = mlt.Producer(profile, None, str(fr_path))
+        else:
+            print "Using timewarp producer, sound available."
         mltrefhold.hold_ref(motion_producer)
         
         # Create sequence and add motion producer into it
@@ -420,7 +426,7 @@
         track = seq.tracks[seq.first_video_index]
         track.append(motion_producer, 0, motion_producer.get_length() - 1)
 
-        print "motion clip render starting..."
+        print "Motion clip render starting..."
 
         consumer = renderconsumer.get_render_consumer_for_encoding_and_quality(write_file, profile, encoding_option_index, quality_option_index)
         
@@ -585,7 +591,7 @@
     end_frame = transition_producer.get_length() - 1
         
     # Launch render
-    # TODO: fix naming this isn't motion renderer
+    # TODO: fix naming, this isn't motion renderer
     global motion_renderer, motion_progress_update
     motion_renderer = renderconsumer.FileRenderPlayer(write_file, transition_producer, consumer, start_frame, end_frame)
     motion_renderer.start()

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/rendergui.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/rendergui.py Changed

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/clip_marker.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_drag_left.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_drag_right.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_sideways.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_trim_left.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/ctx_trim_right.png Added

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png Changed

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/hamburger_big.png Added

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_active.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_not_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/kf_not_active.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/oneroll_noedit_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/slide_noedit_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/darktheme/tworoll_noedit_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/filters/compositors.xml -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/filters/compositors.xml Changed

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/gmic/gmic2scripts.xml Added

@@ -0,0 +1,2565 @@
+<gmic>
+    
+    <gmicscript>
+        <name>Charcoal</name>
+        <group>Black and White</group>
+        <script>-fx_charcoal 65,70,170,0,1,0,50,70,255,255,255,0,0,0,0,0</script>
+    </gmicscript>
+    
+    <gmicscript>
+        <name>Glow 2</name>
+        <group>Glow</group>
+        <script>-glow 10%</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Pencil Portrait</name>
+        <group>Drawing</group>
+        <script>-fx_pencil_portraitbw 30,120,1,0.5,144,79,21,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Ink Wash</name>
+        <group>Black and White</group>
+        <script>-fx_ink_wash 0.14,23,0,0.5,0.54,2.25,0,2,6,5,20</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Dither BW</name>
+        <group>Black and White</group>
+        <script>-ditheredbw</script>
+    </gmicscript>
+    
+    <gmicscript>
+        <name>Angular Blur</name>
+        <group>Blur</group>
+        <script>-blur_angular 10</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Rodilius</name>
+        <group>Glow</group>
+        <script>-rodilius 20,5,200,17,2,1</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Cartoon</name>
+        <group>Painting</group>
+        <script>-cartoon 3,200,20,0.25,1.5,8,0</script>
+    </gmicscript>
+    
+    <gmicscript>
+        <name>Circlism</name>
+        <group>Painting</group>
+        <script>-fx_circle_abstraction 8,5,0.8,0,1,1,1,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Poster Hope</name>
+        <group>Painting</group>
+        <script>-fx_poster_hope 0,3,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Polygonize</name>
+        <group>Geometric</group>
+        <script>-fx_polygonize 300,10,10,10,10,0,0,0,255,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Pen Drawing</name>
+        <group>Drawing</group>
+        <script>-fx_pen_drawing 10,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Feltpen</name>
+        <group>Drawing</group>
+        <script>-fx_feltpen 300,50,1,0.1,20,5,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Fractalize</name>
+        <group>Special Effect</group>
+        <script>-fractalize 0.8</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Rotate Tiles</name>
+        <group>Transform</group>
+        <script>-fx_rotate_tiles 5,5,15,3,3,1.8</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Shift Tiles</name>
+        <group>Transform</group>
+        <script>-fx_shift_tiles 10,10,10,1</script>
+    </gmicscript>
+    
+    <gmicscript>
+        <name>Imagegrid</name>
+        <group>Transform</group>
+        <script>-fx_imagegrid 10,10</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Whirl</name>
+        <group>Artistic</group>
+        <script>-draw_whirl 20,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Warhol</name>
+        <group>Painting</group>
+        <script>-warhol 3,3,2,40</script>
+    </gmicscript>
+    
+    <gmicscript>
+        <name>Shapeism</name>
+        <group>Geometric</group>
+        <script>-fx_shapeism 2,7,0.38,0,1,5,32,8,3,1,5,0.5,1,0,0,0,255</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Poster Edges</name>
+        <group>Edges</group>
+        <script>-fx_poster_edges 20,60,5,0,10,0,0,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Delaunay</name>
+        <group>Geometric</group>
+        <script>-fx_delaunay 5,75,1,3,0,0,0,128,1,1,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Painting</name>
+        <group>Painting</group>
+        <script>-fx_painting 5,2.5,1.5,50,1,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Lylejk</name>
+        <group>Painting</group>
+        <script>-fx_lylejk_painting 10,2,4,10,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Kuwahara</name>
+        <group>Painting</group>
+        <script>-fx_kuwahara 2,5,0,0,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Color Abstraction</name>
+        <group>Painting</group>
+        <script>-fx_color_abstraction 1,10,0.2,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Stamp</name>
+        <group>Black and White</group>
+        <script>-fx_stamp 1,50,0,0,0,0,1,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Sketch</name>
+        <group>Drawing</group>
+        <script>-fx_sketchbw 2,45,180,30,1,0.03,0,0.6,0.1,0.6,0.25,1,0,1,0,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>PencilBW</name>
+        <group>Black and White</group>
+        <script>-fx_pencilbw 0.3,60,0,0,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Hough Sketch</name>
+        <group>Black and White</group>
+        <script>-fx_houghsketchbw 1.25,10,5,80,0.1,0,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Hard Sketch</name>
+        <group>Drawing</group>
+        <script>-fx_hardsketchbw 300,50,1,0.1,20,0,0,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Engrave</name>
+        <group>Black and White</group>
+        <script>-fx_engrave 0.5,50,0,8,40,0,0,0,10,1,0,0,0,1,0</script>
+    </gmicscript>
+
+    <gmicscript>
+        <name>Segment Watershed</name>
+        <group>Painting</group>
+        <script>-fx_segment_watershed 2,1,0,0,0</script>
+    </gmicscript>

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/help/compositor.html -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/help/compositor.html Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/help/edit_tools.html -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/help/edit_tools.html Changed

@@ -56,6 +56,16 @@
 	</ul>
 </ol>
 
+<h4>Cursor context sensitive changes</h4>
+<p>
+When cursor changes appenrance you have access to some different edit actions.
+</p>
+<ul>
+<li> <b>Cursor changes on clip's end.</b> You can drag clip's end to lengthen or shorten it.</li>
+<li> <b>Cursor changes on Compositor's end.</b> You can drag Compositor's end to lengthen or shorten it.</li>
+<li> <b>Cursor changes on Compositor.</b> You can move Compositor.</li>
+</ul>
+
 <a id="overwrite"></a>
 <h3>Overwrite Tool</h3>
 
@@ -81,6 +91,16 @@
 	</ul>
 </ol>
 
+<h4>Cursor context sensitive changes</h4>
+<p>
+When cursor changes appenrance you have access to some different edit actions.
+</p>
+<ul>
+<li> <b>Cursor changes on clip's end.</b> You can drag clip's end to lengthen or shorten it.</li>
+<li> <b>Cursor changes on Compositor's end.</b> You can drag Compositor's end to lengthen or shorten it.</li>
+<li> <b>Cursor changes on Compositor.</b> You can move Compositor.</li>
+</ul>
+
 <a id="trim"></a>
 <h3>Trim Tool</h3>
 <p>
@@ -93,22 +113,17 @@
 	</ul>
 <li> Select trimmed cut and select new in or out frame</li>
 	<ul>
-	<li> Press with <b>Left Mouse</b> on a clip near the side you wish to trim</li>
+	<li> Press with <b>Left Mouse</b> on a clip near the side you wish to trim. Cursor changes appearance to show which end of clip is to be trimmed.</li>
 	<li> Continue on to <b>Left drag</b> on clip to select new in or out frame</li>
 	</ul>
 <li> View trimmed cut</li>
 	<ul>
 	<li> Press <b>Play Loop</b> button to view edit.</li>
 	</ul>
-<li> Select new trim from another clip</li>
+<li> Select new trim</li>
 	<ul>
 	<li> Click with <b>Left Mouse</b> on another clip near the side you wish to trim</li>
 	</ul>
-<li> Select other end of same clip to trim</li>
-	<ul>
-	<li> Click on empty space on the Timeline</li>
-	<li> Click with <b>Left Mouse</b> on the original clip near the side you wish to trim</li>
-	</ul>
 </ol>
 
 <a id="rippletrim"></a>
@@ -213,7 +228,7 @@
 	</ul>
 <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>Press <b>Left Mouse</b> inside the box selection and drag the box into new position on timeline and release mouse. Cursor changes when inside selected area to show that you now move selected items.</li>
 <li>Box contents are overwritten on new position and Compositors are moved.</li>
 
 </ol>

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/help/rendering.html -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/help/rendering.html Changed

@@ -32,19 +32,21 @@
 <h3>Rendering Panel</h3>
 
 <h4>Widgets</h4>
-
-<h5>Folder select button</h5> <div class="r-widget">Select folder to place the output file in.</div>
-<h5>Name entry widget</h5> <div class="r-widget">Set the name of the output file.</div>
-<h5>Type drop down menu</h5> <div class="r-widget">Select between rendering with user defined parameter or use preset render params and file types.</div>
-<h5>Presets drop down menu</h5> <div class="r-widget">Select preset rendering params and file type.</div>
-<h5>Encoding / File Type drop down menu</h5> <div class="r-widget">Select encoding and container format for rendering.</div>
-<h5>Bitrate drop down menu</h5> <div class="r-widget">Select bitrate for rendering.</div>
-<h5>Render Using Args check box</h5> <div class="r-widget">Rendering using arguments set in text edit area below.</div>
-<h5>Args text area</h5> <div class="r-widget">Set arguments for rendering.</div>
-<h5>Load Selection button</h5> <div class="r-widget">Load rendering arguments defined in left panel into args text area.</div>
-<h5>Ext entry widget drop down menu</h5> <div class="r-widget">Set file extension for args rendered file.</div>
-<h5>Open File In Bin check box</h5> <div class="r-widget">Open the rendererd file as media item in current bin.</div>
-<h5>Render Range drop down menu</h5> <div class="r-widget">OSelect between rending the complete program or the marked range.</div>
+<h5><b>Folder</b> select button</h5> <div class="r-widget">Select folder to place the output file in.</div>
+<h5><b>Name</b> entry widget</h5> <div class="r-widget">Set the name of the output file.</div>
+<h5><b>Type</b> drop down menu</h5> <div class="r-widget">Select between rendering with user defined parameter or use preset render params and file types.</div>
+<h5><b>Presets</b> drop down menu</h5> <div class="r-widget">Select preset rendering params and file type.</div>
+<h5><b>Use Project Profile</b> check box</h5> <div class="r-widget">Uncheck to select some other then project profile to used for rendered video.</div>
+<h5><b>Profile</b> drop down menu</h5> <div class="r-widget">Select project profile for rendering</div>
+<h5><b>Encoding / File Type</b> drop down menu</h5> <div class="r-widget">Select encoding and container format for rendering.</div>
+<h5><b>Bitrate</b> drop down menu</h5> <div class="r-widget">Select bitrate for rendering.</div>
+<h5><b>Render Using Args</b> check box</h5> <div class="r-widget">Rendering using arguments set in text edit area below.</div>
+<h5><b>Args</b> text area</h5> <div class="r-widget">Set arguments for rendering.</div>
+<h5><b>Load Selection</b> button</h5> <div class="r-widget">Load rendering arguments defined in left panel into args text area.</div>
+<h5><b>Ext</b> entry widget drop down menu</h5> <div class="r-widget">Set file extension for args rendered file.</div>
+<h5><b>Open File In Bin</b> check box</h5> <div class="r-widget">Open the rendererd file as media item in current bin.</div>
+<h5><b>Render Range</b> drop down menu</h5> <div class="r-widget">Select between rending the complete program or the marked range.</div>
+<h5><b>Render</b> button</h5> <div class="r-widget">Renders timeline into a file.</div>
 </ul>
 
 <h4>Rendering output</h4>

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/clip_marker.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_drag_left.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_drag_right.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_sideways.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_trim_left.png Added

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/ctx_trim_right.png Added

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png Changed

flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/hamburger_big.png Added

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/kf_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/kf_active.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/kf_not_active.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/kf_not_active.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/oneroll_noedit_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/overwrite_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/overwrite_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/slide_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/slide_noedit_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/res/img/tworoll_noedit_cursor.png -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/res/img/tworoll_noedit_cursor.png Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/respaths.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/respaths.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/sequence.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/sequence.py Changed

@@ -232,7 +232,7 @@
         # Mix all audio to track 1 by combining them one after another 
         # using an always active field transition.
         if ((new_track.id > AUDIO_MIX_DOWN_TRACK) # black bg or track1 it's self does not need to be mixed
-            and (is_hidden == False)): # We actually do want hidden track to cover all audio below, which happens if it is not mixed.
+            and (is_hidden == False)): # We actually do want the hidden track to cover all audio below, which happens if it is not mixed.
             self._mix_audio_for_track(new_track)
         
         # Add method that returns track name
@@ -380,11 +380,11 @@
         return True
 
     # -------------------------------------------------- clips
-    def create_file_producer_clip(self, path, new_clip_name=None, novalidate=False):
+    def create_file_producer_clip(self, path, new_clip_name=None, novalidate=False, ttl=None):
         """
         Creates MLT Producer and adds attributes to it, but does 
         not add it to track/playlist object.
-        """
+        """        
         producer = mlt.Producer(self.profile, str(path)) # this runs 0.5s+ on some clips
         if novalidate == True:
             producer.set("mlt_service", "avformat-novalidate")
@@ -398,12 +398,18 @@
         if new_clip_name != None:
             producer.name = new_clip_name
         producer.media_type = get_media_type(path)
+
         if producer.media_type == FILE_DOES_NOT_EXIST:
             print "file does not exist"
             return None
 
         self.add_clip_attr(producer)
         
+        # Img seq ttl value
+        producer.ttl = ttl
+        if ttl != None:
+            producer.set("ttl", int(ttl))
+
         return producer
 
     def create_slowmotion_producer(self, path, speed):
@@ -437,7 +443,7 @@
         return clip
 
     def create_rendered_transition_clip(self, path, rendered_type):
-        clip = self.create_file_producer_clip(path)
+        clip = self.create_file_producer_clip(path) # this can't have ttl so we can use simpler constructor
         clip.rendered_type = rendered_type
         return clip
     
@@ -458,14 +464,15 @@
         clip.clip_length = lambda: _clip_length(clip) # MLT get_length gives wrong values for blanks
         clip.waveform_data = None
         clip.color = None # None means that clip type default color is displayed
-
+        clip.markers = []
+        
     def clone_track_clip(self, track, index):
         orig_clip = track.clips[index]
         return self.create_clone_clip(orig_clip)
 
     def create_clone_clip(self, clip):
         if clip.media_type != appconsts.PATTERN_PRODUCER:
-            clone_clip = self.create_file_producer_clip(clip.path) # file producer
+            clone_clip = self.create_file_producer_clip(clip.path, None, False, clip.ttl) # file producer
         else:
             clone_clip = self.create_pattern_producer(clip.create_data) # pattern producer
         self.clone_clip_and_filters(clip, clone_clip)
@@ -576,6 +583,7 @@
         compositor.clone_properties(old_compositor)
         compositor.set_in_and_out(old_compositor.clip_in, old_compositor.clip_out)
         compositor.transition.set_tracks(old_compositor.transition.a_track, old_compositor.transition.b_track)
+        compositor.obey_autofollow = old_compositor.obey_autofollow
         self._plant_compositor(compositor)
         return compositor
     
@@ -640,7 +648,7 @@
         return track_compositors
             
     # -------------------------- monitor clip, trimming display, output mode and hidden track
-    def display_monitor_clip(self, path, pattern_producer_data=None):
+    def display_monitor_clip(self, path, pattern_producer_data=None, ttl=None):
         """
         Adds media clip to hidden track for viewing and for setting mark
         in and mark out points.
@@ -648,10 +656,10 @@
         """
         track = self.tracks[-1] # Always last track
         if pattern_producer_data == None:
-            self.monitor_clip = self.create_file_producer_clip(path)
+            self.monitor_clip = self.create_file_producer_clip(path, None, False, ttl)
         else:
             if pattern_producer_data.type == IMAGE_SEQUENCE:
-                self.monitor_clip = self.create_file_producer_clip(pattern_producer_data.path)
+                self.monitor_clip = self.create_file_producer_clip(pattern_producer_data.path, None, False, ttl)
             else:
                 self.monitor_clip = self.create_pattern_producer(pattern_producer_data)
         
@@ -660,7 +668,7 @@
         self._mute_editable()
         return self.monitor_clip
 
-    def display_trim_clip(self, path, clip_start_pos, patter_producer_data=None):
+    def display_trim_clip(self, path, clip_start_pos, patter_producer_data=None, ttl=None):
         """
         Adds clip to hidden track for trim editing display.
         """
@@ -673,7 +681,7 @@
         if path != None:
             clip = editorstate.get_cached_trim_clip(path)
             if clip == None:
-                clip = self.create_file_producer_clip(path, None, True)
+                clip = self.create_file_producer_clip(path, None, True, ttl)
                 editorstate.add_cached_trim_clip(clip)
     
             if clip_start_pos > 0:
@@ -765,12 +773,15 @@
             track.set("hide", 3)
     
     def _unmute_editable(self):
-        for i in range(1, len(self.tracks) - 1):
-            track = self.tracks[i]
-            track.set("hide", int(track.mute_state))
+        self.set_tracks_mute_state() # same thing
     
     def set_tracks_mute_state(self):
-        self._unmute_editable() # same thing, this method exists to declare purpose
+        # This only applied to editable tracks on project load
+        for i in range(1, len(self.tracks) - 1):
+            self.set_track_mute_state(i, self.tracks[i].mute_state)
+        
+        self.tracks[0].set("hide", 0) # Black bg track
+        self.tracks[-1].set("hide", 0) # Hidden track
         
     def set_output_mode(self, mode):
         if self.outputfilter != None:
@@ -965,12 +976,40 @@
             return -1
         
         return index
-    
+
+    def get_clip_for_id(self, clip_id):
+        """
+        Returns clip or None if not found.
+        """
+        for i in range(1, len(self.tracks)):
+            track = self.tracks[i]
+            for j in range(0, len(track.clips)):
+                clip = track.clips[j]
+                if clip.id == clip_id:
+                    return clip
+
+        return None
+        
     def set_track_mute_state(self, track_index, mute_state):
         track = self.tracks[track_index]
         track.mute_state = mute_state
-        track.set("hide", int(track.mute_state))
-
+            
+        if mute_state == 2: # TRACK_MUTE_AUDIO
+            if track.id < self.first_video_index:
+                # Audio tracks
+                track.set("hide", 1)
+                track.gain_filter.set("gain", str(0))
+            else:
+                # Video tracks
+                track.set("hide", 0)
+                track.gain_filter.set("gain", str(0))
+        elif mute_state == 3: # TRACK_MUTE_ALL
+            track.set("hide", 1)
+            track.gain_filter.set("gain", str(0))
+        else: # TRACK_MUTE_NOTHING, TRACK_MUTE_VIDEO
+            track.set("hide", int(track.mute_state))
+            track.gain_filter.set("gain", str(track.audio_gain))
+            
     def drop_audio_levels(self):
         for i in range(1, len(self.tracks)):
             clips = self.tracks[i].clips

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/syncsplitevent.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/syncsplitevent.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tlineaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tlineaction.py Changed

@@ -25,9 +25,13 @@
 
 
 from gi.repository import Gtk
+from gi.repository import Gdk
 
+import md5
 import os
 from operator import itemgetter
+import threading
+import time
 
 import appconsts
 import boxmove
@@ -81,7 +85,7 @@
         return None
     
     if MONITOR_MEDIA_FILE().type != appconsts.PATTERN_PRODUCER:
-        new_clip = current_sequence().create_file_producer_clip(MONITOR_MEDIA_FILE().path)
+        new_clip = current_sequence().create_file_producer_clip(MONITOR_MEDIA_FILE().path, None, False, MONITOR_MEDIA_FILE().ttl)
     else:
         new_clip = current_sequence().create_pattern_producer(MONITOR_MEDIA_FILE())
         
@@ -512,14 +516,17 @@
 def sync_compositor(compositor):
     track = current_sequence().tracks[compositor.transition.b_track] # b_track is source track where origin clip is
     origin_clip = None
+    
     for clip in track.clips:
         if clip.id == compositor.origin_clip_id:
             origin_clip = clip
+            
     if origin_clip == None:
         dialogutils.info_message(_("Origin clip not found!"), 
                              _("Clip used to create this Compositor has been removed\nor moved to different track."), 
                              gui.editor_window.window)
         return
+        
     clip_index = track.clips.index(origin_clip)
     clip_start = track.clip_start(clip_index)
     clip_end = clip_start + origin_clip.clip_out - origin_clip.clip_in
@@ -582,6 +589,16 @@
     syncsplitevent.split_audio_from_clips_list(clips, track)
 
 def sync_all_compositors():
+    full_sync_data = edit.get_full_compositor_sync_data()
+    
+    for sync_item in full_sync_data:
+        destroy_id, orig_in, orig_out, clip_start, clip_end = sync_item
+        compositor = current_sequence().get_compositor_for_destroy_id(destroy_id)
+        data = {"compositor":compositor,"clip_in":clip_start,"clip_out":clip_end}
+        action = edit.move_compositor_action(data)
+        action.do_edit()
+
+    """
     # Pair all compositors with their origin clips ids
     comp_clip_pairings = {}
     for compositor in current_sequence().compositors:
@@ -621,7 +638,8 @@
         except:
             # Clip is probably deleted
             pass
-
+    """
+    
 def add_transition_menu_item_selected():
     if movemodes.selected_track == -1:
         # INFOWINDOW
@@ -680,6 +698,16 @@
     from_clip = track.clips[movemodes.selected_range_in]
     to_clip = track.clips[movemodes.selected_range_out]
     
+    transition_data = get_transition_data_for_clips(track, from_clip, to_clip)
+    
+    if track.id >= current_sequence().first_video_index:
+        dialogs.transition_edit_dialog(_add_transition_dialog_callback, 
+                                       transition_data)
+    else:
+        _no_audio_tracks_mixing_info()
+
+def get_transition_data_for_clips(track, from_clip, to_clip):
+    
     # Get available clip handles to do transition
     from_handle = from_clip.get_length() - from_clip.clip_out
     from_clip_length = from_clip.clip_out - from_clip.clip_in                                                 
@@ -706,13 +734,8 @@
                        "from_handle":from_handle,
                        "to_handle":to_handle,
                        "max_length":max_length}
+    return transition_data
 
-    if track.id >= current_sequence().first_video_index:
-        dialogs.transition_edit_dialog(_add_transition_dialog_callback, 
-                                       transition_data)
-    else:
-        _no_audio_tracks_mixing_info()
-        
 def _add_transition_render_folder_select_callback(dialog, response_id, file_select):
     try:
         folder = file_select.get_filenames()[0]
@@ -803,27 +826,38 @@
                                                                         sorted_wipe_luma_index,
                                                                         color_str)
 
+    creation_data = (   from_clip.id,
+                        to_clip.id,
+                        from_out,
+                        from_in,
+                        to_out,
+                        to_in,
+                        transition_type_selection_index,
+                        sorted_wipe_luma_index,
+                        color_str)
+                                                
     # Save transition data into global variable to be available at render complete callback
     global transition_render_data
-    transition_render_data = (trans_index, from_clip, to_clip,  transition_data["track"], from_in, to_out, transition_type_selection_index)
+    transition_render_data = (trans_index, from_clip, to_clip, transition_data["track"], from_in, to_out, transition_type_selection_index, creation_data)
     window_text, type_id = mlttransitions.rendered_transitions[transition_type_selection_index]
     window_text = _("Rendering ") + window_text
 
-    render.render_single_track_transition_clip(producer_tractor,
-                                        encoding_option_index,
-                                        quality_option_index, 
-                                        str(extension_text), 
-                                        _transition_render_complete,
-                                        window_text)
+    render.render_single_track_transition_clip( producer_tractor,
+                                                encoding_option_index,
+                                                quality_option_index, 
+                                                str(extension_text), 
+                                                _transition_render_complete,
+                                                window_text)
 
 def _transition_render_complete(clip_path):
     print "Render complete"
 
     global transition_render_data
-    transition_index, from_clip, to_clip, track, from_in, to_out, transition_type = transition_render_data
+    transition_index, from_clip, to_clip, track, from_in, to_out, transition_type, creation_data = transition_render_data
 
     transition_clip = current_sequence().create_rendered_transition_clip(clip_path, transition_type)
-    
+    transition_clip.creation_data = creation_data
+
     data = {"transition_clip":transition_clip,
             "transition_index":transition_index,
             "from_clip":from_clip,
@@ -835,6 +869,88 @@
     action = edit.add_centered_transition_action(data)
     action.do_edit()
 
+def re_render_transition(data):
+    clip, track, msg, x = data
+    if not hasattr(clip, "creation_data"):
+        _no_creation_data_dialog()
+        return
+    
+    from_clip_id, to_clip_id, from_out, from_in, to_out, to_in, transition_type_selection_index, \
+    sorted_wipe_luma_index, color_str = clip.creation_data
+    
+    from_clip = editorstate.current_sequence().get_clip_for_id(from_clip_id)
+    to_clip = editorstate.current_sequence().get_clip_for_id(to_clip_id)
+    if from_clip == None or to_clip == None:
+        _source_clips_not_found_dialog()
+        return
+
+    transition_data = {"track":track,
+                        "clip":clip,
+                        "from_clip":from_clip,
+                        "to_clip":to_clip}
+
+    dialogs.transition_re_render_dialog(_transition_RE_render_dialog_callback, transition_data)
+
+def _transition_RE_render_dialog_callback(dialog, response_id, selection_widgets, transition_data):
+    if response_id != Gtk.ResponseType.ACCEPT:
+        dialog.destroy()
+        return
+    
+    dialog.destroy()
+    
+    enc_combo, quality_combo = selection_widgets
+    encoding_option_index = enc_combo.get_active()
+    quality_option_index = quality_combo.get_active()
+    extension_text = "." + renderconsumer.encoding_options[encoding_option_index].extension
+
+    clip = transition_data["clip"]
+    track =  transition_data["track"]
+    from_clip_id, to_clip_id, from_out, from_in, to_out, to_in, transition_type_selection_index, \
+    sorted_wipe_luma_index, color_str = clip.creation_data
+    
+    trans_index = track.clips.index(clip)
+
+    producer_tractor = mlttransitions.get_rendered_transition_tractor(  editorstate.current_sequence(),
+                                                                        transition_data["from_clip"],
+                                                                        transition_data["to_clip"],
+                                                                        from_out,
+                                                                        from_in,
+                                                                        to_out,
+                                                                        to_in,

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py Changed

@@ -33,8 +33,10 @@
 
 import appconsts
 import audiowaveformrenderer
+import boxmove
 import cairoarea
 import clipeffectseditor
+import compositormodes
 import editorpersistance
 from editorstate import current_sequence
 from editorstate import timeline_visible
@@ -122,6 +124,7 @@
 VIDEO_MUTE_ICON = None
 ALL_MUTE_ICON = None
 MARKER_ICON = None
+CLIP_MARKER_ICON = None
 LEVELS_RENDER_ICON = None
 SNAP_ICON = None
 KEYBOARD_ICON = None
@@ -180,6 +183,7 @@
 CLIP_COLOR_GRAD = (1, 0.62, 0.38, 0.7, 1)
 CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, CLIP_COLOR_GRAD, GRAD_MULTIPLIER) 
 CLIP_SELECTED_COLOR = get_multiplied_color_from_grad(CLIP_COLOR_GRAD, SELECTED_MULTIPLIER)
+CLIP_END_DRAG_OVERLAY_COLOR = (1,1,1,0.3)
 
 AUDIO_CLIP_COLOR_GRAD = (1, 0.23, 0.52, 0.23, 1)#(1, 0.79, 0.80, 0.18, 1)
 AUDIO_CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, AUDIO_CLIP_COLOR_GRAD, GRAD_MULTIPLIER + 0.5)
@@ -190,13 +194,14 @@
 IMAGE_CLIP_COLOR_GRAD_L = get_multiplied_grad(0, 1, IMAGE_CLIP_COLOR_GRAD, GRAD_MULTIPLIER) 
 
 COMPOSITOR_CLIP = (0.3, 0.3, 0.3, 0.8)
+COMPOSITOR_CLIP_AUTO_FOLLOW = (0.33, 0.05, 0.52, 0.65)
 COMPOSITOR_CLIP_SELECTED = (0.5, 0.5, 0.7, 0.8)
 
 BLANK_CLIP_COLOR_GRAD = (1, 0.6, 0.6, 0.65, 1)
 BLANK_CLIP_COLOR_GRAD_L = (0, 0.6, 0.6, 0.65, 1)
 
-BLANK_CLIP_COLOR_SELECTED_GRAD = (1, 0.7, 0.7, 0.75, 1)
-BLANK_CLIP_COLOR_SELECTED_GRAD_L = (0, 0.7, 0.7, 0.75, 1)
+BLANK_CLIP_COLOR_SELECTED_GRAD = (1, 0.80, 0.80, 0.80, 1)
+BLANK_CLIP_COLOR_SELECTED_GRAD_L = (0, 0.80, 0.80, 0.80, 1)
 
 SINGLE_TRACK_TRANSITION_SELECTED = (0.8, 0.8, 1.0)
 
@@ -220,7 +225,7 @@
 
 ICON_SELECTED_OVERLAY_COLOR = (0.8, 0.8, 1.0, 0.3)
 
-# Dash pattern used to create "LED"s
+# Dash pattern used by Box tool
 BOX_DASH_INK = 12.0
 BOX_DASH_SKIP = 3.0
 BOX_DASHES = [BOX_DASH_INK, BOX_DASH_SKIP, BOX_DASH_INK, BOX_DASH_SKIP]
@@ -269,6 +274,11 @@
 pix_per_frame = 5.0 # Current draw scale. This set set elsewhere on init so default value irrelevant.
 pos = 0 # Current left most frame in timeline display
 
+# A context defining action taken when mouse press happens based on edit mode and mouse position.
+# Cursor communicates current pointer contest to user.
+pointer_context = appconsts.POINTER_CONTEXT_NONE
+DRAG_SENSITIVITY_AREA_WIDTH_PIX = 10
+
 # ref to singleton TimeLineCanvas instance for mode setting and some position
 # calculations.
 canvas_widget = None
@@ -302,7 +312,7 @@
     COMPOSITOR_CLIP_ICON, INSERT_ARROW_ICON, AUDIO_MUTE_ICON, MARKER_ICON, \
     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
+    LEVELS_RENDER_ICON, SNAP_ICON, KEYBOARD_ICON, CLOSE_MATCH_ICON, CLIP_MARKER_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")
@@ -320,6 +330,7 @@
     SNAP_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "snap_magnet.png")
     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")
 
     MARKER_ICON = _load_pixbuf("marker.png")
     TRACK_ALL_ON_V_ICON = _load_pixbuf("track_all_on_V.png")
@@ -1064,7 +1075,7 @@
     
     # Draw clips in draw range
     cr.set_line_width(MOVE_CLIPS_LINE_WIDTH)
-    cr.set_source_rgb(*OVERLAY_TRIM_COLOR)
+
 
     clip_length = end - start
     scale_length = clip_length * pix_per_frame
@@ -1072,6 +1083,9 @@
     track_height = data["track_height"]
 
     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)
     cr.stroke()
 
     if editorpersistance.prefs.delta_overlay == True:
@@ -1307,6 +1321,8 @@
         self.widget = cairoarea.CairoDrawableArea2( WIDTH, 
                                                     HEIGHT, 
                                                     self._draw)
+        self.widget.add_pointer_motion_mask()
+        
         self.widget.press_func = self._press_event
         self.widget.motion_notify_func = self._motion_notify_event
         self.widget.release_func = self._release_event
@@ -1348,7 +1364,7 @@
         """
         Mouse move callback
         """
-        if not self.drag_on:
+        if (not self.drag_on) and editorstate.cursor_is_tline_sensitive == True:
             self.set_pointer_context(x, y)
             return
 
@@ -1377,27 +1393,60 @@
                               event.button, event.get_state())
 
     def set_pointer_context(self, x, y):
+        current_pointer_context = self.get_pointer_context(x, y)
+
+        # If pointer_context changed then save it and change cursor.
+        global pointer_context
+        if pointer_context != current_pointer_context:
+            pointer_context = current_pointer_context
+            if pointer_context == appconsts.POINTER_CONTEXT_NONE:
+                gui.editor_window.set_tline_cursor(EDIT_MODE())
+            else:
+                gui.editor_window.set_tline_cursor_to_context(pointer_context)
+        
+    def get_pointer_context(self, x, y):
         frame = get_frame(x)
         hit_compositor = compositor_hit(frame, y, current_sequence().compositors)
         if hit_compositor != None:
-            return
+            if editorstate.auto_follow == False or (editorstate.auto_follow == True and hit_compositor.obey_autofollow == False):
+                return compositormodes.get_pointer_context(hit_compositor, x)
+            else:
+                return appconsts.POINTER_CONTEXT_NONE
 
-        track = get_track(y)  
+        track = get_track(y)
         if track == None:
-            return    
+            return appconsts.POINTER_CONTEXT_NONE
 
         clip_index = current_sequence().get_clip_index(track, frame)
         if clip_index == -1:
-            return
-
-        clip_start_frame = track.clip_start(clip_index) - pos
-        if abs(x - _get_frame_x(clip_start_frame)) < 5:
-            return
-
-        clip_end_frame = track.clip_start(clip_index + 1) - pos
-        if abs(x - _get_frame_x(clip_end_frame)) < 5:
-            return
+            # This gets none always afetr rack, which may not be what we want
+            return appconsts.POINTER_CONTEXT_NONE
 
+        clip_start_frame = track.clip_start(clip_index)
+        clip_end_frame = track.clip_start(clip_index + 1)
+        
+        # INSERT, OVEWRITE
+        if (EDIT_MODE() == editorstate.INSERT_MOVE or EDIT_MODE() == editorstate.OVERWRITE_MOVE) and editorstate.overwrite_mode_box == False:
+            if abs(x - _get_frame_x(clip_start_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX:
+                return appconsts.POINTER_CONTEXT_END_DRAG_LEFT
+            if abs(x - _get_frame_x(clip_end_frame)) < DRAG_SENSITIVITY_AREA_WIDTH_PIX:
+                return appconsts.POINTER_CONTEXT_END_DRAG_RIGHT
+            
+            return appconsts.POINTER_CONTEXT_NONE
+        # TRIM
+        elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM or EDIT_MODE() == editorstate.ONE_ROLL_TRIM_NO_EDIT:
+            if abs(frame - clip_start_frame) < abs(frame - clip_end_frame):
+                return appconsts.POINTER_CONTEXT_TRIM_LEFT
+            else:
+                return appconsts.POINTER_CONTEXT_TRIM_RIGHT
+        # BOX
+        elif (EDIT_MODE() == editorstate.OVERWRITE_MOVE and editorstate.overwrite_mode_box == True and 
+            boxmove.box_selection_data != None):
+            if boxmove.box_selection_data.is_hit(x, y):
+                return appconsts.POINTER_CONTEXT_BOX_SIDEWAYS
+                
+        return appconsts.POINTER_CONTEXT_NONE
+            
     #----------------------------------------- DRAW
     def _draw(self, event, cr, allocation):
         x, y, w, h = allocation
@@ -1885,6 +1934,15 @@
                     cr.set_source_surface(LEVELS_RENDER_ICON, int(scale_in) + 4, y + 8)
                     cr.paint()
 
+            # Clip markers
+            if len(clip.markers) > 0 and scale_length > TEXT_MIN:
+                for marker in clip.markers:
+                    name, clip_marker_frame = marker

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py Changed

@@ -43,6 +43,7 @@
 import textwrap
 import time
 import threading
+import unicodedata
 
 import dialogutils
 import editorstate
@@ -227,6 +228,7 @@
     project_name = flowblade_project.name
     sequence_name = flowblade_project.c_seq.name
     sequence_index = flowblade_project.sequences.index(flowblade_project.c_seq)
+
     length = flowblade_project.c_seq.get_length()
     render_item = BatchRenderItemData(project_name, sequence_name, render_path, \
                                       sequence_index, args_vals_list, timestamp, length, \
@@ -511,7 +513,13 @@
 
     def generate_identifier(self):
         id_str = self.project_name + self.timestamp.ctime()
-        return md5.new(id_str).hexdigest()
+        try:
+            idfier = md5.new(id_str).hexdigest()
+        except:
+            ascii_pname = unicodedata.normalize('NFKD', self.project_name).encode('ascii','ignore')
+            id_str = str(ascii_pname) + self.timestamp.ctime()
+            idfier = md5.new(id_str).hexdigest()
+        return idfier
 
     def matches_identifier(self, identifier):
         if self.generate_identifier() == identifier:
@@ -1172,7 +1180,9 @@
         profile = mltprofiles.get_profile(render_item.render_data.profile_name)
         
         vcodec = self.get_vcodec(render_item)
-        if self.is_frame_sequence_render(vcodec) == True:
+        vformat = self.get_argval(render_item, "f")
+        
+        if self.is_frame_sequence_render(vcodec) == True and vformat == None:
             # Frame sequence render
             consumer = renderconsumer.get_img_seq_render_consumer_codec_ext(render_item.render_path,
                                                                              profile,  
@@ -1237,14 +1247,17 @@
 
         return False
 
-    def get_vcodec(self, render_item):
+    def get_vcodec(self, render_item):       
+        return self.get_argval(render_item, "vcodec")
+
+    def get_argval(self, render_item, arg_key):
         for arg_val in render_item.args_vals_list:
             arg, val = arg_val
-            if arg == "vcodec":
+            if arg == arg_key:
                 return val
         
         return None
-            
+        
     def get_frame_seq_ext(self, vcodec):
         if vcodec == "targa":
             return "tga"

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py Changed

@@ -73,7 +73,7 @@
 NO_PREVIEW_FILE = "fallback_thumb.png"
 
 _gmic_found = False
-
+_gmic_version = 1
 _session_id = None
 
 _window = None
@@ -156,14 +156,33 @@
     # Set paths.
     respaths.set_paths(root_path)
 
+    # Check G'MIC version
+    cmd = "gmic -version"
+    process = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
+    output, error = process.communicate()
+    tokens = output.split()
+    clended = []
+    for token in tokens:
+        str1 = token.replace('.','')
+        str2 = str1.replace(',','')
+        if str2.isdigit(): # this is based on assumtion that str2 ends up being number like "175" or 215" etc. only for version number token
+            if str2[0] == '2':
+                global _gmic_version
+                _gmic_version = 2
+                respaths.set_gmic2(root_path)
+
+    # Write stdout to log file
+    sys.stdout = open(utils.get_hidden_user_dir_path() + "log_gmic", 'w')
+    print "G'MIC version:", str(_gmic_version)
+        
     # Init gmic tool session dirs
     if os.path.exists(get_session_folder()):
         shutil.rmtree(get_session_folder())
         
     os.mkdir(get_session_folder())
-    
+
     init_frames_dirs()
-    
+
     # Load editor prefs and list of recent projects
     editorpersistance.load()
     if editorpersistance.prefs.dark_theme == True:

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/trackaction.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/trackaction.py Changed

@@ -23,10 +23,12 @@
 """
 
 import appconsts
+import audiomonitoring
 import dialogutils
 import gui
 import guicomponents
 import editorstate
+import edit
 from editorstate import get_track
 from editorstate import current_sequence
 from editorstate import PROJECT
@@ -84,7 +86,7 @@
     updater.repaint_tline()
     
 def mute_track(track, new_mute_state):
-    # NOTE: THIS IS A SAVED EDIT OF SEQUENCE, BUT IS NOT AN UNDOABLE EDIT
+    # NOTE: THIS IS A SAVED EDIT OF SEQUENCE, BUT IT IS NOT AN UNDOABLE EDIT.
     current_sequence().set_track_mute_state(track.id, new_mute_state)
     gui.tline_column.widget.queue_draw()
     
@@ -145,6 +147,7 @@
 def audio_levels_menu_launch_pressed(widget, event):
     guicomponents.get_audio_levels_popup_menu(event, _audio_levels_item_activated)
 
+# THIS HANDLES MUCH MORE NOW, NAME _audio_levels_item_activated needs changing
 def _audio_levels_item_activated(widget, msg):
     if msg == "all":
         editorstate.display_all_audio_levels = True
@@ -157,6 +160,17 @@
         snapping.snapping_on = widget.get_active()
     elif msg == "magnet":
         snapping.show_magnet_icon = widget.get_active()
+    elif msg == "autofollow":
+        active = widget.get_active()
+        editorstate.auto_follow = active
+        PROJECT().set_project_property(appconsts.P_PROP_AUTO_FOLLOW, active)
+        if active == True:
+            # Do autofollow update if auto follow activated
+            compositor_autofollow_data = edit.get_full_compositor_sync_data()
+            edit.do_autofollow_redo(compositor_autofollow_data)
+        updater.repaint_tline()
+    elif msg == "pointer_sensitive_item":
+        editorstate.cursor_is_tline_sensitive = widget.get_active()
     else: # media thumbnails
         editorstate.display_clip_media_thumbnails = widget.get_active()
         updater.repaint_tline()
@@ -229,6 +243,8 @@
                     return 
             # Update track mute state
             current_sequence().set_track_mute_state(track.id, new_mute_state)
+            
+            audiomonitoring.update_mute_states()
             gui.tline_column.widget.queue_draw()
     
     if data.event.button == 3:

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/translations.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/translations.py Changed

@@ -76,7 +76,7 @@
         lang = gettext.translation(APP_NAME, locale_path, languages=langs, fallback=True)
 
     # Un-comment for translations tests
-    #lang = gettext.translation(APP_NAME, locale_path, languages=["cs"], fallback=True)
+    #lang = gettext.translation(APP_NAME, locale_path, languages=["fi"], fallback=True)
 
     lang.install(APP_NAME) # makes _() a build-in available in all modules without imports
 
@@ -240,9 +240,11 @@
     filter_names["Lift Gain Gamma"] = _("Lift Gain Gamma")
     filter_names["Image Grid"] = _("Image Grid")
 
-    # 0.18
     filter_names["Color Lift Gain Gamma"] = _("Color Lift Gain Gamma")
-
+    filter_names["Color Channel Mixer"] = _("Color Channel Mixer")
+    filter_names["Lens Correction AV"] = _("Lens Correction AV")
+    filter_names["Perspective"] = _("Perspective")
+    
     # param names
     global param_names
 
@@ -520,6 +522,19 @@
     param_names["Columns"] = _("Columns")
     param_names["Color Temperature"] = _("Color Temperature")
     param_names["Select .cube file"] = _("Select .cube file")
+    param_names["Red Ch. Red Gain"] = _("Red Ch. Red Gain")
+    param_names["Red Ch. Green Gain"] = _("Red Ch. Green Gain")
+    param_names["Red Ch. Blue Gain"] = _("Red Ch. Blue Gain")
+    param_names["Green Ch. Red Gain"] = _("Green Ch. Red Gain")
+    param_names["Green Ch. Green Gain"] = _("Green Ch. Green Gain")
+    param_names["Green Ch. Blue Gain"] = _("Green Ch. Blue Gain")
+    param_names["Blue Ch. Red Gain"] = _("Blue Ch. Red Gain")
+    param_names["Blue Ch. Green Gain"] = _("Blue Ch. Green Gain")
+    param_names["Blue Ch. Blue Gain"] = _("Blue Ch. Blue Gain")
+    param_names["Center X"] = _("Center X")
+    param_names["Center Y"] = _("Center Y")
+    param_names["Quad Distortion"] = _("Quad Distortion")
+    param_names["Double Quad Distortion"] = _("Double Quad Distortion")
 
     # param names for compositors
     param_names["Opacity"] = _("Opacity")
@@ -536,7 +551,9 @@
     param_names["Softness"] = _("Softness")
     param_names["Fade Out Length"] = _("Fade Out Length")
     param_names["Fade In Length"] = _("Fade In Length")
-
+    param_names["Wipe Direction"] = _("Wipe Direction")
+    param_names["Blend Mode"] = _("Blend Mode")
+    
     # Combo options
     global combo_options
     combo_options["Shave"] = _("Shave")
@@ -588,4 +605,23 @@
     combo_options["Shadows"] = _("Shadows")
     combo_options["Midtones"] = _("Midtones")
     combo_options["Highlights"] = _("Highlights")
-
+    combo_options["Forward"] = _("Forward")
+    combo_options["Backward"] = _("Backward")
+    combo_options["Add"] = _("Add")
+    combo_options["Saturate"] = _("Saturate")
+    combo_options["Multiply"] = _("Multiply")    
+    combo_options["Screen"] = _("Screen")   
+    combo_options["Overlay"] = _("Overlay")
+    combo_options["Darken"] = _("Darken")
+    combo_options["Lighten"] = _("Lighten")
+    combo_options["ColorDodge"] = _("ColorDodge")
+    combo_options["Colorburn"] = _("Colorburn")
+    combo_options["Hardlight"] = _("Hardlight")
+    combo_options["Softlight"] = _("Softlight")
+    combo_options["Difference"] = _("Difference")
+    combo_options["Exclusion"] = _("Exclusion")
+    combo_options["HSLHue"] = _("HSLHue")
+    combo_options["HSLSaturation"] = _("HSLSaturation")
+    combo_options["HSLColor"] = _("HSLColor")
+    combo_options["HSLLuminosity"] = _("HSLLuminosity")
+

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/trimmodes.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/trimmodes.py Changed

@@ -447,7 +447,7 @@
     # made to do things that are needed in trim.
     if _trimmed_clip_is_blank():
         set_exit_mode_func()
-        primary_txt = _("Cant ONE ROLL TRIM blank clips.")
+        primary_txt = _("Can't ONE ROLL TRIM blank clips.")
         secondary_txt = _("You can use MOVE OVERWRITE or TWO ROLL TRIM edits instead\nto get the desired change.")
         dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
         return False
@@ -482,9 +482,9 @@
    
     # Set interactive trimview on hidden track
     if clip.media_type != appconsts.PATTERN_PRODUCER:
-        current_sequence().display_trim_clip(clip.path, clip_start) # file producer
+        current_sequence().display_trim_clip(clip.path, clip_start, None, clip.ttl) # file producer
     else:
-        current_sequence().display_trim_clip(None, clip_start, clip.create_data) # pattern producer
+        current_sequence().display_trim_clip(None, clip_start, clip.create_data, None) # pattern producer
 
     PLAYER().seek_frame(edit_frame)
     return True
@@ -576,7 +576,8 @@
         return
     
     gui.monitor_widget.one_roll_mouse_release(edit_data["edit_frame"], frame - edit_data["edit_frame"])
-    
+    tlinewidgets.pointer_context = appconsts.POINTER_CONTEXT_NONE
+
     _do_one_roll_trim_edit(frame)
 
 def _do_one_roll_trim_edit(frame):
@@ -977,9 +978,9 @@
 
     # Set interactive trim view clip on hidden track
     if clip.media_type != appconsts.PATTERN_PRODUCER:
-        current_sequence().display_trim_clip(clip.path, clip_start) # File producer
+        current_sequence().display_trim_clip(clip.path, clip_start, None, clip.ttl) # File producer
     else:
-        current_sequence().display_trim_clip(None, clip_start, clip.create_data) # pattern producer
+        current_sequence().display_trim_clip(None, clip_start, clip.create_data, None) # pattern producer
         
     PLAYER().seek_frame(edit_frame)
     updater.repaint_tline()
@@ -1246,9 +1247,9 @@
 
     # Set interactive trim view clip on hidden track
     if clip.media_type != appconsts.PATTERN_PRODUCER:
-        current_sequence().display_trim_clip(clip.path, clip_start) # File producer
+        current_sequence().display_trim_clip(clip.path, clip_start, None, clip.ttl) # File producer
     else:
-        current_sequence().display_trim_clip(None, clip_start, clip.create_data) # pattern producer
+        current_sequence().display_trim_clip(None, clip_start, clip.create_data, None) # pattern producer
         
     if start_frame_being_viewed:
         PLAYER().seek_frame(clip.clip_in)

flowblade-1.14.tar.gz/flowblade-trunk/Flowblade/updater.py -> flowblade-1.16.tar.gz/flowblade-trunk/Flowblade/updater.py Changed

flowblade-1.14.tar.gz/flowblade-trunk/docs/FAQ.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/FAQ.md Changed

@@ -2,12 +2,22 @@
 
 **Contents**
 
-  1. [Crop filter does not work](./FAQ.md#crop-filter-does-not-work)
-  2. [How can I move clips around freely?](./FAQ.md#how-can-i-move-clips-around-freely)
-  3. [Will there be Windows or OSX versions?](./FAQ.md#will-there-be-windows-or-osx-versions)
-  4. [Rendering with a profile with different framerate changes video playback speed and loses audio sync](./FAQ.md#rendering-with-a-profile-with-different-framerate-changes-video-playback-speed-and-loses-audio-sync)
+  1. [Alpha Filters do not work](./FAQ.md#alpha-filters-do-not-work)
+  2. [Crop filter does not work](./FAQ.md#crop-filter-does-not-work)
+  3. [How can I move clips around freely?](./FAQ.md#how-can-i-move-clips-around-freely)
+  4. [Will there be Windows or OSX versions?](./FAQ.md#will-there-be-windows-or-osx-versions)
+  5. [Rendering with a profile with different framerate changes video playback speed and loses audio sync](./FAQ.md#rendering-with-a-profile-with-different-framerate-changes-video-playback-speed-and-loses-audio-sync)
+  2. [Wayland](./FAQ.md#wayland)
+  
+### Alpha Filters do not work
 
-#### Crop filter does not work
+In Flowblade Alpha filters write into images alpha channel and have no effect unless used in combination with Compositors to combine two images.
+
+Alpha channel in images exits for the sole purpose of compositing two images. If image is not part of a composite, the data in alpha channel has no purpose and does not affect output.
+
+**Select "Add Compositor" -> "Dissolve" from clip popup menu** to composite e.g. clip on track V2 on a clip on track V1 and add Alpha filter into clip on track V2 to see Alpha filters working.
+
+### Crop filter does not work
 
 Are you trying zoom in a bit and use part of the image instead of the whole image?
 If this is the case then you should use filter **Affine** in filter group **Transform** and set properties *Scale X, Scale Y, X, Y*.
@@ -15,20 +25,30 @@
 If you are trying to crop an image in the sense that you want to cut part of the image out, then you must use a Compositor and composite the image you are trying to crop on top of another image or perhaps a black color producer.
 
 
-#### How can I move clips around freely?
+### How can I move clips around freely?
 
 Use the **Overwrite** tool.
 
 Click on timeline and press **2** on keyboard or use the **Tool Select Menu** in the middlebar next to the timecode display.
 
-#### Will there be Windows or OSX versions?
+### Will there be Windows or OSX versions?
 
 These are not currently planned. If in the future the port effort is reasonable, does not have adverse effects on the code base and someone provides quality patches, then those patches can probably be accepted.
 
 
-#### Rendering with a profile with different framerate changes video playback speed and loses audio sync
+### Rendering with a profile with different framerate changes video playback speed and loses audio sync
 
 Yes, this will happen. When rendering the video frames are just copied, no complex slowdown/speedup prosessing is done, and audio is **not** resampled.
 
 To maintain sync and playback both Project Profile and Render Profile both need to match the frame rate of original material.  
 
+### Wayland ###
+
+Flowblade does not run natively on Wayland yet, but there are fwe ways to get Flowblade running.
+
+1. Start Flowblade from terminal with command:
+
+    GDK_BACKEND=x11 flowblade
+
+
+2. Use X11 session when running Flowblade

flowblade-1.14.tar.gz/flowblade-trunk/docs/INSTALLING.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/INSTALLING.md Changed

@@ -4,7 +4,7 @@
 ### Installing using .deb package
 
 #### Step 1. Download and install .deb 
-**First download .deb file** for Flowblade 1.12 from <a href="https://github.com/jliljebl/flowblade/releases">here.</a>
+**First download .deb file** for Flowblade 1.14 from <a href="https://github.com/jliljebl/flowblade/releases">here.</a>
 
 Double click on <b>.deb</b> file to install it. 
 
@@ -14,7 +14,7 @@
 	<li>	<p>Open terminal in the directory you saved the  downloaded <b>.deb</b> file. Give command:	</li>
 </ul>
 
-    sudo dpkg -i ./flowblade-1.10.0-1_all.deb
+    sudo dpkg -i ./flowblade-1.14.0-1_all.deb
 
 
 #### OPTIONAL Step 2. Give some additional commands on terminal
@@ -29,8 +29,6 @@
 
 Release has been install tested on: <b>Ubuntu 16.10</b>, <b>Ubuntu 16.04</b>. <b>Linux Mint 18</b>. It should work on all recent Debian based distributions.
 
-<i>NOTE: Running a KDEnlive PPA on Ubuntu may cause an uncompatible MLT to be installed and prevent Flowblade from running, more <a href="https://plus.google.com/u/0/102624418925189345577/posts/7ANDDW3hzHB?sfc=true">here.</a> Update to MLT 6.4.1 or remove KDEnlive PPA.</i> 
-
 ### Installing from your OS repository
 
 The easiest way to install Flowblade is using the version in your OS repository. The downside is that **the version available may not be the current latest release**. Contact your OS to get latest Flowblade included in repositories if not already available.
@@ -63,7 +61,7 @@
   * Extract archive into a folder of your choosing
   * Install dependencies. See [Dependencies](DEPENDENCIES.md) doc for more information.
   * If you have Flowblade installed in your system, you probably have the dependencies installed, unless some new ones have been added.
-  * Launch by running script *.../flowblade-1.10.0/flowblade* that was created in the folder where archive was unpacked.
+  * Launch by running script *.../flowblade-1.14.0/flowblade* that was created in the folder where archive was unpacked.
   * Note that if you have Flowblade installed yu will need use full path to repository version or navigate to the folder containing launch script and use command "./flowblade" to launch repository version instead of installed version.
 
 *Please note these issues with Dropbox download:*

flowblade-1.14.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md Changed

@@ -1,13 +1,10 @@
 # Release Notes #
 
-
-**COMING SOON...**
-
 ## Flowblade 1.14 ##
 
-Date: August x, 2017
+Date: October 4, 2017
 
-**Flowblade 1.14** is the fourteenth release of Flowblade. This release had probably more new features then any release  since the initial release 0.6. New functionality like sequence combining, compound clips and audio syncing take the application to the next level as a complete editing solution.
+**Flowblade 1.14** is the fifteenth release of Flowblade. This release had probably more new features then any release  since the initial release 0.6. New functionality like sequence combining, compound clips and audio syncing take the application to the next level as a complete editing solution.
 
 Especially sequence combining feature together with existing features like *Range Log* make Flowblade easily the most advanced and featureful FLOSS tool for projects with long complex edits and large amounts of media.
 
@@ -32,12 +29,12 @@
 ### Compound Clips ###
 
 A **Compound Clip** is a single clip created by combining multiple clips and compositors in to a single media item. Compound Clips are useful when some complex sequence is more conveniently handled as a single unit.
-  * **Compound Clip from Selection** feature creates a Compound Clip from currently selected clips into a Xompound Clip.
+  * **Compound Clip from Selection** feature creates a Compound Clip from currently selected clips into a Compound Clip.
   * **Compound Clip from Sequence** feature creates a Compound Clip from current full contents of the timeline.
-  * **Audio Synced Compound Clips**, see above.
+  * **Audio Synced Compound Clip**, see above.
   
 ### Fade in/out ###
-We have two new features addressing user requests for speeding up the process of creating fade in and fade out transittions.
+We have two new features addressing user requests for speeding up the process of creating fade in and fade out transitions.
   * **Fade Compositors** These are special new compositors that will automatically on creation place themselves at the beginning or end of clips and do not need any keyframe manipulation; lengths of fades are changed by changing the lengths of compositors.
   * **Add Fade buttons** *Compositors* panel now has **Add Fade In** and **Add Fade Out** buttons that will create keyframes that define a fade of desired length in a single click.
 
@@ -52,10 +49,10 @@
 
 #### Titler ####
 
-Titler got two new features
+Titler got two new features:
 
   * Text drop shadow 
-  * Text outline features
+  * Text outline
 
 #### Disk cache management ####
 Disk cache management window provides GUI tool for deleting saved hidden files that could eventually consume noticable amounts of disk space.
@@ -83,7 +80,7 @@
   * Save render settings for proxy conversions.
   * Add Lossless FFv1 profile **by lsde**.
   * Fix timelineline zoom issue causing problems with scrolling.
-  * About menu visually impored **by Mostafa Ahangarha**.
+  * About menu visually improved **by Mostafa Ahangarha**.
   * Allow user preferences for Fast Forward / Reverse speeds **by Steven van de Beek**.
   * Allow shrinking timeline vertically when fewer than maximum tracks used tracks.
   * Make Range Overwrite 3 point edit work with only In set on Timeline.

flowblade-1.14.tar.gz/flowblade-trunk/docs/ROADMAP.md -> flowblade-1.16.tar.gz/flowblade-trunk/docs/ROADMAP.md Changed

@@ -2,63 +2,40 @@
 
 Last updated: September. 2017
 
-
-
-## Editing
-- **Context sensitive Timeline tool cursor** This was originally part of non-features list of the design, but it seems that users prefer this, and we will look for a way to incoporate this with current design.
+## The 2.0 FEATURE SET
+- **New display MLT service or method**. SDL1.2 will be eventually lost as SDL2 is made default on all distros.This is part of the solution for several issues. #309 #329 
+- **Performance review and needed fixes** This needs some investigation and it needs to be made sure that the new display method is as performant as possible.
+- **Context sensitive Timeline tool cursor** This was originally part of non-features list of the design, but it seems that users prefer this, and we will look for a way to incoporate this with current design. #424 
+- **Autofollow compositors** Compositors will be made to follow their origin clips automatically if user so chooses.
 - **Automatic Timeline Rendering** The only way to provide smooth playback in all circumstances is to do some form of timeline rendering. There are some ideas here that will be attempted, but cannot be quaranteed to work beforehand.
-
-## Tracks
+- **Proxy Editing** should have all important improvements. #398 
+- **Audio scratching** on timeline. #95
+- **Dedicated masking/keying/full affine tool and/or new MLT services** to close related functionality gaps. #372 
+- **Binary packaging** At least one of Appimage, Snap, Flatpack. #453
+- **Translations workflow update** These need the easiest, most moders workflows available.
+- **Website update** Some existing features are missing, add *Contributing* text.
+
+### Other possible developments
 - **Track filters stack** for both video and audio tracks.
-
-## Filters
 - Contribute **filters for MLT**. Spotligt, affine transform filter seem most interesting. Frei0r is not an adequate platform for some of these. may require using Cairo.
 - **Selective Filter Application**, this function allows user to apply any filter only inside an area defined by alpha filters. This can currently be simulated with two clips. Requires MLT contribution.
-
-## Compositing
-
 - **Animated Image to Alpha**, combines two images sources using luma information from a third source, probably a frame sequence
-- animated line/curve masks, this may also be best done using **Cairo**.  Requires MLT contribution.
 - add to all alpha filters composing methods union, intersection, difference and exclusion.  Requires MLT and Frei0r contribution.
-
-## Tools development
-- dedicated masking/keying tool
-
-## Tool integration
+- **Configurable Keyboard Shortcuts**
 - **Media Item creation** from ready made programs for e.g. text animations with Natron
 - Gimp, Inkscape, Audacity, Krita examined as **Timeline Container Clip** media creator programs
-
-## Audio
-- audio scratching on playback
 - subbuses or virtual channels to help with mixing.
 - a 5.1 surround audio track mixing
 - synching audio with audio
 - jack integration
-
-## Editor functionality
-
-- Configurable Keyboard Shortcuts.
-
-
-## Packaging
-
-- Appimage, Snap, Flatpack. Appimage is done first, Snap second and Flatpack is assessed last.
-
-## Communications
-
-- translations workflow update. 
-- website update
 - 5 - 10 tutorial videos on some important workflow issues
 - forum with threads
-
-
-## Technical development
 - **GPU Rendering** MLT already contains support for GPU rendering for certain filters
-- The **Wayland** transition using SDL2 or OpenGL consumer. SDL2 consumer does not exist and would need to be contributed.
 	
 
 
 *Changelog*
+- *14-11-2017 Change document focus to 2.0 feature set*
 - *20-9-2017 drop FFMpeg tool, Container clips are done, add Editing section*
 - *13-5-17 Remove undoable items related to animating property values in in MLT, require too large MLt controinutions for the time being*
 - *13-5-17 Remove completed items and items that will be in 1.14*

flowblade-1.16.tar.gz/flowblade-trunk/docs/SDL_2_AND_MLT_6_6_0.md Added

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

flowblade-1.14.tar.gz/flowblade-trunk/flowblade -> flowblade-1.16.tar.gz/flowblade-trunk/flowblade Changed

flowblade-1.14.tar.gz/flowblade-trunk/installdata/flowblade.desktop -> flowblade-1.16.tar.gz/flowblade-trunk/installdata/flowblade.desktop Changed

flowblade-1.14.tar.gz/flowblade-trunk/setup.py -> flowblade-1.16.tar.gz/flowblade-trunk/setup.py Changed

flowblade-1.16.tar.gz/issue_template.md Added