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

2006-09-28 Don Allingham <don@gramps-project.org>

Browse Source 
* src/DataViews/_PlaceView.py: add street column (bug #459)
	* src/DisplayModels/_PlaceModel.py: add street column
	* src/GrampsDb/_GrampsDbBase.py: add street column



svn: r7335
This commit is contained in:
Don Allingham 2006-09-29 04:13:10 +00:00
parent d4f7432238
commit 0dd8c6a7a1
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,3 +1,8 @@
2006-09-28 Don Allingham <don@gramps-project.org>
* 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 <brian@gramps-project.org>
* src/ReportBase/_StyleEditor.py: Make style editor not modal
* src/glade/gramps.glade: Make style editor not modal

1
gramps2/src/DataViews/_PlaceView.py
View File

@ -62,6 +62,7 @@ column_names = [
_('Longitude'),
_('Latitude'),
_('Last Changed'),
_('Street'),
]
#-------------------------------------------------------------------------

20
gramps2/src/DisplayModels/_PlaceModel.py
View File

@ -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''

6
gramps2/src/GrampsDb/_GrampsDbBase.py
View File

@ -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):