diff --git a/ChangeLog b/ChangeLog index ceefc9e8b..063aafab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * src/plugins/lineage.py: Improvements 2007-09-12 Don Allingham + * src/ThumbNails.py (get_thumbnail_image): handle missing image + * src/images/image-missing.png: added + * src/images/Makefile.am: added image-missing.png * src/docgen/ODFDoc.py (ODFDoc): Fix ratio assignment 2007-09-12 Zsolt Foldvari @@ -24,7 +27,7 @@ 2007-09-10 Don Allingham * src/SubstKeywords.py (SubstKeywords.replace_and_clean): fix substitution * src/ImgManip.py: fix typo - + 2007-09-10 Don Allingham * src/plugins/WriteCD.py: don't generate thumbnails * src/Selectors/_SelectObject.py: new image sizing routines diff --git a/src/ThumbNails.py b/src/ThumbNails.py index 50b8bb637..140d21542 100644 --- a/src/ThumbNails.py +++ b/src/ThumbNails.py @@ -260,9 +260,12 @@ def get_thumbnail_path(src_file, mtype=None): @rtype: gtk.gdk.Pixbuf """ filename = __build_thumb_path(src_file) - if not os.path.isfile(filename): - __create_thumbnail_image(src_file, mtype) - elif os.path.getmtime(src_file) > os.path.getmtime(filename): - __create_thumbnail_image(src_file, mtype) - return os.path.abspath(filename) + if not os.path.isfile(src_file): + return os.path.join(const.IMAGE_DIR, "image-missing.png") + else: + if not os.path.isfile(filename): + __create_thumbnail_image(src_file, mtype) + elif os.path.getmtime(src_file) > os.path.getmtime(filename): + __create_thumbnail_image(src_file, mtype) + return os.path.abspath(filename) diff --git a/src/images/Makefile.am b/src/images/Makefile.am index 4d4183b14..60a2b2231 100644 --- a/src/images/Makefile.am +++ b/src/images/Makefile.am @@ -66,7 +66,8 @@ dist_pkgdata_DATA = \ stock_link.png\ stock_notes.png\ somerights20.gif \ - document.png #\ $(map_tile_images) + document.png \ + image-missing.png EXTRA_DIST = gramps.svg diff --git a/src/images/image-missing.png b/src/images/image-missing.png new file mode 100644 index 000000000..27fccd52d Binary files /dev/null and b/src/images/image-missing.png differ