2006-05-14 Don Allingham <don@gramps-project.org>

* src/DateHandler/__init__.py: import DateParser and DateDisplay
	* src/DataViews/_PersonView.py: default gender filter to "any"
	* configure.in: bump up to 2.1.2



svn: r6659
This commit is contained in:
Don Allingham 2006-05-14 23:01:00 +00:00
parent 6a47beca03
commit c41dafef73
6 changed files with 18 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2006-05-14 Don Allingham <don@gramps-project.org>
* src/DateHandler/__init__.py: import DateParser and DateDisplay
* src/DataViews/_PersonView.py: default gender filter to "any"
* configure.in: bump up to 2.1.2
2006-05-14 Alex Roitman <shura@gramps-project.org> 2006-05-14 Alex Roitman <shura@gramps-project.org>
* src/DateHandler/__init__.py: Proper import sequence. * src/DateHandler/__init__.py: Proper import sequence.
* src/DateHandler/_DateHandler.py: Split into parts. * src/DateHandler/_DateHandler.py: Split into parts.

View File

@ -11,8 +11,8 @@ AM_INIT_AUTOMAKE(1.6.3)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
GNOME_DOC_INIT GNOME_DOC_INIT
RELEASE=0.SVN$(svnversion -n .) dnl RELEASE=0.SVN$(svnversion -n .)
dnl RELEASE=1 RELEASE=1
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

View File

@ -237,6 +237,7 @@ class PersonView(PageView.PersonNavView):
self.filter_gender = gtk.combo_box_new_text() self.filter_gender = gtk.combo_box_new_text()
for i in [ _('any'), _('male'), _('female'), _('unknown') ]: for i in [ _('any'), _('male'), _('female'), _('unknown') ]:
self.filter_gender.append_text(i) self.filter_gender.append_text(i)
self.filter_gender.set_active(0)
self.filter_regex = gtk.CheckButton(_('Use regular expressions')) self.filter_regex = gtk.CheckButton(_('Use regular expressions'))

View File

@ -28,6 +28,9 @@ Class handling language-specific selection for date parser and displayer.
from _DateHandler import _lang, _lang_short, \ from _DateHandler import _lang, _lang_short, \
_lang_to_parser, _lang_to_display, register_datehandler _lang_to_parser, _lang_to_display, register_datehandler
from _DateDisplay import DateDisplay
from _DateParser import DateParser
# Import all the localized handlers # Import all the localized handlers
import _Date_de import _Date_de
import _Date_es import _Date_es

View File

@ -93,6 +93,7 @@ class BaseModel(gtk.GenericTreeModel):
def set_sort_column(self,col): def set_sort_column(self,col):
self.sort_func = self.smap[col] self.sort_func = self.smap[col]
#print self.sort_func
def sort_keys(self): def sort_keys(self):
cursor = self.gen_cursor() cursor = self.gen_cursor()
@ -607,6 +608,7 @@ class EventModel(BaseModel):
self.column_cause, self.column_cause,
self.sort_change, self.sort_change,
self.column_handle, self.column_handle,
self.column_tooltip,
] ]
BaseModel.__init__(self, db, scol, order, tooltip_column=8, BaseModel.__init__(self, db, scol, order, tooltip_column=8,
search=search) search=search)
@ -643,10 +645,11 @@ class EventModel(BaseModel):
return unicode(data[0]) return unicode(data[0])
def sort_change(self,data): def sort_change(self,data):
return time.localtime(data[11]) #print time.localtime(data[10])
return time.localtime(data[10])
def column_change(self,data): def column_change(self,data):
return unicode(time.strftime('%x %X',time.localtime(data[11])), return unicode(time.strftime('%x %X',time.localtime(data[10])),
_codeset) _codeset)
def column_tooltip(self,data): def column_tooltip(self,data):

View File

@ -588,7 +588,8 @@ class ListView(BookMarkView):
for i in xrange(len(self.columns)): for i in xrange(len(self.columns)):
self.columns[i].set_sort_indicator(i==colmap[data][1]) self.columns[i].set_sort_indicator(i==colmap[data][1])
self.columns[self.sort_col].set_sort_order(order) self.columns[self.sort_col].set_sort_order(order)
# print self.sort_col, order, colmap
def build_columns(self): def build_columns(self):
for column in self.columns: for column in self.columns:
self.list.remove_column(column) self.list.remove_column(column)