[pitivi/ges: 217/287] Kill the "Preview" menu and reorganize the "Timeline" menu

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 431769ba863a1295fc703a6aeb12369a447cbf4d
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date:   Fri Jan 13 11:07:55 2012 -0500

    Kill the "Preview" menu and reorganize the "Timeline" menu

 data/ui/mainwindow.xml      |    6 ------
 pitivi/mainwindow.py        |    1 -
 pitivi/timeline/timeline.py |    8 ++++++--
 3 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/data/ui/mainwindow.xml b/data/ui/mainwindow.xml
index c97368d..7e9b015 100644
--- a/data/ui/mainwindow.xml
+++ b/data/ui/mainwindow.xml
@@ -37,11 +37,6 @@
     <menu action="Timeline">
       <placeholder name="Timeline" />
     </menu>
-    <menu action="Viewer">
-      <menuitem action="PlayPause" />
-      <menuitem action="Loop" />
-      <separator />
-    </menu>
     <menu action="Help">
       <menuitem action="UserManual" />
       <menuitem action="About" />
@@ -63,7 +58,6 @@
         <separator />
   </toolbar>
   <accelerator action="FullScreenAlternate" />
-  <accelerator action="PlayPause" />
   <accelerator action="RenderProject" />
   <accelerator action="Loop" />
 </ui>
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 425b298..ffaf085 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -341,7 +341,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
                 "About", "Quit", "ImportSourcesFolder",
                 "FullScreen", "FullScreenAlternate", "UserManual",
                 "ShowHideMainToolbar", "ShowHideTimelineToolbar",
-                "PlayPause",
                 "FrameForward", "FrameBackward",
                 "SecondForward", "SecondBackward",
                 "EdgeForward", "EdgeBackward",
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index ecfd5b7..0c9f802 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -113,17 +113,20 @@ ui = '''
         <menu action="Timeline">
             <placeholder name="Timeline">
                 <menuitem action="Split" />
-                <menuitem action="Keyframe" />
-                <separator />
                 <menuitem action="DeleteObj" />
+                <separator />
                 <menuitem action="LinkObj" />
                 <menuitem action="UnlinkObj" />
                 <menuitem action="GroupObj" />
                 <menuitem action="UngroupObj" />
                 <menuitem action="AlignObj" />
                 <separator />
+                <menuitem action="Keyframe" />
                 <menuitem action="Prevframe" />
                 <menuitem action="Nextframe" />
+                <separator />
+                <menuitem action="PlayPause" />
+                <menuitem action="Loop" />
             </placeholder>
         </menu>
     </menubar>
@@ -141,6 +144,7 @@ ui = '''
             <toolitem action="AlignObj" />
         </placeholder>
     </toolbar>
+    <accelerator action="PlayPause" />
     <accelerator action="DeleteObj" />
     <accelerator action="ControlEqualAccel" />
     <accelerator action="ControlKPAddAccel" />