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 4

flowblade.changes Changed

flowblade.spec Changed

@@ -17,7 +17,7 @@
 
 %define prjname Flowblade
 Name:           flowblade
-Version:        1.8
+Version:        1.10
 Release:        0
 Summary:        Multitrack non-linear video editor
 License:        GPL-3.0
@@ -29,14 +29,23 @@
 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-gobject
+BuildRequires:  python-imaging
+BuildRequires:  python-mlt
+BuildRequires:  python-numpy
 Requires:       dbus-1-python
 Requires:       ffmpeg
 Requires:       frei0r-plugins >= 1.4
 Requires:       ladspa
 Requires:       ladspa-swh-plugins
-Requires:       libcairomm-1_0-1
 Requires:       libmlt6-modules
-Requires:       librsvg-2-2
 Requires:       python-cairo
 Requires:       python-gnomevfs
 Requires:       python-gobject
@@ -44,6 +53,8 @@
 Requires:       python-mlt
 Requires:       python-numpy
 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
 BuildArch:      noarch
 
@@ -76,7 +87,6 @@
 rm -rf %{buildroot}%{_libexecdir}/mime/packages/%{name}
 
 %fdupes -s %{buildroot}%{python_sitelib}
-
 %find_lang %{name} %{name}.lang
 
 %post
@@ -92,7 +102,7 @@
 %doc AUTHORS COPYING README docs/RELEASE_NOTES*
 %attr(0755,root,root) %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_mandir}/man1/%{name}.1*
+%{_mandir}/man?/%{name}.?%{ext_info}
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/mime/packages/%{name}.xml
 %{python_sitelib}/%{prjname}

flowblade-1.8.tar.gz/README.md -> flowblade-1.10.tar.gz/README.md Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/app.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/app.py Changed

@@ -72,7 +72,6 @@
 import mlttransitions
 import movemodes
 import persistance
-import phantomcompositor
 import positionbar
 import preferenceswindow
 import projectaction
@@ -87,6 +86,8 @@
 import snapping
 import titler
 import tlinewidgets
+import toolsintegration
+import toolnatron
 import trimmodes
 import translations
 import undo
@@ -168,12 +169,12 @@
 os.mkdir(utils.get_hidden_screenshot_dir_path())
 if not os.path.exists(user_dir + appconsts.GMIC_DIR):
 os.mkdir(user_dir + appconsts.GMIC_DIR)
- """ This may be added back later
- if not os.path.exists(user_dir + appconsts.NODE_COMPOSITORS_DIR):
- os.mkdir(user_dir + appconsts.NODE_COMPOSITORS_DIR)
- if not os.path.exists(user_dir + appconsts.NODE_COMPOSITORS_DIR + "/" + appconsts.PHANTOM_DISK_CACHE_DIR):
- os.mkdir(user_dir + appconsts.NODE_COMPOSITORS_DIR + "/" + appconsts.PHANTOM_DISK_CACHE_DIR)
- """
+ if not os.path.exists(user_dir + appconsts.MATCH_FRAME_DIR):
+ os.mkdir(user_dir + appconsts.MATCH_FRAME_DIR)
+ if not os.path.exists(user_dir + appconsts.TRIM_VIEW_DIR):
+ os.mkdir(user_dir + appconsts.TRIM_VIEW_DIR)
+ if not os.path.exists(user_dir + appconsts.NATRON_DIR):
+ os.mkdir(user_dir + appconsts.NATRON_DIR)
 
 # Set paths.
 respaths.set_paths(root_path)
@@ -215,6 +216,7 @@
 editorstate.SCREEN_WIDTH = scr_w
 editorstate.SCREEN_HEIGHT = scr_h
 
+ print scr_w, scr_h
 print "Small height:", editorstate.screen_size_small_height()
 print "Small width:", editorstate.screen_size_small_width()
 
@@ -261,9 +263,13 @@
 # Audiomonitoring being available needs to be known before GUI creation
 audiomonitoring.init(editorstate.project.profile)
 
- # Check for tools
+ # Set trim view mode to current default value
+ editorstate.show_trim_view = editorpersistance.prefs.trim_view_default
+
+ # Check for tools and init tools integration
 gmic.test_availablity()
- #phantomcompositor.test_availablity()
+ toolnatron.init()
+ toolsintegration.init()
 
 # Create player object
 create_player()
@@ -392,6 +398,12 @@
 updater.set_clip_edit_mode_callback = editevent.set_clip_monitor_edit_mode
 updater.load_icons()
 
+ # Notebook indexes are differn for 1 and 2 window layouts
+ if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
+ medialog.range_log_notebook_index = 0
+ compositeeditor.compositor_notebook_index = 2
+ clipeffectseditor.filters_notebook_index = 1
+
 # Create window and all child components
 editor_window = editorwindow.EditorWindow()
 
@@ -405,7 +417,9 @@
 
 # Connect window global key listener
 gui.editor_window.window.connect("key-press-event", keyevents.key_down)
- 
+ if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
+ gui.editor_window.window2.connect("key-press-event", keyevents.key_down)
+
 # Give undo a reference to uimanager for menuitem state changes
 undo.set_menu_items(gui.editor_window.uimanager)
 
@@ -569,6 +583,9 @@
 loaded_autosave_file = None
 
 editorstate.update_current_proxy_paths()
+ editorstate.fade_length = -1
+ editorstate.transition_length = -1
+ editorstate.clear_trim_clip_cache()
 audiomonitoring.init_for_project_load()
 updater.window_resized()
 
@@ -576,6 +593,9 @@
 gui.editor_window.window.handler_unblock(window_state_id)
 start_autosave()
 
+ if new_project.update_media_lengths_on_load == True:
+ projectaction.update_media_lengths()
+
 #editorstate.project.c_seq.print_all()
 
 def change_current_sequence(index):
@@ -721,6 +741,11 @@
 
 if editorstate.screen_size_small_height() == True:
 appconsts.TOP_ROW_HEIGHT = 10
+ projectinfogui.PROJECT_INFO_PANEL_HEIGHT = 140
+
+ if editorstate.SCREEN_WIDTH < 1153 and editorstate.SCREEN_HEIGHT < 865:
+ editorwindow.MONITOR_AREA_WIDTH = 400
+ positionbar.BAR_WIDTH = 100
 
 def _too_small_screen_exit():
 global exit_timeout_id
@@ -757,18 +782,7 @@
 return True # Signal that event is handled, otherwise it'll destroy window anyway
 
 def get_save_time_msg():
- if projectaction.save_time == None:
- return _("Project has not been saved since it was opened.")
- 
- save_ago = (time.clock() - projectaction.save_time) / 60.0
-
- if save_ago < 1:
- return _("Project was saved less than a minute ago.")
-
- if save_ago < 2:
- return _("Project was saved one minute ago.")
- 
- return _("Project was saved ") + str(int(save_ago)) + _(" minutes ago.")
+ return projectaction.get_save_time_msg()
 
 def _shutdown_dialog_callback(dialog, response_id):
 dialog.destroy()
@@ -795,6 +809,10 @@
 alloc = gui.editor_window.window.get_allocation()
 x, y, w, h = alloc.x, alloc.y, alloc.width, alloc.height 
 editorpersistance.prefs.exit_allocation = (w, h)
+ if gui.editor_window.window2 != None:
+ alloc = gui.editor_window.window2.get_allocation()
+ pos_x, pos_y = gui.editor_window.window2.get_position()
+ editorpersistance.prefs.exit_allocation_window_2 = (alloc.width, alloc.height, pos_x, pos_y) 
 editorpersistance.prefs.app_v_paned_position = gui.editor_window.app_v_paned.get_position()
 editorpersistance.prefs.top_paned_position = gui.editor_window.top_paned.get_position()
 editorpersistance.prefs.mm_paned_position = gui.editor_window.mm_paned.get_position()
@@ -803,6 +821,9 @@
 # Block reconnecting consumer before setting window not visible
 updater.player_refresh_enabled = False
 gui.editor_window.window.set_visible(False)
+ if gui.editor_window.window2 != None:
+ gui.editor_window.window2.set_visible(False)
+
 # Close and destroy app when gtk finds time to do it after hiding window
 GLib.idle_add(_app_destroy)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/appconsts.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/appconsts.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/audiomonitoring.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/audiomonitoring.py Changed

@@ -58,7 +58,6 @@
 DASHES = [DASH_INK, DASH_SKIP, DASH_INK, DASH_SKIP]
 
 METER_LIGHTS = 143 #57
-#METER_HEIGHT = METER_LIGHTS * DASH_INK + (METER_LIGHTS - 1) * DASH_SKIP
 METER_HEIGHT = METER_LIGHTS * DASH_INK + (METER_LIGHTS - 1) * DASH_SKIP
 METER_WIDTH = 10
 
@@ -112,11 +111,19 @@
         MONITORING_AVAILABLE = False
         editorstate.audio_monitoring_available = False
 
-    global CONTROL_SLOT_H, METER_SLOT_H
+    global CONTROL_SLOT_H, METER_SLOT_H, METER_LIGHTS, METER_HEIGHT
     if editorstate.screen_size_small_height() == True:
-        METER_SLOT_H = 400
-        CONTROL_SLOT_H = 220
-            
+        if editorstate.SCREEN_HEIGHT > 898:
+            METER_SLOT_H = 400
+            CONTROL_SLOT_H = 240
+            METER_LIGHTS = 123
+            METER_HEIGHT = METER_LIGHTS * DASH_INK + (METER_LIGHTS - 1) * DASH_SKIP
+        else:
+            METER_SLOT_H = 275
+            CONTROL_SLOT_H = 240
+            METER_LIGHTS = 82
+            METER_HEIGHT = METER_LIGHTS * DASH_INK + (METER_LIGHTS - 1) * DASH_SKIP
+
     # We want this to be always present when closing app or we'll need to handle it being missing.
     global _update_ticker
     _update_ticker = utils.Ticker(_audio_monitor_update, 0.04)
@@ -334,10 +341,7 @@
             else:
                 name = utils.get_track_name(seq.tracks[i], seq)
                 gain = GainControl(name, seq, seq.tracks[i])
-            #if i == 0:
-            #    tmp = gain # for bg color ?
-            #    gain = Gtk.EventBox() # for bg color ?
-            #    gain.add(tmp) # for bg color ?
+
             self.gain_controls.append(gain)
             gain_control_area.pack_start(gain, False, False, 0)
 
@@ -514,8 +518,6 @@
     def __init__(self, name, seq, producer, is_master=False):
         GObject.GObject.__init__(self)
 
-
-
         self.seq = seq
         self.producer = producer
         self.is_master = is_master

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/clipeffectseditor.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/clipeffectseditor.py Changed

@@ -23,9 +23,9 @@
 """
 
 
-
+from gi.repository import GLib
 from gi.repository import Gtk
-
+import time
 
 import dnd
 import edit
@@ -53,6 +53,16 @@
 # Used to update kfeditors with external tline frame position changes
 keyframe_editor_widgets = []
 
+# Filter stack DND requires some state info to be maintained to make sure that it's only done when certain events
+# happen in a certain sequence.
+NOT_ON = 0
+MOUSE_PRESS_DONE = 1
+INSERT_DONE = 2
+stack_dnd_state = NOT_ON
+stack_dnd_event_time = 0.0
+stack_dnd_event_info = None
+
+filters_notebook_index = 2
 
 def get_clip_effects_editor_panel(group_combo_box, effects_list_view):
 """
@@ -132,7 +142,7 @@
 set_enabled(True)
 update_stack_view()
 effect_selection_changed() # This may get called twice
