Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Gtk3's primary designator to replace all instances of <control> for accelerators and bindings.

Browse Source 
svn: r20038
This commit is contained in:
John Ralls 2012-07-20 22:26:10 +00:00
parent cf6b91ffe9
commit 41e77a23bf
26 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gen/ggettext.py
View File

@ -86,4 +86,4 @@ def sgettext(msgid, sep='|'):
if msgval == msgid:
sep_idx = msgid.rfind(sep)
msgval = msgid[sep_idx+1:]
return unicode(msgval)
return unicode(msgval)

2
src/gen/mime/_gnomemime.py
View File

@ -68,4 +68,4 @@ def _is_good_command(cmd):
for sub in [ "%m", "%i", "%c" ]:
if cmd.find(sub) != -1:
return False
return True
return True

2
src/gen/plug/_docgenplugin.py
View File

@ -106,4 +106,4 @@ class DocGenPlugin(Plugin):
@return: bool: True if DrawDoc is supported; False if DrawDoc is not
supported.
"""
return bool(issubclass(self.__basedoc, DrawDoc))
return bool(issubclass(self.__basedoc, DrawDoc))

2
src/gen/plug/_plugin.py
View File

@ -69,4 +69,4 @@ class Plugin(object):
@return: a string representing the name of the module for this plugin
"""
return self.__mod_name

2
src/gen/plug/docbackend/__init__.py
View File

@ -29,4 +29,4 @@ gen data specific for output (eg markup in gen/lib) and output where needed
from docbackend import DocBackendError, DocBackend
from cairobackend import CairoBackend
#__all__ = [ DocBackend, CairoBackend, LateXBackend ]
#__all__ = [ DocBackend, CairoBackend, LateXBackend ]

2
src/gui/editors/editname.py
View File

@ -463,4 +463,4 @@ class EditName(EditSecondary):
# can't use group_over, see Note in gen/lib/name/Name.set_group_as().
if not self.group_as.obj.get_editable():
self.obj.set_group_as("")
EditSecondary._cleanup_on_exit(self)
EditSecondary._cleanup_on_exit(self)

96
src/gui/viewmanager.py
View File

