[meld] Move changes-relevant stuff to a new menu

[Kai Willadsen <kaiw src gnome org>]

commit 252fdc7f5afd089da33149be4cc716c2381bf4b8
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu May 6 08:07:59 2010 +1000

    Move changes-relevant stuff to a new menu
    
    The "Edit" menu is becoming long, and contains all sorts of stuff not
    directly related to editing. This commit moves change-related actions
    into a new "Changes" top-level menu.

 data/ui/filediff-ui.xml |    8 ++++----
 data/ui/meldapp-ui.xml  |    1 +
 meld/filediff.py        |    1 +
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/data/ui/filediff-ui.xml b/data/ui/filediff-ui.xml
index 27b93b3..a2a8576 100644
--- a/data/ui/filediff-ui.xml
+++ b/data/ui/filediff-ui.xml
@@ -8,15 +8,15 @@
   </toolbar>
 
   <menubar name="Menubar">
-    <menu action="EditMenu">
-      <placeholder name="EditActionsPlaceholder">
+    <placeholder name="ActionsMenu">
+      <menu action="ChangesMenu">
         <menuitem action="PushLeft"/>
         <menuitem action="PushRight"/>
         <menuitem action="PullLeft"/>
         <menuitem action="PullRight"/>
         <menuitem action="Delete"/>
-      </placeholder>
-    </menu>
+      </menu>
+    </placeholder>
   </menubar>
 
   <popup name="Popup">
diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml
index 28c96b6..138c05d 100644
--- a/data/ui/meldapp-ui.xml
+++ b/data/ui/meldapp-ui.xml
@@ -27,6 +27,7 @@
       <separator/>
       <menuitem name="Preferences" action="Preferences"/>
     </menu>
+    <placeholder name="ActionsMenu" />
     <menu action="ViewMenu">
       <menuitem action="ToolbarVisible" />
       <menuitem action="StatusbarVisible" />
diff --git a/meld/filediff.py b/meld/filediff.py
index c5415a6..fb019c4 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -177,6 +177,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         actions = (
             ("FileOpen",          gtk.STOCK_OPEN,       None,            None, _("Open selected"), self.on_open_activate),
             ("CreatePatch",       None,                 _("Create Patch"),  None, _("Create a patch"), self.make_patch),
+            ("ChangesMenu", None, _("_Changes")),
             ("PushLeft",  gtk.STOCK_GO_BACK,    _("Push to left"),    "<Alt>Left", _("Push current change to the left"), lambda x: self.push_change(-1)),
             ("PushRight", gtk.STOCK_GO_FORWARD, _("Push to right"),   "<Alt>Right", _("Push current change to the right"), lambda x: self.push_change(1)),
             # FIXME: using LAST and FIRST is terrible and unreliable icon abuse