diff --git a/src/EditPerson.py b/src/EditPerson.py index fdb92aa77..c505aa394 100644 --- a/src/EditPerson.py +++ b/src/EditPerson.py @@ -334,8 +334,11 @@ class EditPerson: #------------------------------------------------------------------------- def add_thumbnail(self,photo): src = os.path.basename(photo.getPath()) - thumb = "%s%s.thumb%s%s" % (self.path,os.sep,os.sep,src) - RelImage.check_thumb(src,thumb,const.thumbScale) + if photo.getPrivate(): + thumb = "%s%s.thumb%s%s" % (self.path,os.sep,os.sep,src) + else: + thumb = "%s%s.thumb%s%s.jpg" % (self.path,os.sep,os.sep,os.path.basename(src)) + RelImage.check_thumb(photo.getPath(),thumb,const.thumbScale) self.photo_list.append(thumb,photo.getDescription()) #------------------------------------------------------------------------- @@ -1194,6 +1197,8 @@ def on_savephoto_clicked(obj): if epo.external.get_active() == 1: if os.path.isfile(filename): name = filename + thumb = "%s%s.thumb.jpg" % (path,os.sep,os.path.basename(filename)) + RelImage.mk_thumb(filename,thumb,const.thumbScale) else: return else: diff --git a/src/RelImage.py b/src/RelImage.py index cd6a2f61f..e71455fe2 100644 --- a/src/RelImage.py +++ b/src/RelImage.py @@ -80,7 +80,6 @@ def import_photo(filename,path,prefix): else: PIL.Image.open(filename).save(name) except: - print path return None return name diff --git a/src/imagesel.glade b/src/imagesel.glade index 85a88ddd3..fe4ac61cb 100644 --- a/src/imagesel.glade +++ b/src/imagesel.glade @@ -15,7 +15,6 @@ GnomeDialog imageSelect - 300 Gramps - Select a picture GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER @@ -305,6 +304,7 @@ GnomeFileEntry photosel + 350 photoselect 10 Select an image