← Back to team overview

openshot.developers team mailing list archive

Re: Static Timeline

 

Andy, this looks like a great start.  This is a tricky feature to add, as
you've discovered.  Lots of moving parts to keep in sync.  I downloaded the
branch tonight and did a bit of work on the .glade file, and fixed a few
scrollbar issues.  Please take a look at this .patch.  (I'm also attaching
the .glade file, in case the patch is no good).

I did the following things:
1) Replaced the gtkTable in the glade file with some vertical and horizontal
splitters (much more control over how they fill the screen).  No more
spacing issues.
2) Fixed a bug in the scrollbar_scroll methods
3) Made it where both the left and right canvases scroll the tracks with the
scroll wheel (no matter which canvas you are over with the mouse)
4) Removed an import to preferences on MainGTK.py (couldn't find the file)

Remaining issues:
1) There were many warnings about missing stock icons from some of the
context menus.  I'm not sure if I blew them away, or you did.  But you might
want to just overwrite those parts of the .glade file with the correct XML
from our trunk.  =)

Note:  This patch will only work on Andy's branch.

Thanks,
-Jonathan

On Tue, Sep 22, 2009 at 2:59 PM, Andy Finch
<we.rocked.in79@xxxxxxxxxxxxxx>wrote:

> I've been working on making the timeline ruler static, so it doesn't scroll
> up & down with the tracks. I think I've ironed out the last issue, so was
> wondering if anyone gets any spare time if they could grab a copy of this
> branch and try it out - it's quite a major change so I'd want another set of
> eyes to look at it before we decide to commit it.
>
> The only issue I can see is when you maximise the application, the gap
> between the ruler and the first track grows quite a bit.
>
> To get the branch:
>
> bzr branch lp:~fincha/openshot/static-timeline
>
> Cheers,
> Andy.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openshot.developers<https://launchpad.net/%7Eopenshot.developers>
> Post to     : openshot.developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openshot.developers<https://launchpad.net/%7Eopenshot.developers>
> More help   : https://help.launchpad.net/ListHelp
>
>
=== modified file 'openshot/windows/MainGTK.py'
--- openshot/windows/MainGTK.py	2009-09-22 19:44:30 +0000
+++ openshot/windows/MainGTK.py	2009-09-23 05:02:33 +0000
@@ -29,7 +29,7 @@
 from classes import files, lock, messagebox, open_project, project, timeline, tree, video
 from windows import About, FileProperties, NewProject, OpenProject
 from windows.SimpleGladeApp import SimpleGladeApp
-from windows import AddFiles, ClipProperties, ExportVideo, ImportImageSeq, Titles, TransitionProperties, TreeFiles, TreeTransitions, preferences
+from windows import AddFiles, ClipProperties, ExportVideo, ImportImageSeq, Titles, TransitionProperties, TreeFiles, TreeTransitions
 
 # init the foreign language
 from language import Language_Init
@@ -1541,6 +1541,8 @@
 	def on_scrolledwindow_Left_scroll_event(self, widget, *args):
 		# Don't bubble up the scroll event.  This prevents the scroll wheel from 
 		# scrolling the individual canvas.
+
+		self.on_scrolledwindow_Right_scroll_event(widget, *args)
 		return True
 
 
@@ -1628,7 +1630,7 @@
 
 		# scroll the canvases
 		self.MyCanvas.scroll_to(horizontal_value, vertical_value)
-		self.TimelineCanvas_Right.scroll_to(horizontal_value, vertical_value)
+		self.TimelineCanvas_Right.scroll_to(horizontal_value, 0.0)
 
 		
 		
@@ -1691,7 +1693,7 @@
 		self.project.is_modified = True
 		
 		# refresh the interface
-		self.project.Render()
+		self.form.refresh()
 		
 	def on_mnuMoveTrackUp_activate(self, event):
 		print "on_mnuMoveTrackUp_activate clicked"

=== modified file 'openshot/windows/glade/Main.glade'
--- openshot/windows/glade/Main.glade	2009-09-21 20:41:36 +0000
+++ openshot/windows/glade/Main.glade	2009-09-23 04:58:18 +0000
@@ -1,15 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Tue Sep 22 23:43:36 2009 -->
 <glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="frmMain">
     <property name="visible">True</property>