- gui.middle_notebook.set_current_page(2) # 2 == index of clipeditor page in notebook
+ gui.middle_notebook.set_current_page(filters_notebook_index) # 2 == index of clipeditor page in notebook
 
 def clip_removed_during_edit(removed_clip):
 """
@@ -165,12 +175,24 @@
 
 def _filter_stack_menu_item_selected(widget, data):
 item_id, row, treeview = data
- # Toggle filter active state
+
 if item_id == "toggle":
 toggle_filter_active(row)
 if item_id == "reset":
 reset_filter_values()
-
+ if item_id == "moveup":
+ delete_row = row
+ insert_row = row + 2
+ if insert_row > len(clip.filters):
+ insert_row = len(clip.filters)
+ do_stack_move(insert_row, delete_row)
+ if item_id == "movedown":
+ delete_row = row + 1
+ insert_row = row - 1
+ if insert_row < 0:
+ insert_row = 0
+ do_stack_move(insert_row, delete_row)
+ 
 def _quit_editing_clip_clicked(): # this is a button callback
 clear_clip()
 
@@ -200,8 +222,10 @@
 widgets.exit_button.connect("clicked", lambda w: _quit_editing_clip_clicked())
 widgets.exit_button.set_tooltip_text(_("Quit editing Clip in editor"))
 
- widgets.effect_stack_view = guicomponents.FilterSwitchListView(lambda ts: effect_selection_changed(), toggle_filter_active)
- dnd.connect_stack_treeview(widgets.effect_stack_view)
+ widgets.effect_stack_view = guicomponents.FilterSwitchListView(lambda ts: effect_selection_changed(), 
+ toggle_filter_active, dnd_row_deleted, dnd_row_inserted)
+ 
+ widgets.effect_stack_view.treeview.connect("button-press-event", lambda w,e, wtf: stack_view_pressed(), None)
 gui.effect_stack_list_view = widgets.effect_stack_view
 
 widgets.value_edit_box = Gtk.VBox()
@@ -349,7 +373,55 @@
 filter_object.update_mlt_disabled_value()
 if update_stack_view == True:
 update_stack_view_changed_blocked()
+
+def dnd_row_deleted(model, path):
+ now = time.time()
+ global stack_dnd_state, stack_dnd_event_time, stack_dnd_event_info
+ if stack_dnd_state == INSERT_DONE:
+ if (now - stack_dnd_event_time) < 0.1:
+ stack_dnd_state = NOT_ON
+ insert_row = int(stack_dnd_event_info)
+ delete_row = int(path.to_string())
+ stack_dnd_event_info = (insert_row, delete_row)
+ # Because of dnd is gtk thing for some internal reason it needs to complete before we go on
+ # touching storemodel again with .clear() or it dies in gtktreeviewaccessible.c
+ GLib.idle_add(do_dnd_stack_move)
+ else:
+ stack_dnd_state = NOT_ON
+ else:
+ stack_dnd_state = NOT_ON
+ 
+def dnd_row_inserted(model, path, tree_iter):
+ global stack_dnd_state, stack_dnd_event_time, stack_dnd_event_info
+ if stack_dnd_state == MOUSE_PRESS_DONE:
+ stack_dnd_state = INSERT_DONE
+ stack_dnd_event_time = time.time()
+ stack_dnd_event_info = path.to_string()
+ else:
+ stack_dnd_state = NOT_ON
+
+def do_dnd_stack_move():
+ insert, delete_row = stack_dnd_event_info
+ do_stack_move(insert, delete_row)
+ 
+def do_stack_move(insert_row, delete_row):
+ if abs(insert_row - delete_row) < 2: # filter was dropped on its previous place or cannot moved further up or down
+ return
+ 
+ # The insert insert_row and delete_row values are rows we get when listening 
+ # "row-deleted" and "row-inserted" events after setting treeview "reorderable"
+ # Dnd is detected by order and timing of these events together with mouse press event
+ data = {"clip":clip,
+ "insert_index":insert_row,
+ "delete_index":delete_row,
+ "filter_edit_done_func":filter_edit_done}
+ action = edit.move_filter_action(data)
+ action.do_edit()
 
+def stack_view_pressed():
+ global stack_dnd_state
+ stack_dnd_state = MOUSE_PRESS_DONE
+
 def effect_selection_changed():
 global keyframe_editor_widgets

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/clipmenuaction.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/clipmenuaction.py Changed

@@ -24,8 +24,14 @@
 
 from PIL import Image
 
+from gi.repository import GLib
 from gi.repository import Gtk
 
+import mlt
+import os
+import shutil
+import time
+
 import audiowaveform
 import appconsts
 import clipeffectseditor
@@ -46,6 +52,8 @@
 import updater
 import utils
 
+_match_frame_writer = None
+
 # ---------------------------------- clip menu
 def display_clip_menu(y, event, frame):
     # See if we actually hit a clip
@@ -334,6 +342,99 @@
     clip, track, item_id, item_data = data
     clear_filters()
 
+def _select_all_after(data):
+    clip, track, item_id, item_data = data
+    movemodes._select_multiple_clips(track.id, track.clips.index(clip), len(track.clips) - 1)
+    updater.repaint_tline()
+
+def _select_all_before(data):
+    clip, track, item_id, item_data = data
+    movemodes._select_multiple_clips(track.id, 0, track.clips.index(clip))
+    updater.repaint_tline()
+
+def _match_frame_start(data):
+    clip, track, item_id, item_data = data
+    _set_match_frame(clip, clip.clip_in, track, True)
+
+def _match_frame_end(data):
+    clip, track, item_id, item_data = data
+    _set_match_frame(clip, clip.clip_out, track, False)
+
+def _match_frame_start_monitor(data):
+    clip, track, item_id, item_data = data
+    gui.monitor_widget.set_frame_match_view(clip, clip.clip_in)
+
+def _match_frame_end_monitor(data):
+    clip, track, item_id, item_data = data
+    gui.monitor_widget.set_frame_match_view(clip, clip.clip_out)
+     
+def _set_match_frame(clip, frame, track, display_on_right):
+    global _match_frame_writer
+    _match_frame_writer = MatchFrameWriter(clip, frame, track, display_on_right)
+    
+    GLib.idle_add(_write_match_frame)
+
+def _write_match_frame():
+    _match_frame_writer.write_image()
+
+def _match_frame_close(data):
+    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
+        self.clip_frame = clip_frame
+        self.track = track
+        self.display_on_right = display_on_right
+        
+    def write_image(self):
+        """
+        Writes thumbnail image from file producer
+        """
+        clip_path = self.clip.path
+
+        # Create consumer
+        matchframe_new_path = utils.get_hidden_user_dir_path() + appconsts.MATCH_FRAME_NEW
+        consumer = mlt.Consumer(PROJECT().profile, "avformat", matchframe_new_path)
+        consumer.set("real_time", 0)
+        consumer.set("vcodec", "png")
+
+        # Create one frame producer
+        producer = mlt.Producer(PROJECT().profile, str(clip_path))
+        producer = producer.cut(int(self.clip_frame), int(self.clip_frame))
+
+        # Delete new match frame
+        try:
+            os.remove(matchframe_new_path)
+        except:
+            # This fails when done first time ever  
+            pass
+
+        # Connect and write image
+        consumer.connect(producer)
+        consumer.run()
+        
+        # Wait until new file exists
+        while os.path.isfile(matchframe_new_path) != True:
+            time.sleep(0.1)
+
+        # Copy to match frame
+        matchframe_path = utils.get_hidden_user_dir_path() + appconsts.MATCH_FRAME
+        shutil.copyfile(matchframe_new_path, matchframe_path)
+
+        # Update timeline data           
+        # Get frame of clip.clip_in_in on timeline.
+        clip_index = self.track.clips.index(self.clip)
+        clip_start_in_tline = self.track.clip_start(clip_index)
+        tline_match_frame = clip_start_in_tline + (self.clip_frame - self.clip.clip_in)
+        tlinewidgets.set_match_frame(tline_match_frame, self.track.id, self.display_on_right)
+
+        # Update view
+        updater.repaint_tline()
+
+    
 # Functions to handle popup menu selections for strings 
 # set as activation messages in guicomponents.py
 # activation_message -> _handler_func
@@ -357,4 +458,11 @@
                   "cover_with_next": _cover_blank_from_next,
                   "clone_filters_from_next": _clone_filters_from_next,
                   "clone_filters_from_prev": _clone_filters_from_prev,
-                  "clear_filters": _clear_filters}
+                  "clear_filters": _clear_filters,
+                  "match_frame_close":_match_frame_close,
+                  "match_frame_start":_match_frame_start,
+                  "match_frame_end":_match_frame_end,
+                  "match_frame_start_monitor":_match_frame_start_monitor,
+                  "match_frame_end_monitor":_match_frame_end_monitor,
+                  "select_all_after": _select_all_after,
+                  "select_all_before":_select_all_before}

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/compositeeditor.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/dialogs.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/dialogs.py Changed

@@ -362,7 +362,7 @@
                             os.path.expanduser("~") + _("\' as render clips folder"),
                             gui.editor_window.window)
 
-def exit_confirm_dialog(callback, msg, parent_window, project_name):
+def exit_confirm_dialog(callback, msg, parent_window, project_name, data=None):
     title = _("Save project '") + project_name + _("' before exiting?")
     content = dialogutils.get_warning_message_dialog_panel(title, msg, False, Gtk.STOCK_QUIT)
 
@@ -377,7 +377,10 @@
     dialog.vbox.pack_start(alignment, True, True, 0)
     dialogutils.set_outer_margins(dialog.vbox)
     _default_behaviour(dialog)
-    dialog.connect('response', callback)
+    if data == None:
+        dialog.connect('response', callback)
+    else:
+        dialog.connect('response', callback, data)
     dialog.show_all()
 
 def close_confirm_dialog(callback, msg, parent_window, project_name):
@@ -405,7 +408,7 @@
 
     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.8.0")
+    ver_label = Gtk.Label(label="1.10.0")
     janne_label = Gtk.Label(label="Copyright 2016 Janne Liljeblad and contributors")
     page_label = Gtk.Label(label="Project page: https://github.com/jliljebl/flowblade")
     flow_label.modify_font(Pango.FontDescription("sans bold 14"))
@@ -614,7 +617,7 @@
     _default_behaviour(dialog)
     dialog.connect('response', _dialog_destroy)
     dialog.show_all()
-
+   
 def _dialog_destroy(dialog, response):
     dialog.destroy()
 
@@ -658,8 +661,14 @@
     return dialog
 
 def recreate_icons_progress_dialog():
+    return _text_info_prograss_dialog(_("Recreating icons"))
+
+def update_media_lengths_progress_dialog():
+    return _text_info_prograss_dialog(_("Update media lengths data"))
+    
+def _text_info_prograss_dialog(title):
     dialog = Gtk.Window(Gtk.WindowType.TOPLEVEL)
-    dialog.set_title(_("Recreating icons"))
+    dialog.set_title(title)
 
     info_label = Gtk.Label(label="")
     status_box = Gtk.HBox(False, 2)
@@ -685,6 +694,8 @@
     dialog.set_position(Gtk.WindowPosition.CENTER)
     dialog.show_all()
 
+    dialog.set_keep_above(True) # Perhaps configurable later
+    
     # Make refs available for updates
     dialog.progress_bar = progress_bar
     dialog.info = info_label
@@ -1141,6 +1152,7 @@
     geom_vbox.pack_start(_get_kb_row(_("Right Arrow"), _("Move Source Video Right")), False, False, 0)
     geom_vbox.pack_start(_get_kb_row(_("Up Arrow"), _("Move Source Video Up")), False, False, 0)
     geom_vbox.pack_start(_get_kb_row(_("Down Arrow"), _("Move Source Video Down")), False, False, 0)
+    geom_vbox.pack_start(_get_kb_row(_("Shift"), _("Snap to X or Y of drag start point")), False, False, 0)
     geom = guiutils.get_named_frame(_("Geometry Editor"), geom_vbox)
 
     panel = Gtk.VBox()
@@ -1183,7 +1195,7 @@
 
 def watermark_dialog(add_callback, remove_callback):
     dialog = Gtk.Dialog(_("Sequence Watermark"),  gui.editor_window.window,
-                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                        Gtk.DialogFlags.DESTROY_WITH_PARENT,
                         (_("Close").encode('utf-8'), Gtk.ResponseType.CLOSE))
 
     seq_label = guiutils.bold_label(_("Sequence:") + " ")
@@ -1229,7 +1241,7 @@
     dialog.show_all()
 
 def watermark_file_dialog(callback, parent, widgets):
-    dialog = Gtk.FileChooserDialog(_("Select Watermark File"),  gui.editor_window.window,
+    dialog = Gtk.FileChooserDialog(_("Select Watermark File"), None,
                                    Gtk.FileChooserAction.OPEN,
                                    (_("Cancel").encode('utf-8'), Gtk.ResponseType.CANCEL,
                                     _("OK").encode('utf-8'), Gtk.ResponseType.ACCEPT))
@@ -1245,7 +1257,7 @@
     dialog.connect('response', callback, widgets)
     dialog.show()
 
-def media_file_dialog(text, callback, multiple_select, data=None, parent=None):
+def media_file_dialog(text, callback, multiple_select, data=None, parent=None, open_dir=None):
     if parent == None:
         parent = gui.editor_window.window
 
@@ -1267,6 +1279,9 @@
         and (editorpersistance.prefs.last_opened_media_dir != None)):
         file_select.set_current_folder(editorpersistance.prefs.last_opened_media_dir)
 
+    if open_dir != None:
+        file_select.set_current_folder(open_dir)
+
     if data == None:
         file_select.connect('response', callback)
     else:

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/dnd.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/dnd.py Changed

@@ -46,6 +46,7 @@
 
 MEDIA_FILES_DND_TARGET = Gtk.TargetEntry.new('media_file', Gtk.TargetFlags.SAME_APP, 0)
 EFFECTS_DND_TARGET = Gtk.TargetEntry.new('effect', Gtk.TargetFlags.SAME_APP, 0)
+#EFFECTS_STACK_DND_TARGET = Gtk.TargetEntry.new('effectstack', Gtk.TargetFlags.SAME_APP, 0)
 CLIPS_DND_TARGET = Gtk.TargetEntry.new('clip', Gtk.TargetFlags.SAME_APP, 0)
 RANGE_DND_TARGET = Gtk.TargetEntry.new('range', Gtk.TargetFlags.SAME_APP, 0)
 
@@ -108,7 +109,7 @@
                                        [EFFECTS_DND_TARGET], 
                                        Gdk.DragAction.COPY)
     tree_view.connect("drag_data_get", _effects_drag_data_get)
-
+  
 def connect_video_monitor(widget):
     widget.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP,
                          [MEDIA_FILES_DND_TARGET], 
@@ -122,13 +123,6 @@
                            Gdk.DragAction.COPY)
     widget.drag_source_set_icon_pixbuf(clip_icon)
 
-def connect_stack_treeview(widget):
-    widget.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP,
-                         [EFFECTS_DND_TARGET], 
-                         Gdk.DragAction.COPY)
-                         
-    widget.connect("drag_drop", _on_effect_stack_drop)
-
 def connect_tline(widget, do_effect_drop_func, do_media_drop_func):
     widget.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.DROP,
                          [MEDIA_FILES_DND_TARGET, EFFECTS_DND_TARGET, CLIPS_DND_TARGET], 
@@ -184,7 +178,7 @@
     _save_treeview_selection(treeview)
     global drag_source
     drag_source = SOURCE_EFFECTS_TREE
-  
+
 def _on_monitor_drop(widget, context, x, y, timestamp):
     context.finish(True, False, timestamp)
     media_file = drag_data[0].media_file
@@ -201,7 +195,7 @@
     for media_object in drag_data:
         moved_rows.append(media_object.bin_index)
     move_files_to_bin_func(max(bin_path), moved_rows)
-    
+
 def _save_treeview_selection(treeview):
     treeselection = treeview.get_selection()
     (model, rows) = treeselection.get_selected_rows()

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/edit.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/edit.py Changed

@@ -34,6 +34,7 @@
 import mltfilters
 import movemodes
 import resync
+import tlinewidgets
 import trimmodes
 import undo
 import updater
@@ -357,6 +358,8 @@
 _remove_trailing_blanks_redo(self)
 resync.calculate_and_set_child_clip_sync_states()
 
+ tlinewidgets.set_match_frame(-1, -1, True)
+
 # HACK, see above.
 if self.stop_for_edit:
 PLAYER().consumer.start()
@@ -377,6 +380,7 @@
 current_sequence().update_trim_hack_blank_length() # NEEDED FOR TRIM CRASH HACK, REMOVE IF FIXED
 PLAYER().display_inside_sequence_length(current_sequence().seq_len) # NEEDED FOR TRIM CRASH HACK, REMOVE IF FIXED
 
+ updater. update_seqence_info_text()
 
 # ---------------------------------------------------- SYNC DATA
 class SyncData:
@@ -1345,12 +1349,68 @@
 
 self.filter_edit_done_func(self.clip, len(self.clip.filters) - 1)# updates effect stack gui
 
+#------------------- MOVE FILTER
+# "clip",""insert_index","delete_index"","filter_edit_done_func"
+# Moves filter in filter stack filter to clip.
+def move_filter_action(data):
+ action = EditAction(_move_filter_undo,_move_filter_redo, data)
+ return action
+
+def _move_filter_undo(self):
+ _detach_all(self.clip)
+
+ for i in range(0, len(self.filters_orig)):
+ self.clip.filters.pop(0)
+
+ for i in range(0, len(self.filters_orig)):
+ self.clip.filters.append(self.filters_orig[i])
+
+ if self.delete_index < self.insert_index:
+ active_index = self.delete_index
+ else:
+ active_index = self.delete_index - 1
+ 
+ _attach_all(self.clip)
+
+ self.filter_edit_done_func(self.clip, active_index)
+
+def _move_filter_redo(self):
+ _detach_all(self.clip)
+ 
+ # Copy filters in original order for undo
+ self.filters_orig = []
+ for i in range(0, len(self.clip.filters)):
+ self.filters_orig.append(self.clip.filters[i])
+ 
+ if self.delete_index < self.insert_index:
+ # d < i, moved filter can be found at d
+ moved_filter = self.clip.filters[self.delete_index]
+ _filter_move_insert(self.clip.filters, moved_filter, self.insert_index)
+ self.clip.filters.pop(self.delete_index)
+ active_index = self.insert_index - 1
+ else:
+ # d > i, moved filter can be found at d - 1
+ moved_filter = self.clip.filters[self.delete_index - 1]
+ _filter_move_insert(self.clip.filters, moved_filter, self.insert_index)
+ self.clip.filters.pop(self.delete_index)
+ active_index = self.insert_index
+
+ _attach_all(self.clip)
+
+ self.filter_edit_done_func(self.clip, active_index)
+ 
 def _detach_all(clip):
 mltfilters.detach_all_filters(clip)
 
 def _attach_all(clip):
 mltfilters.attach_all_filters(clip)
 
+def _filter_move_insert(filters_list, f, insert_index):
+ try:
+ filters_list.insert(insert_index, f)
+ except:
+ filters_list.append(insert_index, f)
+ 
 #------------------- REMOVE MULTIPLE FILTERS
 # "clips"
 # Adds filter to clip.
@@ -2030,6 +2090,34 @@
 self.turn_on_stop_for_edit = True
 
 
+#----------------- RANGE DELETE 
+# "tracks","mark_in_frame","mark_out_frame"
+def range_delete_action(data):
+ action = EditAction(_range_delete_undo, _range_delete_redo, data)
+ action.stop_for_edit = True
+ return action
+
+def _range_delete_undo(self):
+ for i in range(0, len(self.tracks)): # -1 because hidden track, 1 because black track
+ track = self.tracks[i]
+ track_extract_data = self.tracks_extract_data[i]
+
+ _track_put_back_range(self.mark_in_frame, 
+ track, 
+ track_extract_data)
+ 
+def _range_delete_redo(self):
+ self.tracks_extract_data = []
+ for track in self.tracks: # -1 because hidden track, 1 because black track
+ track_extracted = _track_extract_range(self.mark_in_frame, 
+ self.mark_out_frame, 
+ track)
+ self.tracks_extract_data.append(track_extracted)
+ 
+ # HACK, see EditAction for details
+ self.turn_on_stop_for_edit = True
+ 
+
 #------------------- ADD CENTERED TRANSITION
 # "transition_clip","transition_index", "from_clip","to_clip","track","from_in","to_out"
 def add_centered_transition_action(data):

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/editevent.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editevent.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editorpersistance.py Changed

@@ -178,7 +178,7 @@
     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 = edit_prefs_widgets
     
-    use_english, disp_splash, buttons_style, dark_theme, theme_combo, audio_levels_combo = view_prefs_widgets
+    use_english, disp_splash, buttons_style, dark_theme, theme_combo, audio_levels_combo, window_mode_combo = view_prefs_widgets
 
     global prefs
     prefs.open_in_last_opended_media_dir = open_in_last_opened_check.get_active()
@@ -204,6 +204,7 @@
     prefs.dark_theme = (dark_theme.get_active() == 1)
     prefs.theme_fallback_colors = theme_combo.get_active() 
     prefs.display_all_audio_levels = (audio_levels_combo.get_active() == 0)
+    prefs.global_layout = window_mode_combo.get_active() + 1 # +1 'cause values are 1 and 2
 
 def get_graphics_default_in_out_length():
     in_fr = int(15000/2) - int(prefs.default_grfx_length/2)
@@ -268,10 +269,16 @@
         self.jack_output_type = appconsts.JACK_OUT_AUDIO # not used
         self.media_load_order = appconsts.LOAD_ABSOLUTE_FIRST
         self.use_english_always = False
-        self.theme_fallback_colors = 0 # index oc gui._THEME_COLORS
+        self.theme_fallback_colors = 0 # index of gui._THEME_COLORS
         self.display_all_audio_levels = True
         self.overwrite_clip_drop = True
         self.trans_cover_delete = True
         # Jul-2016 - SvdB - For play/pause button
         self.play_pause = False
-
+        self.midbar_layout = appconsts.MIDBAR_TC_LEFT
+        self.global_layout = appconsts.SINGLE_WINDOW
+        self.trim_view_default = appconsts.TRIM_VIEW_OFF
+        self.trim_view_message_shown = False
+        self.exit_allocation_window_2 = (0, 0, 0, 0)
+        
+

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/editorstate.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editorstate.py Changed

@@ -106,6 +106,16 @@
 # Flag for window being in fullscreen mode
 fullscreen = False
 
+# Trim view mode
+show_trim_view = appconsts.TRIM_VIEW_OFF
+
+# Remember fade and transition lengths
+fade_length = -1
+transition_length = -1
+
+# Trim clips cache for quicker inits, path -> clip
+_trim_clips_cache = {}
+
 def current_is_move_mode():
 if ((edit_mode == INSERT_MOVE) or (edit_mode == OVERWRITE_MOVE) or (edit_mode == MULTI_MOVE)):
 return True
@@ -172,14 +182,35 @@
 return _copy_paste_objects
 
 def screen_size_small_height():
- if SCREEN_HEIGHT < 865:
+ if SCREEN_HEIGHT < 901:
 return True
 else:
+ if SCREEN_WIDTH < 1280:
+ return True
+ 
 return False
 
 def screen_size_small_width():
- if SCREEN_WIDTH < 1200:
+ if SCREEN_WIDTH < 1368:
 return True
 else:
 return False
- 
+
+def screen_size_small():
+ if screen_size_small_height() == True or screen_size_small_width() == True:
+ return True
+ 
+ return False
+
+def get_cached_trim_clip(path):
+ try:
+ return _trim_clips_cache[path]
+ except:
+ return None 
+
+def add_cached_trim_clip(clip):
+ _trim_clips_cache[clip.path] = clip
+
+def clear_trim_clip_cache():
+ global _trim_clips_cache
+ _trim_clips_cache = {}

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/editorwindow.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/editorwindow.py Changed

@@ -51,12 +51,12 @@
 import menuactions
 import middlebar
 import monitorevent
+import monitorwidget
 import respaths
 import render
 import rendergui
 import panels
 import patternproducer
-import phantomcompositor
 from positionbar import PositionBar
 import preferenceswindow
 import projectaction
@@ -129,6 +129,13 @@
 self.window.set_icon_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")
 self.window.set_border_width(5)
 
+ self.window2 = None
+ if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
+ self.window2 = Gtk.Window(Gtk.WindowType.TOPLEVEL)
+ self.window2.set_icon_from_file(respaths.IMAGE_PATH + "flowbladeappicon.png")
+ self.window2.set_border_width(5)
+ self.window2.connect("delete-event", lambda w, e:app.shutdown())
+
 # To ask confirmation for shutdown 
 self.window.connect("delete-event", lambda w, e:app.shutdown())
 
@@ -170,6 +177,9 @@
 ('AddTransition', None, _('Add Single Track Transition'), None, None, lambda a:tlineaction.add_transition_menu_item_selected()),
 ('AddFade', None, _('Add Single Track Fade'), None, None, lambda a:tlineaction.add_fade_menu_item_selected()),
 ('ClearFilters', None, _('Clear Filters'), None, None, lambda a:clipmenuaction.clear_filters()),
+ ('Timeline', None, _('Timeline')),
+ ('FiltersOff', None, _('All Filters Off'), None, None, lambda a:tlineaction.all_filters_off()),
+ ('FiltersOn', None, _('All Filters On'), None, None, lambda a:tlineaction.all_filters_on()),
 ('SyncCompositors', None, _('Sync All Compositors'), None, None, lambda a:tlineaction.sync_all_compositors()),
 ('ChangeSequenceTracks', None, _('Change Sequence Tracks Count...'), None, None, lambda a:projectaction.change_sequence_track_count()),
 ('Watermark', None, _('Watermark...'), None, None, lambda a:menuactions.edit_watermark()),
@@ -201,7 +211,6 @@
 ('Titler', None, _('Titler'), None, None, lambda a:titler.show_titler()),
 ('AudioMix', None, _('Audio Mixer'), None, None, lambda a:audiomonitoring.show_audio_monitor()),
 ('GMIC', None, _("G'MIC Effects"), None, None, lambda a:gmic.launch_gmic()),
- ('Phantom2D', None, _("Phantom2D"), None, None, lambda a: phantomcompositor.launch_phantom()),
 ('MediaLink', None, _('Media Relinker'), None, None, lambda a:medialinker.display_linker()),
 ('HelpMenu', None, _('_Help')),
 ('QuickReference', None, _('Contents'), None, None, lambda a:menuactions.quick_reference()),
@@ -258,6 +267,11 @@
 <menuitem action='SyncCompositors'/>
 <menuitem action='ClearFilters'/>
 <separator/>
+ <menu action='Timeline'>
+ <menuitem action='FiltersOff'/>
+ <menuitem action='FiltersOn'/>
+ </menu>
+ <separator/>
 <menuitem action='AddTransition'/>
 <menuitem action='AddFade'/>
 <separator/>
@@ -439,7 +453,10 @@
 render_panel_right = rendergui.get_render_panel_right(render.widgets,
 lambda w,e: projectaction.do_rendering(),
 lambda w,e: projectaction.add_to_render_queue())
- render_hbox = Gtk.HBox(True, 5)
+ if editorstate.screen_size_small_width() == False:
+ render_hbox = Gtk.HBox(True, 5)
+ else:
+ render_hbox = Gtk.HBox(False, 5) 
 render_hbox.pack_start(render_panel_left, True, True, 0)
 render_hbox.pack_start(render_panel_right, True, True, 0)
 
@@ -471,7 +488,6 @@
 project_vbox = Gtk.VBox()
 project_vbox.pack_start(project_info_panel, False, True, 0)
 project_vbox.pack_start(seq_panel, True, True, 0)
- 
 project_panel = guiutils.set_margins(project_vbox, 0, 2, 6, 2)
 
 # Notebook
@@ -479,7 +495,8 @@
 self.notebook.set_size_request(appconsts.NOTEBOOK_WIDTH, appconsts.TOP_ROW_HEIGHT)
 media_label = Gtk.Label(label=_("Media"))
 media_label.no_dark_bg = True
- self.notebook.append_page(mm_panel, media_label)
+ if editorpersistance.prefs.global_layout == appconsts.SINGLE_WINDOW:
+ self.notebook.append_page(mm_panel, media_label)
 self.notebook.append_page(media_log_panel, Gtk.Label(label=_("Range Log")))
 self.notebook.append_page(self.effects_panel, Gtk.Label(label=_("Filters")))
 self.notebook.append_page(self.compositors_panel, Gtk.Label(label=_("Compositors")))
@@ -487,10 +504,6 @@
 self.notebook.append_page(render_panel, Gtk.Label(label=_("Render")))
 self.notebook.set_tab_pos(Gtk.PositionType.BOTTOM)
 
- # Right notebook, used for Widescreen and Two row layouts
- self.right_notebook = Gtk.Notebook()
- self.right_notebook.set_tab_pos(Gtk.PositionType.BOTTOM)
-
 # Position bar and decorative frame for it
 self.pos_bar = PositionBar()
 pos_bar_frame = Gtk.Frame()
@@ -504,39 +517,42 @@
 self._create_monitor_row_widgets()
 self.player_buttons = glassbuttons.PlayerButtons()
 self.player_buttons.widget.set_tooltip_text(_("Prev Frame - Arrow Left\nNext Frame - Arrow Right\nPlay - Space\nStop - Space\nMark In - I\nMark Out - O\nClear Marks\nTo Mark In\nTo Mark Out"))
- self.monitor_source.modify_font(Pango.FontDescription("sans bold 8"))
 player_buttons_row = Gtk.HBox(False, 0)
-
 player_buttons_row.pack_start(self.player_buttons.widget, False, True, 0)
- player_buttons_row.pack_start(self.monitor_source, True, True, 0)
+ player_buttons_row.pack_start(pos_bar_frame, True, True, 0)
 player_buttons_row.set_margin_bottom(2)
 
 # Creates monitor switch buttons
 self._create_monitor_buttons()
 
+ # Monitor top info row
+ monitor_info_row = Gtk.HBox(False, 1)
+ monitor_info_row.pack_start(self.monitor_source, False, False, 0)
+ monitor_info_row.pack_start(Gtk.Label(), True, False, 0)
+ monitor_info_row.pack_start(self.info1, False, False, 0)
+
 # Switch / pos bar row
 self.view_mode_select = guicomponents.get_monitor_view_select_combo(lambda w, e: tlineaction.view_mode_menu_lauched(w, e))
+ self.trim_view_select = guicomponents.get_trim_view_select_combo(lambda w, e: monitorevent.trim_view_menu_launched(w, e))
 sw_pos_hbox = Gtk.HBox(False, 1)
- sw_pos_hbox.pack_start(self.sequence_editor_b, False, True, 0)
- sw_pos_hbox.pack_start(self.clip_editor_b, False, True, 0)
- sw_pos_hbox.pack_start(pos_bar_frame, True, True, 0)
+ sw_pos_hbox.pack_start(self.sequence_editor_b, True, True, 0)
+ sw_pos_hbox.pack_start(self.clip_editor_b, True, True, 0)
+ sw_pos_hbox.pack_start(self.trim_view_select.widget, False, False, 0)
 sw_pos_hbox.pack_start(self.view_mode_select.widget, False, False, 0)
 sw_pos_hbox.set_margin_top(4)
 sw_pos_hbox.set_margin_left(2)
 
 # Video display
- black_box = Gtk.EventBox()
- black_box.add(Gtk.Label())
- bg_color = Gdk.Color(red=0.0, green=0.0, blue=0.0)
- black_box.modify_bg(Gtk.StateType.NORMAL, bg_color)
- 
- self.tline_display = black_box # This could be any GTK+ widget (that is not "windowless"), only its XWindow draw rect 
- # is used to position and scale SDL overlay that actually displays video.
+ monitor_widget = monitorwidget.MonitorWidget()
+ self.tline_display = monitor_widget.get_monitor()
+ self.monitor_widget = monitor_widget
+
 dnd.connect_video_monitor(self.tline_display)
 
 # Monitor
 monitor_vbox = Gtk.VBox(False, 1)
- monitor_vbox.pack_start(self.tline_display, True, True, 0)
+ monitor_vbox.pack_start(monitor_info_row, False, True, 0)
+ monitor_vbox.pack_start(monitor_widget.widget, True, True, 0)
 monitor_vbox.pack_start(sw_pos_hbox, False, True, 0)
 monitor_vbox.pack_start(player_buttons_row, False, True, 0)
 
@@ -554,9 +570,13 @@
 
 # Top row paned
 self.top_paned = Gtk.HPaned()
- self.top_paned.pack1(notebook_vbox, resize=False, shrink=False)
- self.top_paned.pack2(monitor_frame, resize=True, shrink=False)
-
+ if editorpersistance.prefs.global_layout == appconsts.SINGLE_WINDOW:
+ self.top_paned.pack1(notebook_vbox, resize=False, shrink=False)
+ self.top_paned.pack2(monitor_frame, resize=True, shrink=False)
+ else:
+ self.top_paned.pack1(mm_panel, resize=False, shrink=False)
+ self.top_paned.pack2(notebook_vbox, resize=True, shrink=False)
+ 
 # Top row
 self.top_row_hbox = Gtk.HBox(False, 0)
 self.top_row_hbox.pack_start(self.top_paned, True, True, 0)
@@ -683,7 +703,6 @@
 if w != 0: # non-existing prefs file causes w and h to be 0
 if (float(w) / editorstate.SCREEN_WIDTH > 0.95) and (float(h) / editorstate.SCREEN_HEIGHT > 0.95):
 self.window.maximize()
- print "maximize" 
 else:
 self.window.resize(w, h)
 self.window.set_position(Gtk.WindowPosition.CENTER)
@@ -692,7 +711,28 @@
 
 # Show window and all of its components
 self.window.show_all()
- 
+
+ # Show Monitor Window in two window mode
+ if editorpersistance.prefs.global_layout != appconsts.SINGLE_WINDOW:
+ pane2 = Gtk.VBox(False, 1)
+ pane2.pack_start(monitor_frame, True, True, 0)
+ 
+ # Set pane and show window
+ self.window2.add(pane2)
+ self.window2.set_title("Flowblade")
+
+ # Maximize if it seems that we exited maximized, else set size
+ w, h, x, y = editorpersistance.prefs.exit_allocation_window_2
+ 
+ if w != 0: # non-existing prefs file causes w and h to be 0

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/glassbuttons.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/glassbuttons.py Changed

@@ -100,6 +100,8 @@
         else:
             self.glass_style = False
         
+        self.no_decorations = False
+        
         # Dark theme comes with flat buttons
         self.dark_theme = False
         if editorpersistance.prefs.dark_theme == True:
@@ -158,6 +160,24 @@
         # Width of buttons group
         buttons_width = self.button_width * len(self.icons)
 
+        if self.no_decorations == True:
+            x = self.button_x
+            for i in range(0, len(self.icons)):
+                icon = self.icons[i]
+                cr.set_source_surface(icon, x + self.image_x[i], self.image_y[i])
+                cr.paint()
+                if self.sensitive[i] == False:
+                    cr.save()
+                    self._round_rect_path(cr)
+                    cr.set_source(grad)
+                    cr.clip()
+                    cr.rectangle(x, self.button_y, self.button_width, self.button_height)
+                    cr.fill()
+                    cr.restore()
+                x += self.button_width
+            
+            return
+
         # Line width for all strokes
         cr.set_line_width(1.0)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/gui.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/gui.py Changed

@@ -67,6 +67,8 @@
 tline_left_corner = None
 big_tc = None
 
+monitor_widget = None
+
 # indexes match editmode values in editorstate.py
 notebook_buttons = None
 
@@ -98,7 +100,8 @@
     global editor_window, media_list_view, bin_list_view, sequence_list_view, pos_bar, \
     tc, tline_display, tline_scale, tline_canvas, tline_scroll, tline_v_scroll, tline_info, \
     tline_column, play_b, clip_editor_b, sequence_editor_b, \
-    effect_select_list_view, effect_select_combo_box, project_info_vbox, middle_notebook, big_tc, editmenu, notebook_buttons, tline_left_corner
+    effect_select_list_view, effect_select_combo_box, project_info_vbox, middle_notebook, big_tc, editmenu, notebook_buttons, tline_left_corner, \
+    monitor_widget
 
     editor_window = new_editor_window
 
@@ -114,6 +117,8 @@
     pos_bar = editor_window.pos_bar
     tc = editor_window.tc
 
+    monitor_widget = editor_window.monitor_widget
+
     tline_display = editor_window.tline_display
     tline_scale = editor_window.tline_scale
     tline_canvas = editor_window.tline_canvas

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/guicomponents.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/guicomponents.py Changed

@@ -23,6 +23,7 @@
 """
 
 import cairo
