[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/kphotoalbum
From:       Jan Kundrát <jkt () gentoo ! org>
Date:       2007-09-30 22:14:53
Message-ID: 1191190493.229632.13850.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 719329 by jkt:

merged r719323 fron kde3 (adjust file extension for html export)


 M  +5 -0      ChangeLog  
 M  +5 -1      HTMLGenerator/Generator.cpp  


--- trunk/extragear/graphics/kphotoalbum/ChangeLog #719328:719329
@@ -1,3 +1,8 @@
+2007-10-01  Jan Kundrat  <jkt@gentoo.org>
+
+	* Adjust the extension of images generated for HTML export. Based on a patch
+	submitted by Miika Turkia <mturkia@nixu.fi>.
+
 2007-09-23  Jan Kundrat  <jkt@gentoo.org>
 
 	* Show image label in the infobox and thumbnail tooltip
--- trunk/extragear/graphics/kphotoalbum/HTMLGenerator/Generator.cpp #719328:719329
@@ -386,7 +386,11 @@
     QString name = _nameMap[fileName];
     QString base = QFileInfo( name ).completeBaseName();
     if ( size == maxImageSize() && !Utilities::isVideo( fileName ) )
-        return name;
+        if ( name.endsWith( QString::fromAscii(".jpg"), false ) ||
+                name.endsWith( QString::fromAscii(".jpeg"), false ) )
+            return name;
+        else
+            return base + QString::fromAscii(".jpg");
     else
         return QString::fromLatin1( "%1-%2.jpg" ).arg( base ).arg( size );
 }
[prev in list] [next in list] [prev in thread] [next in thread]