Update
svn: r3225
This commit is contained in:
parent
6da362e2fa
commit
fcabe82c3d
@ -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)
|
||||
|
@ -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()
|
||||
@ -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."
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user