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

Merge pull request #272 from prculley/bug9787

Browse Source 
bug 9787; fix right-click menus crash caused by PR268
This commit is contained in:
Josip 2016-11-20 22:52:48 +01:00 committed by GitHub
commit a3960c8515
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/gui/editors/displaytabs/embeddedlist.py
View File

@ -166,6 +166,7 @@ class EmbeddedList(ButtonTab):
""" """
self.__store_menu = Gtk.Menu() #need to keep reference or menu disappears self.__store_menu = Gtk.Menu() #need to keep reference or menu disappears
menu = self.__store_menu menu = self.__store_menu
menu.set_reserve_toggle_size(False)
for (need_write, title, func) in self.get_popup_menu_items(): for (need_write, title, func) in self.get_popup_menu_items():
item = Gtk.MenuItem.new_with_mnemonic(title) item = Gtk.MenuItem.new_with_mnemonic(title)
item.connect('activate', func) item.connect('activate', func)

4
gramps/gui/editors/displaytabs/eventembedlist.py
View File

@ -311,8 +311,8 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList):
return GroupEmbeddedList.get_popup_menu_items(self) return GroupEmbeddedList.get_popup_menu_items(self)
else: else:
return [ return [
(True, _('_Add'), 'list-add', self.add_button_clicked), (True, _('_Add'), self.add_button_clicked),
(False, _('_Edit'), 'gtk-edit', self.edit_button_clicked), (False, _('_Edit'), self.edit_button_clicked),
] ]
def _non_native_change(self): def _non_native_change(self):

12
gramps/gui/editors/displaytabs/nameembedlist.py
View File

@ -119,15 +119,15 @@ class NameEmbedList(GroupEmbeddedList):
def get_popup_menu_items(self): def get_popup_menu_items(self):
if self._tmpgroup == self._WORKGROUP: if self._tmpgroup == self._WORKGROUP:
return [ return [
(True, _('_Add'), 'list-add', self.add_button_clicked), (True, _('_Add'), self.add_button_clicked),
(False, _('_Edit'), 'gtk-edit', self.edit_button_clicked), (False, _('_Edit'), self.edit_button_clicked),
(True, _('_Remove'), 'list-remove', self.del_button_clicked), (True, _('_Remove'), self.del_button_clicked),
(True, _('Set as default name'), None, self.name_button_clicked), (True, _('Set as default name'), self.name_button_clicked),
] ]
else: else:
return [ return [
(True, _('_Add'), 'list-add', self.add_button_clicked), (True, _('_Add'), self.add_button_clicked),
(False,_('_Edit'), 'gtk-edit', self.edit_button_clicked), (False,_('_Edit'), self.edit_button_clicked),
] ]
def name_button_clicked(self, obj): def name_button_clicked(self, obj):

8
gramps/gui/editors/displaytabs/webembedlist.py
View File

@ -112,10 +112,10 @@ class WebEmbedList(EmbeddedList):
def get_popup_menu_items(self): def get_popup_menu_items(self):
return [ return [
(True, _('_Add'), 'list-add', self.add_button_clicked), (True, _('_Add'), self.add_button_clicked),
(False, _('_Edit'), 'gtk-edit', self.edit_button_clicked), (False, _('_Edit'), self.edit_button_clicked),
(True, _('_Remove'), 'list-remove', self.del_button_clicked), (True, _('_Remove'), self.del_button_clicked),
(True, _('_Jump to'), 'go-jump', self.jump_button_clicked), (True, _('_Jump to'), self.jump_button_clicked),
] ]
def jump_button_clicked(self, obj): def jump_button_clicked(self, obj):

12
gramps/gui/editors/editfamily.py
View File

@ -144,13 +144,11 @@ class ChildEmbedList(EmbeddedList):
def get_popup_menu_items(self): def get_popup_menu_items(self):
return [ return [
(False, _('Edit child'), 'gtk-edit', (False, _('Edit child'), self.edit_child_button_clicked),
self.edit_child_button_clicked), (True, _('_Add'), self.add_button_clicked),
(True, _('_Add'), 'list-add', self.add_button_clicked), (True, _('Add an existing child'), self.share_button_clicked),
(True, _('Add an existing child'), None, self.share_button_clicked), (False, _('Edit relationship'), self.edit_button_clicked),
(False, _('Edit relationship'), 'gtk-edit', (True, _('_Remove'), self.del_button_clicked),
self.edit_button_clicked),
(True, _('_Remove'), 'list-remove', self.del_button_clicked),
] ]
def get_middle_click(self): def get_middle_click(self):