# HG changeset patch # User Adrian Buehlmann <adr...@cadifra.com> # Date 1259193270 -3600 # Node ID 8a7a4c68004eabf822a5c71c617dfaca46158333 # Parent 019dbdf976180c1be32e9abd1ba4369771f5d51b history: reorder/tune changeset context menu
- Entries with submenus must not have '...' - Move 'Archive' into 'Export' submenu (was 'Patches & Bundles'). - Rename 'Tags & Bookmarks...' to just 'Tag' - Rename 'Backout Revision...' to just 'Backout...' - Move 'Mercurial Queues' to before 'Transp_lant to local' - Add more separators diff --git a/tortoisehg/hgtk/history.py b/tortoisehg/hgtk/history.py --- a/tortoisehg/hgtk/history.py +++ b/tortoisehg/hgtk/history.py @@ -720,14 +720,16 @@ class GLog(gdialog.GDialog): m.append(create_menu(_('_Update...'), self.checkout)) cmenu_merge = create_menu(_('_Merge with...'), self.domerge) m.append(cmenu_merge) - m.append(create_submenu(_('Patches & Bundles...'), - self.patches_context_menu())) - m.append(create_submenu(_('Tags & Bookmarks...'), - self.tags_context_menu())) - cmenu_backout = create_menu(_('Backout Revision...'), self.backout_rev) + cmenu_backout = create_menu(_('Backout...'), self.backout_rev) m.append(cmenu_backout) m.append(create_menu(_('_Revert'), self.revert)) - m.append(create_menu(_('_Archive...'), self.archive)) + m.append_sep() + m.append(create_submenu(_('Export'), + self.export_context_menu())) + m.append_sep() + m.append(create_submenu(_('Tag'), + self.tags_context_menu())) + m.append_sep() # disable/enable menus as required parents = self.repo.parents() @@ -743,27 +745,29 @@ class GLog(gdialog.GDialog): cmenu_merge.set_sensitive(can_merge) cmenu_backout.set_sensitive(can_backout) + # need mq extension for strip command + if 'mq' in self.exs: + m.append(create_submenu(_('Mercurial Queues'), + self.mq_context_menu())) + # need transplant extension for transplant command if 'transplant' in self.exs: m.append(create_menu(_('Transp_lant to local'), self.transplant_rev)) - # need mq extension for strip command - if 'mq' in self.exs: - m.append(create_submenu(_('Mercurial Queues...'), - self.mq_context_menu())) - - m.append(create_submenu(_('Bisect...'), + m.append_sep() + m.append(create_submenu(_('Bisect'), self.bisect_context_menu())) menu = m.create_menu() menu.show_all() return menu - def patches_context_menu(self): + def export_context_menu(self): m = gtklib.MenuItems() m.append(create_menu(_('_Export Patch...'), self.export_patch)) m.append(create_menu(_('E_mail Patch...'), self.email_patch)) m.append(create_menu(_('_Bundle rev:tip...'), self.bundle_rev_to_tip)) + m.append(create_menu(_('_Archive...'), self.archive)) return m.create_menu() def tags_context_menu(self): ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop