[meld] Add file change actions to DirDiff menus and reorganise context menu
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Add file change actions to DirDiff menus and reorganise context menu
- Date: Sat, 15 Jan 2011 21:50:15 +0000 (UTC)
commit fb241d3403775968260873862cc8e7ff5754ea60
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jan 15 12:39:36 2011 +1000
Add file change actions to DirDiff menus and reorganise context menu
data/ui/dirdiff-ui.xml | 11 +++++++++--
meld/dirdiff.py | 4 ++--
2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/data/ui/dirdiff-ui.xml b/data/ui/dirdiff-ui.xml
index 7704516..70631af 100644
--- a/data/ui/dirdiff-ui.xml
+++ b/data/ui/dirdiff-ui.xml
@@ -10,6 +10,14 @@
<menuitem action="ShowModified" />
</menu>
</menu>
+ <menu action="ChangesMenu">
+ <placeholder name="ChangesActions">
+ <menuitem action="DirCopyLeft" />
+ <menuitem action="DirCopyRight" />
+ <menuitem action="DirDelete" />
+ </placeholder>
+ </menu>
+
</menubar>
<toolbar name="Toolbar">
@@ -39,10 +47,9 @@
<separator/>
<menuitem action="DirCopyLeft" />
<menuitem action="DirCopyRight" />
+ <menuitem action="DirDelete" />
<separator/>
<menuitem action="DirOpen" />
- <separator/>
- <menuitem action="DirDelete" />
</popup>
<popup name="CustomPopup">
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index b8a9980..6c063ab 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -140,8 +140,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
actions = (
("DirCompare", gtk.STOCK_DIALOG_INFO, _("_Compare"), None, _("Compare selected"), self.on_button_diff_clicked),
- ("DirCopyLeft", gtk.STOCK_GO_BACK, _("Left"), "<Alt>Left", _("Copy To Left"), self.on_button_copy_left_clicked),
- ("DirCopyRight", gtk.STOCK_GO_FORWARD, _("Right"), "<Alt>Right", _("Copy To Right"), self.on_button_copy_right_clicked),
+ ("DirCopyLeft", gtk.STOCK_GO_BACK, _("Copy _Left"), "<Alt>Left", _("Copy to left"), self.on_button_copy_left_clicked),
+ ("DirCopyRight", gtk.STOCK_GO_FORWARD, _("Copy _Right"), "<Alt>Right", _("Copy to right"), self.on_button_copy_right_clicked),
("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),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]