From 6665df0a3efedc45dd6eb1e3b601892842afb10d Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 12 Sep 2007 16:37:27 +0000 Subject: [PATCH] * src/ThumbNails.py (get_thumbnail_image): handle missing image * src/images/image-missing.png: added * src/images/Makefile.am: added image-missing.png svn: r8967 --- ChangeLog | 5 ++++- src/ThumbNails.py | 13 ++++++++----- src/images/Makefile.am | 3 ++- src/images/image-missing.png | Bin 0 -> 1066 bytes 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 src/images/image-missing.png 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 0000000000000000000000000000000000000000..27fccd52d594d876384e21f44a4fbaef0abeea82 GIT binary patch literal 1066 zcmV+_1l9YAP)OG{+c+6dh&sy zzuxNSd7pZ#x*C3U2!OG%F(;eN&S|a7p6BI%CZT0nUzJk-*6a0&`T6;V1(46@|L*Va z9~mAVb_#_8Qp%q~uC=CCtK}CL7e}_Xw(7v71>kw!Sfx^NeBWn#dmG>P6P<++smJ4< zr5%gKB9%(TnVy~=114o#K)$c9kG;LU1i26*(&8^XuBC~nR;v^W1Og?O=H_Oqh~r>tMhJnFvZEtXN(Kf7&|0SpFoc7HgIy7y6uY~-2qDl~ zW7~FT0VhRTKVx+mN~s`LDFr}cz8x##^=tIf64G^%QX-{9DRp%I`7^DdA@ssR^nPea zY}*bTa2zKozy!tb2_fLsD_Rp1_zxfA-Mfd_-w#N{hYz?{uAsNJXwA$ZAs`QnG2YX4yS|Qh_b#GVLuk$6_;~Qlx^)X_SqT@Ulz{_bBx=9}g)3VKfts8| zfBZ=6#R~xZjSU(@Lx@ZUe`f~(b?Fk>sj0~Ln{!k7-xLto8lOh_JlWY<+=~}+XJ(FG zy0b&L)Ow#hK}dNb0f{2CZ98IHq$!1S=MK5q*?2d4Divf~eB64|jDWC+)FO;89^q=% z@7}Th;6Xxw`}{f8YuE7C*E=QZr&t&`*v{czkkn{ za+&?9DWujN9SFk;lN$%(#8OH=ojVulSeTn5Qz{{Zz`1&rFZb``@9hC_u&_XGbQE>| zJX-6>`v1)uFb;&tTN@jZnBU*NC42pPkXiQfW&T)QC0i;1&^ta(&xH#e9gtGeXf&b@ z7#HF-AcVjk9K;zJL07BvJ${`2p*eGgvrnIb>!RCZZL-%|)mQ!Ew}D$|gbO*e2|m!+j8_wev=88|BW z)z#HMJtyb<-Z|)M7WgRpcjh8DcD}Mp?a2hty2lTej)eq+OIQkcD0-u1d kfbQhuk0v+pA+m?zKY#aScPI+x9RL6T07*qoM6N<$g5z}Z0{{R3 literal 0 HcmV?d00001