+import copy
 import math
 import time
 
@@ -47,8 +48,10 @@
 import mltfilters
 import mltprofiles
 import mlttransitions
+import monitorwidget
 import respaths
 import snapping
+import toolsintegration
 import translations
 import utils
 
@@ -89,6 +92,7 @@
 markers_menu = Gtk.Menu.new()
 tracks_menu = Gtk.Menu.new()
 monitor_menu = Gtk.Menu.new()
+trim_view_menu = Gtk.Menu.new()
 tools_menu = Gtk.Menu.new()
 file_filter_menu = Gtk.Menu()
 column_count_menu = Gtk.Menu()
@@ -385,12 +389,14 @@
     GUI component displaying list of filters applied to a clip.
     """
 
-    def __init__(self, selection_cb, toggle_cb):
+    def __init__(self, selection_cb, toggle_cb, row_deleted, row_inserted):
         GObject.GObject.__init__(self)
 
-       # Datamodel: icon, text, icon
+        # Datamodel: icon, text, icon
         self.storemodel = Gtk.ListStore(GdkPixbuf.Pixbuf, str, bool)
-
+        self.storemodel.connect("row-deleted", row_deleted)
+        self.storemodel.connect("row-inserted", row_inserted)
+        
         # Scroll container
         self.scroll = Gtk.ScrolledWindow()
         self.scroll.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
@@ -400,6 +406,9 @@
         self.treeview = Gtk.TreeView(self.storemodel)
         self.treeview.set_property("rules_hint", True)
         self.treeview.set_headers_visible(False)
+        self.treeview.set_reorderable(True)
+
+        
         tree_sel = self.treeview.get_selection()
         tree_sel.set_mode(Gtk.SelectionMode.SINGLE)
 
@@ -913,11 +922,13 @@
         self.img.press_func = self._press
         self.img.dnd_media_widget_attr = True # this is used to identify widget at dnd drop
         self.img.set_can_focus(True)
+        self.img.set_tooltip_text(media_file.name)
 
         txt = Gtk.Label(label=media_file.name)
         txt.modify_font(Pango.FontDescription("sans 9"))
         txt.set_ellipsize(Pango.EllipsizeMode.END)
         txt.set_max_width_chars(13)
+        txt.set_tooltip_text(media_file.name)
 
         self.vbox.pack_start(self.img, True, True, 0)
         self.vbox.pack_start(txt, False, False, 0)
@@ -953,16 +964,30 @@
         if self.media_file == editorstate.MONITOR_MEDIA_FILE():
             cr.set_source_surface(self.indicator_icon, 29, 22)
             cr.paint()
+
+        cr.select_font_face ("sans-serif",
+                 cairo.FONT_SLANT_NORMAL,
+                 cairo.FONT_WEIGHT_NORMAL)
+        cr.set_font_size(9)
         if self.media_file.mark_in != -1 and self.media_file.mark_out != -1:
-            cr.set_source_rgb(1, 1, 1)
-            cr.select_font_face ("sans-serif",
-                     cairo.FONT_SLANT_NORMAL,
-                     cairo.FONT_WEIGHT_NORMAL)
-            cr.set_font_size(9)
-            cr.move_to(23, 80)
+            cr.set_source_rgba(0,0,0,0.5)
+            cr.rectangle(21,1,72,12)
+            cr.fill()
+            
+            cr.move_to(23, 10)
             clip_length = utils.get_tc_string(self.media_file.mark_out - self.media_file.mark_in + 1) #+1 out incl.
+            cr.set_source_rgb(1, 1, 1)
             cr.show_text("][ " + str(clip_length))
 
+        cr.set_source_rgba(0,0,0,0.5)
+        cr.rectangle(28,75,62,12)
+        cr.fill()
+            
+        cr.move_to(30, 84)
+        cr.set_source_rgb(1, 1, 1)
+        media_length = utils.get_tc_string(self.media_file.length)
+        cr.show_text(str(media_length))
+            
         if self.media_file.type != appconsts.PATTERN_PRODUCER:
             if self.media_file.is_proxy_file == True:
                 cr.set_source_surface(is_proxy_icon, 96, 6)
@@ -1028,6 +1053,12 @@
     menu_launch.surface_y = 10
     return menu_launch
 
+def get_trim_view_select_combo(callback):
+    surface = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "trim_view.png")
+    menu_launch = PressLaunch(callback, surface, w=24, h=20)
+    menu_launch.surface_y = 10
+    return menu_launch
+    
 def get_compositor_track_select_combo(source_track, target_track, callback):
     tracks_combo = Gtk.ComboBoxText()
     active_index = -1
@@ -1104,6 +1135,10 @@
     _add_separetor(clip_menu)
 
     if track.type == appconsts.VIDEO:
+        clip_menu.add(_get_tool_integration_menu_item(event, clip, track, callback))
+        _add_separetor(clip_menu)
+        
+    if track.type == appconsts.VIDEO:
 
         clip_menu.add(_get_menu_item(_("Split Audio"), callback,\
                       (clip, track, "split_audio", event.x), True))
@@ -1161,8 +1196,16 @@
     clip_menu.add(_get_menu_item(_("Clip Info"), callback,\
                   (clip, track, "clip_info", event.x)))
 
+    _add_separetor(clip_menu)
+    clip_menu.add(_get_select_menu_item(event, clip, track, callback))
+        
+    if track.type == appconsts.VIDEO and clip.media_type != appconsts.PATTERN_PRODUCER:
+        _add_separetor(clip_menu)
+        clip_menu.add(_get_match_frame_menu_item(event, clip, track, callback))
+            
     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)
@@ -1247,6 +1290,9 @@
     clip_menu.add(_get_menu_item(_("Clip Info"), callback,\
                   (clip, track, "clip_info", event.x)))
 
+    _add_separetor(clip_menu)
+    clip_menu.add(_get_select_menu_item(event, clip, track, callback))
+    
     clip_menu.popup(None, None, None, None, event.button, event.time)
 
 def display_compositor_popup_menu(event, compositor, callback):
@@ -1342,6 +1388,80 @@
     menu_item.show()
     return menu_item
 
+def _get_match_frame_menu_item(event, clip, track, callback):
+    menu_item = Gtk.MenuItem(_("Show Match Frame"))
+    sub_menu = Gtk.Menu()
+    menu_item.set_submenu(sub_menu)
+
+    start_item_monitor = Gtk.MenuItem(_("First Frame in Monitor"))
+    sub_menu.append(start_item_monitor)
+    start_item_monitor.connect("activate", callback, (clip, track, "match_frame_start_monitor", None))
+    start_item_monitor.show()
+
+    end_item_monitor = Gtk.MenuItem(_("Last Frame in Monitor"))
+    sub_menu.append(end_item_monitor)
+    end_item_monitor.connect("activate", callback, (clip, track, "match_frame_end_monitor", None))
+    end_item_monitor.show()
+    
+    _add_separetor(sub_menu)
+    
+    start_item = Gtk.MenuItem(_("First Frame on Timeline"))
+    sub_menu.append(start_item)
+    start_item.connect("activate", callback, (clip, track, "match_frame_start", None))
+    start_item.show()
+
+    end_item = Gtk.MenuItem(_("Last Frame on Timeline"))
+    sub_menu.append(end_item)
+    end_item.connect("activate", callback, (clip, track, "match_frame_end", None))
+    end_item.show()
+
+    _add_separetor(sub_menu)
+        
+    clear_item = Gtk.MenuItem(_("Clear Match Frame"))
+    sub_menu.append(clear_item)
+    clear_item.connect("activate", callback, (clip, track, "match_frame_close", None))
+    clear_item.show()
+    
+    menu_item.set_sensitive(True)
+    menu_item.show()
+    return menu_item
+
+def _get_select_menu_item(event, clip, track, callback):

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/keyevents.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/keyevents.py Changed

@@ -42,6 +42,7 @@
 import monitorevent
 import mltrefhold
 import tlineaction
+import tlinewidgets
 import trimmodes
 import updater
 import projectaction
@@ -116,6 +117,7 @@
         if PLAYER().is_playing():
             monitorevent.stop_pressed()
         PLAYER().seek_frame(0)
+        _move_to_beginning()
         return True
 
     # Select all with CTRL + A in media panel
@@ -146,7 +148,7 @@
        or gui.tline_scale.widget.is_focus()
        or glassbuttons.focus_group_has_focus(glassbuttons.DEFAULT_FOCUS_GROUP)):
         return True
-
+    
     return False
     
 def _handle_tline_key_event(event):
@@ -346,6 +348,7 @@
             if PLAYER().is_playing():
                 monitorevent.stop_pressed()
             PLAYER().seek_frame(0)
+            _move_to_beginning()
             return True
     else:
         # HOME
@@ -355,6 +358,7 @@
             gui.editor_window.handle_insert_move_mode_button_press()
             gui.editor_window.set_mode_selector_to_mode()
             PLAYER().seek_frame(0)
+            _move_to_beginning()
             return True
 
     return False
@@ -601,3 +605,11 @@
         if kfeditor.get_focus_child() != None:
            return kfeditor
     return None
+
+def _move_to_beginning():
+    tlinewidgets.pos = 0
+    updater.repaint_tline()
+    updater.update_tline_scrollbar()
+    
+    
+

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/keyframeeditor.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/keyframeeditor.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/launch/flowbladegmic -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/launch/flowbladegmic Changed

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/launch/natron_clip_export_start.sh Added

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/launch/natronclipimportinit.py Added

@@ -0,0 +1,69 @@
+"""
+ Flowblade Movie Editor is a nonlinear video editor.
+ Copyright 2012 Janne Liljeblad.
+
+ 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/>.
+"""
+
+"""
+NOTE: THIS SCRIPT IS RUN BY NATRON WHEN LAUNCHING IT AND HAS NO ACCES TO
+OTHER PYTHON MODULES IN FLOWBLADE.
+"""
+import os
+import NatronEngine
+
+def createInstance(app,group):
+ # Get export data
+ natron_dir = get_hidden_user_dir_path() + "natron"
+ exportfile = get_latest_clip_export_file(natron_dir)
+ clip_path, mark_in, mark_out = get_export_data(exportfile)
+
+ # Create Natron graph
+ readerNode = app.createReader("")
+ viewerNode = app.createNode("fr.inria.built-in.Viewer")
+ viewerNode.connectInput(0, readerNode)
+ reader = app.Read1
+ reader.filename.set(clip_path)
+ reader.getParam("firstFrame").set(int(mark_in))
+ reader.getParam("lastFrame").set(int(mark_out) + 1)
+ reader.getParam("startingTime").set(0)
+ readerNode.setPosition(300.0, 100.0)
+ viewerNode.setPosition(315.0, 300.0)
+ app.getProjectParam("frameRange").set(1, int(mark_out) - int(mark_in) + 1)
+
+# ---------------------------------------------------- helper funcs
+def get_hidden_user_dir_path():
+ return os.getenv("HOME") + "/.flowblade/"
+
+def get_latest_clip_export_file(dirpath):
+ from os import listdir
+ from os.path import isfile, join
+ file_paths = [f for f in listdir(dirpath) if isfile(join(dirpath, f))]
+ 
+ # Get files staring with "clipexport_"
+ clip_export_files = []
+ for fpath in file_paths:
+ if fpath.startswith("clipexport_"):
+ clip_export_files.append(dirpath + "/" + fpath)
+ 
+ newest = max(clip_export_files, key=os.path.getctime)
+ return newest
+
+def get_export_data(export_file):
+ data_file = open(export_file)
+ data_text = data_file.read()
+ tokens = data_text.split(" ")
+ return (tokens[0], tokens[1], tokens[2])

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/Flowblade/flowblade.pot -> flowblade-1.10.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: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,43 +17,23 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr ""
 
-#: app.py:736
+#: app.py:761
 msgid "Minimum screen dimensions for this application are 1152 x 768.\n"
 msgstr ""
 
-#: app.py:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr ""
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr ""
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr ""
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr ""
-
-#: app.py:771
-msgid "Project was saved "
-msgstr ""
-
-#: app.py:771
-msgid " minutes ago."
-msgstr ""
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr ""
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 
@@ -110,451 +90,479 @@
 msgid "Opening"
 msgstr ""
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr ""
 
-#: projectaction.py:244
+#: projectaction.py:282
 msgid ""
 "Files already present:\n"
 "\n"
 msgstr ""
 
-#: projectaction.py:442
+#: projectaction.py:481
 msgid "Selected folder contains files"
 msgstr ""
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:502
+#: projectaction.py:554
 msgid "Saving project file"
 msgstr ""
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr ""
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr ""
 
-#: projectaction.py:684
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr ""
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr ""
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr ""
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr ""
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr ""
+
+#: projectaction.py:782
 msgid "Render launch failed!"
 msgstr ""
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 msgid "Error message: "
 msgstr ""
 
-#: projectaction.py:698
+#: projectaction.py:796
 msgid "Adding item to render queue failed!"
 msgstr ""
 
-#: projectaction.py:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr ""
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr ""
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr ""
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr ""
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
 msgstr ""
 
-#: projectaction.py:806
+#: projectaction.py:904
 msgid "Can't make home folder thumbnails folder"
 msgstr ""
 
-#: projectaction.py:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 msgid "Please create and select some other folder then '"
 msgstr ""
 
-#: projectaction.py:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr ""
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936
-#: projectaction.py:944 projectaction.py:951
+#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034
+#: projectaction.py:1042 projectaction.py:1049
 msgid "N/A"
 msgstr ""
 
-#: projectaction.py:940 guicomponents.py:1621
+#: projectaction.py:1038 guicomponents.py:1745
 msgid "Yes"
 msgstr ""
 
-#: projectaction.py:942 guicomponents.py:1623
+#: projectaction.py:1040 guicomponents.py:1747
 msgid "No"
 msgstr ""

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/create_pot -> flowblade-1.10.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
+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

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/cs/LC_MESSAGES/flowblade.po -> flowblade-1.10.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: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\n"
 "PO-Revision-Date: 2016-03-05 13:35+0100\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -19,43 +19,23 @@
 "X-Language: cs_CZ\n"
 "X-Source-Language: C\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "Příliš malá obrazovka pro tento program."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "Rozměry vaší obrazovky jsou "
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "Projekt nebyl od té doby, co byl otevřen, uložen."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "Projekt byl uložen před méně než minutou."
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "Projekt byl uložen před jednou minutou."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "Projekt byl uložen před "
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " minutami"
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "Projekt předtím byl uložen"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr "Uložte projekt před zavření pomocí Soubor -> Uložit."
 
@@ -119,11 +99,11 @@
 msgid "Opening"
 msgstr "Otevírá se"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr "Soubory již přítomné v projektu byly otevřeny!"
 
-#: projectaction.py:244
+#: projectaction.py:282
 msgid ""
 "Files already present:\n"
 "\n"
@@ -131,62 +111,82 @@
 "Soubory již přítomné:\n"
 "\n"
 
-#: projectaction.py:442
+#: projectaction.py:481
 msgid "Selected folder contains files"
 msgstr "Vybraná složka obsahuje soubory"
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
 msgstr ""
 "Při ukládání záložního snímku projektu musí být vybraná složka prázdná."
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr "Kopírují se položky záznamů projektu"
 
-#: projectaction.py:502
+#: projectaction.py:554
 msgid "Saving project file"
 msgstr "Ukládá se soubor s projektem"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "Projekt nebyl na disku nalezen"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "Projekt nelze nahrát."
 
-#: projectaction.py:684
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr "Projekt nebyl od té doby, co byl otevřen, uložen."
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr "Projekt byl uložen před méně než minutou."
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "Projekt byl uložen před jednou minutou."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "Projekt byl uložen před "
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " minutami"
+
+#: projectaction.py:782
 msgid "Render launch failed!"
 msgstr "Spuštění zpracování se nezdařilo!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 msgid "Error message: "
 msgstr "Zpráva o chybě: "
 
-#: projectaction.py:698
+#: projectaction.py:796
 msgid "Adding item to render queue failed!"
 msgstr "Přidání položky do řady ke zpracování se nezdařilo!"
 
-#: projectaction.py:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr "Otevřít..."
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr "Nebyl vybrán žádný soubor"
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "Vyberte číslovaný soubor pro přidání obrazové řady do projektu."
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr "Není řadovým souborem!"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -194,52 +194,52 @@
 "Vybraný soubor nemá ve svém názvu část s číslem.\n"
 "Nemůže to tedy být soubor obrazové řady."
 
-#: projectaction.py:806
+#: projectaction.py:904
 msgid "Can't make home folder thumbnails folder"
 msgstr "Nelze udělat složku pro náhledy z domovské složky"
 
-#: projectaction.py:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 msgid "Please create and select some other folder then '"
 msgstr "Vytvořte a vyberte, prosím, nějakou jinou složku než '"
 
-#: projectaction.py:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr "' jako složku pro náhledy"
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936
-#: projectaction.py:944 projectaction.py:951
+#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034
+#: projectaction.py:1042 projectaction.py:1049
 msgid "N/A"
 msgstr ""
 
-#: projectaction.py:940 guicomponents.py:1621
+#: projectaction.py:1038 guicomponents.py:1745
 msgid "Yes"
 msgstr "Ano"

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/de/LC_MESSAGES/flowblade.po Changed

@@ -1,16 +1,17 @@
-# Language de translations for PACKAGE package.
-# Copyright (C) 2014 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Martin Wielebinski <mwdev@esc.de>, 2014.
-# Adaptions by Bene81 <Bene81@users.noreply.github.com>
-# 
+# Language de translations for PACKAGE package.
+# Copyright (C) 2014 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Martin Wielebinski <mwdev@esc.de>, 2014.
+# Adaptions by Bene81 <Bene81@users.noreply.github.com>
+# Improved and expanded by Mario Dejanovic <mario.dejanovic@gmx.at>, November 2016
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\n"
 "PO-Revision-Date: 2014-11-23 14:22+0100\n"
-"Last-Translator: Martin Wielebinski <mwdev@esc.de>\n"
+"Last-Translator: Mario Dejanovic <mario.dejanovic@gmx.at>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -18,43 +19,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "Zu kleiner Bildschirm für diese Applikation."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "Ihre Auflösung beträgt "
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "Projekt wurde seit dem Öffnen nicht gesichert."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "Projekt wurde vor weniger als einer Minute gesichert."
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "Projekt wurde vor einer Minute gesichert."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "Projekt wurde vor "
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " Minuten gesichert."
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "Projekt wurde noch nicht gesichert"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr "Projekt vor dem Schließen sichern mit 'Datei -> Sichern als...'."
 
@@ -77,7 +58,6 @@
 msgstr "Um das Projekt zu laden ist einer der folgenden Schritte erforderlich:"
 
 #: projectaction.py:115
-#, fuzzy
 msgid ""
 "Open project in 'Media Relinker' tool to relink media assets to new files, or"
 msgstr ""
@@ -85,21 +65,18 @@
 "oder"
 
 #: projectaction.py:116
-#, fuzzy
 msgid "Place a file with the same exact name and path on the hard drive"
 msgstr "eine Ersatzdatei mit gleichem Namen und ähnlichem Inhalt anlegen"
 
 #: projectaction.py:117
 msgid "Open project in Media Relinker tool"
-msgstr ""
+msgstr "Öffne das Projekt im Medien-Link Werkzeug"
 
 #: projectaction.py:136
-#, fuzzy
 msgid "Profile with Description: '"
 msgstr "Profil mit Beschreibung: '"
 
 #: projectaction.py:136
-#, fuzzy
 msgid "' was not found on load!"
 msgstr "' wurde beim Laden nicht gefunden!"
 
@@ -109,9 +86,9 @@
 "the same Description\n"
 "as the missing profile. "
 msgstr ""
-"Es ist möglich das Projekt zu laden, indem ein Nutzerprofil mit exakt der "
-"gleichen Beschreibung\n"
-"wie das fehlende Profil angelegt wird. "
+"Es ist möglich das Projekt zu laden, indem ein Nutzerprofil mit den selben "
+"Parametern\n"
+"wie das fehlende Profil, angelegt wird. "
 
 #: projectaction.py:138
 msgid "User Profiles can be created by selecting 'Edit->Profiles Manager'."
@@ -122,11 +99,11 @@
 msgid "Opening"
 msgstr "Öffnen"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr "Im Projekt bereits vorhandene Mediendateien wurden geöffnet!"
 
-#: projectaction.py:244
+#: projectaction.py:282
 msgid ""
 "Files already present:\n"
 "\n"
@@ -134,12 +111,11 @@
 "Bereits vorhandene Dateien:\n"
 "\n"
 
-#: projectaction.py:442
-#, fuzzy
+#: projectaction.py:481
 msgid "Selected folder contains files"
 msgstr "Gewählter Ordner enthält Dateien"
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
@@ -147,53 +123,71 @@
 "Für das Sichern einer Sicherungskopie muss der gewählte Ordner\n"
 "leer sein."
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr "Kopiere Projektmediendaten"
 
-#: projectaction.py:502
-#, fuzzy
+#: projectaction.py:554
 msgid "Saving project file"
 msgstr "Sichere Projektdatei"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "Projekt nicht gefunden"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "Projekt kann nicht geladen werden."
 
-#: projectaction.py:684
-#, fuzzy
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr "Projekt wurde seit dem Öffnen nicht gesichert."
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr "Projekt wurde vor weniger als einer Minute gesichert."
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "Projekt wurde vor einer Minute gesichert."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "Projekt wurde vor "
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " Minuten gesichert."
+
+#: projectaction.py:782
 msgid "Render launch failed!"
 msgstr "Renderstart fehlgeschlagen!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/es/LC_MESSAGES/flowblade.po -> flowblade-1.10.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: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\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,44 +18,24 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.0\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "La pantalla es demasiado pequeña para esta aplicación."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "Las dimensiones de su pantalla son "
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "El proyecto no ha sido salvado desde que se abrió."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "El proyecto fue salvado hace menos de un minuto."
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "El proyecto fue salvado hace un minuto."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "El proyecto salvado "
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " hace minutos."
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "El proyecto no se ha salvado antes"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr "Salvar el proyecto en un Archivo -> Salvar como antes de cerrar."
 
@@ -116,77 +96,97 @@
 msgid "Opening"
 msgstr "Abriendo"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr ""
 
-#: projectaction.py:244
+#: projectaction.py:282
 #, fuzzy
 msgid ""
 "Files already present:\n"
 "\n"
 msgstr " ya existe!"
 
-#: projectaction.py:442
+#: projectaction.py:481
 #, fuzzy
 msgid "Selected folder contains files"
 msgstr "Seleccionar carpeta para nuevos miniaturas."
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:502
+#: projectaction.py:554
 #, fuzzy
 msgid "Saving project file"
 msgstr "¿Guardar proyecto '"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "El proyecto no se encuentra en el disco"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "El proyecto no puede ser cargado."
 
-#: projectaction.py:684
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr "El proyecto no ha sido salvado desde que se abrió."
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr "El proyecto fue salvado hace menos de un minuto."
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "El proyecto fue salvado hace un minuto."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "El proyecto salvado "
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " hace minutos."
+
+#: projectaction.py:782
 #, fuzzy
 msgid "Render launch failed!"
 msgstr "Render rango no definido!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 msgid "Error message: "
 msgstr "Mensaje de error:"
 
-#: projectaction.py:698
+#: projectaction.py:796
 msgid "Adding item to render queue failed!"
 msgstr "¡Fallo al añadir un elemento a la cola de renderizado!"
 
-#: projectaction.py:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr "Abrir…"
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr "Ningún archivo seleccionado."
 
-#: projectaction.py:747
+#: projectaction.py:845
 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:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr "¡No hay archivo de secuencia!"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -194,52 +194,52 @@
 "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:806
+#: projectaction.py:904
 msgid "Can't make home folder thumbnails folder"
 msgstr "No se puede hacer la carpeta miniaturas de carpeta home"
 
-#: projectaction.py:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 msgid "Please create and select some other folder then '"
 msgstr "Por favor, crear y seleccionar otra carpeta y luego '"
 
-#: projectaction.py:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr "Como carpeta de miniaturas"
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936
-#: projectaction.py:944 projectaction.py:951
+#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034
+#: projectaction.py:1042 projectaction.py:1049
 msgid "N/A"
 msgstr ""
 
-#: projectaction.py:940 guicomponents.py:1621

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fi/LC_MESSAGES/flowblade.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\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"
@@ -17,50 +17,30 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "Näyttö on liian pieni tälle ohjelmalle."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "Sinun näyttösi koko on "
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "Projektia ei ole tallennettu aikaisemmin."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "Projekti tallennettiin viimeksi alle minuutti sitten."
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "Projekti tallennettiin viimeksi minuutti sitten."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "Projektia ei ole tallennettu aikaisemmin"
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " minuuttia sitten."
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "Projektia ei ole tallennettu aikaisemmin"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr ""
 "Tallenna projekti valinnalla Tiedosto -> Tallenna nimellä ennen sulkemista."
 
 #: projectaction.py:111
 msgid "Media asset was missing!"
-msgstr ""
+msgstr "Mediaa ei löytynyt!"
 
 #: projectaction.py:112
 msgid "Path of missing asset:"
@@ -115,11 +95,11 @@
 msgid "Opening"
 msgstr "Avaa"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr "Avattiin media tiedostoja, jotka jo ovat projektissa"
 
-#: projectaction.py:244
+#: projectaction.py:282
 msgid ""
 "Files already present:\n"
 "\n"
@@ -127,11 +107,11 @@
 "Projektissa jo olevat tiedostot:\n"
 "\n"
 
-#: projectaction.py:442
+#: projectaction.py:481
 msgid "Selected folder contains files"
 msgstr "Valitussa kansiossa on tiedostoja"
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
@@ -139,52 +119,71 @@
 "Kun tallennetaan projektia ja mediaa yhtä aikaa\n"
 "täytyy kansion olla tyhjä."
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr "Kopioidaan mediaa"
 
-#: projectaction.py:502
+#: projectaction.py:554
 msgid "Saving project file"
 msgstr "Tallennetaan projektia"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "Projektia ei löytynyt kovalevyltä"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "Projektia ei voida ladata."
 
-#: projectaction.py:684
-#, fuzzy
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr "Projektia ei ole tallennettu aikaisemmin."
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr "Projekti tallennettiin viimeksi alle minuutti sitten."
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "Projekti tallennettiin viimeksi minuutti sitten."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "Projektia ei ole tallennettu aikaisemmin"
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " minuuttia sitten."
+
+#: projectaction.py:782
 msgid "Render launch failed!"
-msgstr "Renderöinti alue ei ole määritelty"
+msgstr "Renderöinnin aloitus epäonnistui!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 msgid "Error message: "
 msgstr "Virhe viesti"
 
-#: projectaction.py:698
+#: projectaction.py:796
 msgid "Adding item to render queue failed!"
 msgstr ""
 
-#: projectaction.py:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr "Avaa"
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr "Tiedostoa ei valittu"
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "Select a numbered file to add an Image Sequence to Project."
 msgstr "Valitse numeroitu tiedosto lisätäksesi kuvasarjan projektiin"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr "Tiedosto ei kuulu kuvasarjaan"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -192,53 +191,53 @@
 "Valitussa tiedostossa ei ole numero osuutta,\n"
 "joten se ei voi olla osa kuvasarjaa."
 
-#: projectaction.py:806
+#: projectaction.py:904
 msgid "Can't make home folder thumbnails folder"
 msgstr "Et voi valita kotikansiotasi mediaikoni kansioksi"
 
-#: projectaction.py:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 msgid "Please create and select some other folder then '"
 msgstr "Luo ja valitse joku toinen kansio kuin '"
 
-#: projectaction.py:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr "' mediaikoni kansioksi."
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/fr/LC_MESSAGES/flowblade.po -> flowblade-1.10.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: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\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,43 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "Votre écran est trop petit pour cette application."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "Votre résolution actuelle est "
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "Ce projet n'a pas été enregistré depuis qu'il a été ouvert."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "Le projet a été sauvegardé il y a moins d'une minute."
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "Le projet a été sauvegardé il y a une minute."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "Le projet a été sauvegardé il y a "
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " minutes."
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "Le projet n'a jamais été sauvegardé"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr "Sauvegardez le projet avec Fichier -> Enregistrer sous."
 
@@ -113,78 +93,98 @@
 msgid "Opening"
 msgstr "Ouverture"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr ""
 
-#: projectaction.py:244
+#: projectaction.py:282
 #, fuzzy
 msgid ""
 "Files already present:\n"
 "\n"
 msgstr " existe déjà!"
 
-#: projectaction.py:442
+#: projectaction.py:481
 #, fuzzy
 msgid "Selected folder contains files"
 msgstr "Sélectionner un dossier pour les nouvelles miniatures"
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:502
+#: projectaction.py:554
 #, fuzzy
 msgid "Saving project file"
 msgstr "Sauvegarder le projet '"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "Le projet n'a pas été trouvé sur le disque"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "Le projet ne peut pas être chargé."
 
-#: projectaction.py:684
+#: projectaction.py:718
+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:723
+msgid "Project was saved less than a minute ago."
+msgstr "Le projet a été sauvegardé il y a moins d'une minute."
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "Le projet a été sauvegardé il y a une minute."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "Le projet a été sauvegardé il y a "
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " minutes."
+
+#: projectaction.py:782
 #, fuzzy
 msgid "Render launch failed!"
 msgstr "Zone de rendu non définie!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 #, fuzzy
 msgid "Error message: "
 msgstr "Message d'erreur: "
 
-#: projectaction.py:698
+#: projectaction.py:796
 msgid "Adding item to render queue failed!"
 msgstr "Echec de l'ajout d'élément à la liste de rendu!"
 
-#: projectaction.py:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr "Ouvrir..."
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr "Aucun fichier sélectionné"
 
-#: projectaction.py:747
+#: projectaction.py:845
 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:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr "Ce n'est pas un fichier de séquence!"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -192,52 +192,52 @@
 "Le fichier sélectionné ne contient pas de numérotation,\n"
 "il ne peut donc pas constituer une séquence d'images."
 
-#: projectaction.py:806
+#: projectaction.py:904
 msgid "Can't make home folder thumbnails folder"
 msgstr "Le dossier home ne peut pas être le dossier des miniatures"
 
-#: projectaction.py:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 msgid "Please create and select some other folder then '"
 msgstr "Créez et sélectionnez un autre dossier '"
 
-#: projectaction.py:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr "' comme dossier de miniatures"
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936
-#: projectaction.py:944 projectaction.py:951
+#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034
+#: projectaction.py:1042 projectaction.py:1049
 msgid "N/A"
 msgstr ""
 
-#: projectaction.py:940 guicomponents.py:1621

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/hu/LC_MESSAGES/flowblade.po -> flowblade-1.10.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: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\n"
 "PO-Revision-Date: 2016-08-04 21:35+0100\n"
 "Last-Translator: Péter Gábor <ptrg@freemail.hu>\n"
 "Language-Team: \n"
@@ -17,43 +17,23 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "Túl kicsi a képernyő az alkalmazás számára."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "Az ön képernyőjének felbontása "
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "A projekt még nem volt mentve a megnyitás óta."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "A projekt kevesebb mint egy perce volt mentve"
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "A projekt egy perce volt mentve."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "A projekt mentése "
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " perce történt."
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "A projekt korábban még nem volt mentve"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 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 "
@@ -121,11 +101,11 @@
 msgid "Opening"
 msgstr "Megnyitás"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr "A projektben már jelenlévő fájlok lettek megnyitva!"
 
-#: projectaction.py:244
+#: projectaction.py:282
 msgid ""
 "Files already present:\n"
 "\n"
@@ -133,11 +113,11 @@
 "Már jelenlévő fájlok:\n"
 "\n"
 
-#: projectaction.py:442
+#: projectaction.py:481
 msgid "Selected folder contains files"
 msgstr "A választott könyvtár fájlokat tartalmaz"
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
@@ -145,52 +125,72 @@
 "Egy projekt állapotának mentésekor a választott mappának\n"
 "üresnek kell lennie."
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr "A projekt média összetevőinek másolása"
 
-#: projectaction.py:502
+#: projectaction.py:554
 msgid "Saving project file"
 msgstr "Projekt fájl mentése"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "A projekt nem található a lemezen"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "A projekt nem tölthető be."
 
-#: projectaction.py:684
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr "A projekt még nem volt mentve a megnyitás óta."
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr "A projekt kevesebb mint egy perce volt mentve"
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "A projekt egy perce volt mentve."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "A projekt mentése "
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " perce történt."
+
+#: projectaction.py:782
 msgid "Render launch failed!"
 msgstr "Nem sikerült elindítani a renderelést!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 msgid "Error message: "
 msgstr "Hibaüzenet: "
 
-#: projectaction.py:698
+#: projectaction.py:796
 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:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr "Megnyitás..."
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr "Nem lett fájl kiválasztva"
 
-#: projectaction.py:747
+#: projectaction.py:845
 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:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr "Nem jelenetfájl!"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -198,52 +198,52 @@
 "A kiválasztott fájl nem tartalmaz számot a nevében,\n"
 "így nem is lehet képsorozat része."
 
-#: projectaction.py:806
+#: projectaction.py:904
 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:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 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:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr "' a bélyegképek számára"
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936
-#: projectaction.py:944 projectaction.py:951
+#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034
+#: projectaction.py:1042 projectaction.py:1049
 msgid "N/A"
 msgstr "N/A"
 
-#: projectaction.py:940 guicomponents.py:1621
+#: projectaction.py:1038 guicomponents.py:1745
 msgid "Yes"

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.mo Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/locale/it/LC_MESSAGES/flowblade.po -> flowblade-1.10.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: 2016-09-15 21:26+0300\n"
+"POT-Creation-Date: 2016-12-05 10:12+0200\n"
 "PO-Revision-Date: 2014-09-15 23:42+0100\n"
 "Last-Translator: Massimo Stella <info@massimostella.it>\n"
 "Language-Team: Italiano\n"
@@ -18,43 +18,23 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: app.py:733
+#: app.py:758
 msgid "Too small screen for this application."
 msgstr "Lo schermo è troppo piccolo per questa applicazione."
 
-#: app.py:736
+#: app.py:761
 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:737
+#: app.py:762
 msgid "Your screen dimensions are "
 msgstr "La risoluzione corrente è"
 
-#: app.py:761
-msgid "Project has not been saved since it was opened."
-msgstr "Questo progetto non è ancora stato salvato dall'apertura."
-
-#: app.py:766
-msgid "Project was saved less than a minute ago."
-msgstr "Il progetto è stato salvato meno di un minuto fa."
-
-#: app.py:769
-msgid "Project was saved one minute ago."
-msgstr "Il progetto è stato salvato un minuto fa."
-
-#: app.py:771
-msgid "Project was saved "
-msgstr "Il progetto è stato salvato"
-
-#: app.py:771
-msgid " minutes ago."
-msgstr " minuti fa."
-
-#: app.py:781 projectaction.py:327
+#: app.py:795 projectaction.py:366 projectaction.py:696
 msgid "Project has not been saved previously"
 msgstr "Il progetto non è mai stato salvato"
 
-#: app.py:782 projectaction.py:328
+#: app.py:796 projectaction.py:367 projectaction.py:697
 msgid "Save project with File -> Save As before closing."
 msgstr "Salva il progetto da File -> Salva con nome"
 
@@ -114,11 +94,11 @@
 msgid "Opening"
 msgstr "Apertura"
 
-#: projectaction.py:238
+#: projectaction.py:276
 msgid "Media files already present in project were opened!"
 msgstr "File multimediali già presenti nel progetto sono stati aperti!"
 
-#: projectaction.py:244
+#: projectaction.py:282
 msgid ""
 "Files already present:\n"
 "\n"
@@ -126,64 +106,84 @@
 "File già esistenti:\n"
 "\n"
 
-#: projectaction.py:442
+#: projectaction.py:481
 #, fuzzy
 msgid "Selected folder contains files"
 msgstr "Seleziona cartella per le nuove miniature."
 
-#: projectaction.py:443
+#: projectaction.py:482
 msgid ""
 "When saving a back-up snapshot of the project, the selected folder\n"
 "has to be empty."
 msgstr ""
 
-#: projectaction.py:501
+#: projectaction.py:553
 msgid "Copying project media assets"
 msgstr ""
 
-#: projectaction.py:502
+#: projectaction.py:554
 #, fuzzy
 msgid "Saving project file"
 msgstr "Salvo il progetto '"
 
-#: projectaction.py:625
+#: projectaction.py:709
 msgid "Project not found on disk"
 msgstr "Il progetto non è stato trovato sul disco"
 
-#: projectaction.py:626
+#: projectaction.py:710
 msgid "Project can't be loaded."
 msgstr "Il progetto non può essere caricato."
 
-#: projectaction.py:684
+#: projectaction.py:718
+msgid "Project has not been saved since it was opened."
+msgstr "Questo progetto non è ancora stato salvato dall'apertura."
+
+#: projectaction.py:723
+msgid "Project was saved less than a minute ago."
+msgstr "Il progetto è stato salvato meno di un minuto fa."
+
+#: projectaction.py:726
+msgid "Project was saved one minute ago."
+msgstr "Il progetto è stato salvato un minuto fa."
+
+#: projectaction.py:728
+msgid "Project was saved "
+msgstr "Il progetto è stato salvato"
+
+#: projectaction.py:728
+msgid " minutes ago."
+msgstr " minuti fa."
+
+#: projectaction.py:782
 #, fuzzy
 msgid "Render launch failed!"
 msgstr "Area di calcolo non definita!"
 
-#: projectaction.py:685 projectaction.py:699 tools/batchrendering.py:296
+#: projectaction.py:783 projectaction.py:797 tools/batchrendering.py:299
 msgid "Error message: "
 msgstr "Messaggio d'errore: "
 
-#: projectaction.py:698
+#: projectaction.py:796
 msgid "Adding item to render queue failed!"
 msgstr "Aggiunta alla coda dei render fallita!"
 
-#: projectaction.py:717
+#: projectaction.py:815
 msgid "Open.."
 msgstr "Apri..."
 
-#: projectaction.py:747
+#: projectaction.py:845
 msgid "No file was selected"
 msgstr "Nessun file selezionato"
 
-#: projectaction.py:747
+#: projectaction.py:845
 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:755
+#: projectaction.py:853
 msgid "Not a sequence file!"
 msgstr "Questa non è una sequenza!"
 
-#: projectaction.py:755
+#: projectaction.py:853
 msgid ""
 "Selected file does not have a number part in it,\n"
 "so it can't be an image sequence file."
@@ -191,52 +191,52 @@
 "Il file selezionato non è numerato, \n"
 "quindi non può essere una sequenza di immagini."
 
-#: projectaction.py:806
+#: projectaction.py:904
 msgid "Can't make home folder thumbnails folder"
 msgstr "Non si può usare la carella Home per le miniature"
 
-#: projectaction.py:807 dialogs.py:361
+#: projectaction.py:905 dialogs.py:361
 msgid "Please create and select some other folder then '"
 msgstr "Creare e selezionare una cartella differente da '"
 
-#: projectaction.py:808
+#: projectaction.py:906
 msgid "' as thumbnails folder"
 msgstr "' per le miniature"
 
-#: projectaction.py:925 projectaction.py:927 projectaction.py:936
-#: projectaction.py:944 projectaction.py:951
+#: projectaction.py:1023 projectaction.py:1025 projectaction.py:1034
+#: projectaction.py:1042 projectaction.py:1049
 msgid "N/A"
 msgstr ""
 
-#: projectaction.py:940 guicomponents.py:1621
+#: projectaction.py:1038 guicomponents.py:1745
 msgid "Yes"

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/medialinker.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/medialinker.py Changed

@@ -26,6 +26,9 @@
 import sys
 import threading
 
+import gi
+gi.require_version('Gtk', '3.0')
+gi.require_version('PangoCairo', '1.0')
 from gi.repository import Gtk, Gdk, GdkPixbuf
 from gi.repository import Pango, GObject
 
@@ -51,6 +54,7 @@
 
 linker_window = None
 target_project = None
+last_media_dir = None
 media_assets = []
 
 NO_PROJECT_AT_LAUNCH = "##&&noproject&&##"
@@ -85,6 +89,7 @@
         linker_window.project_label.set_text(self.filename)
         linker_window.set_active_state()
         linker_window.update_files_info()
+        linker_window.load_button.set_sensitive(False)
         Gdk.threads_leave()
 
 
@@ -99,7 +104,7 @@
         load_button = Gtk.Button(_("Load Project For Relinking"))
         load_button.connect("clicked",
                             lambda w: self.load_button_clicked())
-
+        self.load_button = load_button
         project_row = Gtk.HBox(False, 2)
         project_row.pack_start(load_button, False, False, 0)
         project_row.pack_start(Gtk.Label(), True, True, 0)
@@ -429,7 +434,7 @@
     file_name = os.path.basename(media_asset.orig_path)
     dialogs.media_file_dialog(_("Select Media File To Relink To") + " " + file_name, 
                                 _select_relink_path_dialog_callback, False, 
-                                media_asset, linker_window)
+                                media_asset, linker_window, last_media_dir)
 
 def _select_relink_path_dialog_callback(file_select, response_id, media_asset):
     filenames = file_select.get_filenames()
@@ -441,14 +446,17 @@
         return
 
     media_asset.relink_path = filenames[0]
-
+    folder, file_name = os.path.split(filenames[0])
+        
+    global last_media_dir
+    last_media_dir = folder
+    
     if media_asset.media_type == appconsts.IMAGE_SEQUENCE: # img seqs need formatted path
         if editorstate.mlt_version_is_equal_or_greater("0.8.5"):
             new_style = True
         else:
             new_style = False
         resource_name_str = utils.get_img_seq_resource_name(filenames[0], new_style)
-        folder, file_name = os.path.split(filenames[0])
         media_asset.relink_path = folder + "/" + resource_name_str
 
     linker_window.relink_list.fill_data_model()

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/medialog.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/medialog.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/middlebar.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/middlebar.py Changed

@@ -22,6 +22,7 @@
 
 from gi.repository import Gtk
 
+import appconsts
 import audiomonitoring
 import batchrendering
 import editevent
@@ -62,7 +63,7 @@
     fill_with_TC_LEFT_pattern(w.edit_buttons_row, w)
     w.window.show_all()
 
-    editorpersistance.prefs.midbar_tc_left = True
+    editorpersistance.prefs.midbar_layout = appconsts.MIDBAR_TC_LEFT
     editorpersistance.save()
     
 def _show_buttons_TC_MIDDLE_layout(widget):
@@ -78,9 +79,25 @@
     fill_with_TC_MIDDLE_pattern(w.edit_buttons_row, w)
     w.window.show_all()
 
-    editorpersistance.prefs.midbar_tc_left = False
+    editorpersistance.prefs.midbar_layout = appconsts.MIDBAR_TC_CENTER
     editorpersistance.save()
 
+def _show_buttons_COMPONETS_CENTERED_layout(widget):
+    global w
+    w = gui.editor_window
+    if w == None:
+        return
+    if widget.get_active() == False:
+        return
+
+    _clear_container(w.edit_buttons_row)
+    _create_buttons(w)
+    fill_with_COMPONETS_CENTERED_pattern(w.edit_buttons_row, w)
+    w.window.show_all()
+
+    editorpersistance.prefs.midbar_layout = appconsts.MIDBAR_COMPONENTS_CENTERED
+    editorpersistance.save()
+    
 def _show_monitor_info_toggled(widget):
     editorpersistance.prefs.show_sequence_profile = widget.get_active()
     editorpersistance.save()
@@ -108,38 +125,43 @@
     editor_window.zoom_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "zoom_out.png"), updater.zoom_out)
     editor_window.zoom_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "zoom_length.png"), updater.zoom_project_length)
     editor_window.zoom_buttons.widget.set_tooltip_text(_("Zoom In - Mouse Middle Scroll\n Zoom Out - Mouse Middle Scroll\n Zoom Length - Mouse Middle Click"))
-
+    
     editor_window.edit_buttons = glassbuttons.GlassButtonsGroup(46, 23, 2, 4, 5)
     editor_window.edit_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "dissolve.png"), tlineaction.add_transition_pressed)
     editor_window.edit_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "cut.png"), tlineaction.cut_pressed)
     editor_window.edit_buttons.widget.set_tooltip_text(_("Add Rendered Transition - 2 clips selected\nAdd Rendered Fade - 1 clip selected\nCut - X"))
+    
+    editor_window.edit_buttons_3 = glassbuttons.GlassButtonsGroup(46, 23, 2, 4, 5)
+    editor_window.edit_buttons_3.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "splice_out.png"), tlineaction.splice_out_button_pressed)
+    editor_window.edit_buttons_3.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "lift.png"), tlineaction.lift_button_pressed)
+    editor_window.edit_buttons_3.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "delete_range.png"), tlineaction.delete_range_button_pressed)
+    editor_window.edit_buttons_3.widget.set_tooltip_text(_("Splice Out - Delete\nLift\nDelete Range"))
 
     editor_window.edit_buttons_2 = glassbuttons.GlassButtonsGroup(46, 23, 2, 4, 5)
-    editor_window.edit_buttons_2.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "splice_out.png"), tlineaction.splice_out_button_pressed)
-    editor_window.edit_buttons_2.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "lift.png"), tlineaction.lift_button_pressed)
-    #editor_window.edit_buttons_2.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "delete_range.png"), tlineaction.append_button_pressed)
     editor_window.edit_buttons_2.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "resync.png"), tlineaction.resync_button_pressed)
     editor_window.edit_buttons_2.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "split_audio.png"), tlineaction.split_audio_button_pressed)
-    editor_window.edit_buttons_2.widget.set_tooltip_text(_("Splice Out - Delete\nLift\nResync Selected\nSplit Audio"))
-
+    editor_window.edit_buttons_2.widget.set_tooltip_text(_("Resync Selected\nSplit Audio"))
+    
     editor_window.monitor_insert_buttons = glassbuttons.GlassButtonsGroup(46, 23, 2, 4, 5)
     editor_window.monitor_insert_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "overwrite_range.png"), tlineaction.range_overwrite_pressed)
     editor_window.monitor_insert_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "overwrite_clip.png"), tlineaction.three_point_overwrite_pressed)
     editor_window.monitor_insert_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "insert_clip.png"), tlineaction.insert_button_pressed)
     editor_window.monitor_insert_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "append_clip.png"), tlineaction.append_button_pressed)
     editor_window.monitor_insert_buttons.widget.set_tooltip_text(_("Overwrite Range\nOverwrite Clip - T\nInsert Clip - Y\nAppend Clip - U"))
-
+    
     editor_window.undo_redo = glassbuttons.GlassButtonsGroup(28, 23, 2, 2, 7)
     editor_window.undo_redo.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "undo.png"), undo.do_undo_and_repaint)
     editor_window.undo_redo.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "redo.png"), undo.do_redo_and_repaint)
     editor_window.undo_redo.widget.set_tooltip_text(_("Undo - Ctrl + Z\nRedo - Ctrl + Y"))
-
-    editor_window.tools_buttons = glassbuttons.GlassButtonsGroup(46, 23, 2, 14, 7)
+    
+    editor_window.tools_buttons = glassbuttons.GlassButtonsGroup(30, 23, 2, 14, 7)
     editor_window.tools_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "open_mixer.png"), audiomonitoring.show_audio_monitor)
     editor_window.tools_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "open_titler.png"), titler.show_titler)
     editor_window.tools_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "open_gmic.png"), gmic.launch_gmic)
     editor_window.tools_buttons.add_button(cairo.ImageSurface.create_from_png(IMG_PATH + "open_renderqueue.png"), lambda :batchrendering.launch_batch_rendering())
     editor_window.tools_buttons.widget.set_tooltip_text(_("Audio Mixer\nTitler\nG'Mic Effects\nBatch Render Queue"))
+    editor_window.tools_buttons.no_decorations = True
+    
     if editorstate.audio_monitoring_available == False:
         editor_window.tools_buttons.sensitive[0] = False
         editor_window.tools_buttons.widget.set_tooltip_text(_("Audio Mixer(not available)\nTitler"))
@@ -150,20 +172,30 @@
     buttons_row.pack_start(w.big_TC.widget, False, True, 0)
     buttons_row.pack_start(guiutils.get_pad_label(7, MIDDLE_ROW_HEIGHT), False, True, 0) #### NOTE!!!!!! THIS DETERMINES THE HEIGHT OF MIDDLE ROW
     buttons_row.pack_start(w.modes_selector.widget, False, True, 0)
-    buttons_row.pack_start(Gtk.Label(), True, True, 0)
     if editorstate.SCREEN_WIDTH > 1279:
+        buttons_row.pack_start(guiutils.get_pad_label(10, 10), False, True, 0)
         buttons_row.pack_start(_get_tools_buttons(), False, True, 0)
-        buttons_row.pack_start(Gtk.Label(), True, True, 0)
+        buttons_row.pack_start(guiutils.get_pad_label(120, 10), False, True, 0)
+    else:
+        buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+        
     buttons_row.pack_start(_get_undo_buttons_panel(), False, True, 0)
     buttons_row.pack_start(Gtk.Label(), True, True, 0)
+        
     buttons_row.pack_start(_get_zoom_buttons_panel(),False, True, 0)
     buttons_row.pack_start(Gtk.Label(), True, True, 0)
+    
     buttons_row.pack_start(_get_edit_buttons_panel(),False, True, 0)
     buttons_row.pack_start(Gtk.Label(), True, True, 0)
+    
     buttons_row.pack_start(_get_edit_buttons_2_panel(),False, True, 0)
     buttons_row.pack_start(Gtk.Label(), True, True, 0)
+    
+    buttons_row.pack_start(_get_edit_buttons_3_panel(),False, True, 0)
+    buttons_row.pack_start(Gtk.Label(), True, True, 0)
+    
     buttons_row.pack_start(_get_monitor_insert_buttons(), False, True, 0)
-
+    
 def fill_with_TC_MIDDLE_pattern(buttons_row, window):
     global w
     w = window
@@ -188,6 +220,8 @@
     right_panel.pack_start(Gtk.Label(), True, True, 0)
     right_panel.pack_start(_get_edit_buttons_panel(), False, True, 0)
     right_panel.pack_start(guiutils.get_pad_label(10, 10), False, True, 0)
+    right_panel.pack_start(_get_edit_buttons_3_panel(),False, True, 0)
+    right_panel.pack_start(guiutils.get_pad_label(10, 10), False, True, 0)
     right_panel.pack_start(_get_edit_buttons_2_panel(),False, True, 0)
     right_panel.pack_start(guiutils.get_pad_label(10, 10), False, True, 0)
     right_panel.pack_start(_get_monitor_insert_buttons(), False, True, 0)
@@ -196,6 +230,39 @@
     buttons_row.pack_start(middle_panel, False, False, 0)
     buttons_row.pack_start(right_panel, True, True, 0)
 
+def fill_with_COMPONETS_CENTERED_pattern(buttons_row, window):
+    global w
+    w = window
+    buttons_row.pack_start(Gtk.Label(), True, True, 0)
+    buttons_row.pack_start(w.big_TC.widget, False, True, 0)
+    buttons_row.pack_start(guiutils.get_pad_label(7, MIDDLE_ROW_HEIGHT), False, True, 0) #### NOTE!!!!!! THIS DETERMINES THE HEIGHT OF MIDDLE ROW
+    buttons_row.pack_start(w.modes_selector.widget, False, True, 0)
+    if editorstate.SCREEN_WIDTH > 1279:
+        buttons_row.pack_start(guiutils.get_pad_label(10, 10), False, True, 0)
+        buttons_row.pack_start(_get_tools_buttons(), False, True, 0)
+        #buttons_row.pack_start(guiutils.get_pad_label(120, 10), False, True, 0)
+        buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+    else:
+        buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+        
+    buttons_row.pack_start(_get_undo_buttons_panel(), False, True, 0)
+    buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+        
+    buttons_row.pack_start(_get_zoom_buttons_panel(),False, True, 0)
+    buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+    
+    buttons_row.pack_start(_get_edit_buttons_panel(),False, True, 0)
+    buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+    
+    buttons_row.pack_start(_get_edit_buttons_2_panel(),False, True, 0)
+    buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+    
+    buttons_row.pack_start(_get_edit_buttons_3_panel(),False, True, 0)
+    buttons_row.pack_start(guiutils.get_pad_label(20, 10), False, True, 0)
+    
+    buttons_row.pack_start(_get_monitor_insert_buttons(), False, True, 0)
+    buttons_row.pack_start(Gtk.Label(), True, True, 0)
+    
 def _get_zoom_buttons_panel():    
     return w.zoom_buttons.widget
 
@@ -207,6 +274,9 @@
 
 def _get_edit_buttons_2_panel():
     return w.edit_buttons_2.widget
+
+def _get_edit_buttons_3_panel():
+    return w.edit_buttons_3.widget
     
 def _get_monitor_insert_buttons():
     return w.monitor_insert_buttons.widget

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/monitorevent.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/monitorevent.py Changed

@@ -22,6 +22,9 @@
 Module handles button presses from monitor control buttons row.
 """
 
