--- elogviewer 2007-09-20 10:47:05.000000000 +0300 +++ elogviewer 2008-01-23 23:50:12.000000000 +0200 @@ -123,26 +123,29 @@ #otime = '%Y-%m-%d %H:%M:%S' # see modules time and locale otime = '%x %X' + vtime = '%Y-%m-%d %H:%M:%S' (c, p, t) = filename.split(':') t = time.strptime(t, itime) + st = time.strftime(vtime, t) t = time.strftime(otime, t) self.category = c self.package = p - self.timestamp = t + self.timestamp = st + self.timesort = t self.filename = filename from glob import glob from gobject import TYPE_STRING -( CATEGORY, PACKAGE, TIMESTAMP, FILENAME ) = range(4) +( CATEGORY, PACKAGE, TIMESTAMP, TIMESORT, FILENAME ) = range(5) class TreeStore(gtk.TreeStore): def __init__(self): gtk.TreeStore.__init__( self, - TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING ) + TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_STRING ) def get_filename(self, iter): if not iter: @@ -169,14 +172,14 @@ iter = self.insert_before(None, None) self.set_value(iter, 0, e.category) self.append(iter, (None, - e.package, e.timestamp, e.filename)) + e.package, e.timestamp, e.timesort, e.filename)) def populate_flat(self): self.clear() iter = self.get_iter_first() for e in [Elog(filename) for filename in glob('*:*:*.log')]: self.append(iter, - (e.category, e.package, e.timestamp, e.filename)) + (e.category, e.package, e.timestamp, e.timesort, e.filename)) class TreeViewColumn(gtk.TreeViewColumn): @@ -184,7 +187,7 @@ def __init__(self, title=None, *args, **kargs): gtk.TreeViewColumn.__init__(self, title, *args, **kargs) - self.set_sort_column_id(TIMESTAMP) + self.set_sort_column_id(TIMESORT) class TreeView(gtk.TreeView): @@ -197,7 +200,7 @@ self.append_column(TreeViewColumn( 'Package', gtk.CellRendererText(), text=PACKAGE)) self.append_column(TreeViewColumn( - 'Time', gtk.CellRendererText(), text=TIMESTAMP)) + 'Time', gtk.CellRendererText(), text=TIMESORT)) self.set_enable_search(True) self.set_search_column(PACKAGE)