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

4546 Numbers are always bound to Go menu (MacOS)

Browse Source 
svn: r17182
This commit is contained in:
Jérôme Rapinat 2011-04-21 09:54:42 +00:00
parent 8797495dc0
commit 8c22cce7b2
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/constfunc.py
View File

@ -115,3 +115,18 @@ def has_display():
except: except:
sys.argv = temp sys.argv = temp
return False return False
# A couple of places add menu accelerators using <alt>, which doesn't
# work with Gtk-quartz. <Meta> is the usually correct replacement, but
# in one case the key is a number, and <meta>number is used by Spaces
# (a mac feature), so we'll use control instead.
def mod_key():
"""
Returns a string to pass to an accelerator map.
"""
if is_quartz():
return "<ctrl>"
return "<alt>"

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

@ -49,6 +49,7 @@ import gtk
from gui.views.pageview import PageView from gui.views.pageview import PageView
from gen.ggettext import sgettext as _ from gen.ggettext import sgettext as _
from Utils import navigation_label from Utils import navigation_label
from constfunc import mod_key
DISABLED = -1 DISABLED = -1
MRU_SIZE = 10 MRU_SIZE = 10
@ -288,7 +289,7 @@ class NavigationView(PageView):
self.fwd_action = gtk.ActionGroup(self.title + '/Forward') self.fwd_action = gtk.ActionGroup(self.title + '/Forward')
self.fwd_action.add_actions([ self.fwd_action.add_actions([
('Forward', gtk.STOCK_GO_FORWARD, _("_Forward"), ('Forward', gtk.STOCK_GO_FORWARD, _("_Forward"),
"<ALT>Right", _("Go to the next person in the history"), "%sRight" % mod_key(), _("Go to the next person in the history"),
self.fwd_clicked) self.fwd_clicked)
]) ])
@ -296,12 +297,12 @@ class NavigationView(PageView):
self.back_action = gtk.ActionGroup(self.title + '/Backward') self.back_action = gtk.ActionGroup(self.title + '/Backward')
self.back_action.add_actions([ self.back_action.add_actions([
('Back', gtk.STOCK_GO_BACK, _("_Back"), ('Back', gtk.STOCK_GO_BACK, _("_Back"),
"<ALT>Left", _("Go to the previous person in the history"), "%sLeft" % mod_key(), _("Go to the previous person in the history"),
self.back_clicked) self.back_clicked)
]) ])
self._add_action('HomePerson', gtk.STOCK_HOME, _("_Home"), self._add_action('HomePerson', gtk.STOCK_HOME, _("_Home"),
accel="<Alt>Home", accel="%sHome" % mod_key(),
tip=_("Go to the default person"), callback=self.home) tip=_("Go to the default person"), callback=self.home)
self.other_action = gtk.ActionGroup(self.title + '/PersonOther') self.other_action = gtk.ActionGroup(self.title + '/PersonOther')
@ -440,7 +441,7 @@ class NavigationView(PageView):
for index, handle in enumerate(mitems): for index, handle in enumerate(mitems):
name, obj = navigation_label(self.dbstate.db, nav_type, handle) name, obj = navigation_label(self.dbstate.db, nav_type, handle)
data.append(('%s%02d'%(nav_type, index), None, name, data.append(('%s%02d'%(nav_type, index), None, name,
"<alt>%d" % index, None, "%s%d" % (mod_key(), index), None,
make_callback(hobj.push, handle))) make_callback(hobj.push, handle)))
self.mru_action = gtk.ActionGroup(nav_type) self.mru_action = gtk.ActionGroup(nav_type)