-    <property name="window_position">center</property>
+    <property name="window_position">GTK_WIN_POS_CENTER</property>
     <property name="default_width">900</property>
     <property name="default_height">710</property>
     <property name="icon">icons/openshot.png</property>
+    <signal name="key_press_event" handler="on_frmMain_key_press_event"/>
     <signal name="destroy" handler="on_frmMain_destroy"/>
-    <signal name="key_press_event" handler="on_frmMain_key_press_event"/>
     <signal name="delete_event" handler="on_frmMain_delete_event"/>
     <child>
       <widget class="GtkVBox" id="vboxMenu">
@@ -27,8 +27,8 @@
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuNewProject">
+                        <property name="visible">True</property>
                         <property name="label">New Project...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuNewProject_activate"/>
@@ -36,8 +36,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuOpenProject">
+                        <property name="visible">True</property>
                         <property name="label">Open Project...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuOpenProject_activate"/>
@@ -59,8 +59,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuImportFiles">
+                        <property name="visible">True</property>
                         <property name="label">Import Files...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuImportFiles_activate"/>
@@ -68,8 +68,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuImportImageSequence">
+                        <property name="visible">True</property>
                         <property name="label">Import Image Sequence...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuImportImageSequence_activate"/>
@@ -82,8 +82,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuSaveProject">
+                        <property name="visible">True</property>
                         <property name="label">Save Project</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuSaveProject_activate"/>
@@ -91,8 +91,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuSaveProjectAs">
+                        <property name="visible">True</property>
                         <property name="label">Save Project As...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuSaveProjectAs_activate"/>
@@ -105,8 +105,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuMakeMovie">
+                        <property name="visible">True</property>
                         <property name="label">Export Video...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuMakeMovie1_activate"/>
@@ -119,8 +119,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuQuit">
+                        <property name="visible">True</property>
                         <property name="label">gtk-quit</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuQuit1_activate"/>
@@ -140,8 +140,8 @@
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuNewTitle">
+                        <property name="visible">True</property>
                         <property name="label">New Title...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuNewTitle_activate"/>
@@ -149,8 +149,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuNewSequence">
+                        <property name="visible">True</property>
                         <property name="label">New Sequence...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuNewSequence_activate"/>
@@ -163,8 +163,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuPreferences">
+                        <property name="visible">True</property>
                         <property name="label">Preferences</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuPreferences_activate"/>
@@ -205,8 +205,8 @@
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuHelpContents">
+                        <property name="visible">True</property>
                         <property name="label">_Contents</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuHelpContents_activate"/>
@@ -219,8 +219,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuReportBug">
+                        <property name="visible">True</property>
                         <property name="label">_Report a Bug...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuReportBug_activate"/>
@@ -228,8 +228,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuAskQuestion">
+                        <property name="visible">True</property>
                         <property name="label">_Ask a Question...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuAskQuestion_activate"/>
@@ -237,8 +237,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuTranslate">
+                        <property name="visible">True</property>
                         <property name="label">_Translate this Application...</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuTranslate_activate"/>
@@ -251,8 +251,8 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="mnuAbout">
+                        <property name="visible">True</property>
                         <property name="label">gtk-about</property>
-                        <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <signal name="activate" handler="on_mnuAbout_activate"/>
@@ -265,7 +265,6 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -274,8 +273,8 @@
             <child>
               <widget class="GtkToolbar" id="tlbMain">
                 <property name="visible">True</property>
-                <property name="toolbar_style">icons</property>
-                <property name="icon_size">0</property>
+                <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+                <property name="icon_size">GTK_ICON_SIZE_INVALID</property>
                 <child>
                   <widget class="GtkToolButton" id="tlbOpenProject">
                     <property name="visible">True</property>
@@ -286,7 +285,6 @@
                     <signal name="clicked" handler="on_tlbOpenProject_clicked"/>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -300,7 +298,6 @@
                     <signal name="clicked" handler="on_tlbSave_clicked"/>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -308,9 +305,6 @@
                   <widget class="GtkSeparatorToolItem" id="toolbutton2">
                     <property name="visible">True</property>
                   </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
                 </child>
                 <child>
                   <widget class="GtkToolButton" id="tlbImportFiles">
@@ -321,7 +315,6 @@
                     <signal name="clicked" handler="on_tlbImportFiles_clicked"/>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -329,9 +322,6 @@
                   <widget class="GtkSeparatorToolItem" id="toolbutton2a">
                     <property name="visible">True</property>
                   </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
                 </child>
                 <child>
                   <widget class="GtkToolButton" id="tlbSnapshot">
