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

* src/PlaceView.py: fix sorting

Browse Source 
* src/SourceView.py: fix sorting


svn: r4860
This commit is contained in:
Don Allingham 2005-06-22 17:58:13 +00:00
parent 4f9a905a15
commit e87f58a584
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-06-22 Don Allingham <don@gramps-project.org>
* src/PlaceView.py: fix sorting
* src/SourceView.py: fix sorting
2005-06-22 Alexander Roitman <shura@gramps-project.org> 2005-06-22 Alexander Roitman <shura@gramps-project.org>
* src/GenericFilter.py (IsDescendantOfFilterMatch.__init__): * src/GenericFilter.py (IsDescendantOfFilterMatch.__init__):
Remove unneeded method. Remove unneeded method.

9
gramps2/src/PlaceView.py
View File

@ -98,18 +98,19 @@ class PlaceView:
order = gtk.SORT_DESCENDING order = gtk.SORT_DESCENDING
self.sort_col = data self.sort_col = data
handle = self.first_selected() handle = self.first_selected()
colmap = self.parent.db.get_place_column_order()
self.model = DisplayModels.PlaceModel(self.parent.db, self.model = DisplayModels.PlaceModel(self.parent.db,
self.sort_col,order) self.scol_map[self.sort_col],order)
self.list.set_model(self.model) self.list.set_model(self.model)
colmap = self.parent.db.get_place_column_order()
if handle: if handle:
path = self.model.on_get_path(handle) path = self.model.on_get_path(handle)
self.selection.select_path(path) self.selection.select_path(path)
self.list.scroll_to_cell(path,None,1,0.5,0) self.list.scroll_to_cell(path,None,1,0.5,0)
for i in range(0,len(self.columns)): 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) self.columns[self.sort_col].set_sort_order(order)
def build_columns(self): def build_columns(self):
@ -122,12 +123,14 @@ class PlaceView:
column.connect('clicked',self.column_clicked,0) column.connect('clicked',self.column_clicked,0)
column.set_clickable(True) column.set_clickable(True)
self.list.append_column(column) self.list.append_column(column)
self.scol_map = [0]
self.columns = [column] self.columns = [column]
index = 1 index = 1
for pair in self.parent.db.get_place_column_order(): for pair in self.parent.db.get_place_column_order():
if not pair[0]: if not pair[0]:
continue continue
self.scol_map.append(pair[1])
name = column_names[pair[1]] name = column_names[pair[1]]
column = gtk.TreeViewColumn(name, self.renderer, text=pair[1]) column = gtk.TreeViewColumn(name, self.renderer, text=pair[1])
column.set_resizable(True) column.set_resizable(True)

8
gramps2/src/SourceView.py
View File

@ -59,7 +59,7 @@ column_names = [
_HANDLE_COL = len(column_names) _HANDLE_COL = len(column_names)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# SouceView # SouceView
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -97,7 +97,7 @@ class SourceView:
self.sort_col = data self.sort_col = data
handle = self.first_selected() handle = self.first_selected()
self.model = DisplayModels.SourceModel(self.parent.db, self.model = DisplayModels.SourceModel(self.parent.db,
self.sort_col,order) self.scol_map[self.sort_col],order)
self.list.set_model(self.model) self.list.set_model(self.model)
colmap = self.parent.db.get_place_column_order() colmap = self.parent.db.get_place_column_order()
@ -106,7 +106,7 @@ class SourceView:
self.selection.select_path(path) self.selection.select_path(path)
self.list.scroll_to_cell(path,None,1,0.5,0) self.list.scroll_to_cell(path,None,1,0.5,0)
for i in range(0,len(self.columns)): 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) self.columns[self.sort_col].set_sort_order(order)
def build_columns(self): def build_columns(self):
@ -119,12 +119,14 @@ class SourceView:
column.set_clickable(True) column.set_clickable(True)
column.connect('clicked',self.column_clicked,0) column.connect('clicked',self.column_clicked,0)
self.list.append_column(column) self.list.append_column(column)
self.scol_map = [0]
self.columns = [column] self.columns = [column]
index = 1 index = 1
for pair in self.parent.db.get_source_column_order(): for pair in self.parent.db.get_source_column_order():
if not pair[0]: if not pair[0]:
continue continue
self.scol_map.append(pair[1])
name = column_names[pair[1]] name = column_names[pair[1]]
column = gtk.TreeViewColumn(name, self.renderer, text=pair[1]) column = gtk.TreeViewColumn(name, self.renderer, text=pair[1])
column.connect('clicked',self.column_clicked,index) column.connect('clicked',self.column_clicked,index)