New logo for about box, reorder ids preserves integer, added David Hampton to author's list

svn: r526
This commit is contained in:
Don Allingham 2001-10-30 15:13:42 +00:00
parent 060e522e16
commit fedaa8ca90
5 changed files with 48 additions and 67 deletions

View File

@ -38,6 +38,8 @@ Version 0.6.0pre
format statements (such as "I-%04d").
* Adoption relationships are visible on the pedigree view (seen as
a dotted line).
* Reordering GRAMPS' ids attempts to preserve the integer originally
assigned to the object.
Version 0.5.1
* Bug fixes

View File

@ -53,7 +53,8 @@ if os.environ.has_key('GRAMPSDIR'):
else:
rootDir = "."
logo = rootDir + os.sep + "gramps.xpm"
icon = rootDir + os.sep + "gramps.xpm"
logo = rootDir + os.sep + "logo.png"
gladeFile = rootDir + os.sep + "gramps.glade"
placesFile = rootDir + os.sep + "places.glade"
imageselFile = rootDir + os.sep + "imagesel.glade"
@ -78,16 +79,9 @@ gtkrcFile = rootDir + os.sep + "gtkrc"
#-------------------------------------------------------------------------
progName = "gramps"
version = "0.6.0pre"
copyright = "(C) 2001 Donald N. Allingham"
authors = ["Donald N. Allingham"]
comments = _("Gramps (Genealogical Research and Analysis Management Programming System) is a personal genealogy program that can be extended by using the Python programming language.")
#-------------------------------------------------------------------------
#
# Enable/disable exceptions. For debugging purposes
#
#-------------------------------------------------------------------------
useExceptions= 0
copyright = "© 2001 Donald N. Allingham"
authors = ["Donald N. Allingham", "David Hampton"]
comments = _("Gramps (Genealogical Research and Analysis Management Programming System) is a personal genealogy program.")
#-------------------------------------------------------------------------
#

View File

@ -2659,7 +2659,7 @@ def main(arg):
fw.set_sensitive(0)
# set the window icon
topWindow.set_icon(GtkPixmap(topWindow,const.logo))
topWindow.set_icon(GtkPixmap(topWindow,const.icon))
person_list.column_titles_active()

BIN
gramps/src/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@ -20,11 +20,14 @@
"Database Processing/Reorder gramps IDs"
import re
import utils
import intl
_ = intl.gettext
_findint = re.compile('^[^\d]*(\d+)[^\d]*')
#-------------------------------------------------------------------------
#
#
@ -32,64 +35,46 @@ _ = intl.gettext
#-------------------------------------------------------------------------
def runTool(database,active_person,callback):
for prefix in ["xyzzytemporaryid%d", database.iprefix] :
index = 0
pmap = database.getPersonMap()
for id in pmap.keys():
newid = prefix % index
person = pmap[id]
person.setId(newid)
pmap[newid] = person
del pmap[id]
index = index + 1
for prefix in ["xyzzytemporaryid%d", database.fprefix] :
index = 0
pmap = database.getFamilyMap()
for id in pmap.keys():
newid = prefix % index
person = pmap[id]
person.setId(newid)
pmap[newid] = person
del pmap[id]
index = index + 1
for prefix in ["xyzzytemporaryid%d", database.sprefix] :
index = 0
pmap = database.getSourceMap()
for id in pmap.keys():
newid = prefix % index
person = pmap[id]
person.setId(newid)
pmap[newid] = person
del pmap[id]
index = index + 1
for prefix in ["xyzzytemporaryid%d", database.pprefix] :
index = 0
pmap = database.getPlaceMap()
for id in pmap.keys():
newid = prefix % index
person = pmap[id]
person.setId(newid)
pmap[newid] = person
del pmap[id]
index = index + 1
for prefix in ["xyzzytemporaryid%d", database.oprefix] :
index = 0
pmap = database.getObjectMap()
for id in pmap.keys():
newid = prefix % index
person = pmap[id]
person.setId(newid)
pmap[newid] = person
del pmap[id]
index = index + 1
make_new_ids(database.getPersonMap(),database.iprefix)
make_new_ids(database.getFamilyMap(),database.fprefix)
make_new_ids(database.getObjectMap(),database.oprefix)
make_new_ids(database.getSourceMap(),database.sprefix)
make_new_ids(database.getPlaceMap(),database.pprefix)
utils.modified()
callback(1)
def make_new_ids(data_map,prefix):
dups = []
newids = []
for id in data_map.keys():
match = _findint.match(id)
if match:
index = match.groups()[0]
newid = prefix % int(index)
if newid == id:
continue
elif data_map.has_key(newid):
dups.append(id)
else:
newids.append(id)
data = data_map[id]
data.setId(newid)
data_map[newid] = data
del data_map[id]
index = 0
for id in dups:
while 1:
newid = prefix % index
if newid not in newids:
break
index = index + 1
newids.append(newid)
data = data_map[id]
data.setId(newid)
data_map[newid] = data
del data_map[id]
#-------------------------------------------------------------------------
#
#