+import appconsts
+import dialogutils
+import editorpersistance
 import editorstate
 from editorstate import PLAYER
 from editorstate import current_sequence
@@ -30,6 +33,7 @@
 from editorstate import current_is_move_mode
 from editorstate import MONITOR_MEDIA_FILE
 import gui
+import guicomponents
 import movemodes
 import trimmodes
 import updater
@@ -81,26 +85,11 @@
 def next_pressed():
 if current_is_move_mode():
 movemodes.next_pressed()
- """ This is highly fucking suspect, it does an edit immediately
- commented out at 6-1-16 and lets see if anyone complains
- elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
- trimmodes.oneroll_next_pressed()
- elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
- trimmodes.tworoll_next_pressed()
- elif EDIT_MODE() == editorstate.SLIDE_TRIM:
- trimmodes.slide_next_pressed()
- """
+
 def prev_pressed():
 if current_is_move_mode():
 movemodes.prev_pressed()
- """
- elif EDIT_MODE() == editorstate.ONE_ROLL_TRIM:
- trimmodes.oneroll_prev_pressed()
- elif EDIT_MODE() == editorstate.TWO_ROLL_TRIM:
- trimmodes.tworoll_prev_pressed()
- elif EDIT_MODE() == editorstate.SLIDE_TRIM:
- trimmodes.slide_prev_pressed()
- """
+
 def j_pressed():
 if timeline_visible():
 trimmodes.set_no_edit_trim_mode()
