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

Enhance event type selector to use sub-menus

Browse Source
This commit is contained in:
Nick Hall 2013-12-22 19:56:10 +00:00
parent e7c5f1684e
commit dd56299936
5 changed files with 93 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gramps/gen/lib/eventtype.py
View File

@ -139,6 +139,27 @@ class EventType(GrampsType):
RETIREMENT = 43
WILL = 44
_MENU = [[_('Life Events'),
[BIRTH, BAPTISM, DEATH, BURIAL, CREMATION, ADOPT]],
[_('Family'),
[ENGAGEMENT, MARRIAGE, DIVORCE, ANNULMENT, MARR_SETTL, MARR_LIC,
MARR_CONTR, MARR_BANNS, DIV_FILING, MARR_ALT]],
[_('Religious'),
[CHRISTEN, ADULT_CHRISTEN, CONFIRMATION, FIRST_COMMUN, BLESS,
BAR_MITZVAH, BAS_MITZVAH, RELIGION]],
[_('Vocational'),
[OCCUPATION, RETIREMENT, ELECTED, MILITARY_SERV, ORDINATION]],
[_('Academic'),
[EDUCATION, DEGREE, GRADUATION]],
[_('Travel'),
[EMIGRATION, IMMIGRATION, NATURALIZATION]],
[_('Legal'),
[PROBATE, WILL]],
[_('Residence'),
[RESIDENCE, CENSUS, PROPERTY]],
[_('Other'),
[CAUSE_DEATH, MED_INFO, NOB_TITLE, NUM_MARRIAGES]]]
_CUSTOM = CUSTOM
_DEFAULT = BIRTH

4
gramps/gen/lib/grampstype.py
View File

@ -118,6 +118,7 @@ class GrampsType(GrampsTypeC):
_DATAMAP = []
_BLACKLIST = None
_MENU = None
__slots__ = ('__value', '__string')
def __getstate__(self):
@ -289,6 +290,9 @@ class GrampsType(GrampsTypeC):
def get_custom(self):
return self._CUSTOM
def get_menu(self):
return self._MENU
def __eq__(self, value):
if isinstance(value, int):
return self.__value == value

86
gramps/gui/autocomp.py
View File

@ -41,6 +41,7 @@ from gi.repository import GObject
from gramps.gen.constfunc import STRTYPE
from gramps.gen.const import GRAMPS_LOCALE as glocale
_ = glocale.translation.sgettext
def fill_combo(combo, data_list):
"""
@ -113,7 +114,7 @@ class StandardCustomSelector(object):
"""
def __init__(self, mapping, cbe=None, custom_key=None, active_key=None,
additional=None):
additional=None, menu=None):
"""
Constructor for the StandardCustomSelector class.
@ -133,12 +134,7 @@ class StandardCustomSelector(object):
self.active_key = active_key
self.active_index = 0
self.additional = additional
# make model
self.store = Gtk.ListStore(GObject.TYPE_INT, GObject.TYPE_STRING)
# fill it up using mapping
self.fill()
self.menu = menu
# create combo box entry
if cbe:
@ -146,48 +142,81 @@ class StandardCustomSelector(object):
self.selector = cbe
else:
self.selector = Gtk.ComboBox(has_entry=True)
# create models
if menu:
self.store = self.create_menu()
completion_store = self.create_list()
else:
self.store = self.create_list()
completion_store = self.store
self.selector.set_model(self.store)
self.selector.set_entry_text_column(1)
if menu:
for cell in self.selector.get_cells():
self.selector.add_attribute(cell, 'sensitive', 2)
#renderer = Gtk.CellRendererText()
#self.selector.pack_start(renderer, True)
#self.selector.add_attribute(renderer, 'text', 1)
if self.active_key is not None:
self.selector.set_active(self.active_index)
#if self.active_key is not None:
#self.selector.set_active(self.active_index)
# make autocompletion work
completion = Gtk.EntryCompletion()
completion.set_model(self.store)
completion.set_model(completion_store)
completion.set_minimum_key_length(1)
completion.set_text_column(1)
self.selector.get_child().set_completion(completion)
def fill(self):
def create_menu(self):
"""
Fill with data
Create a model and fill it with a two-level tree corresponding to the
menu.
"""
store = Gtk.TreeStore(int, str, bool)
for heading, items in self.menu:
if self.active_key in items:
parent = None
else:
parent = store.append(None, row=[None, heading, False])
for item in items:
store.append(parent, row=[item, self.mapping[item], True])
if self.additional:
parent = store.append(None, row=[None, _('Custom'), False])
for event_type in self.additional:
key, value = self.get_key_and_value(event_type)
store.append(parent, row=[key, value, True])
return store
def create_list(self):
"""
Create a model and fill it with a sorted flat list.
"""
store = Gtk.ListStore(int, str)
keys = sorted(self.mapping, key=self.by_value)
index = 0
for key in keys:
if key != self.custom_key:
self.store.append(row=[key, self.mapping[key]])
store.append(row=[key, self.mapping[key]])
if key == self.active_key:
self.active_index = index
index += 1
if self.additional:
for event_type in self.additional:
if isinstance(event_type, STRTYPE):
if event_type:
self.store.append(row=[self.custom_key, event_type])
elif isinstance(event_type, tuple):
if event_type[1]:
self.store.append(row=[event_type[0], event_type[1]])
else:
self.store.append(row=[int(event_type), str(event_type)])
key, value = self.get_key_and_value(event_type)
store.append(row=[key, value])
if key == self.active_key:
self.active_index = index
index += 1
return store
def by_value(self, val):
"""
Method for sorting keys based on the values.
@ -240,4 +269,17 @@ class StandardCustomSelector(object):
return True
return False
def get_key_and_value(self, event_type):
"""
Return the key and value for the given event type. The event type may be
a string representing a custom type, an (int, str) tuple or an EventType
instance.
"""
if isinstance(event_type, STRTYPE):
if event_type:
return (self.custom_key, event_type)
elif isinstance(event_type, tuple):
if event_type[1]:
return (event_type[0], event_type[1])
else:
return(int(event_type), str(event_type))

3
gramps/gui/editors/filtereditor.py
View File

@ -403,7 +403,8 @@ class MySelect(Gtk.ComboBox):
self.sel = StandardCustomSelector(type_class._I2SMAP, self,
type_class._CUSTOM,
type_class._DEFAULT,
additional)
additional,
type_class._MENU)
self.show()
def get_text(self):

3
gramps/gui/widgets/monitoredwidgets.py
View File

@ -470,7 +470,8 @@ class MonitoredDataType(object):
obj,
get_val().get_custom(),
default,
additional=custom_values)
additional=custom_values,
menu=get_val().get_menu())
self.sel.set_values((int(get_val()), str(get_val())))
self.obj.set_sensitive(not readonly)