@ -212,20 +212,20 @@ UIDEFAULT = '''<ui>
<accelerator action="F9"/>
<accelerator action="F11"/>
<accelerator action="F12"/>
<accelerator action="<CONTROL>1"/>
<accelerator action="<CONTROL>2"/>
<accelerator action="<CONTROL>3"/>
<accelerator action="<CONTROL>4"/>
<accelerator action="<CONTROL>5"/>
<accelerator action="<CONTROL>6"/>
<accelerator action="<CONTROL>7"/>
<accelerator action="<CONTROL>8"/>
<accelerator action="<CONTROL>9"/>
<accelerator action="<CONTROL>0"/>
<accelerator action="<CONTROL>BackSpace"/>
<accelerator action="<CONTROL>J"/>
<accelerator action="<CONTROL>N"/>
<accelerator action="<CONTROL>P"/>
<accelerator action="<PRIMARY>1"/>
<accelerator action="<PRIMARY>2"/>
<accelerator action="<PRIMARY>3"/>
<accelerator action="<PRIMARY>4"/>
<accelerator action="<PRIMARY>5"/>
<accelerator action="<PRIMARY>6"/>
<accelerator action="<PRIMARY>7"/>
<accelerator action="<PRIMARY>8"/>
<accelerator action="<PRIMARY>9"/>
<accelerator action="<PRIMARY>0"/>
<accelerator action="<PRIMARY>BackSpace"/>
<accelerator action="<PRIMARY>J"/>
<accelerator action="<PRIMARY>N"/>
<accelerator action="<PRIMARY>P"/>
</ui>
'''
@ -743,11 +743,11 @@ class ViewManager(CLIManager):
"""
self._file_action_list = [
('FileMenu', None, _('_Family Trees')),
('Open', 'gramps-db', _('_Manage Family Trees...'), "<control>o",
('Open', 'gramps-db', _('_Manage Family Trees...'), "<PRIMARY>o",
_("Manage databases"), self.__open_activate),
('OpenRecent', None, _('Open _Recent'), None,
_("Open an existing database")),
('Quit', Gtk.STOCK_QUIT, _('_Quit'), "<control>q", None,
('Quit', Gtk.STOCK_QUIT, _('_Quit'), "<PRIMARY>q", None,
self.quit),
('ViewMenu', None, _('_View')),
('EditMenu', None, _('_Edit')),
@ -775,7 +775,7 @@ class ViewManager(CLIManager):
]
self._readonly_action_list = [
('Export', 'gramps-export', _('_Export...'), "<control>e", None,
('Export', 'gramps-export', _('_Export...'), "<PRIMARY>e", None,
self.export_data),
('Backup', None, _("Make Backup..."), None,
_("Make a Gramps XML backup of the database"), self.quick_backup),
@ -795,48 +795,48 @@ class ViewManager(CLIManager):
('F8', None, 'F9', "F8", None, self.__keypress),
('F9', None, 'F9', "F9", None, self.__keypress),
('F11', None, 'F11', "F11", None, self.__keypress),
('<CONTROL>1', None, '<CONTROL>1', "<CONTROL>1", None, self.__gocat),
('<CONTROL>2', None, '<CONTROL>2', "<CONTROL>2", None, self.__gocat),
('<CONTROL>3', None, '<CONTROL>3', "<CONTROL>3", None, self.__gocat),
('<CONTROL>4', None, '<CONTROL>4', "<CONTROL>4", None, self.__gocat),
('<CONTROL>5', None, '<CONTROL>5', "<CONTROL>5", None, self.__gocat),
('<CONTROL>6', None, '<CONTROL>6', "<CONTROL>6", None, self.__gocat),
('<CONTROL>7', None, '<CONTROL>7', "<CONTROL>7", None, self.__gocat),
('<CONTROL>8', None, '<CONTROL>8', "<CONTROL>8", None, self.__gocat),
('<CONTROL>9', None, '<CONTROL>9', "<CONTROL>9", None, self.__gocat),
('<CONTROL>0', None, '<CONTROL>0', "<CONTROL>0", None, self.__gocat),
('<PRIMARY>1', None, '<PRIMARY>1', "<PRIMARY>1", None, self.__gocat),
('<PRIMARY>2', None, '<PRIMARY>2', "<PRIMARY>2", None, self.__gocat),
('<PRIMARY>3', None, '<PRIMARY>3', "<PRIMARY>3", None, self.__gocat),
('<PRIMARY>4', None, '<PRIMARY>4', "<PRIMARY>4", None, self.__gocat),
('<PRIMARY>5', None, '<PRIMARY>5', "<PRIMARY>5", None, self.__gocat),
('<PRIMARY>6', None, '<PRIMARY>6', "<PRIMARY>6", None, self.__gocat),
('<PRIMARY>7', None, '<PRIMARY>7', "<PRIMARY>7", None, self.__gocat),
('<PRIMARY>8', None, '<PRIMARY>8', "<PRIMARY>8", None, self.__gocat),
('<PRIMARY>9', None, '<PRIMARY>9', "<PRIMARY>9", None, self.__gocat),
('<PRIMARY>0', None, '<PRIMARY>0', "<PRIMARY>0", None, self.__gocat),
# NOTE: CTRL+ALT+NUMBER is set in src/plugins/sidebar/cat...py
('<CONTROL>BackSpace', None, '<CONTROL>BackSpace',
"<CONTROL>BackSpace", None, self.__keypress),
('<CONTROL>Delete', None, '<CONTROL>Delete',
"<CONTROL>Delete", None, self.__keypress),
('<CONTROL>Insert', None, '<CONTROL>Insert',
"<CONTROL>Insert", None, self.__keypress),
('<PRIMARY>BackSpace', None, '<PRIMARY>BackSpace',
"<PRIMARY>BackSpace", None, self.__keypress),
('<PRIMARY>Delete', None, '<PRIMARY>Delete',
"<PRIMARY>Delete", None, self.__keypress),
('<PRIMARY>Insert', None, '<PRIMARY>Insert',
"<PRIMARY>Insert", None, self.__keypress),
('F12', None, 'F12', "F12", None, self.__keypress),
('<CONTROL>J', None, '<CONTROL>J',
"<CONTROL>J", None, self.__keypress),
('<CONTROL>N', None, '<CONTROL>N', "<CONTROL>N", None,
('<PRIMARY>J', None, '<PRIMARY>J',
"<PRIMARY>J", None, self.__keypress),
('<PRIMARY>N', None, '<PRIMARY>N', "<PRIMARY>N", None,
self.__next_view),
('<CONTROL>P', None, '<CONTROL>P', "<CONTROL>P", None,
('<PRIMARY>P', None, '<PRIMARY>P', "<PRIMARY>P", None,
self.__prev_view),
]
self._action_action_list = [
('Clipboard', Gtk.STOCK_PASTE, _('Clip_board'), "<control>b",
('Clipboard', Gtk.STOCK_PASTE, _('Clip_board'), "<PRIMARY>b",
_("Open the Clipboard dialog"), self.clipboard),
('Import', 'gramps-import', _('_Import...'), "<control>i", None,
('Import', 'gramps-import', _('_Import...'), "<PRIMARY>i", None,
self.import_data),
('Tools', 'gramps-tools', _('_Tools'), None,
_("Open the tools dialog"), self.tools_clicked),
('BookMenu', None, _('_Bookmarks')),
('ToolsMenu', None, _('_Tools')),
('ConfigView', 'gramps-config', _('_Configure View...'),
'<shift><control>c', _('Configure the active view'),
'<shift><PRIMARY>c', _('Configure the active view'),
self.config_view),
]
self._file_toggle_action_list = [
('Navigator', None, _('_Navigator'), "<control>m", None,
('Navigator', None, _('_Navigator'), "<PRIMARY>m", None,
self.navigator_toggle, self.show_navigator ),
('Toolbar', None, _('_Toolbar'), None, None, self.toolbar_toggle,
self.show_toolbar ),
@ -845,18 +845,18 @@ class ViewManager(CLIManager):
]
self._undo_action_list = [
('Undo', Gtk.STOCK_UNDO, _('_Undo'), '<control>z', None,
('Undo', Gtk.STOCK_UNDO, _('_Undo'), '<PRIMARY>z', None,
self.undo),
]
self._redo_action_list = [
('Redo', Gtk.STOCK_REDO, _('_Redo'), '<shift><control>z', None,
('Redo', Gtk.STOCK_REDO, _('_Redo'), '<shift><PRIMARY>z', None,
self.redo),
]
self._undo_history_action_list = [
('UndoHistory', 'gramps-undo-history',
_('Undo History...'), "<control>H", None, self.undo_history),
_('Undo History...'), "<PRIMARY>H", None, self.undo_history),
]
def __keypress(self, action):
@ -1424,11 +1424,11 @@ class ViewManager(CLIManager):
self.undoactions = Gtk.ActionGroup('Undo')
if label:
self.undoactions.add_actions([
('Undo', Gtk.STOCK_UNDO, label, '<control>z', None, self.undo)])
('Undo', Gtk.STOCK_UNDO, label, '<PRIMARY>z', None, self.undo)])
else:
self.undoactions.add_actions([
('Undo', Gtk.STOCK_UNDO, _('_Undo'),
'<control>z', None, self.undo)])
'<PRIMARY>z', None, self.undo)])
self.undoactions.set_sensitive(False)
self.uimanager.insert_action_group(self.undoactions, 1)
@ -1440,12 +1440,12 @@ class ViewManager(CLIManager):
self.redoactions = Gtk.ActionGroup('Redo')
if label:
self.redoactions.add_actions([
('Redo', Gtk.STOCK_REDO, label, '<shift><control>z',
('Redo', Gtk.STOCK_REDO, label, '<shift><PRIMARY>z',
None, self.redo)])
else:
self.redoactions.add_actions([
('Redo', Gtk.STOCK_UNDO, _('_Redo'),
'<shift><control>z', None, self.redo)])
'<shift><PRIMARY>z', None, self.redo)])
self.redoactions.set_sensitive(False)
self.uimanager.insert_action_group(self.redoactions, 1)

6
src/gui/views/listview.py
View File

@ -202,9 +202,9 @@ class ListView(NavigationView):
self.edit_action = Gtk.ActionGroup(self.title + '/ChangeOrder')
self.edit_action.add_actions([
('Add', Gtk.STOCK_ADD, _("_Add..."), "<control>Insert",
('Add', Gtk.STOCK_ADD, _("_Add..."), "<PRIMARY>Insert",
self.ADD_MSG, self.add),
('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "<control>Delete",
('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "<PRIMARY>Delete",
self.DEL_MSG, self.remove),
('Merge', 'gramps-merge', _('_Merge...'), None,
self.MERGE_MSG, self.merge),
@ -215,7 +215,7 @@ class ListView(NavigationView):
self._add_action_group(self.edit_action)
self._add_action('Edit', Gtk.STOCK_EDIT, _("action|_Edit..."),
accel="<control>Return",
accel="<PRIMARY>Return",
tip=self.EDIT_MSG,
callback=self.edit)

4
src/gui/views/navigationview.py
View File

@ -270,10 +270,10 @@ class NavigationView(PageView):
self.book_action = Gtk.ActionGroup(self.title + '/Bookmark')
self.book_action.add_actions([
('AddBook', 'gramps-bookmark-new', _('_Add Bookmark'),
'<control>d', None, self.add_bookmark),
'<PRIMARY>d', None, self.add_bookmark),
('EditBook', 'gramps-bookmark-edit',
_("%(title)s...") % {'title': _("Organize Bookmarks")},
'<shift><control>D', None,
'<shift><PRIMARY>D', None,
self.edit_bookmarks),
])

4
src/gui/views/pageview.py
View File

@ -405,10 +405,10 @@ class PageView(DbGUIElement):
self.action_toggle_list in this function.
"""
self._add_toggle_action('Sidebar', None, _('_Sidebar'),
"<shift><control>R", None, self.__sidebar_toggled,
"<shift><PRIMARY>R", None, self.__sidebar_toggled,
self.sidebar.get_property('visible'))
self._add_toggle_action('Bottombar', None, _('_Bottombar'),
"<shift><control>B", None, self.__bottombar_toggled,
"<shift><PRIMARY>B", None, self.__bottombar_toggled,
self.bottombar.get_property('visible'))
def __build_action_group(self):

