From 0fb8fad4ee5598fefcc82a097b0c8f61cbba8f92 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sat, 29 Dec 2007 11:49:15 +0000 Subject: [PATCH] 2007-12-29 Douglas S. Blank * src/DataViews/MyGrampsView.py: renamed background to main * src/plugins/DefaultGadgets.py: call main (generator) svn: r9622 --- ChangeLog | 4 ++++ src/DataViews/MyGrampsView.py | 8 ++------ src/plugins/DefaultGadgets.py | 11 ++++------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 131387071..281caf71d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-29 Douglas S. Blank + * src/DataViews/MyGrampsView.py: renamed background to main + * src/plugins/DefaultGadgets.py: call main (generator) + 2007-12-28 Douglas S. Blank * src/plugins/SameSurnames.py: new quick report for showing people with same surnames diff --git a/src/DataViews/MyGrampsView.py b/src/DataViews/MyGrampsView.py index 247a22052..09304d9dd 100644 --- a/src/DataViews/MyGrampsView.py +++ b/src/DataViews/MyGrampsView.py @@ -174,10 +174,7 @@ class Gadget(object): def init(self): # once, constructor pass - def main(self): # once per db open - pass - - def background(self): # return false finishes + def main(self): # return false finishes """ Generator which will be run in the background. """ @@ -254,12 +251,11 @@ class Gadget(object): self.gui.data.append(text) def update(self, *handles): - self.main() if self._idle_id != 0: if debug: print "%s interrupt!" % self.gui.title self.interrupt() if debug: print "%s creating generator" % self.gui.title - self._generator = self.background() + self._generator = self.main() if debug: print "%s adding to gobject" % self.gui.title self._idle_id = gobject.idle_add(self._updater, priority=gobject.PRIORITY_LOW) diff --git a/src/plugins/DefaultGadgets.py b/src/plugins/DefaultGadgets.py index d5cdad76b..91b0c08f0 100644 --- a/src/plugins/DefaultGadgets.py +++ b/src/plugins/DefaultGadgets.py @@ -36,10 +36,9 @@ import string # init- run once, on construction # active_changed- run when active-changed is triggered # db_changed- run when db-changed is triggered -# main- run once per db change, main process (for fast code) -# background- run once per db change, main process (for slow code) +# main- run once per db change, main process (a generator) -# You can also call update() to run main and background +# You can also call update() to run main class CalendarGadget(Gadget): def init(self): @@ -63,7 +62,7 @@ class CalendarGadget(Gadget): self.gui.calendar.mark_day(date[2]) self.gui.calendar.thaw() - def background(self): + def main(self): self.dates = {} # for each day in events people = self.gui.dbstate.db.get_person_handles(sort_handles=False) @@ -161,8 +160,6 @@ class TopSurnamesGadget(Gadget): def main(self): self.set_text("Processing...\n") - - def background(self): people = self.dbstate.db.get_person_handles(sort_handles=False) surnames = {} cnt = 0 @@ -209,7 +206,7 @@ class StatsGadget(Gadget): def init(self): self.set_text("No Family Tree loaded.") - def background(self): + def main(self): self.set_text("Processing...") database = self.dbstate.db personList = database.get_person_handles(sort_handles=False)