[meld] Move Up/Down change actions to Changes menu

[Kai Willadsen <kaiw src gnome org>]

commit d84f0855c477289b9585b0a5ee41e2a911f6c2ed
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu May 6 08:16:44 2010 +1000

    Move Up/Down change actions to Changes menu
    
    The Up/Down actions are not about editing, but about navigation through
    changes. Now that there is a new menu specifically for change-related
    actions, they belong there.

 data/ui/filediff-ui.xml |    8 ++++----
 data/ui/meldapp-ui.xml  |    6 ++++--
 meld/filediff.py        |    1 -
 meld/meldapp.py         |    4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/data/ui/filediff-ui.xml b/data/ui/filediff-ui.xml
index a2a8576..668ceb2 100644
--- a/data/ui/filediff-ui.xml
+++ b/data/ui/filediff-ui.xml
@@ -8,15 +8,15 @@
   </toolbar>
 
   <menubar name="Menubar">
-    <placeholder name="ActionsMenu">
-      <menu action="ChangesMenu">
+    <menu action="ChangesMenu">
+      <placeholder name="ChangesActions">
         <menuitem action="PushLeft"/>
         <menuitem action="PushRight"/>
         <menuitem action="PullLeft"/>
         <menuitem action="PullRight"/>
         <menuitem action="Delete"/>
-      </menu>
-    </placeholder>
+      </placeholder>
+    </menu>
   </menubar>
 
   <popup name="Popup">
diff --git a/data/ui/meldapp-ui.xml b/data/ui/meldapp-ui.xml
index 138c05d..0ae33d1 100644
--- a/data/ui/meldapp-ui.xml
+++ b/data/ui/meldapp-ui.xml
@@ -22,12 +22,14 @@
       <menuitem action="FindNext"/>
       <menuitem action="Replace"/>
       <separator/>
+      <menuitem name="Preferences" action="Preferences"/>
+    </menu>
+    <menu action="ChangesMenu">
       <menuitem action="Down"/>
       <menuitem action="Up"/>
       <separator/>
-      <menuitem name="Preferences" action="Preferences"/>
+      <placeholder name="ChangesActions" />
     </menu>
-    <placeholder name="ActionsMenu" />
     <menu action="ViewMenu">
       <menuitem action="ToolbarVisible" />
       <menuitem action="StatusbarVisible" />
diff --git a/meld/filediff.py b/meld/filediff.py
index fb019c4..c5415a6 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -177,7 +177,6 @@ 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
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 6f01a47..4aa8062 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -152,9 +152,11 @@ class MeldApp(gnomeglade.Component):
             ("Find",    gtk.STOCK_FIND,     None, None, _("Search for text"), self.on_menu_find_activate),
             ("FindNext", None,              _("Find Ne_xt"), "<control>G", _("Search forwards for the same text"), self.on_menu_find_next_activate),
             ("Replace", gtk.STOCK_FIND_AND_REPLACE, _("_Replace"), "<control>H", _("Find and replace text"), self.on_menu_replace_activate),
+            ("Preferences", gtk.STOCK_PREFERENCES, _("Prefere_nces"), None, _("Configure the application"), self.on_menu_preferences_activate),
+
+            ("ChangesMenu", None, _("_Changes")),
             ("Down",    gtk.STOCK_GO_DOWN,  None, "<control>D", _("Go to the next difference"), self.on_menu_edit_down_activate),
             ("Up",      gtk.STOCK_GO_UP,    None, "<control>E", _("Go to the previous difference"), self.on_menu_edit_up_activate),
-            ("Preferences", gtk.STOCK_PREFERENCES, _("Prefere_nces"), None, _("Configure the application"), self.on_menu_preferences_activate),
 
             ("ViewMenu", None, _("_View")),
             ("FileStatus",  None, _("File status")),