6
src/gui/widgets/styledtexteditor.py
View File

@ -512,9 +512,9 @@ class StyledTextEditor(Gtk.TextView):
# action accelerators
self.action_accels = {
'<Control>i': str(StyledTextTagType.ITALIC),
'<Control>b': str(StyledTextTagType.BOLD),
'<Control>u': str(StyledTextTagType.UNDERLINE),
'<PRIMARY>i': str(StyledTextTagType.ITALIC),
'<PRIMARY>b': str(StyledTextTagType.BOLD),
'<PRIMARY>u': str(StyledTextTagType.UNDERLINE),
}
# create the action group and insert all the actions

2
src/gui/widgets/toolcomboentry.py
View File

@ -74,4 +74,4 @@ class ToolComboEntry(ValueToolItem):
self.get_child().set_active_data(value)
def get_value(self):
return self.get_child().get_active_data()
return self.get_child().get_active_data()

2
src/gui/widgets/valueaction.py
View File

@ -167,4 +167,4 @@ class ValueAction(Gtk.Action):
def get_value(self):
"""Get the value from the action."""
return self._value
return self._value

10
src/plugins/lib/libpersonview.py
View File

@ -141,8 +141,8 @@ class BasePersonView(ListView):
markup=BasePersonView.MARKUP_COLS)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
uistate.connect('nameformat-changed', self.build_tree)
@ -353,7 +353,7 @@ class BasePersonView(ListView):
('FilterEdit', None, _('Person Filter Editor'), None, None,
self.filter_editor),
('Edit', Gtk.STOCK_EDIT, _("action|_Edit..."),
"<control>Return", self.EDIT_MSG, self.edit),
"<PRIMARY>Return", self.EDIT_MSG, self.edit),
('QuickReport', None, _("Quick View"), None, None, None),
('WebConnect', None, _("Web Connection"), None, None, None),
('Dummy', None, ' ', None, None, self.dummy_report),
@ -362,9 +362,9 @@ class BasePersonView(ListView):
self.edit_action.add_actions(
[
('Add', Gtk.STOCK_ADD, _("_Add..."), "<control>Insert",
('Add', Gtk.STOCK_ADD, _("_Add..."), "<PRIMARY>Insert",
self.ADD_MSG, self.add),
('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "<control>Delete",
('Remove', Gtk.STOCK_REMOVE, _("_Remove"), "<PRIMARY>Delete",
self.DEL_MSG, self.remove),
('Merge', 'gramps-merge', _('_Merge...'), None,
self.MERGE_MSG, self.merge),

4
src/plugins/lib/libplaceview.py
View File

@ -147,8 +147,8 @@ class PlaceBaseView(ListView):
filter_class=PlaceSidebarFilter, markup=markup)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())

2
src/plugins/sidebar/categorysidebar.py
View File

@ -131,7 +131,7 @@ class CategorySidebar(BaseSidebar):
uitoolitems += '\n<toolitem action="%s"/>' % pageid
# id, stock, button text, UI, tooltip, page
if view_num < 9:
modifier = "<CONTROL><ALT>%d" % ((view_num % 9) + 1)
modifier = "<PRIMARY><ALT>%d" % ((view_num % 9) + 1)
else:
modifier = ""

4
src/plugins/view/citationlistview.py
View File

@ -145,8 +145,8 @@ class CitationListView(ListView):
markup = CitationListView.MARKUP_COLS)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())