@@ -265,7 +254,52 @@
 
 PLAYER().seek_frame(0)
 
+# -------------------------------------------------- monitor playback interpolation
 def set_monitor_playback_interpolation(new_interpolation):
 PLAYER().consumer.set("rescale", str(new_interpolation)) # MLT options "nearest", "bilinear", "bicubic", "hyper" hardcoded into menu items
+
+# --------------------------------------------------------- trim view
+def trim_view_menu_launched(launcher, event):
+ guicomponents.get_trim_view_popupmenu(launcher, event, _trim_view_menu_item_activated)
+ 
+def _trim_view_menu_item_activated(widget, msg):
+ if msg == "matchclear":
+ gui.monitor_widget.set_default_view_force()
+ return
+ if msg == "clipframematch":
+ import tlineaction # if this is on top level gmic tool get circular import
+ clip = tlineaction._get_new_clip_from_clip_monitor()
+ if clip == None:
+ return
+ frame = PLAYER().current_frame()
+ gui.monitor_widget.set_frame_match_view(clip, frame)
+ return
+ 
+ if widget.get_active() == False:
+ return
 
+ if msg == "trimon":
+ editorstate.show_trim_view = appconsts.TRIM_VIEW_ON
+ editorpersistance.prefs.trim_view_default = appconsts.TRIM_VIEW_ON
+ editorpersistance.save()
+ if editorpersistance.prefs.trim_view_message_shown == False:
+ _show_trimview_info()
+ if msg == "trimsingle":
+ editorstate.show_trim_view = appconsts.TRIM_VIEW_SINGLE
+ editorpersistance.prefs.trim_view_default = appconsts.TRIM_VIEW_SINGLE
+ editorpersistance.save()
+ if editorpersistance.prefs.trim_view_message_shown == False:
+ _show_trimview_info()
+ if msg == "trimoff":
+ editorstate.show_trim_view = appconsts.TRIM_VIEW_OFF
+ editorpersistance.prefs.trim_view_default = appconsts.TRIM_VIEW_OFF
+ editorpersistance.save()
+
+def _show_trimview_info():
+ editorpersistance.prefs.trim_view_message_shown = True
+ editorpersistance.save()
+ primary_txt = _("On some systems Trim View may update slowly")
+ secondary_txt = _("Trim View works best with SSDs and relatively powerful processors.\n\n") + \
+ _("Select 'Trim View Off' or'Trim View Single Side Edits Only' options\nif performance is not satisfactory.")
+ dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/monitorwidget.py Added

@@ -0,0 +1,928 @@
+"""
+ Flowblade Movie Editor is a nonlinear video editor.
+ Copyright 2012 Janne Liljeblad.
+
+ 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/>.
+"""
+from gi.repository import Gdk
+from gi.repository import Gtk, GLib
+
+import cairo
+import mlt
+import numpy as np
+import os
+import threading
+import time
+import utils
+
+import appconsts
+import cairoarea
+import editorstate
+from editorstate import PLAYER
+from editorstate import PROJECT
+import respaths
+import utils
+
+"""
+Module is used to display trim views for Trim, Roll and Slip tools and selected match frames.
+"""
+
+DEFAULT_VIEW = 0
+START_TRIM_VIEW = 1
+END_TRIM_VIEW = 2
+ROLL_TRIM_RIGHT_ACTIVE_VIEW = 3
+ROLL_TRIM_LEFT_ACTIVE_VIEW = 4
+SLIP_TRIM_RIGHT_ACTIVE_VIEW = 5
+SLIP_TRIM_LEFT_ACTIVE_VIEW = 6
+FRAME_MATCH_VIEW = 7
+
+TC_LEFT_SIDE_PAD = 172
+TC_RIGHT_SIDE_PAD = 28
+TC_HEIGHT = 27
+ 
+MATCH_FRAME = "match_frame.png"
+
+MONITOR_INDICATOR_COLOR = utils.get_cairo_color_tuple_255_rgb(71, 131, 169)
+MONITOR_INDICATOR_COLOR_MATCH = utils.get_cairo_color_tuple_255_rgb(21, 71, 105)
+
+FRAME_MATCH_VIEW_COLOR = (0.3, 0.3, 0.3)
+
+# Continuos match frame update
+CONTINUOS_UPDATE_PAUSE = 0.2
+_last_render_time = 0.0
+_producer = None
+_consumer = None
+_frame_write_on = False
+ 
+_widget = None
+
+def _get_match_frame_path():
+ return utils.get_hidden_user_dir_path() + appconsts.TRIM_VIEW_DIR + "/" + MATCH_FRAME
+ 
+class MonitorWidget:
+ 
+ def __init__(self):
+ self.widget = Gtk.VBox()
+ 
+ self.view = DEFAULT_VIEW
+ self.match_frame_surface = None
+ self.match_frame = -1
+ self.edit_tline_frame = -1
+ self.edit_delta = None
+ self.edit_clip_start_on_tline = -1
+ 
+ self.slip_clip_media_length = -1
+ self.slip_clip_length = -1
+
+ self.clip_name = "clip name"
+ 
+ self.match_is_pattern_producer = False # Roll and Slip need this flag to know if surface updates needed
+ 
+ # top row
+ self.top_row = Gtk.HBox()
+ 
+ self.top_edge_panel = cairoarea.CairoDrawableArea2(1, 1, self._draw_top_panel, use_widget_bg=False)
+ self.top_edge_panel.press_func = self._press_event
+ self.top_row.pack_start(self.top_edge_panel, True, True,0)
+ 
+ # mid row
+ self.mid_row = Gtk.HBox()
+
+ self.left_display = cairoarea.CairoDrawableArea2(1, 1, self._draw_match_frame_left, use_widget_bg=False)
+
+ black_box = Gtk.EventBox()
+ black_box.add(Gtk.Label())
+ bg_color = Gdk.Color(red=0.0, green=0.0, blue=0.0)
+ black_box.modify_bg(Gtk.StateType.NORMAL, bg_color)
+ self.monitor = black_box
+
+ self.right_display = cairoarea.CairoDrawableArea2(1, 1, self._draw_match_frame_right, use_widget_bg=False)
+ 
+ self.mid_row.pack_start(self.left_display, False, False,0)
+ self.mid_row.pack_start(self.monitor, True, True,0)
+ self.mid_row.pack_start(self.right_display, False, False,0)
+ 
+ # bottom row
+ self.bottom_edge_panel = cairoarea.CairoDrawableArea2(1, 1, self._draw_bottom_panel, use_widget_bg=False)
+ self.bottom_row = Gtk.HBox()
+ self.bottom_row.pack_start(self.bottom_edge_panel, True, True,0)
+ 
+ # build pane
+ self.widget.pack_start(self.top_row, False, False,0)
+ self.widget.pack_start(self.mid_row , True, True,0)
+ self.widget.pack_start(self.bottom_row, False, False,0)
+
+ self.CLOSE_MATCH_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "close_match.png")
+ self.PATTERN_PRODUCER_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "pattern_producer_trim_view.png")
+
+ global _widget
+ _widget = self
+
+ # ------------------------------------------------------------------ INTERFACE
+ def get_monitor(self):
+ return self.monitor
+ 
+ def is_active(self, attempting_trim=False):
+ if editorstate.show_trim_view == appconsts.TRIM_VIEW_ON:
+ return True
+ 
+ if editorstate.show_trim_view == appconsts.TRIM_VIEW_OFF:
+ return False
+ 
+ if editorstate.show_trim_view == appconsts.TRIM_VIEW_SINGLE and attempting_trim:
+ return True
+ 
+ if (editorstate.show_trim_view == appconsts.TRIM_VIEW_SINGLE and 
+ (self.view == START_TRIM_VIEW or self.view == END_TRIM_VIEW)):
+ return True
+
+ return False
+
+ # ------------------------------------------------------------------ SET VIEW TYPE
+ def set_default_view_force(self):
+ self.set_default_view(True)
+
+ def set_default_view(self, force_default_mode=False):
+ if self.view == DEFAULT_VIEW:
+ return
+
+ if self.view == FRAME_MATCH_VIEW and force_default_mode==False:
+ return
+ 
+ # Refreshing while rendering overwrites file on disk and loses 
+ # previous rendered data. 
+ if PLAYER().is_rendering:
+ return
+
+ # Delete match frame
+ try:
+ os.remove(_get_match_frame_path())
+ except:
+ # This fails when done first time ever 
+ pass
+ 
+ self.match_frame_surface = None
+ 
+ self.view = DEFAULT_VIEW
+ 
+ self.left_display.set_pref_size(1, 1)
+ self.right_display.set_pref_size(1, 1)
+
+ self.top_edge_panel.set_pref_size(1, 1)
+ self.bottom_edge_panel.set_pref_size(1, 1)
+ 
+ self.widget.queue_draw()
+ PLAYER().refresh()
+
+ def set_frame_match_view(self, match_clip, frame): 
+ # Refreshing while rendering overwrites file on disk and loses 
+ # previous rendered data. 
+ if PLAYER().is_rendering:
+ return
+
+ # Delete match frame
+ try:
+ os.remove(_get_match_frame_path())
+ except:

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/multimovemode.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/multimovemode.py Changed

