Use Gtk3's primary designator to replace all instances of <control> for accelerators and bindings.
svn: r20038
This commit is contained in:
@@ -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),
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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 = ""
|
||||
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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())
|
||||
|
||||
Reference in New Issue
Block a user