From e87f58a584ee087353338a5d7eaaf81765e7dd5a Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 22 Jun 2005 17:58:13 +0000 Subject: [PATCH] * src/PlaceView.py: fix sorting * src/SourceView.py: fix sorting svn: r4860 --- gramps2/ChangeLog | 4 ++++ gramps2/src/PlaceView.py | 9 ++++++--- gramps2/src/SourceView.py | 8 +++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index ce69a65cb..d0175acb2 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2005-06-22 Don Allingham + * src/PlaceView.py: fix sorting + * src/SourceView.py: fix sorting + 2005-06-22 Alexander Roitman * src/GenericFilter.py (IsDescendantOfFilterMatch.__init__): Remove unneeded method. diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index 5b36b68fa..4822aec61 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/src/PlaceView.py @@ -98,18 +98,19 @@ class PlaceView: order = gtk.SORT_DESCENDING self.sort_col = data handle = self.first_selected() + colmap = self.parent.db.get_place_column_order() + self.model = DisplayModels.PlaceModel(self.parent.db, - self.sort_col,order) + self.scol_map[self.sort_col],order) self.list.set_model(self.model) - colmap = self.parent.db.get_place_column_order() if handle: path = self.model.on_get_path(handle) self.selection.select_path(path) self.list.scroll_to_cell(path,None,1,0.5,0) for i in range(0,len(self.columns)): - self.columns[i].set_sort_indicator(i==colmap[data][1]-1) + self.columns[i].set_sort_indicator(i==self.sort_col) self.columns[self.sort_col].set_sort_order(order) def build_columns(self): @@ -122,12 +123,14 @@ class PlaceView: column.connect('clicked',self.column_clicked,0) column.set_clickable(True) self.list.append_column(column) + self.scol_map = [0] self.columns = [column] index = 1 for pair in self.parent.db.get_place_column_order(): if not pair[0]: continue + self.scol_map.append(pair[1]) name = column_names[pair[1]] column = gtk.TreeViewColumn(name, self.renderer, text=pair[1]) column.set_resizable(True) diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py index 9622757d1..88c61feec 100644 --- a/gramps2/src/SourceView.py +++ b/gramps2/src/SourceView.py @@ -59,7 +59,7 @@ column_names = [ _HANDLE_COL = len(column_names) #------------------------------------------------------------------------- -# + # # SouceView # #------------------------------------------------------------------------- @@ -97,7 +97,7 @@ class SourceView: self.sort_col = data handle = self.first_selected() self.model = DisplayModels.SourceModel(self.parent.db, - self.sort_col,order) + self.scol_map[self.sort_col],order) self.list.set_model(self.model) colmap = self.parent.db.get_place_column_order() @@ -106,7 +106,7 @@ class SourceView: self.selection.select_path(path) self.list.scroll_to_cell(path,None,1,0.5,0) for i in range(0,len(self.columns)): - self.columns[i].set_sort_indicator(i==colmap[data][1]-1) + self.columns[i].set_sort_indicator(i==self.sort_col) self.columns[self.sort_col].set_sort_order(order) def build_columns(self): @@ -119,12 +119,14 @@ class SourceView: column.set_clickable(True) column.connect('clicked',self.column_clicked,0) self.list.append_column(column) + self.scol_map = [0] self.columns = [column] index = 1 for pair in self.parent.db.get_source_column_order(): if not pair[0]: continue + self.scol_map.append(pair[1]) name = column_names[pair[1]] column = gtk.TreeViewColumn(name, self.renderer, text=pair[1]) column.connect('clicked',self.column_clicked,index)