-Fix realignment of the items but now it updates too often

-Fix slave not to include <qt></qt> for iconViewName

3 files changed, 6 insertions, 5 deletions

diff --git a/noncore/graphics/opie-eye/slave/gif_slave.cpp b/noncore/graphics/opie-eye/slave/gif_slave.cpp
index feb69b6..f0dc86e 100644
--- a/noncore/graphics/opie-eye/slave/gif_slave.cpp
+++ b/noncore/graphics/opie-eye/slave/gif_slave.cpp
@@ -277,26 +277,27 @@ GifSlave::GifSlave()
 
 GifSlave::~GifSlave() {
 
 }
 
 QString GifSlave::iconViewName(const QString& str) {
     QString st;
     get_gif_info(QFile::encodeName( str ).data(), st );
     return st;
 }
 
 QString GifSlave::fullImageInfo( const QString& str) {
-    QString st;
+    QString st = "<qt>";
     get_gif_info(QFile::encodeName( str ).data(), st, true );
+    st.append(  "</qt>" );
     return st;
 }
 
 QPixmap GifSlave::pixmap(const QString& path, int width, int height ) {
     static QImage img;
     img.load( path );
     if ( img.isNull() ) {
         QPixmap pix;
         return pix;
     }
 
     return ThumbNailTool::scaleImage( img, width,height );
diff --git a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
index 95055fd..086b47f 100644
--- a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
+++ b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
@@ -1291,52 +1291,51 @@ static QString exposure_program( int i ) {
 JpegSlave::JpegSlave()
     : SlaveInterface(  QStringList::split( " ", "jpeg jpg" ) )
 {}
 
 JpegSlave::~JpegSlave() {}
 
 QString JpegSlave::iconViewName( const QString& path) {
     ExifData ImageInfo;
     if ( !ImageInfo.scan( path ) )
         return QString::null;
 
     QString tag;
-    tag  = QObject::tr( "<qt>Comment: %1\n" ).arg( ImageInfo.getComment() );
+    tag  = QObject::tr( "Comment: %1\n" ).arg( ImageInfo.getComment() );
     {
 // ODP fixme
         QString timestring = TimeString::dateString( parseDateTime(  ImageInfo.getDateTime() ), FALSE );
         tag += QObject::tr( "Date/Time: %1\n" ).arg( timestring );
     }
     tag += QObject::tr( "Dimensions: %1x%2\n" ).arg(ImageInfo.getWidth())
            .arg(ImageInfo.getHeight() );
 
     tag += color_mode_to_string(  ImageInfo.getIsColor() );
 
     tag += compression_to_string( ImageInfo.getCompressionLevel() );
-    tag += QObject::tr( "</qt>" );
 
     return tag;
 }
 
 
 /*
  * messy messy string creation
  */
 QString JpegSlave::fullImageInfo( const QString& path) {
     ExifData ImageInfo;
     if ( !ImageInfo.scan( path ) )
         return QString::null;
 
     QString tag, tmp;
-    tag   = QObject::tr( "Comment: %1\n" ).arg( ImageInfo.getComment() );
+    tag   = QObject::tr( "<qt>Comment: %1\n" ).arg( ImageInfo.getComment() );
 
     tmp =  ImageInfo.getCameraMake();
     if ( tmp.length() )
         tag  += QObject::tr( "Manufacturer: %1\n" ).arg( tmp );
     tmp = ImageInfo.getCameraModel();
     if ( tmp.length() )
         tag += QObject::tr( "Model: %1\n" ).arg( tmp );
     {
 // ODP fixme
         tmp = TimeString::dateString( parseDateTime(  ImageInfo.getDateTime() ), FALSE );
         tag += QObject::tr( "Date/Time: %1\n" ).arg( tmp );
     }
diff --git a/noncore/graphics/opie-eye/slave/png_slave.cpp b/noncore/graphics/opie-eye/slave/png_slave.cpp
index 72b93cc..86e1cdc 100644
--- a/noncore/graphics/opie-eye/slave/png_slave.cpp
+++ b/noncore/graphics/opie-eye/slave/png_slave.cpp
@@ -186,25 +186,26 @@ PNGSlave::PNGSlave()
     : SlaveInterface("png")
 {
 }
 PNGSlave::~PNGSlave() {
 }
 QString PNGSlave::iconViewName( const QString& path) {
     QString str;
     read_comment( path, false, str );
     return str;
 }
 
 QString PNGSlave::fullImageInfo( const QString& path) {
-    QString str;
+    QString str = "<qt>";
     read_comment( path, true, str );
+    str += "</qt>";
     return str;
 }
 
 
 QPixmap PNGSlave::pixmap( const QString& path, int  width, int height) {
     QImage img; img.load( path );
     if ( img.isNull() )
         return QPixmap();
     else
         return ThumbNailTool::scaleImage( img, width,height );
 }