fix marker type, search bar tuple problem

svn: r6622
This commit is contained in:
Don Allingham
2006-05-11 23:05:12 +00:00
parent f4a522efa7
commit b073854468
5 changed files with 47 additions and 9 deletions

View File

@@ -46,3 +46,31 @@ class MarkerType(GrampsType):
def __init__(self, value=None):
GrampsType.__init__(self, value)
def set(self, value):
if isinstance(value,self.__class__):
if value.val == self.CUSTOM and value.string == '':
self.val = self.NONE
self.string = ''
else:
self.val = value.val
self.string = value.string
elif type(value) == tuple:
if value[0] == self.CUSTOM and value[1] == '':
self.value = self.NONE
self.string = ''
else:
self.val = value[0]
self.string = value[1]
elif type(value) == int:
self.val = value
self.string = ''
elif type(value) == str:
self.val = self._S2IMAP.get(value,self._CUSTOM)
if self.val == self._CUSTOM:
self.string = value
else:
self.string = ''
else:
self.val = self._DEFAULT
self.string = ''