diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 41fbd6d7a..cd0719129 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-09-28 Don Allingham + * src/DataViews/_PlaceView.py: add street column (bug #459) + * src/DisplayModels/_PlaceModel.py: add street column + * src/GrampsDb/_GrampsDbBase.py: add street column + 2006-09-27 Brian Matherly * src/ReportBase/_StyleEditor.py: Make style editor not modal * src/glade/gramps.glade: Make style editor not modal diff --git a/gramps2/src/DataViews/_PlaceView.py b/gramps2/src/DataViews/_PlaceView.py index 2d5207685..6a1ddc3d7 100644 --- a/gramps2/src/DataViews/_PlaceView.py +++ b/gramps2/src/DataViews/_PlaceView.py @@ -62,6 +62,7 @@ column_names = [ _('Longitude'), _('Latitude'), _('Last Changed'), + _('Street'), ] #------------------------------------------------------------------------- diff --git a/gramps2/src/DisplayModels/_PlaceModel.py b/gramps2/src/DisplayModels/_PlaceModel.py index 78e311b1b..c6e7d5cf2 100644 --- a/gramps2/src/DisplayModels/_PlaceModel.py +++ b/gramps2/src/DisplayModels/_PlaceModel.py @@ -73,6 +73,7 @@ class PlaceModel(BaseModel): self.column_longitude, self.column_latitude, self.column_change, + self.column_street, self.column_handle, self.column_tooltip ] @@ -88,9 +89,10 @@ class PlaceModel(BaseModel): self.column_longitude, self.column_latitude, self.column_change, + self.column_street, self.column_handle, ] - BaseModel.__init__(self, db, scol, order, tooltip_column=12, + BaseModel.__init__(self, db, scol, order, tooltip_column=13, search=search, skip=skip, sort_map=sort_map) def on_get_n_columns(self): @@ -117,33 +119,39 @@ class PlaceModel(BaseModel): except: return u'' - def column_city(self,data): + def column_street(self,data): try: return data[5][0][0] except: return u'' + + def column_city(self,data): + try: + return data[5][0][1] + except: + return u'' def column_county(self,data): try: - return data[5][2] + return data[5][0][2] except: return u'' def column_state(self,data): try: - return data[5][0][1] + return data[5][0][3] except: return u'' def column_country(self,data): try: - return data[5][0][2] + return data[5][0][4] except: return u'' def column_postal_code(self,data): try: - return data[5][0][3] + return data[5][0][5] except: return u'' diff --git a/gramps2/src/GrampsDb/_GrampsDbBase.py b/gramps2/src/GrampsDb/_GrampsDbBase.py index 4a97d3366..39b6da359 100644 --- a/gramps2/src/GrampsDb/_GrampsDbBase.py +++ b/gramps2/src/GrampsDb/_GrampsDbBase.py @@ -1983,9 +1983,9 @@ class GrampsDbBase(GrampsDBCallback): Returns the Place display common information stored in the database's metadata. """ - default = [(1, 0, 250), (1, 1, 75), (1, 2, 100), (0, 3, 100), - (0, 4, 100, ), (1, 5, 150), (0, 6, 150), (1, 7, 150), - (0, 8, 150), (0, 9, 150), (0, 10, 150)] + default = [(1, 0, 250), (1, 1, 75), (1, 11, 100), (0, 3, 100), + (1, 4, 100, ), (0, 5, 150), (1, 6, 150), (0, 7, 150), + (0, 8, 150), (0, 9, 150), (0, 10, 150),(0,2,100)] return self._get_columns(PLACE_COL_KEY, default) def get_source_column_order(self):