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

2007-08-30 Don Allingham <don@gramps-project.org>

Browse Source 
* src/BasicUtils/_UpdateCallback.py: add support for text in progressbar
	* src/ExportAssistant.py: add support for text in progressbar
	* src/ExportOptions.py: add support for text in progressbar
	* src/GrampsDbUtils/_WriteGedcom.py: add support for text in progressbar
	
2007-08-30  Don Allingham  <don@gramps-project.org>
	* src/GrampsDb/_GrampsDBDir.py: use types.InstanceType
	* src/RelLib/_SourceBase.py: use types.InstanceType
	* src/RelLib/_Source.py: use types.InstanceType
	* src/RelLib/_MediaObject.py: use types.InstanceType
	* src/RelLib/_Person.py: use types.InstanceType
	* src/RelLib/_DateBase.py: use types.InstanceType
	* src/RelLib/_ChildRef.py: use types.InstanceType
	* src/RelLib/_Family.py: use types.InstanceType
	* src/RelLib/_Place.py: use types.InstanceType
	* src/RelLib/_RepoRef.py: use types.InstanceType
	* src/RelLib/_Note.py: use types.InstanceType
	* src/RelLib/_EventRef.py: use types.InstanceType
	* src/RelLib/_Repository.py: use types.InstanceType
	* src/RelLib/_Event.py: use types.InstanceType



svn: r8900
This commit is contained in:
Don Allingham 2007-08-31 03:18:38 +00:00
parent 3bcaf36d57
commit 27aa4ec6a2
5 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,3 +1,25 @@
2007-08-30 Don Allingham <don@gramps-project.org>
* src/BasicUtils/_UpdateCallback.py: add support for text in progressbar
* src/ExportAssistant.py: add support for text in progressbar
* src/ExportOptions.py: add support for text in progressbar
* src/GrampsDbUtils/_WriteGedcom.py: add support for text in progressbar
2007-08-30 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_GrampsDBDir.py: use types.InstanceType
* src/RelLib/_SourceBase.py: use types.InstanceType
* src/RelLib/_Source.py: use types.InstanceType
* src/RelLib/_MediaObject.py: use types.InstanceType
* src/RelLib/_Person.py: use types.InstanceType
* src/RelLib/_DateBase.py: use types.InstanceType
* src/RelLib/_ChildRef.py: use types.InstanceType
* src/RelLib/_Family.py: use types.InstanceType
* src/RelLib/_Place.py: use types.InstanceType
* src/RelLib/_RepoRef.py: use types.InstanceType
* src/RelLib/_Note.py: use types.InstanceType
* src/RelLib/_EventRef.py: use types.InstanceType
* src/RelLib/_Repository.py: use types.InstanceType
* src/RelLib/_Event.py: use types.InstanceType
2007-08-30 Benny Malengier <benny.malengier@gramps-project.org> 2007-08-30 Benny Malengier <benny.malengier@gramps-project.org>
* src/ExportAssistant.py: request Don, progressbar in exportassistant. * src/ExportAssistant.py: request Don, progressbar in exportassistant.
@ -54,22 +76,6 @@
count filters count filters
* po/POTFILES.in: new reference count filters * po/POTFILES.in: new reference count filters
2007-08-29 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_GrampsDBDir.py: use types.InstanceType
* src/RelLib/_SourceBase.py: use types.InstanceType
* src/RelLib/_Source.py: use types.InstanceType
* src/RelLib/_MediaObject.py: use types.InstanceType
* src/RelLib/_Person.py: use types.InstanceType
* src/RelLib/_DateBase.py: use types.InstanceType
* src/RelLib/_ChildRef.py: use types.InstanceType
* src/RelLib/_Family.py: use types.InstanceType
* src/RelLib/_Place.py: use types.InstanceType
* src/RelLib/_RepoRef.py: use types.InstanceType
* src/RelLib/_Note.py: use types.InstanceType
* src/RelLib/_EventRef.py: use types.InstanceType
* src/RelLib/_Repository.py: use types.InstanceType
* src/RelLib/_Event.py: use types.InstanceType
2007-08-29 Don Allingham <don@gramps-project.org> 2007-08-29 Don Allingham <don@gramps-project.org>
* src/RelLib/_Source.py: fix fast unserialize() * src/RelLib/_Source.py: fix fast unserialize()
* src/RelLib/_Place.py: fix fast unserialize() * src/RelLib/_Place.py: fix fast unserialize()

