@@ -1,4 +1,11 @@

 -------------------------------------------------------------------

+Thu Jan 12 16:55:58 UTC 2017 - avvissu@yandex.by

+

+- Update to 1.10:

+  * see /usr/share/docpackages/flowblade/RELEASE_NOTES 

+- Check list of dependencies

+

+-------------------------------------------------------------------

 Sat Oct 22 17:36:13 UTC 2016 - avvissu@yandex.by

 - Update to 1.8:

​

@@ -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}

​

@@ -1,8 +1,6 @@

 ![Flowblade](flowblade-trunk/Flowblade/res/img/header_text.png "Flowblade")

-**NEW VERSION 1.8 AVAILABLE. Go to [release notes](./flowblade-trunk/docs/RELEASE_NOTES.md) to see what's new. Installing information available [here](./flowblade-trunk/docs/INSTALLING.md).**

-

 **Contents:**

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

   1. [Features](https://github.com/jliljebl/flowblade#features)

​

@@ -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)

​

@@ -100,7 +100,7 @@

 EXTRA_EDITOR = "extraeditor"

 # Available tracks configurations for flowblade

-TRACK_CONFIGURATIONS = [(5,4),(4,3),(3,2),(2,1),(8,1),(1,8)]

+TRACK_CONFIGURATIONS = [(5,4),(4,3),(3,2),(2,1),(7,2),(2,7),(8,1),(1,8)]

 # Thumbnail image dimensions

 THUMB_WIDTH = 116

@@ -149,6 +149,11 @@

 GMIC_DIR = "gmic"

 NODE_COMPOSITORS_DIR = "node_compositors"

 PHANTOM_DISK_CACHE_DIR = "phantom_disk_cache"

+MATCH_FRAME_DIR = "match_frame"

+MATCH_FRAME = MATCH_FRAME_DIR + "/match_frame.png"

+MATCH_FRAME_NEW = MATCH_FRAME_DIR + "/match_frame_new.png"

+TRIM_VIEW_DIR = "trim_view"

+NATRON_DIR = "natron"

 # Luma bands

 SHADOWS = 0

@@ -173,4 +178,17 @@

 LOAD_RELATIVE_FIRST = 1

 LOAD_ABSOLUTE_ONLY = 2

+# Trim view modes

+TRIM_VIEW_ON = 0

+TRIM_VIEW_SINGLE = 1

+TRIM_VIEW_OFF = 2

+

+# MIdbar layout

+MIDBAR_TC_LEFT = 0

+MIDBAR_TC_CENTER = 1

+MIDBAR_COMPONENTS_CENTERED = 2

+

+# Windows mode

+SINGLE_WINDOW = 1

+TWO_WINDOWS = 2

​

@@ -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

​

@@ -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

​

@@ -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}

​

@@ -48,6 +48,8 @@

 # Used to update kfeditors with external tline frame position changes

 keyframe_editor_widgets = []

+compositor_notebook_index = 3 # this is set 2 for 2 window mode

+

 def create_widgets():

     """

     Widgets for editing compositing properties.

@@ -95,11 +97,9 @@

     set_enabled(True)

     _display_compositor_edit_box()

-    # ????? this is not used

+

     if editorpersistance.prefs.default_layout == True:

-        gui.middle_notebook.set_current_page(3)

-    else:

-        gui.editor_window.right_notebook.set_current_page(2)

+        gui.middle_notebook.set_current_page(compositor_notebook_index)

 def clear_compositor():

     global compositor

​

@@ -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:

​

@@ -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()

​

@@ -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):

​

@@ -545,6 +545,13 @@

         # This shouldn't happen unless for some reason mouse release didn't hit clipenddragmode listener.

         print "EDIT_MODE() == editorstate.CLIP_END_DRAG at mouse press!"

+    #  Check if match frame close is hit

+    if editorstate.current_is_move_mode() and timeline_visible():

+        if tlinewidgets.match_frame_close_hit(event.x, event.y) == True:

+            tlinewidgets.set_match_frame(-1, -1, True)

+            updater.repaint_tline()

+            return

+

     #  Check if compositor is hit and if so handle compositor editing

     if editorstate.current_is_move_mode() and timeline_visible():

         hit_compositor = tlinewidgets.compositor_hit(frame, event.y, current_sequence().compositors)

​

@@ -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)

+        

+        

​

@@ -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 = {}

​

@@ -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

+                if (float(w) / editorstate.SCREEN_WIDTH > 0.95) and (float(h) / editorstate.SCREEN_HEIGHT > 0.95):

+                    self.window2.maximize()

+                else:

+                    self.window2.resize(w, h)

+            

+            self.window2.move(x, y)

+            self.window2.show_all()

+                        

         # Set paned positions

         self.mm_paned.set_position(editorpersistance.prefs.mm_paned_position)

         self.top_paned.set_position(editorpersistance.prefs.top_paned_position)

@@ -709,7 +749,7 @@

         mb_menu = Gtk.Menu()

         tc_left = Gtk.RadioMenuItem()

         tc_left.set_label(_("Timecode Left").encode('utf-8'))

-        tc_left.set_active(True)

+        #tc_left.set_active(appconsts)

         tc_left.connect("activate", lambda w: middlebar._show_buttons_TC_LEFT_layout(w))

         mb_menu.append(tc_left)

@@ -717,7 +757,13 @@

         tc_middle.connect("activate", lambda w: middlebar._show_buttons_TC_MIDDLE_layout(w))

         mb_menu.append(tc_middle)

-        if editorpersistance.prefs.midbar_tc_left == True:

+        components_centered = Gtk.RadioMenuItem.new_with_label([tc_left], _("Components Centered").encode('utf-8'))

+        components_centered.connect("activate", lambda w: middlebar._show_buttons_COMPONETS_CENTERED_layout(w))

+        mb_menu.append(components_centered)

+

+        if editorpersistance.prefs.midbar_layout == appconsts.MIDBAR_COMPONENTS_CENTERED:

+            components_centered.set_active(True)

+        elif editorpersistance.prefs.midbar_layout == appconsts.MIDBAR_TC_LEFT:

             tc_left.set_active(True)

         else:

             tc_middle.set_active(True)

@@ -747,20 +793,18 @@

         sep = Gtk.SeparatorMenuItem()

         menu.append(sep)

-        if not (editorstate.screen_size_small_height() == True or editorstate.screen_size_small_height() == True):