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

[MacOS] Replace GDK_CONTROL_MASK with GDK_META_MASK in accelerators.

Browse Source 
Fixes #10231 and works on all versions of Gtk3 by avoiding
GdkModifierIntent.
This commit is contained in:
John Ralls 2018-02-05 14:52:56 -08:00
parent 0a38a6352f
commit f688d376f5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gramps/gui/glade.py
View File

@ -46,6 +46,7 @@ from gi.repository import Gtk
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gramps.gen.const import GLADE_DIR, GRAMPS_LOCALE as glocale from gramps.gen.const import GLADE_DIR, GRAMPS_LOCALE as glocale
from gramps.gen.constfunc import is_quartz
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -142,11 +143,19 @@ class Glade(Gtk.Builder):
# toplevel is given # toplevel is given
if toplevel: if toplevel:
loadlist = [toplevel] + also_load loadlist = [toplevel] + also_load
self.add_objects_from_file(path, loadlist) with open(path, 'r', encoding='utf-8') as builder_file:
data = builder_file.read().replace('\n', '')
if is_quartz():
data = data.replace('GDK_CONTROL_MASK', 'GDK_META_MASK')
self.add_objects_from_string(data, loadlist)
self.__toplevel = self.get_object(toplevel) self.__toplevel = self.get_object(toplevel)
# toplevel not given # toplevel not given
else: else:
self.add_from_file(path) with open(path, 'r', encoding='utf-8') as builder_file:
data = builder_file.read().replace('\n', '')
if is_quartz():
data = data.replace('GDK_CONTROL_MASK', 'GDK_META_MASK')
self.add_from_string(data)
# first, use filename as possible toplevel widget name # first, use filename as possible toplevel widget name
self.__toplevel = self.get_object(filename.rpartition('.')[0]) self.__toplevel = self.get_object(filename.rpartition('.')[0])