@@ -48,9 +48,9 @@
 self._build_move_data()
 
 def _build_move_data(self):
- # Look at all tracks exept
 tracks = current_sequence().tracks
 
+ # Look at all tracks exept hidden and black
 # Get per track:
 # * maximum length edit can be done backwards before an overwrite happens
 # * indexes of blanks that are trimmed and/or added/removed,
@@ -86,8 +86,8 @@
 track_max_deltas.append(0)
 trim_blank_indexes.append(clip_index)
 else:
- blank_clip_start_frame = track.clip_start(clip_index + 1)
- moved_clip_start_frame = track.clip_start(clip_index + 2)
+ blank_clip_start_frame = track.clip_start(clip_index - 1)
+ moved_clip_start_frame = track.clip_start(clip_index)
 track_max_deltas.append(moved_clip_start_frame - blank_clip_start_frame)
 trim_blank_indexes.append(clip_index - 1) 
 continue
@@ -144,16 +144,19 @@
 
 track_max_deltas[self.pressed_track_id - 1] = max_d
 self.trim_blank_indexes[self.pressed_track_id - 1] = trim_index
- 
+ 
 # Smallest track delta is the max number of frames 
- # the edit can be done backwards 
- smallest_max_delta = MAX_DELTA
- for i in range(1, len(tracks) - 1):
- d = track_max_deltas[i - 1]
- if d < smallest_max_delta:
- smallest_max_delta = d
- self.max_backwards = smallest_max_delta
- 
+ # the edit can be done backwards
+ if self.move_all_tracks:
+ smallest_max_delta = MAX_DELTA
+ for i in range(1, len(tracks) - 1):
+ d = track_max_deltas[i - 1]
+ if d < smallest_max_delta:
+ smallest_max_delta = d
+ self.max_backwards = smallest_max_delta
+ else: # Single track moved with CTRL
+ self.max_backwards = track_max_deltas[self.pressed_track_id - 1] # - 1 because black track
+ 
 # Track have different ways the edit will need to be applied
 # make a list of those
 track_edit_ops = []

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/panels.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/panels.py Changed

@@ -31,6 +31,7 @@
 import guicomponents
 import guiutils
 import editorpersistance
+import editorstate
 import mlttransitions
 import renderconsumer
 import respaths
@@ -347,7 +348,10 @@
                               None)
                               
     length_entry = Gtk.Entry()
-    length_entry.set_text(str(30))    
+    trans_length = 30
+    if editorstate.transition_length > 0: # use last invocation length if available
+        trans_length = editorstate.transition_length
+    length_entry.set_text(str(trans_length))    
     length_row = get_two_column_box(Gtk.Label(label=_("Length:")), 
                                     length_entry)
 
@@ -417,7 +421,10 @@
     color_row = get_two_column_box(color_label, color_button_box)
                               
     length_entry = Gtk.Entry()
-    length_entry.set_text(str(30))    
+    fade_length = 30
+    if editorstate.fade_length > 0: # use last invocation length if available
+        fade_length = editorstate.fade_length
+    length_entry.set_text(str(fade_length))    
     length_row = get_two_column_box(Gtk.Label(label=_("Length:")), 
                                     length_entry)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/persistance.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/persistance.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/positionbar.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/positionbar.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/preferenceswindow.py Changed

@@ -20,6 +20,7 @@
 
 from gi.repository import Gtk
 
+import appconsts
 import dialogs
 import dialogutils
 import editorpersistance
@@ -256,15 +257,25 @@
     else:
         audio_levels_combo.set_active(1)
 
+    window_mode_combo = Gtk.ComboBoxText()
+    window_mode_combo.append_text(_("Single Window"))
+    window_mode_combo.append_text(_("Two Windows"))
+    if prefs.global_layout == appconsts.SINGLE_WINDOW:
+        window_mode_combo.set_active(0)
+    else:
+        window_mode_combo.set_active(1)
+        
     # Layout
+    row00 = _row(guiutils.get_two_column_box(Gtk.Label(label=_("Application window mode:")), window_mode_combo, PREFERENCES_LEFT))
     row0 =  _row(guiutils.get_checkbox_row_box(force_english_check, Gtk.Label(label=_("Use English texts on localized OS"))))
     row1 =  _row(guiutils.get_checkbox_row_box(display_splash_check, Gtk.Label(label=_("Display splash screen"))))
     row2 =  _row(guiutils.get_two_column_box(Gtk.Label(label=_("Buttons style:")), buttons_combo, PREFERENCES_LEFT))
-    row3 =  _row(guiutils.get_two_column_box(Gtk.Label(label=_("Icons and color optimized for:")), dark_combo, PREFERENCES_LEFT))
+    row3 =  _row(guiutils.get_two_column_box(Gtk.Label(label=_("Theme request, icons and colors:")), dark_combo, PREFERENCES_LEFT))
     row4 =  _row(guiutils.get_two_column_box(Gtk.Label(label=_("Theme detection fail fallback colors:")), theme_combo, PREFERENCES_LEFT))
     row5 =  _row(guiutils.get_two_column_box(Gtk.Label(label=_("Default audio levels display:")), audio_levels_combo, PREFERENCES_LEFT))
 
     vbox = Gtk.VBox(False, 2)
+    vbox.pack_start(row00, False, False, 0)
     vbox.pack_start(row0, False, False, 0)
     vbox.pack_start(row1, False, False, 0)
     vbox.pack_start(row2, False, False, 0)
@@ -275,7 +286,7 @@
 
     guiutils.set_margins(vbox, 12, 0, 12, 12)
 
-    return vbox, (force_english_check, display_splash_check, buttons_combo, dark_combo, theme_combo, audio_levels_combo)
+    return vbox, (force_english_check, display_splash_check, buttons_combo, dark_combo, theme_combo, audio_levels_combo, window_mode_combo)
 
 def _row(row_cont):
     row_cont.set_size_request(10, 26)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/profilesmanager.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/profilesmanager.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/projectaction.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/projectaction.py Changed

@@ -26,6 +26,7 @@
 import datetime
 import glob
 import md5
+import mlt
 import os
 from os import listdir
 from os.path import isfile, join
@@ -74,7 +75,6 @@
 save_time = None
 save_icon_remove_event_id = None
 
-
 #--------------------------------------- worker threads
 class LoadThread(threading.Thread):
 
@@ -170,14 +170,14 @@
 Gdk.threads_leave()
 ticker.stop_ticker()
 
-
 def _missing_file_dialog_callback(self, dialog, response_id):
 if self.open_check.get_active() == True:
 medialinker.display_linker(self.filename)
 dialog.destroy()
 else:
 dialog.destroy()
- 
+
+
 class AddMediaFilesThread(threading.Thread):
 
 def __init__(self, filenames):
@@ -234,6 +234,44 @@
 
 audiowaveformrenderer.launch_audio_levels_rendering(filenames)
 
+
+class UpdateMediaLengthsThread(threading.Thread):
+ 
+ def __init__(self):
+ threading.Thread.__init__(self)
+
+ def run(self):
+ print "Updating media lengths:"
+
+ Gdk.threads_enter()
+ dialog = dialogs.update_media_lengths_progress_dialog()
+ time.sleep(0.1)
+ Gdk.threads_leave()
+
+ for key, media_file in PROJECT().media_files.iteritems():
+ print media_file.name
+ if media_file.type == appconsts.VIDEO or media_file.type == appconsts.IMAGE_SEQUENCE:
+ print media_file.name
+ Gdk.threads_enter()
+ dialog.info.set_text(media_file.name)
+ Gdk.threads_leave()
+ 
+ producer = mlt.Producer(PROJECT().profile, str(media_file.path))
+ if producer.is_valid() == False:
+ print "not valid producer"
+ continue
+
+ length = producer.get_length()
+ media_file.length = length
+ 
+ PROJECT().update_media_lengths_on_load = False
+ 
+ Gdk.threads_enter()
+ dialog.destroy()
+ Gdk.threads_leave()
+ 
+ print "Updating media lengths done."
+ 
 def _duplicates_info(duplicates):
 primary_txt = _("Media files already present in project were opened!")
 MAX_DISPLAYED_ITEMS = 3
@@ -269,7 +307,8 @@
 profile = mltprofiles.get_profile_for_index(match_profile_index)
 
 path = utils.get_hidden_user_dir_path() + "/" + PROJECT().name
-
+ PROJECT().update_media_lengths_on_load = True
+ 
 persistance.save_project(PROJECT(), path, profile.description()) #<----- HERE
 
 actually_load_project(path)
@@ -457,6 +496,10 @@
 save_thread = SnaphotSaveThread(root_folder_path, project_name)
 save_thread.start()
 
+def update_media_lengths():
+ update_thread = UpdateMediaLengthsThread()
+ update_thread.start()
+ 
 def change_project_profile():
 dialogs.change_profile_project_dialog(PROJECT(), _change_project_profile_callback)
 
@@ -466,13 +509,18 @@
 name = project_name_entry.get_text()
 profile = mltprofiles.get_profile_for_index(profile_combo.get_active())
 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()
-
+ 
+""" 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)
 
@@ -482,13 +530,17 @@
 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):
 
@@ -619,6 +671,38 @@
 
 def open_recent_project(widget, index):
 path = editorpersistance.recent_projects.projects[index]
+ if _project_empty() == True:
+ _actually_open_recent(path)
+ else:
+ dialogs.exit_confirm_dialog(_open_recent_shutdown_dialog_callback, get_save_time_msg(), gui.editor_window.window, editorstate.PROJECT().name, path)
+
+def _project_empty():
+ for seq in PROJECT().sequences:
+ if not seq.is_empty():
+ return False
+ 
+ return True
+ 
+def _open_recent_shutdown_dialog_callback(dialog, response_id, path):
+ dialog.destroy()
+ 
+ # Handle poroject close responses
+ if response_id == Gtk.ResponseType.CLOSE:# "Don't Save"
+ pass
+ elif response_id == Gtk.ResponseType.YES:# "Save"
+ if editorstate.PROJECT().last_save_path != None:
+ persistance.save_project(editorstate.PROJECT(), editorstate.PROJECT().last_save_path)
+ else:
+ dialogutils.warning_message(_("Project has not been saved previously"), 
+ _("Save project with File -> Save As before closing."),
+ gui.editor_window.window)
+ return
+ else: # "Cancel"
+ return
+ 
+ _actually_open_recent(path)
+
+def _actually_open_recent(path):
 if not os.path.exists(path):
 editorpersistance.recent_projects.projects.pop(index)
 editorpersistance.fill_recents_menu_widget(gui.editor_window.uimanager.get_widget('/MenuBar/FileMenu/OpenRecent'), open_recent_project)
@@ -629,6 +713,20 @@
 
 actually_load_project(path)
 
+def get_save_time_msg():
+ if save_time == None:
+ return _("Project has not been saved since it was opened.")
+ 
+ save_ago = (time.clock() - save_time) / 60.0
+
+ if save_ago < 1:
+ return _("Project was saved less than a minute ago.")
+
+ if save_ago < 2:
+ return _("Project was saved one minute ago.")
+ 
+ return _("Project was saved ") + str(int(save_ago)) + _(" minutes ago.")
+ 
 # ---------------------------------- rendering
 def do_rendering():
 success = _write_out_render_item(True)
@@ -1249,8 +1347,8 @@

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/projectdata.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/projectdata.py Changed

@@ -84,6 +84,9 @@
 self.media_log = []
 self.media_log_groups = []
 self.proxy_data = miscdataobjects.ProjectProxyEditingData()
+ self.update_media_lengths_on_load = False # 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
+
 self.SAVEFILE_VERSION = SAVEFILE_VERSION
 
 # c_seq is the currently edited Sequence
@@ -98,9 +101,8 @@
 
 def init_thumbnailer(self):
 global thumbnailer
- if thumbnailer == None:
- thumbnailer = Thumbnailer()
- thumbnailer.set_context(self.profile)
+ thumbnailer = Thumbnailer()
+ thumbnailer.set_context(self.profile)
 
 def add_image_sequence_media_object(self, resource_path, name, length):
 media_object = self.add_media_file(resource_path)
@@ -316,7 +318,7 @@
 icon = cairo.ImageSurface.create_from_png(self.icon_path)
 scaled_icon = cairo.ImageSurface(cairo.FORMAT_ARGB32, appconsts.THUMB_WIDTH, appconsts.THUMB_HEIGHT)
 cr = cairo.Context(scaled_icon)
- cr.scale( float(appconsts.THUMB_WIDTH) / float(icon.get_width()), float(appconsts.THUMB_HEIGHT) / float(icon.get_height()))
+ cr.scale(float(appconsts.THUMB_WIDTH) / float(icon.get_width()), float(appconsts.THUMB_HEIGHT) / float(icon.get_height()))
 cr.set_source_surface(icon, 0, 0)
 cr.paint()

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/projectinfogui.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/projectinfogui.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/render.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/render.py Changed

@@ -36,6 +36,7 @@
 import threading
 
 import dialogutils
+import editorstate
 from editorstate import current_sequence
 from editorstate import PROJECT
 from editorstate import PLAYER
@@ -111,7 +112,12 @@
                                                                                             quality_option_index)
         args_vals_list.append(("ar", str(widgets.encoding_panel.sample_rate_selector.get_selected_rate())))
     else: # Manual args encodings
-        buf = widgets.args_panel.opts_view.get_buffer()
+        if widgets.args_panel.text_buffer == None:
+            # Normal height args panel
+            buf = widgets.args_panel.opts_view.get_buffer()
+        else:
+            # Small heights with dialog for setting args
+            buf = widgets.args_panel.text_buffer
         args_vals_list, error = renderconsumer.get_ffmpeg_opts_args_vals_tuples_list(buf)
     
         if error != None:
@@ -127,8 +133,16 @@
     if  widgets.args_panel.use_args_check.get_active() == False:
         extension = widgets.file_panel.extension_label.get_text()
     else:
-        extension = "." +  widgets.args_panel.ext_entry.get_text()
-
+        if widgets.args_panel.text_buffer == None:
+            extension = "." +  widgets.args_panel.ext_entry.get_text()
+        else:
+            # Small height with dialog args setting
+            ext_str = widgets.args_panel.args_edit_window.ext_entry.get_text()
+            if ext_str == "":
+                # dialog is closed
+                print "yyyyyyyyy"
+                ext_str = widgets.args_panel.ext
+            extension = "." + ext_str
     return folder + "/" + filename + extension
 
 
@@ -141,9 +155,13 @@
     widgets.render_type_panel = rendergui.RenderTypePanel(_render_type_changed, _preset_selection_changed)
     widgets.profile_panel = rendergui.RenderProfilePanel(_out_profile_changed)
     widgets.encoding_panel = rendergui.RenderEncodingPanel(widgets.file_panel.extension_label)
-    widgets.args_panel = rendergui.RenderArgsPanel(_save_opts_pressed, _load_opts_pressed,
-                                                   _display_selection_in_opts_view)
-
+    if (editorstate.SCREEN_HEIGHT > 898):
+        widgets.args_panel = rendergui.RenderArgsPanel(_save_opts_pressed, _load_opts_pressed,
+                                                       _display_selection_in_opts_view)
+    else:
+        widgets.args_panel = rendergui.RenderArgsPanelSmall(_save_opts_pressed, _load_opts_pressed,
+                                                            _display_selection_in_opts_view)
+        
     # Range, Render, Reset, Render Queue
     widgets.render_button = guiutils.get_render_button()
     widgets.range_cb = rendergui.get_range_selection_combo()

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/rendergui.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/rendergui.py Changed

@@ -20,6 +20,7 @@
 
 from gi.repository import Gtk
 from gi.repository import GObject
+from gi.repository import Pango
 
 import math
 import os
@@ -36,7 +37,7 @@
 
 destroy_window_event_id = -1
 
-FFMPEG_VIEW_SIZE = (200, 20) # Text edit area height for render opts. Width 200 seems to be ignored in current layout?
+FFMPEG_VIEW_SIZE = (20, 20) # Text edit area height for render opts. Width 200 seems to be ignored in current layout?
 
 
 # ----------------------------------------------------------- dialogs
@@ -426,19 +427,19 @@
 
 # ------------------------------------------------------------ panels
 def get_render_panel_left(render_widgets):
- small_height = editorstate.screen_size_small_height()
+ small_height = (editorstate.SCREEN_HEIGHT < 898)
 
 file_opts_panel = guiutils.get_named_frame(_("File"), render_widgets.file_panel.vbox, 4) 
 profile_panel = guiutils.get_named_frame(_("Render Profile"), render_widgets.profile_panel.vbox, 4)
 
 if small_height == False:
 encoding_panel = guiutils.get_named_frame(_("Encoding Format"), render_widgets.encoding_panel.vbox, 4)
- render_type_panel = guiutils.get_named_frame(_("Render Type"), render_widgets.render_type_panel.vbox, 4)
+ 
+ render_type_panel = guiutils.get_named_frame(_("Render Type"), render_widgets.render_type_panel.vbox, 4)
 
 render_panel = Gtk.VBox()
 render_panel.pack_start(file_opts_panel, False, False, 0)
- if small_height == False:
- render_panel.pack_start(render_type_panel, False, False, 0)
+ render_panel.pack_start(render_type_panel, False, False, 0)
 render_panel.pack_start(profile_panel, False, False, 0)
 if small_height == False:
 render_panel.pack_start(encoding_panel, False, False, 0)
@@ -447,12 +448,11 @@
 return render_panel
 
 def get_render_panel_right(render_widgets, render_clicked_cb, to_queue_clicked_cb):
- small_height = editorstate.screen_size_small_height()
+ small_height = (editorstate.SCREEN_HEIGHT < 898)
 
 if small_height:
 encoding_panel = guiutils.get_named_frame(_("Encoding Format"), render_widgets.encoding_panel.vbox, 4)
- render_type_panel = guiutils.get_named_frame(_("Render Type"), render_widgets.render_type_panel.vbox, 4)
- 
+ 
 opts_panel = guiutils.get_named_frame(_("Render Args"), render_widgets.args_panel.vbox, 4)
 
 bin_row = Gtk.HBox()
@@ -464,15 +464,17 @@
 
 range_row = Gtk.HBox()
 range_row.pack_start(guiutils.get_pad_label(10, 8), False, False, 0)
- range_row.pack_start(Gtk.Label(label=_("Render Range:")), False, False, 0)
- range_row.pack_start(guiutils.get_pad_label(10, 2), False, False, 0)
+ if not editorstate.screen_size_small_width():
+ range_row.pack_start(Gtk.Label(label=_("Render Range:")), False, False, 0)
+ range_row.pack_start(guiutils.get_pad_label(10, 2), False, False, 0)
 range_row.pack_start(render_widgets.range_cb, True, True, 0)
 
 buttons_panel = Gtk.HBox()
 buttons_panel.pack_start(guiutils.get_pad_label(10, 8), False, False, 0)
 buttons_panel.pack_start(render_widgets.reset_button, False, False, 0)
- buttons_panel.pack_start(Gtk.Label(), True, True, 0)
- buttons_panel.pack_start(render_widgets.queue_button, False, False, 0)
+ if not editorstate.screen_size_small_width():
+ buttons_panel.pack_start(Gtk.Label(), True, True, 0)
+ buttons_panel.pack_start(render_widgets.queue_button, False, False, 0)
 buttons_panel.pack_start(Gtk.Label(), True, True, 0)
 buttons_panel.pack_start(render_widgets.render_button, False, False, 0)
 
@@ -486,17 +488,22 @@
 
 render_panel = Gtk.VBox()
 if small_height:
- render_panel.pack_start(render_type_panel, False, False, 0)
 render_panel.pack_start(encoding_panel, False, False, 0)
- render_panel.pack_start(Gtk.Label(), True, True, 0)
+ render_panel.pack_start(opts_panel, True, True, 0)
+ #render_panel.pack_start(Gtk.Label(), True, True, 0)
 else:
 render_panel.pack_start(opts_panel, True, True, 0)
 if small_height == False:
 render_panel.pack_start(guiutils.get_pad_label(10, 22), False, False, 0)
 render_panel.pack_start(bin_row, False, False, 0)
+ else:
+ render_panel.pack_start(Gtk.Label(), True, True, 0)
+ 
 render_panel.pack_start(range_row, False, False, 0)
 if small_height == False:
 render_panel.pack_start(guiutils.get_pad_label(10, 12), False, False, 0)
+ else:
+ render_panel.pack_start(guiutils.get_pad_label(10, 4), False, False, 0)
 render_panel.pack_start(buttons_panel, False, False, 0)
 
 return render_panel
@@ -578,7 +585,8 @@
 self.vbox = Gtk.VBox(False, 2)
 self.vbox.pack_start(use_project_profile_row, False, False, 0)
 self.vbox.pack_start(self.out_profile_combo.widget, False, False, 0)
- self.vbox.pack_start(self.out_profile_info_box, False, False, 0)
+ if editorstate.screen_size_small_height() == False:
+ self.vbox.pack_start(self.out_profile_info_box, False, False, 0)
 
 def set_sensitive(self, value):
 self.use_project_profile_check.set_sensitive(value)
@@ -633,7 +641,8 @@
 
 self.use_project_label = Gtk.Label(label=_("Use Project Profile:"))
 self.use_args_label = Gtk.Label(label=_("Render using args:"))
- 
+ self.text_buffer = None # only used for small screen heights with dialog for setting agrs, but this value is tested to determine where to get agrs if set
+ 
 self.use_args_check = Gtk.CheckButton()
 self.use_args_check.connect("toggled", self.use_args_toggled)
 
@@ -736,3 +745,185 @@
 self.ext_entry.set_text("")
 
 
+class RenderArgsPanelSmall():
+
+ def __init__(self, save_args_callback, 
+ load_args_callback, display_selection_callback):
+ self.display_selection_callback = display_selection_callback
+ 
+ self.args_edit_window = None
+ self.text_buffer = None # only used here for small screen heights with dialog for setting agrs, but this value is always tested to determine where to get agrs if set
+ self.ext = ""
+ 
+ self.use_project_label = Gtk.Label(label=_("Use Project Profile:"))
+ self.use_args_label = Gtk.Label(label=_("Render using args:"))
+ 
+ self.use_args_check = Gtk.CheckButton()
+ self.use_args_check.connect("toggled", self.use_args_toggled)
+
+ self.opts_save_button = Gtk.Button()
+ icon = Gtk.Image.new_from_stock(Gtk.STOCK_SAVE, Gtk.IconSize.MENU)
+ self.opts_save_button.set_image(icon)
+ self.opts_save_button.connect("clicked", lambda w: save_args_callback())
+ self.opts_save_button.set_sensitive(False)
+ 
+ self.opts_load_button = Gtk.Button()
+ icon = Gtk.Image.new_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.MENU)
+ self.opts_load_button.set_image(icon)
+ self.opts_load_button.connect("clicked", lambda w: load_args_callback())
+
+ self.open_in_bin = Gtk.CheckButton()
+
+ self.open_args_editor_button = Gtk.Button(_("Edit Args:"))
+ self.open_args_editor_button.connect("clicked", lambda w: self.open_edit_window())
+ self.open_args_editor_button.set_sensitive(False)
+
+ self.args_info = Gtk.Label()
+ self.args_info.set_sensitive(False)
+ self.args_info.set_ellipsize(Pango.EllipsizeMode.END)
+ 
+ use_opts_row = Gtk.HBox()
+ use_opts_row.pack_start(self.use_args_label, False, False, 0)
+ use_opts_row.pack_start(self.use_args_check, False, False, 0)
+ use_opts_row.pack_start(Gtk.Label(), True, True, 0)
+ use_opts_row.pack_start(self.opts_load_button, False, False, 0)
+ use_opts_row.pack_start(self.opts_save_button, False, False, 0)
+
+ args_edit_row = Gtk.HBox(False)
+ args_edit_row.pack_start(self.open_args_editor_button, False, False, 0)
+ args_edit_row.pack_start(guiutils.get_pad_label(4, 2), False, False, 0)
+ args_edit_row.pack_start(self.args_info, True, True, 0)
+
+ self.use_args_check.set_tooltip_text(_("Render using key=value rendering options"))
+
+ self.opts_save_button.set_tooltip_text(_("Save Render Args into a text file"))
+ self.opts_load_button.set_tooltip_text(_("Load Render Args from a text file"))
+ 
+ self.vbox = Gtk.VBox(False, 2)
+ self.vbox.pack_start(use_opts_row , False, False, 0)
+ self.vbox.pack_start(args_edit_row, False, False, 0)
+
+ def set_sensitive(self, value):
+ self.use_args_check.set_sensitive(value)
+ self.use_args_label.set_sensitive(value)
+ 
+ def display_encoding_args(self, profile, enc_index, qual_index):
+ encoding_option = renderconsumer.encoding_options[enc_index]
+ quality_option = encoding_option.quality_options[qual_index]
+ args_vals_list = encoding_option.get_args_vals_tuples_list(profile, quality_option)
+ text = ""
+ info_text = ""
+ for arg_val in args_vals_list:
+ k, v = arg_val
+ line = str(k) + "=" + str(v) 
+ text = text + line + "\n"
+ info_text = info_text + line + ", "

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/append_clip.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/append_clip.png Changed

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/close_match.png Added

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/cut.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/cut.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/delete_range.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/delete_range.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/flowblade_splash_black_small.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/full_lock.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/full_lock.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/insert_clip.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/insert_clip.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/lift.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/lift.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_clip.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_clip.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_range.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/overwrite_range.png Changed

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/pattern_producer_trim_view.png Added

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/resync.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/resync.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/darktheme/splice_out.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/splice_out.png Changed

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/darktheme/trim_view.png Added

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/help/translations -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/help/translations Changed

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/img/close_match.png Added

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/img/delete_range.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/img/delete_range.png Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/img/flowblade_splash_black_small.png Changed

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/img/pattern_producer_trim_view.png Added

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/res/img/trim_view.png Added

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/sequence.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/sequence.py Changed

@@ -365,13 +365,23 @@
                 return False
         return True
 
+    def is_empty(self):
+        for i in range (1, len(self.tracks) - 1):
+            track = self.tracks[i]
+            if len(track.clips) > 0:
+                return False
+        
+        return True
+
     # -------------------------------------------------- clips
-    def create_file_producer_clip(self, path, new_clip_name=None):
+    def create_file_producer_clip(self, path, new_clip_name=None, novalidate=False):
         """
         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")
         mltrefhold.hold_ref(producer)
         producer.path = path
         producer.filters = []
