# HG changeset patch
# User K. Arvanitis <
kosta@alumni.uvic.ca>
# Date 1422777672 28800
# Parent 692c2f783c89c6395229770a7c042362eeb5a033
[PATCH] Updated Memory Edit View #4
Reoganized a few context menu items in the memory editor to provide
quicker access to most frequently accessed items.
Delete item was relocated to top level, and delete submenu
renamed to 'Insert'.
Renamed a few menu items to follow a more consistent camel case pattern.
Attempted to match names between app menu items and context menu items.
Feature #2273
diff -r 692c2f783c89 -r 8d37121f29d3 chirpui/mainapp.py
--- a/chirpui/mainapp.py Sat Jan 31 23:38:24 2015 -0800
+++ b/chirpui/mainapp.py Sun Feb 01 00:01:12 2015 -0800
@@ -1495,6 +1495,7 @@
<menu action="radio" name="radio">
<menuitem action="download"/>
<menuitem action="upload"/>
+ <separator/>
<menu action="importsrc" name="importsrc">
<menuitem action="iradioreference"/>
<menuitem action="irbook"/>
@@ -1528,11 +1529,11 @@
('file', None, _("_File"), None, None, self.mh),
('new', gtk.STOCK_NEW, None, None, None, self.mh),
('open', gtk.STOCK_OPEN, None, None, None, self.mh),
- ('openstock', None, _("Open stock config"), None, None, self.mh),
+ ('openstock', None, _("Open Stock Config"), None, None, self.mh),
('recent', None, _("_Recent"), None, None, self.mh),
('save', gtk.STOCK_SAVE, None, None, None, self.mh),
('saveas', gtk.STOCK_SAVE_AS, None, None, None, self.mh),
- ('loadmod', None, _("Load Module"), None, None, self.mh),
+ ('loadmod', None, _("Load Module..."), None, None, self.mh),
('close', gtk.STOCK_CLOSE, None, None, None, self.mh),
('quit', gtk.STOCK_QUIT, None, None, None, self.mh),
('edit', None, _("_Edit"), None, None, self.mh),
@@ -1551,18 +1552,18 @@
('devshowraw', None, _('Show raw memory'), "<Control><Shift>r", None, self.mh),
('devdiffraw', None, _("Diff raw memories"), "<Control><Shift>d", None, self.mh),
('devdifftab', None, _("Diff tabs"), "<Control><Shift>t", None, self.mh),
- ('language', None, _("Change language"), None, None, self.mh),
+ ('language', None, _("Change Language..."), None, None, self.mh),
('radio', None, _("_Radio"), None, None, self.mh),
('download', None, _("Download From Radio"), "<Alt>d", None, self.mh),
('upload', None, _("Upload To Radio"), "<Alt>u", None, self.mh),
- ('import', None, _("Import"), "<Alt>i", None, self.mh),
- ('export', None, _("Export"), "<Alt>x", None, self.mh),
- ('importsrc', None, _("Import from data source"), None, None, self.mh),
+ ('import', None, _("Import..."), "<Alt>i", None, self.mh),
+ ('export', None, _("Export..."), "<Alt>x", None, self.mh),
+ ('importsrc', None, _("Import Data Source"), None, None, self.mh),
('iradioreference', None, _("RadioReference.com"), None, None, self.mh),
('irfinder', None, _("RFinder"), None, None, self.mh),
('irbook', None, _("RepeaterBook"), None, None, self.mh),
('ipr', None, _("przemienniki.net"), None, None, self.mh),
- ('querysrc', None, _("Query data source"), None, None, self.mh),
+ ('querysrc', None, _("Query Data Source"), None, None, self.mh),
('qradioreference', None, _("RadioReference.com"), None, None, self.mh),
('qrfinder', None, _("RFinder"), None, None, self.mh),
('qpr', None, _("przemienniki.net"), None, None, self.mh),
@@ -1570,7 +1571,7 @@
('export_chirp', None, _("CHIRP Native File"), None, None, self.mh),
('export_csv', None, _("CSV File"), None, None, self.mh),
('stock', None, _("Import from stock config"), None, None, self.mh),
- ('channel_defaults', None, _("Channel defaults"), None, None, self.mh),
+ ('channel_defaults', None, _("Reset Channel Defaults"), None, None, self.mh),
('cancelq', gtk.STOCK_STOP, None, "Escape", None, self.mh),
('help', None, _('Help'), None, None, self.mh),
('about', gtk.STOCK_ABOUT, None, None, None, self.mh),
diff -r 692c2f783c89 -r 8d37121f29d3 chirpui/memedit.py
--- a/chirpui/memedit.py Sat Jan 31 23:38:24 2015 -0800
+++ b/chirpui/memedit.py Sun Feb 01 00:01:12 2015 -0800
@@ -833,13 +833,15 @@
<menuitem action="cut"/>
<menuitem action="copy"/>
<menuitem action="paste"/>
+ <menuitem action="delete"/>
<separator/>
<menuitem action="all"/>
<separator/>
- <menuitem action="insert_prev"/>
- <menuitem action="insert_next"/>
- <menu action="deletes">
- <menuitem action="delete"/>
+ <menu action="insert">
+ <menuitem action="insert_prev"/>
+ <menuitem action="insert_next"/>
+ </menu>
+ <menu action="remove">
<menuitem action="delete_s"/>
<menuitem action="delete_sall"/>
</menu>
@@ -862,16 +864,17 @@
("cut", _("Cut")),
("copy", _("Copy")),
("paste", _("Paste")),
+ ("delete", _("Delete")),
("all", _("Select All")),
- ("insert_prev", _("Insert row above")),
- ("insert_next", _("Insert row below")),
- ("deletes", _("Delete")),
- ("delete", issingle and _("this memory") or _("these memories")),
+ ("insert", _("Insert")),
+ ("insert_prev", _("Row above")),
+ ("insert_next", _("Row below")),
+ ("remove", _("Remove")),
("delete_s", _("...and shift block up")),
("delete_sall", _("...and shift all memories up")),
- ("move_up", _("Move up")),
- ("move_dn", _("Move down")),
- ("exchange", _("Exchange memories")),
+ ("move_up", _("Move Up")),
+ ("move_dn", _("Move Down")),
+ ("exchange", _("Exchange")),
("properties", _("P_roperties")),
("devshowraw", _("Show Raw Memory")),
("devdiffraw", _("Diff Raw Memories")),