@@ -341,7 +331,6 @@
                     <signal name="clicked" handler="on_tlbSnapshot_clicked"/>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -354,14 +343,12 @@
                     <signal name="clicked" handler="on_tlbMakeMovie_clicked"/>
                   </widget>
                   <packing>
-                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -382,8 +369,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                             <child>
                               <widget class="GtkTreeView" id="treeFiles">
                                 <property name="visible">True</property>
@@ -404,8 +391,8 @@
                             <property name="label" translatable="yes">Project Files</property>
                           </widget>
                           <packing>
+                            <property name="type">tab</property>
                             <property name="tab_fill">False</property>
-                            <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
@@ -413,8 +400,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                             <child>
                               <widget class="GtkTreeView" id="treeTransitions">
                                 <property name="visible">True</property>
@@ -437,9 +424,9 @@
                             <property name="label" translatable="yes">Transitions</property>
                           </widget>
                           <packing>
+                            <property name="type">tab</property>
                             <property name="position">1</property>
                             <property name="tab_fill">False</property>
-                            <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
@@ -457,17 +444,17 @@
                             <property name="label" translatable="yes">Effects</property>
                           </widget>
                           <packing>
+                            <property name="type">tab</property>
                             <property name="position">2</property>
                             <property name="tab_fill">False</property>
-                            <property name="type">tab</property>
                           </packing>
                         </child>
                         <child>
                           <widget class="GtkScrolledWindow" id="scrFileIcons">
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                             <child>
                               <widget class="GtkIconView" id="icvFileIcons">
                                 <property name="can_focus">True</property>
@@ -486,9 +473,9 @@
                             <property name="label" translatable="yes">Project Files</property>
                           </widget>
                           <packing>
+                            <property name="type">tab</property>
                             <property name="position">3</property>
                             <property name="tab_fill">False</property>
-                            <property name="type">tab</property>
                           </packing>
                         </child>
                       </widget>
@@ -508,15 +495,12 @@
                               <widget class="GtkDrawingArea" id="videoscreen">
                                 <property name="visible">True</property>
                               </widget>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <widget class="GtkHScale" id="hsVideoProgress">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="update_policy">delayed</property>
+                                <property name="update_policy">GTK_UPDATE_DELAYED</property>
                                 <property name="adjustment">0 0 110 1 10 10</property>
                                 <property name="draw_value">False</property>
                                 <signal name="value_changed" handler="on_hsVideoProgress_value_changed"/>
@@ -533,19 +517,16 @@
                                 <child>
                                   <widget class="GtkToolbar" id="toolbar1">
                                     <property name="visible">True</property>
-                                    <property name="toolbar_style">text</property>
-                                    <property name="icon_size">0</property>
+                                    <property name="toolbar_style">GTK_TOOLBAR_TEXT</property>
+                                    <property name="icon_size">GTK_ICON_SIZE_INVALID</property>
                                   </widget>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkToolbar" id="tlbPreviewControls">
                                     <property name="width_request">375</property>
                                     <property name="visible">True</property>
-                                    <property name="toolbar_style">icons</property>
-                                    <property name="icon_size">0</property>
+                                    <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+                                    <property name="icon_size">GTK_ICON_SIZE_INVALID</property>
                                     <child>
                                       <widget class="GtkToolButton" id="tlbPrevious">
                                         <property name="visible">True</property>
@@ -554,7 +535,6 @@
                                         <signal name="clicked" handler="on_tlbPrevious_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -566,7 +546,6 @@
                                         <signal name="clicked" handler="on_tlbPreviousMarker_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -578,7 +557,6 @@
                                         <signal name="clicked" handler="on_tlbSeekBackward_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -590,7 +568,6 @@
                                         <signal name="clicked" handler="on_tlbPlay_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -602,7 +579,6 @@
                                         <signal name="clicked" handler="on_tlbSeekForward_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -614,7 +590,6 @@
                                         <signal name="clicked" handler="on_tlbNextMarker_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -626,7 +601,6 @@
                                         <signal name="clicked" handler="on_tlbNext_clicked"/>
                                       </widget>
                                       <packing>
-                                        <property name="expand">False</property>
                                         <property name="homogeneous">True</property>
                                       </packing>
                                     </child>
@@ -638,8 +612,8 @@
                                 <child>
                                   <widget class="GtkToolbar" id="toolbar2">
                                     <property name="visible">True</property>
-                                    <property name="toolbar_style">text</property>
-                                    <property name="icon_size">0</property>
+                                    <property name="toolbar_style">GTK_TOOLBAR_TEXT</property>
+                                    <property name="icon_size">GTK_ICON_SIZE_INVALID</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -661,8 +635,8 @@
                             <property name="label" translatable="yes">VIdeo Preview</property>
                           </widget>
                           <packing>
+                            <property name="type">tab</property>
                             <property name="tab_fill">False</property>
-                            <property name="type">tab</property>
                           </packing>
                         </child>
                       </widget>
@@ -691,8 +665,8 @@
                             <child>
                               <widget class="GtkToolbar" id="tlbTimeline">
                                 <property name="visible">True</property>
-                                <property name="toolbar_style">icons</property>
-                                <property name="icon_size">0</property>
+                                <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+                                <property name="icon_size">GTK_ICON_SIZE_INVALID</property>
                                 <child>
                                   <widget class="GtkToolButton" id="tlbAddTrack">
                                     <property name="visible">True</property>
@@ -701,7 +675,6 @@
                                     <signal name="clicked" handler="on_tlbAddTrack_clicked"/>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
@@ -709,9 +682,6 @@
                                   <widget class="GtkSeparatorToolItem" id="toolbutton1">
                                     <property name="visible">True</property>
                                   </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkToggleToolButton" id="tlbArrow">
@@ -722,7 +692,6 @@
                                     <signal name="toggled" handler="on_tlbArrow_toggled"/>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
@@ -734,7 +703,6 @@
                                     <signal name="toggled" handler="on_tlbRazor_toggled"/>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
@@ -746,7 +714,6 @@
                                     <signal name="toggled" handler="on_tlbResize_toggled"/>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
@@ -759,7 +726,6 @@
                                     <signal name="toggled" handler="on_tlbSnap_toggled"/>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
@@ -767,9 +733,6 @@
                                   <widget class="GtkSeparatorToolItem" id="toolbutton3">
                                     <property name="visible">True</property>
                                   </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkToolButton" id="tlbAddMarker">
@@ -779,14 +742,10 @@
                                     <signal name="clicked" handler="on_tlbAddMarker_clicked"/>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
                               </widget>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
                               <widget class="GtkToolbar" id="toolbar3">
@@ -803,8 +762,9 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="relief">none</property>
+                                            <property name="relief">GTK_RELIEF_NONE</property>
                                             <property name="focus_on_click">False</property>
+                                            <property name="response_id">0</property>
                                             <signal name="clicked" handler="on_btnZoomIn_clicked"/>
                                             <child>
                                               <widget class="GtkImage" id="image1">
@@ -815,14 +775,13 @@
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
-                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <widget class="GtkHScale" id="hsZoom">
                                             <property name="width_request">200</property>
                                             <property name="visible">True</property>
-                                            <property name="update_policy">discontinuous</property>
+                                            <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
                                             <property name="adjustment">15 1 205 1 5 5</property>
                                             <property name="draw_value">False</property>
                                             <signal name="value_changed" handler="on_hsZoom_value_changed"/>
@@ -847,8 +806,9 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="relief">none</property>
+                                            <property name="relief">GTK_RELIEF_NONE</property>
                                             <property name="focus_on_click">False</property>
+                                            <property name="response_id">0</property>
                                             <signal name="clicked" handler="on_btnZoomOu_clicked"/>
                                             <child>
                                               <widget class="GtkImage" id="btnZoomOut">
@@ -866,7 +826,6 @@
                                     </child>
                                   </widget>
                                   <packing>
-                                    <property name="expand">False</property>
                                     <property name="homogeneous">True</property>
                                   </packing>
                                 </child>
@@ -879,131 +838,138 @@
                           </widget>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkTable" id="table2">
+                          <widget class="GtkHBox" id="hbox5">
+                            <property name="height_request">50</property>
                             <property name="visible">True</property>