@@ -516,6 +526,15 @@
         filter_object.create_mlt_filters(self.profile, clip)
         return filter_object
 
+    def set_all_filters_active_state(self, is_active):
+        for i in range(1, len(self.tracks)):
+            track = self.tracks[i]
+            for clip in track.clips:
+                if clip.is_blanck_clip == False:
+                    for f in clip.filters:
+                        f.active = is_active
+                        f.update_mlt_disabled_value()
+        
     # ------------------------------------------------------ compositors
     def create_compositor(self, compositor_type):
         compositor = mlttransitions.create_compositor(compositor_type)
@@ -636,11 +655,15 @@
         track = self.tracks[-1] # Always last track
         track.clear() # # TRIM INIT CRASH HACK, see clear_hidden_track there may be blank clip here
         track.clips = []
-
+    
         # Display trimmmed clip on hidden track by creating copy of it.
         # File producer
         if path != None:
-            clip = self.create_file_producer_clip(path)
+            clip = editorstate.get_cached_trim_clip(path)
+            if clip == None:
+                clip = self.create_file_producer_clip(path, None, True)
+                editorstate.add_cached_trim_clip(clip)
+    
             if clip_start_pos > 0:
                 edit._insert_blank(track, 0, clip_start_pos)
                 edit._insert_clip(track, clip, 1, 0, clip.get_length() - 1)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/snapping.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/snapping.py Changed

@@ -28,7 +28,7 @@
 from editorstate import current_sequence
 from editorstate import EDIT_MODE
 
-# These are monkeypatched to haev acces to tlinewidgets.py state  
+# These are monkeypatched to have access to tlinewidgets.py state  
 _get_frame_for_x_func = None
 _get_x_for_frame_func = None
 
@@ -143,7 +143,7 @@
     first_clip_frame = first_clip_start + (frame - press_frame)
     first_clip_x = _get_x_for_frame_func(first_clip_frame)
 
-    snapped_x = -1 # if value stys same till end, no snapping has happened
+    snapped_x = -1 # if value stays same till end, no snapping has happened
     snapped_x = _three_track_snap(track, x, first_clip_frame, first_clip_x)
             
     # Return either original x or snapped x
@@ -155,7 +155,7 @@
 
     frame_x = _get_x_for_frame_func(frame)
 
-    snapped_x = -1  # if value stays same till end no snapping happened.
+    snapped_x = -1  # if value stays same till end, no snapping happened.
     snapped_x = _three_track_snap(track, x, frame, frame_x)
         
     # Return either original or snapped x
@@ -165,7 +165,7 @@
     if edit_data == None:
         return x
 
-    snapped_x = -1 # if value stays same till end no snapping happened.
+    snapped_x = -1 # if value stays same till end, no snapping happened.
 
     comp_in_frame = edit_data["clip_in"] + (frame - edit_data["press_frame"])
     comp_in_x = _get_x_for_frame_func(comp_in_frame)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/tlineaction.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tlineaction.py Changed

@@ -30,6 +30,7 @@
 from operator import itemgetter
 
 import appconsts
+import clipeffectseditor
 import compositormodes
 import dialogs
 import dialogutils
@@ -68,7 +69,7 @@
     """
     if MONITOR_MEDIA_FILE() == None:
         # Info window here
-        return
+        return None
     
     if MONITOR_MEDIA_FILE().type != appconsts.PATTERN_PRODUCER:
         new_clip = current_sequence().create_file_producer_clip(MONITOR_MEDIA_FILE().path)
@@ -368,6 +369,9 @@
     action = edit.three_point_overwrite_action(data)
     action.do_edit()
 
+    if not editorstate.timeline_visible():
+        updater.display_sequence_in_monitor()
+    
     updater.display_tline_cut_frame(track, range_in)
 
 def range_overwrite_pressed():
@@ -416,6 +420,45 @@
 
     updater.display_tline_cut_frame(track, track.get_clip_index_at(mark_in_frame))
 
+def delete_range_button_pressed():
+    # Get data
+    #track = current_sequence().get_first_active_track()
+    #if editevent.track_lock_check_and_user_info(track, range_overwrite_pressed, "range overwrite"):
+    #    return
+    tracks = []
+    for i in range(1, len(current_sequence().tracks) - 1):
+        track = current_sequence().tracks[i]
+        if track.edit_freedom != appconsts.LOCKED:
+            tracks.append(track)
+
+    if len(tracks) == 0:
+        # all tracks are locked!
+        return
+            
+    # tractor is has mark in and mark
+    mark_in_frame = current_sequence().tractor.mark_in
+    mark_out_frame = current_sequence().tractor.mark_out
+    range_length = mark_out_frame - mark_in_frame + 1 # end is incl.
+    if mark_in_frame == -1 or mark_out_frame == -1:
+        primary_txt = _("Timeline Range not set!")
+        secondary_txt = _("You need to set Timeline Range using Mark In and Mark Out buttons\nto perform this edit.")
+        dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
+        return
+
+    movemodes.clear_selected_clips() # edit consumes selection
+
+    updater.save_monitor_frame = False # hack to not get wrong value saved in MediaFile.current_frame
+
+    data = {"tracks":tracks,
+            "mark_in_frame":mark_in_frame,
+            "mark_out_frame":mark_out_frame + 1} # +1 because mark is displayed and end of frame end this 
+                                                 # confirms to user expectation of
+                                                 # of how this should work
+    action = edit.range_delete_action(data)
+    action.do_edit()
+
+    PLAYER().seek_frame(mark_in_frame)
+    
 def resync_button_pressed():
     if movemodes.selected_track != -1:
         syncsplitevent.resync_selected()
@@ -450,7 +493,6 @@
     for i in range(movemodes.selected_range_in, movemodes.selected_range_out + 1):
         
         clip = track.clips[i]
-        print i, clip
         if clip.is_blanck_clip == False:
             clips.append(clip)
 
@@ -636,6 +678,8 @@
                                  length) == False:
         return
     
+    editorstate.transition_length = length
+    
     # Get from in and out frames
     from_in = from_clip.clip_out - from_part + add_thingy
     from_out = from_in + length # or transition will include one frame too many
@@ -673,7 +717,7 @@
                                         window_text)
 
 def _transition_render_complete(clip_path):
-    print "render complete"
+    print "Render complete"
 
     global transition_render_data
     transition_index, from_clip, to_clip, track, from_in, to_out, transition_type = transition_render_data
@@ -810,6 +854,9 @@
                                  gui.editor_window.window)
         return
 
+
+    editorstate.fade_length = length
+
     # Edit clears selection, get track index before selection is cleared
     clip_index = movemodes.selected_range_in
     movemodes.clear_selected_clips()
@@ -1018,3 +1065,15 @@
     current_sequence().markers.append((name, current_frame))
     current_sequence().markers = sorted(current_sequence().markers, key=itemgetter(1))
     updater.repaint_tline()
+    
+
+# ---------------------------------------- timeline edits
+def all_filters_off():
+    current_sequence().set_all_filters_active_state(False)
+    clipeffectseditor.update_stack_view()
+
+def all_filters_on():
+    current_sequence().set_all_filters_active_state(True)
+    clipeffectseditor.update_stack_view()
+
+

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tlinewidgets.py Changed

@@ -125,6 +125,7 @@
 LEVELS_RENDER_ICON = None
 SNAP_ICON = None
 KEYBOARD_ICON = None
+CLOSE_MATCH_ICON = None
 
 # tc scale
 TC_POINTER_HEAD = None
@@ -236,6 +237,8 @@
 POINTER_TRIANGLE_COLOR = (0.6, 0.7, 0.8, 0.7)
 SHADOW_POINTER_COLOR = (0.5, 0.5, 0.5)
 
+MATCH_FRAME_LINES_COLOR = (0.78, 0.31, 0.31)
+
 BLANK_SELECTED = (0.68, 0.68, 0.74)
 
 TRACK_GRAD_STOP1 = (1, 0.68, 0.68, 0.68, 1) #0.93, 0.93, 0.93, 1)
@@ -277,13 +280,22 @@
 # Dict for clip thumbnails path -> image
 clip_thumbnails = {}
 
+# Timeline match image
+match_frame = -1
+match_frame_track_index = -1
+image_on_right = True 
+match_frame_image = None
+match_frame_width = 1
+match_frame_height = 1
+
+
 # ------------------------------------------------------------------- module functions
 def load_icons():
 global FULL_LOCK_ICON, FILTER_CLIP_ICON, VIEW_SIDE_ICON,\
 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
+ LEVELS_RENDER_ICON, SNAP_ICON, KEYBOARD_ICON, CLOSE_MATCH_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")
@@ -300,6 +312,7 @@
 LEVELS_RENDER_ICON = cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + "audio_levels_render.png")
 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")
 
 MARKER_ICON = _load_pixbuf("marker.png")
 TRACK_ALL_ON_V_ICON = _load_pixbuf("track_all_on_V.png")
@@ -324,6 +337,33 @@
 global BG_COLOR
 BG_COLOR = get_multiplied_color((r, g, b), 1.25)
 
+def set_match_frame(tline_match_frame, track_index, display_on_right):
+ global match_frame, match_frame_track_index, image_on_right, match_frame_image
+ match_frame = tline_match_frame
+ match_frame_track_index = track_index
+ image_on_right = display_on_right
+ match_frame_image = None
+
+def match_frame_close_hit(x, y):
+ if match_frame == -1:
+ return False
+ 
+ if image_on_right == True:
+ frame_adj = 0
+ img_pos_adj = 0
+ else:
+ frame_adj = 1
+ img_pos_adj = int(match_frame_width)
+ 
+ scale_in = (match_frame + frame_adj - pos) * pix_per_frame
+
+ test_x = scale_in - img_pos_adj + 4
+ test_y = 24
+ if (x >= test_x and x <= test_x + 12) and (y >= test_y and y <= test_y + 12):
+ return True
+ 
+ return False
+
 def _load_pixbuf(icon_file):
 return cairo.ImageSurface.create_from_png(respaths.IMAGE_PATH + icon_file)
 
@@ -1095,6 +1135,9 @@
 if EDIT_MODE() != editorstate.SLIDE_TRIM and fake_current_frame != None:
 PLAYER().seek_frame(fake_current_frame)
 fake_current_frame = None
+ 
+ # Draw match frame
+ self.draw_match_frame(cr)
 
 # Draw frame pointer
 if EDIT_MODE() != editorstate.SLIDE_TRIM or PLAYER().looping():
@@ -1639,7 +1682,75 @@
 cr.arc(parent_x + pad, parent_y + pad, small_radius, 0.0 * degrees, 360.0 * degrees)
 cr.fill()
 
+ def draw_match_frame(self, cr):
+ if match_frame == -1:
+ return
+ 
+ global match_frame_image
+ if match_frame_image == None:
+ self.create_match_frame_image_surface()
+
+ if image_on_right == True:
+ dir_mult = 1
+ frame_adj = 0
+ img_pos_adj = 0
+ else:
+ dir_mult = -1
+ frame_adj = 1
+ img_pos_adj = int(match_frame_width)
+ 
+ scale_in = (match_frame + frame_adj - pos) * pix_per_frame
+ 
+ cr.set_source_surface(match_frame_image, scale_in - img_pos_adj, 20)
+ cr.paint_with_alpha(0.7)
+ 
+ cr.set_source_surface(CLOSE_MATCH_ICON, scale_in - img_pos_adj + 4, 24)
+ cr.paint()
+ 
+ cr.set_source_rgb(*MATCH_FRAME_LINES_COLOR)
+ cr.set_line_width(2.0)
+ cr.rectangle(int(scale_in) - img_pos_adj, 20, int(match_frame_width), int(match_frame_height))
+ cr.stroke()
+
+ cr.move_to(int(scale_in), 0, )
+ cr.line_to(int(scale_in), int(match_frame_height) + 42)
+ cr.stroke()
+
+ start_y = _get_track_y(match_frame_track_index)
+ end_y = _get_track_y(match_frame_track_index - 1)
+ 
+ cr.move_to (int(scale_in) + 8 * dir_mult, start_y)
+ cr.line_to (int(scale_in), start_y)
+ cr.line_to (int(scale_in), end_y + 1)
+ cr.line_to (int(scale_in) + 8 * dir_mult, end_y + 1)
+ cr.set_source_rgb(0.2, 0.2, 0.2)
+ cr.set_line_width(4.0)
+ cr.stroke()
+ 
+ def create_match_frame_image_surface(self):
+ # Create non-scaled icon
+ matchframe_path = utils.get_hidden_user_dir_path() + appconsts.MATCH_FRAME
+ icon = cairo.ImageSurface.create_from_png(matchframe_path)
+
+ # Create and return scaled icon
+ allocation = canvas_widget.widget.get_allocation()
+ x, y, w, h = allocation.x, allocation.y, allocation.width, allocation.height
+ profile_screen_ratio = float(PROJECT().profile.width()) / float(PROJECT().profile.height())
+ 
+ global match_frame_width, match_frame_height
+ match_frame_height = h - 40
+ match_frame_width = match_frame_height * profile_screen_ratio
+ 
+ scaled_icon = cairo.ImageSurface(cairo.FORMAT_ARGB32, int(match_frame_width), int(match_frame_height))
+ cr = cairo.Context(scaled_icon)
+ cr.scale(float(match_frame_width) / float(icon.get_width()), float(match_frame_height) / float(icon.get_height()))
 
+ cr.set_source_surface(icon, 0, 0)
+ cr.paint()
+ 
+ global match_frame_image
+ match_frame_image = scaled_icon
+ 
 class TimeLineColumn:
 """
 GUI component for displaying and editing track parameters.

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tools/batchrendering.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tools/gmic.py Changed