4
src/plugins/view/citationtreeview.py
View File

@ -150,8 +150,8 @@ class CitationTreeView(ListView):
markup = CitationTreeView.MARKUP_COLS)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())

4
src/plugins/view/eventview.py
View File

@ -124,8 +124,8 @@ class EventView(ListView):
markup = EventView.MARKUP_COLS)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
uistate.connect('nameformat-changed', self.build_tree)

4
src/plugins/view/familyview.py
View File

@ -122,8 +122,8 @@ class FamilyView(ListView):
markup=FamilyView.MARKUP_COLS)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
uistate.connect('nameformat-changed', self.build_tree)

4
src/plugins/view/mediaview.py
View File

@ -135,8 +135,8 @@ class MediaView(ListView):
multiple=True)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())

4
src/plugins/view/noteview.py
View File

@ -113,8 +113,8 @@ class NoteView(ListView):
multiple=True)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())

2
src/plugins/view/pedigreeview.py
View File

@ -711,7 +711,7 @@ class PedigreeView(NavigationView):
self.func_list.update({
'F2' : self.kb_goto_home,
'<CONTROL>J' : self.jump,
'<PRIMARY>J' : self.jump,
})
self.dbstate = dbstate

4
src/plugins/view/relview.py
View File

@ -144,7 +144,7 @@ class RelationshipView(NavigationView):
nav_group)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<PRIMARY>J' : self.jump,
})
dbstate.connect('database-changed', self.change_db)
@ -395,7 +395,7 @@ class RelationshipView(NavigationView):
self.family_action = Gtk.ActionGroup(self.title + '/Family')
self.family_action.add_actions([
('Edit', Gtk.STOCK_EDIT, _('Edit...'), "<control>Return",
('Edit', Gtk.STOCK_EDIT, _('Edit...'), "<PRIMARY>Return",
_("Edit the active person"), self.edit_active),
('AddSpouse', 'gramps-spouse', _('Partner'), None ,
_("Add a new family with person as parent"), self.add_spouse),

4
src/plugins/view/repoview.py
View File

@ -130,8 +130,8 @@ class RepositoryView(ListView):
filter_class=RepoSidebarFilter)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())

4
src/plugins/view/sourceview.py
View File

@ -117,8 +117,8 @@ class SourceView(ListView):
filter_class=SourceSidebarFilter)
self.func_list.update({
'<CONTROL>J' : self.jump,
'<CONTROL>BackSpace' : self.key_delete,
'<PRIMARY>J' : self.jump,
'<PRIMARY>BackSpace' : self.key_delete,
})
self.additional_uis.append(self.additional_ui())