-                            <property name="n_rows">3</property>
-                            <property name="n_columns">3</property>
-                            <child>
-                              <widget class="GtkHScrollbar" id="hscrollbar2">
-                                <property name="visible">True</property>
-                                <property name="adjustment">0 0 5500 1 10 10</property>
-                                <signal name="value_changed" handler="on_hscrollbar2_value_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkVScrollbar" id="vscrollbar2">
-                                <property name="visible">True</property>
-                                <property name="orientation">vertical</property>
-                                <property name="adjustment">0 0 1000 1 10 10</property>
-                                <signal name="value_changed" handler="on_vscrollbar2_value_changed"/>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">2</property>
-                                <property name="right_attach">3</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options">GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkScrolledWindow" id="scrolledwindow_Right">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">never</property>
-                                <property name="vscrollbar_policy">never</property>
-                                <signal name="scroll_event" handler="on_scrolledwindow_Right_scroll_event"/>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkScrolledWindow" id="scrolledwindow_Left">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">never</property>
-                                <property name="vscrollbar_policy">never</property>
-                                <signal name="scroll_event" handler="on_scrolledwindow_Left_scroll_event"/>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">1</property>
-                                <property name="bottom_attach">2</property>
-                                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                <property name="y_options">GTK_SHRINK | GTK_FILL</property>
-                              </packing>
-                            </child>
                             <child>
                               <widget class="GtkScrolledWindow" id="timelineWindowLeft">
+                                <property name="width_request">160</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">never</property>
-                                <property name="vscrollbar_policy">never</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
                                 <signal name="scroll_event" handler="on_timelineWindowLeft_scroll_event"/>
                                 <child>
                                   <placeholder/>
                                 </child>
                               </widget>
                               <packing>
-                                <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                               </packing>
                             </child>
                             <child>
                               <widget class="GtkScrolledWindow" id="timelinewindowRight">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">never</property>
-                                <property name="vscrollbar_policy">never</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
                                 <signal name="scroll_event" handler="on_timelinewindowRight_scroll_event"/>
                                 <child>
                                   <placeholder/>
                                 </child>
                               </widget>
                               <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
-                                <property name="y_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
                           </widget>
                           <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox6">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="scrolledwindow_Left">
+                                <property name="width_request">160</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <signal name="scroll_event" handler="on_scrolledwindow_Left_scroll_event"/>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="scrolledwindow_Right">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <signal name="scroll_event" handler="on_scrolledwindow_Right_scroll_event"/>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkVScrollbar" id="vscrollbar2">
+                                <property name="visible">True</property>
+                                <property name="adjustment">0 0 1000 1 10 10</property>
+                                <signal name="value_changed" handler="on_vscrollbar2_value_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox7">
+                            <property name="height_request">20</property>
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="scrolledwindow_Left1">
+                                <property name="width_request">160</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHScrollbar" id="hscrollbar2">
+                                <property name="visible">True</property>
+                                <property name="adjustment">0 0 5500 1 10 10</property>
+                                <signal name="value_changed" handler="on_hscrollbar2_value_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                     <child>
@@ -1012,8 +978,8 @@
                         <property name="label" translatable="yes">Timeline - Sequence 1</property>
                       </widget>
                       <packing>
+                        <property name="type">tab</property>
                         <property name="tab_fill">False</property>
-                        <property name="type">tab</property>
                       </packing>
                     </child>
                   </widget>
@@ -1040,9 +1006,9 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <child>
       <widget class="GtkImageMenuItem" id="mnuAddFile">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="label">Import Files...</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAddFile_activate"/>
@@ -1050,9 +1016,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuAddNewFolder">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="label">Create Folder...</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAddNewFolder_activate"/>
@@ -1068,8 +1034,8 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Folder Name</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
@@ -1089,7 +1055,6 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -1111,32 +1076,33 @@
           <widget class="GtkHButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">end</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
             <child>
               <widget class="GtkButton" id="btnCancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_btnCancel_clicked"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <widget class="GtkButton" id="btnOK">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="is_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="is_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="use_stock">True</property>
+                <property name="response_id">0</property>
                 <signal name="clicked" handler="on_btnOK_clicked"/>
               </widget>
               <packing>
@@ -1148,8 +1114,7 @@
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="pack_type">GTK_PACK_END</property>
           </packing>
         </child>
       </widget>
@@ -1160,14 +1125,13 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
     <child>
       <widget class="GtkImageMenuItem" id="mnuAddTrackAbove">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+        <property name="tooltip" translatable="yes">Add Track Above</property>
         <property name="label" translatable="yes">Add Track Above</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-        <property name="tooltip" translatable="yes">Add Track Above</property>