@@ -18,6 +18,10 @@
 along with Flowblade Movie Editor. If not, see <http://www.gnu.org/licenses/>.
 """
 
+import gi
+gi.require_version('Gtk', '3.0')
+gi.require_version('PangoCairo', '1.0')
+
 from gi.repository import GObject, GLib
 from gi.repository import Gtk, Gdk, GdkPixbuf
 from gi.repository import GdkX11
@@ -86,7 +90,9 @@
 _current_profile_index = None
 _render_data = None
 _last_load_file = None
- 
+
+_startup_data = None
+
 _encoding_panel = None
 
 # GTK3 requires this to be created outside of callback
@@ -100,21 +106,41 @@
 _gmic_found = True
 else:
 print "G'MIC NOT found"
- 
-def launch_gmic():
+
+def gmic_available():
+ return _gmic_found
+ 
+def launch_gmic(launch_data=None):
 if _gmic_found == False:
 primary_txt = _("G'Mic not found!")
 secondary_txt = _("G'Mic binary was not present at /usr/bin/gmic.\nInstall G'MIC to use this tool.")
 dialogutils.info_message(primary_txt, secondary_txt, gui.editor_window.window)
 return
 
- print "Launch gmic..."
 gui.save_current_colors()
- 
- FLOG = open(utils.get_hidden_user_dir_path() + "log_gmic", 'w')
- subprocess.Popen([sys.executable, respaths.LAUNCH_DIR + "flowbladegmic"], stdin=FLOG, stdout=FLOG, stderr=FLOG)
-
 
+ # Handle launching with clip data
+ args = None
+ if launch_data != None:
+ clip, track = launch_data # from guicomponwnts._get_tool_integration_menu_item()
+ args = ("path:" + str(clip.path), "clip_in:" + str(clip.clip_in), "clip_out:" + str(clip.clip_out))
+ 
+ print "Launch gmic..."
+ FLOG = open(utils.get_hidden_user_dir_path() + "log_gmic", 'w')
+ if args == None:
+ subprocess.Popen([sys.executable, respaths.LAUNCH_DIR + "flowbladegmic"], stdin=FLOG, stdout=FLOG, stderr=FLOG)
+ else:
+ subprocess.Popen([sys.executable, respaths.LAUNCH_DIR + "flowbladegmic", args[0], args[1], args[2]], stdin=FLOG, stdout=FLOG, stderr=FLOG)
+
+def _get_arg_value(args, key_str):
+ for arg in sys.argv:
+ parts = arg.split(":")
+ if len(parts) > 1:
+ if parts[0] == key_str:
+ return parts[1]
+ 
+ return None
+ 
 def main(root_path, force_launch=False):
 
 gtk_version = "%s.%s.%s" % (Gtk.get_major_version(), Gtk.get_minor_version(), Gtk.get_micro_version())
@@ -183,10 +209,33 @@
 
 os.putenv('SDL_WINDOWID', str(_window.monitor.get_window().get_xid()))
 Gdk.flush()
+
+ # Start with a clip loaded if data provided
+ if len(sys.argv) > 1:
+ path = _get_arg_value(sys.argv, "path")
+ mark_in = int(_get_arg_value(sys.argv, "clip_in"))
+ mark_out = int(_get_arg_value(sys.argv, "clip_out"))
+ global _startup_data
+ _startup_data = (path, mark_in, mark_out)
+ GLib.idle_add(_load_startup_data)
 
 Gtk.main()
 Gdk.threads_leave()
 
+def _load_startup_data():
+ path, mark_in, mark_out = _startup_data
+ _do_file_load(path)
+ GLib.idle_add(_finish_load_startup_data)
+
+def _finish_load_startup_data():
+ path, mark_in, mark_out = _startup_data
+ _player.producer.mark_in = mark_in
+ _player.producer.mark_out = mark_out
+
+ _window.update_marks_display()
+ _window.pos_bar.update_display_from_producer(_player.producer)
+ _window.update_render_status_info()
+ 
 def init_frames_dirs():
 os.mkdir(get_clip_frames_dir())
 os.mkdir(get_render_frames_dir())
@@ -245,9 +294,12 @@
 if utils.get_file_type(filenames[0]) != "video":
 return
 
- global _last_load_file
- _last_load_file = filenames[0]
+ _do_file_load(filenames[0])
 
+def _do_file_load(file_path):
+ global _last_load_file
+ _last_load_file = file_path
+ 
 global _current_path, _render_data
 
 # if another clip has already been opened then we need to shutdown players.
@@ -259,7 +311,7 @@
 if _effect_renderer != None:
 _effect_renderer.shutdown()
 
- _current_path = filenames[0]
+ _current_path = file_path
 
 # Finish clip open when dialog has been destroyed
 GLib.idle_add(_finish_clip_open)

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/tools/toolnatron.py Added

@@ -0,0 +1,57 @@
+"""
+ Flowblade Movie Editor is a nonlinear video editor.
+ Copyright 2014 Janne Liljeblad.
+
+ 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/>.
+"""
+
+import md5
+import os
+import subprocess
+import sys
+
+import appconsts
+import respaths
+import utils
+
+_natron_found = False
+
+def init():
+ global _natron_found
+ if utils.program_is_installed("Natron"):
+ _natron_found = True
+ print "Natron found"
+ else:
+ _natron_found = False
+ print "Natron not found"
+
+def natron_available():
+ return _natron_found
+
+def export_clip(clip):
+ # Write export data file
+ natron_dir = utils.get_hidden_user_dir_path() + appconsts.NATRON_DIR + "/"
+ file_path = natron_dir + "clipexport_" + md5.new(str(os.urandom(32))).hexdigest()
+ data_text = clip.path + " " + str(clip.clip_in) + " " + str(clip.clip_out + 1)
+ 
+ export_data_file = open(file_path, "w")
+ export_data_file.write(data_text)
+ export_data_file.close()
+
+ # Launch Natron
+ print "Launch Natron..."
+ args = [str(respaths.LAUNCH_DIR + "natron_clip_export_start.sh"), str(respaths.LAUNCH_DIR)]
+ subprocess.Popen(args)

flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/toolsintegration.py Added

@@ -0,0 +1,111 @@
+"""
+ Flowblade Movie Editor is a nonlinear video editor.
+ Copyright 2012 Janne Liljeblad.
+
+ 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/>.
+"""
+import copy
+
+import appconsts
+from editorstate import PROJECT
+import gmic
+import toolnatron
+import render
+
+_tools = []
+_active_integrators = []
+
+# --------------------------------------------------- interface
+def init():
+ 
+ if gmic.gmic_available():
+ _tools.append(GMICIntegrator())
+
+ if toolnatron.natron_available():
+ _tools.append(NatronIntegrator())
+ 
+ _tools.append(SlowMoIntegrator())
+ 
+def get_export_integrators():
+ export_integrators = []
+ for tool_integrator in _tools:
+ if tool_integrator.is_export_target == True:
+ export_integrators.append(tool_integrator)
+ 
+ return export_integrators
+
+# --------------------------------------------------- integrator classes
+class ToolIntegrator:
+ 
+ def __init__(self, tool_name, supported_media_types,is_export_target):
+ self.tool_name = tool_name
+ self.is_export_target = is_export_target
+ self.supported_media_types = supported_media_types
+ self.data = None # Used at call sites to give needed info for exports
+ 
+ def activate(self):
+ _active_integrators.append(self)
+ 
+ def deactivate(self):
+ _active_integrators.remove(self)
+
+ def supports_clip_media(self, clip):
+ if clip.media_type in self.supported_media_types:
+ return True
+ else:
+ return False
+
+ def export_callback(self, widget, data):
+ new_instance = copy.deepcopy(self)
+ new_instance.data = data
+ new_instance.activate()
+ new_instance.do_export()
+ 
+ def do_export(self):
+ print self.__class__.__name__ + " does not implement do_export()"
+ 
+
+
+class GMICIntegrator(ToolIntegrator):
+ 
+ def __init__(self):
+ ToolIntegrator.__init__(self, _("G'MIC Effects"), [appconsts.VIDEO], True)
+ 
+ def do_export(self):
+ gmic.launch_gmic(self.data) # tuple (clip, track)
+ 
+
+class NatronIntegrator(ToolIntegrator):
+ def __init__(self):
+ ToolIntegrator.__init__(self, _("Natron"), [appconsts.VIDEO], True)
+
+ def do_export(self):
+ clip, track = self.data
+ toolnatron.export_clip(clip)
+
+
+class SlowMoIntegrator(ToolIntegrator):
+ 
+ def __init__(self):
+ ToolIntegrator.__init__(self, _("Slow/Fast Motion"), [appconsts.VIDEO], True)
+ 
+ def do_export(self):
+ clip, track = self.data
+ media_file = PROJECT().get_media_file_for_path(clip.path)
+ media_file.mark_in = clip.clip_in
+ media_file.mark_out = clip.clip_out
+ render.render_frame_buffer_clip(media_file, True)
+

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/trackaction.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/trackaction.py Changed

@@ -107,12 +107,33 @@
         current_sequence().maximize_audio_tracks_height(gui.tline_canvas.widget.get_allocation())
         _tracks_resize_update()
 
+    if msg == "allactive":
+        _activate_all_tracks()
+
+    if msg == "topactiveonly":
+        _activate_only_current_top_active()
+    
 def _tracks_resize_update():
     tlinewidgets.set_ref_line_y(gui.tline_canvas.widget.get_allocation())
     gui.tline_column.init_listeners()
     updater.repaint_tline()
     gui.tline_column.widget.queue_draw()
 
+def _activate_all_tracks():
+    for i in range(0, len(current_sequence().tracks) - 1):
+        current_sequence().tracks[i].active = True
+
+    gui.tline_column.widget.queue_draw()
+    
+def _activate_only_current_top_active():
+    for i in range(0, len(current_sequence().tracks) - 1):
+        if i == current_sequence().get_first_active_track().id:
+            current_sequence().tracks[i].active = True
+        else:
+            current_sequence().tracks[i].active = False
+
+    gui.tline_column.widget.queue_draw()
+    
 def audio_levels_menu_launch_pressed(widget, event):
     guicomponents.get_audio_levels_popup_menu(event, _audio_levels_item_activated)

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/translations.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/translations.py Changed

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/trimmodes.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/trimmodes.py Changed

@@ -22,6 +22,8 @@
 Module handles user edit events for trim, roll and slip trim modes. 
 """
 
+import traceback
+
 import appconsts
 import dialogutils
 import edit
@@ -33,6 +35,7 @@
 import gui
 import tlinewidgets
 import updater
+import utils
 
 # Default value for pre- and post roll in loop playback
 DEFAULT_LOOP_HALF_LENGTH = 25
@@ -288,6 +291,7 @@
 frame = edit_data["selected_frame"] - delta
 frame = _legalize_one_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
 
 PLAYER().seek_frame(frame)
 
@@ -297,6 +301,7 @@
 frame = edit_data["selected_frame"] + delta
 frame = _legalize_one_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
 
 PLAYER().seek_frame(frame)
 
@@ -310,6 +315,9 @@
 frame = _legalize_two_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
 
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
+ gui.monitor_widget.update_roll_match_frame()
+ 
 PLAYER().seek_frame(frame)
 
 def _tworoll_trim_right(delta):
@@ -318,6 +326,9 @@
 frame = _legalize_two_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
 
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
+ gui.monitor_widget.update_roll_match_frame()
+ 
 PLAYER().seek_frame(frame)
 
 def _tworoll_enter_edit():
@@ -335,7 +346,10 @@
 trim_limits = edit_data["trim_limits"]
 edit_data["press_start"] = trim_limits["clip_start"] + 1 # this can be anything the relevant thing here is mouse delta
 edit_data["keyboard_selected_frame"] = edit_data["press_start"] - delta
-
+ 
+ total_delta = edit_data["press_start"] - edit_data["keyboard_selected_frame"]
+ gui.monitor_widget.set_slip_edit_tline_frame(edit_data["clip"], total_delta)
+ 
 display_frame = _update_slide_trim_for_mouse_frame(edit_data["keyboard_selected_frame"])
 PLAYER().seek_frame(display_frame)
 
@@ -352,6 +366,9 @@
 edit_data["press_start"] = trim_limits["clip_start"] + 1 # this can be anything the relevant thing here is mouse delta
 edit_data["keyboard_selected_frame"] = edit_data["press_start"] + delta
 
+ total_delta = edit_data["press_start"] - edit_data["keyboard_selected_frame"]
+ gui.monitor_widget.set_slip_edit_tline_frame(edit_data["clip"], total_delta)
+
 display_frame = _update_slide_trim_for_mouse_frame(edit_data["keyboard_selected_frame"])
 PLAYER().seek_frame(display_frame)
 
@@ -421,7 +438,17 @@
 clip = edit_data["from_clip"]
 clip_start = trim_limits["from_start"]
 
- # Display trim clip
+ # Init trim view layout
+ if track.type == appconsts.VIDEO and clip.media_type != appconsts.PATTERN_PRODUCER:
+ if edit_data["to_side_being_edited"]:
+ gui.monitor_widget.set_start_trim_view(edit_data["from_clip"], clip_start)
+ else:
+ gui.monitor_widget.set_end_trim_view(edit_data["to_clip"], clip_start)
+ gui.monitor_widget.set_edit_tline_frame(current_frame, current_frame - edit_frame)
+ else:
+ gui.monitor_widget.set_default_view()
+ 
+ # Set interactive trimview on hidden track
 if clip.media_type != appconsts.PATTERN_PRODUCER:
 current_sequence().display_trim_clip(clip.path, clip_start) # file producer
 else:
@@ -498,7 +525,8 @@
 global edit_data
 frame = _legalize_one_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
- 
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
+
 PLAYER().seek_frame(frame)
 
 def oneroll_trim_release(x, y, frame, state):
@@ -514,7 +542,9 @@
 tlinewidgets.trim_mode_in_non_active_state = False 
 gui.tline_canvas.widget.queue_draw()
 return
-
+ 
+ gui.monitor_widget.one_roll_mouse_release(edit_data["edit_frame"], frame - edit_data["edit_frame"])
+ 
 _do_one_roll_trim_edit(frame)
 
 def _do_one_roll_trim_edit(frame):
@@ -636,12 +666,14 @@
 def set_tworoll_mode(track, current_frame = -1):
 """
 Sets two roll mode
- """
+ """ 
 if track == None:
 return False
 
+ current_frame_trim_view_fix = 0
 if current_frame == -1:
 current_frame = PLAYER().producer.frame() + 1 # +1 because cut frame selects previous clip
+ current_frame_trim_view_fix = -1 # when initing trim view the +1 for current frame needs to be undone
 
 if current_frame >= track.get_length():
 return False
@@ -698,6 +730,19 @@
 else:
 clip = edit_data["from_clip"]
 clip_start = trim_limits["from_start"]
+
+ # Init two roll trim view layout
+ if track.type == appconsts.VIDEO and clip.media_type != appconsts.PATTERN_PRODUCER:
+ if edit_data["to_side_being_edited"]:
+ gui.monitor_widget.set_roll_trim_right_active_view(edit_data["from_clip"], clip_start)
+ else:
+ gui.monitor_widget.set_roll_trim_left_active_view(edit_data["to_clip"], clip_start)
+ gui.monitor_widget.set_edit_tline_frame(current_frame + current_frame_trim_view_fix, 
+ current_frame + current_frame_trim_view_fix - edit_frame)
+ else:
+ gui.monitor_widget.set_default_view()
+
+ # 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
 else:
@@ -764,6 +809,9 @@
 frame = _legalize_two_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
 
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
+ gui.monitor_widget.update_roll_match_frame()
+
 PLAYER().seek_frame(frame)
 
 def tworoll_trim_release(x, y, frame, state):
@@ -784,6 +832,10 @@
 
 frame = _legalize_two_roll_trim(frame, edit_data["trim_limits"])
 edit_data["selected_frame"] = frame
+
+ gui.monitor_widget.set_edit_tline_frame(frame, frame - edit_data["edit_frame"])
+ gui.monitor_widget.update_roll_match_frame()
+ 
 _do_two_roll_edit(frame)
 
 def tworoll_play_pressed():
@@ -841,7 +893,7 @@
 # Calculated frame always reinits in to side, so we need to 
 # step one back to reinit on from side if we did the edit from that side
 if to_side_being_edited != True:
- frame = frame - 1
+ frame = frame - 2
 if frame < 0:
 frame = 0
 
@@ -906,10 +958,10 @@
 
 return (first, last)
 
-#---------------------------------------- SLIDE ROLL TRIM EVENTS
-def set_slide_mode(track, current_frame):
+#---------------------------------------- SLIP ROLL TRIM EVENTS
+def set_slide_mode(track, current_frame): # we need to change to to correct one some time
 """
- Sets two roll mode
+ Sets SLIP tool mode
 """
 if track == None:
 return None
@@ -948,10 +1000,23 @@
 clip = edit_data["clip"]
 clip_start = 0 # we'll calculate the offset from actual position of clip on timeline to display the frame displayed after sliding
 
+ # Init two roll trim view layout

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/updater.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/updater.py Changed

@@ -349,10 +349,10 @@
 MONITOR_MEDIA_FILE().mark_in = mark_in
 MONITOR_MEDIA_FILE().mark_out = mark_out
 
- display_monitor_clip_name()
-
 # Display frame, marks and pos
 gui.pos_bar.update_display_from_producer(clip_producer)
+ 
+ display_monitor_clip_name()
 
 if MONITOR_MEDIA_FILE().type == appconsts.IMAGE or \
 MONITOR_MEDIA_FILE().type == appconsts.PATTERN_PRODUCER:
@@ -373,15 +373,16 @@
 
 repaint_tline()
 
-def display_monitor_clip_name():
- # Display clip name
+def display_monitor_clip_name():#we're displaying length and range length also
+ tc_info = utils.get_tc_string(gui.pos_bar.producer.get_length()) 
 if MONITOR_MEDIA_FILE().mark_in != -1 and MONITOR_MEDIA_FILE().mark_out != -1:
 clip_length = utils.get_tc_string(MONITOR_MEDIA_FILE().mark_out - MONITOR_MEDIA_FILE().mark_in + 1) #+1 out incl.
- range_text = " / ][ " + str(clip_length)
+ tc_info = tc_info + " ][ " + str(clip_length)
 else:
- range_text = ""
+ tc_info = tc_info + " ][ --:--:--:--" 
 
- gui.editor_window.monitor_source.set_text(MONITOR_MEDIA_FILE().name + range_text)
+ gui.editor_window.monitor_source.set_text(MONITOR_MEDIA_FILE().name)
+ gui.editor_window.info1.set_text(tc_info)
 
 def display_sequence_in_monitor():
 """
@@ -408,13 +409,7 @@
 PLAYER().seek_frame(saved_timeline_pos)
 saved_timeline_pos = -1
 
- # Display sequence name
- name = editorstate.current_sequence().name
- profile_desc = editorstate.current_sequence().profile.description()
- if editorpersistance.prefs.show_sequence_profile:
- gui.editor_window.monitor_source.set_text(name + " / " + profile_desc)
- else:
- gui.editor_window.monitor_source.set_text(name)
+ update_seqence_info_text()
 
 # Display marks and pos 
 gui.pos_bar.update_display_from_producer(PLAYER().producer)
@@ -422,6 +417,28 @@
 
 repaint_tline()
 
+def update_seqence_info_text():
+ name = editorstate.current_sequence().name
+ profile_desc = editorstate.current_sequence().profile.description()
+ 
+ if editorpersistance.prefs.show_sequence_profile:
+ gui.editor_window.monitor_source.set_text(name + " - " + profile_desc)
+ else:
+ gui.editor_window.monitor_source.set_text(name)
+ 
+ prog_len = PLAYER().producer.get_length()
+ if prog_len < 2: # # to 'fix' the single frame black frame at start, will bug for actual 1 frame sequences
+ prog_len = 0
+ 
+ range_len = PLAYER().producer.mark_out - PLAYER().producer.mark_in + 1 # +1, out incl.
+ tc_info = utils.get_tc_string(prog_len)
+ if PLAYER().producer.mark_in != -1 and PLAYER().producer.mark_out != -1:
+ tc_info = tc_info + " ][ " + utils.get_tc_string(range_len)
+ else:
+ tc_info = tc_info + " ][ --:--:--:--" 
+ 
+ gui.editor_window.info1.set_text(tc_info)
+
 def switch_monitor_display():
 monitorevent.stop_pressed()
 if editorstate.MONITOR_MEDIA_FILE() == None:
@@ -502,6 +519,8 @@
 def display_marks_tc():
 if not timeline_visible():
 display_monitor_clip_name()
+ else:
+ update_seqence_info_text()
 
 # ----------------------------------------------- clip editors
 def clip_removed_during_edit(clip):
@@ -530,6 +549,7 @@
 Called when user selects move mode
 """
 display_sequence_in_monitor()
+ gui.monitor_widget.set_default_view()
 
 def set_transition_render_edit_menu_items_sensitive(range_start, range_end):
 if not editorstate.current_is_move_mode():
@@ -551,8 +571,9 @@
 render_transition.set_sensitive(False)
 render_fade.set_sensitive(False)
 
+"""
 # ------------------------------------------------ notebook
 def switch_notebook_panel(index):
 gui.middle_notebook.set_current_page(index)
 
-
+"""

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/utils.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/utils.py Changed

@@ -21,7 +21,7 @@
 """
 Helper functions and data
 """
-
+import time
 
 from gi.repository import Gtk
 
@@ -34,6 +34,8 @@
 import appconsts
 import editorstate
 
+_start_time = 0.0
+
 # ---------------------------------- CLASSES
 class EmptyClass:
     pass
@@ -430,6 +432,23 @@
     else:
         return True
 
+def program_is_installed(program):
+    def is_exe(fpath):
+        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+    fpath, fname = os.path.split(program)
+    if fpath:
+        if is_exe(program):
+            return True
+    else:
+        for path in os.environ["PATH"].split(os.pathsep):
+            path = path.strip('"')
+            exe_file = os.path.join(path, program)
+            if is_exe(exe_file):
+                return True
+
+    return False
+    
 # File exntension lists
 _audio_file_extensions = [  "act",
                             "aif",
@@ -538,3 +557,20 @@
                             "xvid",
                             "y4m",
                             "yuv"]
+                            
+                            
+def start_timing(msg="start timing"):
+    global _start_time
+    _start_time = time.time()
+    print msg
+
+def elapsed_time(msg="elapsed: ", show_in_millis=True):
+    elapsed_time = time.time() - _start_time
+    if show_in_millis:
+        elapsed_time = round(elapsed_time * 1000.0, 1)
+        unit = "ms"
+    else:
+        unit = "s"
+    
+    print msg + " " + str(elapsed_time) + " " + unit
+

flowblade-1.8.tar.gz/flowblade-trunk/Flowblade/vieweditor/vieweditor.py -> flowblade-1.10.tar.gz/flowblade-trunk/Flowblade/vieweditor/vieweditor.py Changed

flowblade-1.10.tar.gz/flowblade-trunk/docs/1-10-timeline_match_frame.jpg Added

flowblade-1.10.tar.gz/flowblade-trunk/docs/1-10_dual_monitor.jpg Added

flowblade-1.10.tar.gz/flowblade-trunk/docs/1-10_monitor_match_frame.jpg Added

flowblade-1.10.tar.gz/flowblade-trunk/docs/1-10_trimview.jpg Added

flowblade-1.8.tar.gz/flowblade-trunk/docs/KNOWN_ISSUES.md -> flowblade-1.10.tar.gz/flowblade-trunk/docs/KNOWN_ISSUES.md Changed

flowblade-1.8.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md -> flowblade-1.10.tar.gz/flowblade-trunk/docs/RELEASE_NOTES.md Changed

@@ -2,7 +2,7 @@
 
 ## Flowblade 1.8 ##
 
-**Date: September 2, 2016**
+**Date: September 19, 2016**
 
 **Flowblade 1.8** is the twelth release of Flowblade. 
 
@@ -20,7 +20,7 @@
 
 ### Flowblade Main Features ###
 
-* **Keybord trimming with arrow keys** Trim positions can now be moved using arrow keys and trim edit confirmed with pressing Enter key. This is often more convenient and previse then always working with a mouse
+* **Keybord trimming with arrow keys** Trim positions can now be moved using arrow keys and trim edit confirmed with pressing Enter key. This is often more convenient and precise then always working with a mouse
 * **Clip Snapping** Clips and compositors will now snap to clip ends on adjacent tracks when clips or compositors are moved or their ends dragged. 
 * **Clips display media thumbnails** This helps differentiating clips from each other on timeline.
 * **EDL export** is now available. Thanks to Github user *tin2tin* for extensive testing on software not available on my system. Unfortunately it became clear that Blender EDL import is buggy.

flowblade-1.8.tar.gz/flowblade-trunk/flowblade -> flowblade-1.10.tar.gz/flowblade-trunk/flowblade Changed

flowblade-1.8.tar.gz/flowblade-trunk/setup.py -> flowblade-1.10.tar.gz/flowblade-trunk/setup.py Changed