From fcabe82c3d02cfed9f3a5371b2fcd097c6081900 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Mon, 21 Jun 2004 23:24:51 +0000 Subject: [PATCH] Update svn: r3225 --- src/ArgHandler.py | 6 +++--- src/gramps_main.py | 22 +++++++++++----------- src/plugins/Summary.py | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/ArgHandler.py b/src/ArgHandler.py index 47e15ffa5..21f5b2383 100644 --- a/src/ArgHandler.py +++ b/src/ArgHandler.py @@ -299,15 +299,15 @@ class ArgHandler: print "Temporary directory %s is not writable" % tmpdir_path os._exit(1) else: # tempdir exists and writable -- clean it up if not empty - files = os.listdir(tmpdir_path) ; + files = os.listdir(tmpdir_path) ; for fn in files: os.remove( os.path.join(tmpdir_path,fn) ) try: import TarFile t = TarFile.ReadTarFile(filename,tmpdir_path) - t.extract() - t.close() + t.extract() + t.close() except: print "Error extracting into %s" % tmpdir_path os._exit(1) diff --git a/src/gramps_main.py b/src/gramps_main.py index 8cc021a90..5214636a6 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -150,9 +150,9 @@ class Gramps: ArgHandler.ArgHandler(self,args) # Don't show main window until ArgHandler is done. - # This prevents a window from annoyingly popping up when - # the command line args are sufficient to operate without it. - self.topWindow.show() + # This prevents a window from annoyingly popping up when + # the command line args are sufficient to operate without it. + self.topWindow.show() if GrampsCfg.usetips: TipOfDay.TipOfDay() @@ -335,7 +335,7 @@ class Gramps: "on_gramps_report_bug_activate" : self.report_bug_activate, "on_gramps_mailing_lists_activate" : self.mailing_lists_activate, "on_open_example" : self.open_example, - }) + }) self.enable_filter(self.use_filter) @@ -451,9 +451,9 @@ class Gramps: #FIXME: revert to stock item when German gtk translation is fixed #item = gtk.ImageMenuItem(gtk.STOCK_HOME) item = gtk.ImageMenuItem(_("Home")) - im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) - im.show() - item.set_image(im) + im = gtk.image_new_from_stock(gtk.STOCK_HOME,gtk.ICON_SIZE_MENU) + im.show() + item.set_image(im) item.connect("activate",self.on_home_clicked) item.add_accelerator("activate", self.accel_group, gtk.gdk.keyval_from_name("Home"), @@ -955,7 +955,7 @@ class Gramps: self.people_view.build_tree() if Utils.wasHistory_broken(): self.clear_history() - Utils.clearHistory_broken() + Utils.clearHistory_broken() self.people_view.apply_filter() if not self.active_person: self.change_active_person(self.find_initial_person()) @@ -1222,7 +1222,7 @@ class Gramps: # File is lost => ask what to do if missmedia_action == 0: mmd = MissingMediaDialog(_("Media object could not be found"), - _("%(file_name)s is referenced in the database, but no longer exists. " + _("%(file_name)s is referenced in the database, but no longer exists. " "The file may have been deleted or moved to a different location. " "You may choose to either remove the reference from the database, " "keep the reference to the missing file, or select a new file." @@ -1456,7 +1456,7 @@ class Gramps: except: DisplayTrace.DisplayTrace() return "" - + def fs_close_window(self,obj): self.filesel.destroy() @@ -1624,7 +1624,7 @@ class Gramps: return _("Unknown") else: return GrampsCfg.nameof(person) - + def load_progress(self,value): self.statusbar.set_progress_percentage(value) while gtk.events_pending(): diff --git a/src/plugins/Summary.py b/src/plugins/Summary.py index 527c10537..4484a540f 100644 --- a/src/plugins/Summary.py +++ b/src/plugins/Summary.py @@ -79,9 +79,9 @@ def build_report(database,person): for person_id in personList: person = database.try_to_find_person_from_id(person_id) - if not person: - continue - length = len(person.get_media_list()) + if not person: + continue + length = len(person.get_media_list()) if length > 0: with_photos = with_photos + 1 total_photos = total_photos + length