-        <property name="use_stock">False</property>
         <signal name="activate" handler="on_mnuAddTrackAbove_activate"/>
         <child internal-child="image">
-          <widget class="GtkImage" id="image1">
+          <widget class="GtkImage" id="menu-item-image1">
             <property name="visible">True</property>
             <property name="stock">gtk-add</property>
           </widget>
@@ -1176,11 +1140,10 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuAddTrackBelow">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+        <property name="tooltip" translatable="yes">Add Track Below</property>
         <property name="label" translatable="yes">Add Track Below</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-        <property name="tooltip" translatable="yes">Add Track Below</property>
-        <property name="use_stock">False</property>
         <signal name="activate" handler="on_mnuAddTrackBelow_activate"/>
         <child internal-child="image">
           <widget class="GtkImage" id="image2">
@@ -1197,11 +1160,10 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuMoveTrackUp">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+        <property name="tooltip" translatable="yes">Move Track Up</property>
         <property name="label" translatable="yes">Move Track Up</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-        <property name="tooltip" translatable="yes">Move Track Up</property>
-        <property name="use_stock">False</property>
         <signal name="activate" handler="on_mnuMoveTrackUp_activate"/>
         <child internal-child="image">
           <widget class="GtkImage" id="image3">
@@ -1213,11 +1175,10 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuMoveTrackDown">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+        <property name="tooltip" translatable="yes">Move Track Down</property>
         <property name="label" translatable="yes">Move Track Down</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-        <property name="tooltip" translatable="yes">Move Track Down</property>
-        <property name="use_stock">False</property>
         <signal name="activate" handler="on_mnuMoveTrackDown_activate"/>
         <child internal-child="image">
           <widget class="GtkImage" id="image4">
@@ -1234,11 +1195,10 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuRenameTrack">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+        <property name="tooltip" translatable="yes">Rename Track</property>
         <property name="label" translatable="yes">Rename Track</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-        <property name="tooltip" translatable="yes">Rename Track</property>
-        <property name="use_stock">False</property>
         <signal name="activate" handler="on_mnuRenameTrack_activate"/>
         <child internal-child="image">
           <widget class="GtkImage" id="image5">
@@ -1255,11 +1215,10 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuRemoveTrac">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+        <property name="tooltip" translatable="yes">Remove Track</property>
         <property name="label" translatable="yes">Remove Track</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-        <property name="tooltip" translatable="yes">Remove Track</property>
-        <property name="use_stock">False</property>
         <signal name="activate" handler="on_mnuRemoveTrack_activate"/>
         <child internal-child="image">
           <widget class="GtkImage" id="image6">
@@ -1275,9 +1234,9 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
     <child>
       <widget class="GtkImageMenuItem" id="mnuDuplicate">
-        <property name="label">Duplicate</property>
         <property name="visible">True</property>
         <property name="tooltip" translatable="yes">Make a copy of this clip</property>
+        <property name="label">Duplicate</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuDuplicate_activate"/>
@@ -1290,9 +1249,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuAnimate">
+        <property name="visible">True</property>
+        <property name="tooltip" translatable="yes">Animate this clip</property>
         <property name="label">Animate</property>
-        <property name="visible">True</property>
-        <property name="tooltip" translatable="yes">Animate this clip</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1300,24 +1259,24 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuPosition">
+        <property name="visible">True</property>
+        <property name="tooltip" translatable="yes">Position and resize this clip</property>
         <property name="label">Layout</property>
-        <property name="visible">True</property>
-        <property name="tooltip" translatable="yes">Position and resize this clip</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem5">
+      <widget class="GtkSeparatorMenuItem" id="menuitem1">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuSliceandShuffle">
+        <property name="visible">True</property>
+        <property name="tooltip" translatable="yes">Slice this clip into many small clips, and then shuffle them.</property>
         <property name="label">Slice and Shuffle</property>
-        <property name="visible">True</property>
-        <property name="tooltip" translatable="yes">Slice this clip into many small clips, and then shuffle them.</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuSliceandShuffle_activate"/>
@@ -1325,9 +1284,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuSliceandCut">
+        <property name="visible">True</property>
+        <property name="tooltip" translatable="yes">Slice this clip into many small clips, cutting each alternating clip.</property>
         <property name="label">Slice and Cut</property>