7
src/BasicUtils/_UpdateCallback.py
View File

@ -60,11 +60,13 @@ class UpdateCallback:
self.reset() self.reset()
else: else:
self.update = self.update_empty self.update = self.update_empty
self.text = ""
def reset(self): def reset(self, text=""):
self.count = 0 self.count = 0
self.oldval = 0 self.oldval = 0
self.oldtime = 0 self.oldtime = 0
self.text = text
def set_total(self, total): def set_total(self, total):
self.total = total self.total = total
@ -81,6 +83,9 @@ class UpdateCallback:
time_has_come = self.interval and (newtime-self.oldtime>self.interval) time_has_come = self.interval and (newtime-self.oldtime>self.interval)
value_changed = newval!=self.oldval value_changed = newval!=self.oldval
if value_changed or time_has_come: if value_changed or time_has_come:
if self.text:
self.callback(newval, text=self.text)
else:
self.callback(newval) self.callback(newval)
self.oldval = newval self.oldval = newval
self.oldtime = newtime self.oldtime = newtime

4
src/ExportAssistant.py
View File

@ -578,9 +578,9 @@ class ExportAssistant(gtk.Assistant, ManagedWindow.ManagedWindow) :
while gtk.events_pending(): while gtk.events_pending():
gtk.main_iteration() gtk.main_iteration()
def pulse_progressbar(self, value): def pulse_progressbar(self, value, text):
self.progressbar.set_fraction(min(value/100.0, 1.0)) self.progressbar.set_fraction(min(value/100.0, 1.0))
self.progressbar.set_text("%d%%" % value) self.progressbar.set_text("%s: %d%%" % (text, value))
while gtk.events_pending(): while gtk.events_pending():
gtk.main_iteration() gtk.main_iteration()

26
src/ExportOptions.py
View File

@ -24,31 +24,7 @@ import RelLib
import Config import Config
from BasicUtils import name_displayer from BasicUtils import name_displayer
from Filters import GenericFilter, Rules, build_filter_menu from Filters import GenericFilter, Rules
def restrict_living(person):
newperson = RelLib.Person()
name = RelLib.Name()
# copy name info
source = person.get_primary_name()
name.first_name = _(u'Living')
name.surname = source.surname
name.title = source.title
name.type = source.type
name.prefix = source.prefix
name.patronymic = source.patronymic
name.group_as = source.group_as
name.sort_as = source.sort_as
name.display_as = source.display_as
name.call = ""
newperson.set_primary_name(name)
newperson.parent_family_list = person.parent_family_list[:]
newperson.family_list = person.family_list[:]
newperson.gender = person.gender
return newperson
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

4
src/GrampsDbUtils/_WriteGedcom.py
View File

@ -438,7 +438,7 @@ class GedcomWriter(UpdateCallback):
hcnt = len(phandles) hcnt = len(phandles)
self.reset() self.reset(_("Sorting"))
self.set_total(hcnt) self.set_total(hcnt)
sorted = [] sorted = []
for handle in phandles: for handle in phandles:
@ -449,7 +449,7 @@ class GedcomWriter(UpdateCallback):
sorted.sort() sorted.sort()
self.set_total(hcnt + len(self.db.get_family_handles())) self.set_total(hcnt + len(self.db.get_family_handles()))
self.reset() self.reset(_("Writing"))
for data in sorted: for data in sorted:
self.__write_person(self.db.get_person_from_handle(data[1])) self.__write_person(self.db.get_person_from_handle(data[1]))
self.update() self.update()