[meld] Add external open command to Changes menu and fix actions

[Kai Willadsen <kaiw src gnome org>]

commit 69cf220b713f9fba75186cf1fb858defbe57e44e
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Sep 10 08:12:50 2011 +1000

    Add external open command to Changes menu and fix actions

 data/ui/dirdiff-ui.xml  |    2 ++
 data/ui/filediff-ui.xml |    2 ++
 data/ui/vcview-ui.xml   |    2 ++
 meld/dirdiff.py         |    2 +-
 meld/filediff.py        |    2 +-
 meld/vcview.py          |    2 +-
 6 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/data/ui/dirdiff-ui.xml b/data/ui/dirdiff-ui.xml
index 70631af..0fd530f 100644
--- a/data/ui/dirdiff-ui.xml
+++ b/data/ui/dirdiff-ui.xml
@@ -15,6 +15,8 @@
         <menuitem action="DirCopyLeft" />
         <menuitem action="DirCopyRight" />
         <menuitem action="DirDelete" />
+        <separator/>
+        <menuitem action="DirOpen" />
       </placeholder>
     </menu>
 
diff --git a/data/ui/filediff-ui.xml b/data/ui/filediff-ui.xml
index 7097b61..7d92b48 100644
--- a/data/ui/filediff-ui.xml
+++ b/data/ui/filediff-ui.xml
@@ -32,6 +32,8 @@
         <menuitem action="MergeFromLeft"/>
         <menuitem action="MergeFromRight"/>
         <menuitem action="MergeAll"/>
+        <separator/>
+        <menuitem action="FileOpen"/>
       </placeholder>
     </menu>
     <menu action="ViewMenu">
diff --git a/data/ui/vcview-ui.xml b/data/ui/vcview-ui.xml
index 719d854..433b081 100644
--- a/data/ui/vcview-ui.xml
+++ b/data/ui/vcview-ui.xml
@@ -7,6 +7,8 @@
         <menuitem action="VcCommit" />
         <menuitem action="VcUpdate" />
         <separator/>
+        <menuitem action="VcOpen" />
+        <separator/>
         <menuitem action="VcAdd" />
         <menuitem action="VcResolved" />
         <menuitem action="VcRemove" />
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 315fdda..493ddec 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -230,7 +230,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
             ("DirDelete",    gtk.STOCK_DELETE,        None,         "Delete", _("Delete selected"), self.on_button_delete_clicked),
             ("Hide",         gtk.STOCK_NO,           _("Hide"),     None, _("Hide selected"), self.on_filter_hide_current_clicked),
 
-            ("DirOpen",      gtk.STOCK_OPEN,          None,         None, _("Open selected"), self.on_button_open_clicked),
+            ("DirOpen", None, _("Open externally"), None, _("Open selected file or directory in the default external application"), self.on_button_open_clicked),
         )
 
         toggleactions = (
diff --git a/meld/filediff.py b/meld/filediff.py
index 4e8296d..9239717 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -295,7 +295,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                             "replace"  : darken(self.fill_colors["replace"])}
 
         actions = (
-            ("FileOpen",          gtk.STOCK_OPEN,       None,            None, _("Open selected"), self.on_open_activate),
+            ("FileOpen", None, _("Open externally"), None, _("Open selected file in the default external application"), self.on_open_activate),
             ("MakePatch", None, _("Format as patch..."), None, _("Create a patch using differences between files"), self.make_patch),
             ("PrevConflict", None, _("Previous conflict"), "<Ctrl>I", _("Go to the previous conflict"), lambda x: self.on_next_conflict(gtk.gdk.SCROLL_UP)),
             ("NextConflict", None, _("Next conflict"), "<Ctrl>K", _("Go to the next conflict"), lambda x: self.on_next_conflict(gtk.gdk.SCROLL_DOWN)),
diff --git a/meld/vcview.py b/meld/vcview.py
index 35074e1..222b536 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -116,7 +116,7 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
 
         actions = (
             ("VcCompare",       gtk.STOCK_DIALOG_INFO,      _("_Compare"),      None, _("Compare selected"), self.on_button_diff_clicked),
-            ("VcOpen",          gtk.STOCK_OPEN,             None,               None, _("Open selected"), self.on_button_open_clicked),
+            ("VcOpen", None, _("Open externally"), None, _("Open selected file or directory in the default external application"), self.on_button_open_clicked),
             ("VcCommit",        "vc-commit-24",             _("Co_mmit"),       None, _("Commit"), self.on_button_commit_clicked),
             ("VcUpdate",        "vc-update-24",             _("_Update"),       None, _("Update"), self.on_button_update_clicked),
             ("VcAdd",           "vc-add-24",                _("_Add"),          None, _("Add to VC"), self.on_button_add_clicked),