-        <property name="visible">True</property>
-        <property name="tooltip" translatable="yes">Slice this clip into many small clips, cutting each alternating clip.</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuSliceandCut_activate"/>
@@ -1335,22 +1294,22 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuClipProperties">
+        <property name="visible">True</property>
         <property name="label">Properties</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuClipProperties_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem1">
+      <widget class="GtkSeparatorMenuItem" id="menuitem2">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuRemoveClip">
+        <property name="visible">True</property>
         <property name="label">Remove Clip</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuRemoveClip_activate"/>
@@ -1375,24 +1334,24 @@
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_none">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">No Animation</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem5">
+      <widget class="GtkSeparatorMenuItem" id="menuitem6">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_zoom_in_100_150">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Zoom In (100% to 150%)</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1400,9 +1359,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_zoom_in_50_100">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Zoom In (50% to 100%)</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1410,9 +1369,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_zoom_out_100_50">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Zoom Out (100% to 50%)</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1420,24 +1379,24 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_zoom_out_150_100">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Zoom Out (150% to 100%)</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem1">
+      <widget class="GtkSeparatorMenuItem" id="menuitem7">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_center_to_top">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Center to Top</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1445,9 +1404,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_center_to_left">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Center to Left</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1455,9 +1414,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_center_to_right">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Center To Right</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1465,24 +1424,24 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_center_to_bottom">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Center to Bottom</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem2">
+      <widget class="GtkSeparatorMenuItem" id="menuitem9">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_top_to_center">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Top to Center</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1490,9 +1449,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_left_to_center">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Left to Center</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1500,9 +1459,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_right_to_center">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Right to Center</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1510,24 +1469,24 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_bottom_to_center">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Bottom to Center</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem3">
+      <widget class="GtkSeparatorMenuItem" id="menuitem10">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_top_to_bottom">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Top to Bottom</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1535,9 +1494,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_left_to_right">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Left to Right</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1545,9 +1504,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_right_to_left">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Right to Left</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1555,9 +1514,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_bottom_to_top">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Bottom to Top</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuAnimate_activate"/>
@@ -1568,25 +1527,25 @@
     <property name="visible">True</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
     <child>
-      <widget class="GtkImageMenuItem" id="mnu_none">
+      <widget class="GtkImageMenuItem" id="mnu_none1">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">Reset Layout</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem5">
+      <widget class="GtkSeparatorMenuItem" id="menuitem11">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_center_1_4">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">1/4 Size - Center</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
@@ -1594,9 +1553,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_top_left_1_4">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">1/4 Size - Top Left</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
@@ -1604,9 +1563,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_top_right_1_4">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">1/4 Size - Top Right</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
@@ -1614,9 +1573,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_bottom_left_1_4">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">1/4 Size - Bottom Left</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
@@ -1624,9 +1583,9 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnu_bottom_right_1_4">
+        <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="label">1/4 Size - Bottom Right</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuPosition_activate"/>
@@ -1637,24 +1596,24 @@
     <property name="visible">True</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
     <child>
-      <widget class="GtkImageMenuItem" id="mnuDuplicate">
-        <property name="label">Duplicate</property>
+      <widget class="GtkImageMenuItem" id="mnuDuplicate1">
         <property name="visible">True</property>
         <property name="tooltip" translatable="yes">Make a copy of this transition</property>
+        <property name="label">Duplicate</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuDuplicate_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem5">
+      <widget class="GtkSeparatorMenuItem" id="menuitem12">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuReverseTransition">
+        <property name="visible">True</property>
         <property name="label">Switch Direction</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuReverseMarker_activate"/>
@@ -1662,8 +1621,8 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuMask">
+        <property name="visible">True</property>
         <property name="label">Convert to Mask</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuMask_activate"/>
@@ -1671,22 +1630,22 @@
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuTransitionProperties">
+        <property name="visible">True</property>
         <property name="label">Properties</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuTransitionProperties_activate"/>
       </widget>
     </child>
     <child>
-      <widget class="GtkSeparatorMenuItem" id="menuitem1">
+      <widget class="GtkSeparatorMenuItem" id="menuitem13">
         <property name="visible">True</property>
       </widget>
     </child>
     <child>
       <widget class="GtkImageMenuItem" id="mnuRemoveTransition">
+        <property name="visible">True</property>
         <property name="label">Remove Transition</property>
-        <property name="visible">True</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
         <signal name="activate" handler="on_mnuRemoveTransition_activate"/>

Attachment: Main.glade
Description: application/glade


Follow ups

References