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

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

5 files changed, 20 insertions, 22 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index b3f0006..ed9fc9c 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -14,2 +14,3 @@
 #include <opie2/okeyconfigwidget.h>
+#include <opie2/odebug.h>
 
@@ -44,3 +45,4 @@ namespace {
         void setText( const QString& );
-        void reCalc();
+
+
     private:
@@ -72,2 +74,6 @@ namespace {
     inline QPixmap* IconViewItem::pixmap()const {
+        qWarning(  "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d",
+                   rect().x(),rect().y(),rect().width(),rect().height(),
+                   iconView()->contentsX(), iconView()->contentsY());
+
         if ( m_isDir )
@@ -92,8 +98,2 @@ namespace {
         QIconViewItem::setText( text );
-        reCalc();
-    }
-
-    inline void IconViewItem::reCalc()
-    {
-        calcRect();
     }
@@ -124,3 +124,2 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
     m_view->setItemTextPos( QIconView::Right );
-    m_view->setResizeMode(QIconView::Adjust);
 
@@ -128,3 +127,3 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
     int viewerWidth = dw-style().scrollBarExtent().width();
-    m_view->setGridX( viewerWidth-2*m_view->spacing() );
+    m_view->setGridX( viewerWidth-3*m_view->spacing());
     m_view->setGridY( fontMetrics().height()*2+40 );
@@ -198,3 +197,3 @@ void PIconView::slotChangeDir(const QString& path) {
 
-    m_view->setUpdatesEnabled( false );
+    m_view->viewport()->setUpdatesEnabled( false );
     m_view->clear();
@@ -202,3 +201,3 @@ void PIconView::slotChangeDir(const QString& path) {
     addFiles( lister->files() );
-    m_view->setUpdatesEnabled( true );
+    m_view->viewport()->setUpdatesEnabled( true );
 
@@ -316,3 +315,2 @@ void PIconView::slotThumbInfo( const QString& _path, const QString& str ) {
         item->setText( str );
-        item->repaint();
         g_stringInf.remove( _path );
@@ -327,3 +325,2 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) {
             /* required for a recalculated rectangle. otherwise the view show nonsense! */
-            item->reCalc();
         } else {
@@ -331,3 +328,2 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) {
         }
-        item->repaint();
         g_stringPix.remove( _path );
@@ -359,3 +355,3 @@ void PIconView::slotBeamDone( Ir* ir) {
 void PIconView::slotStart() {
-    m_view->setUpdatesEnabled( false );
+    m_view->viewport()->setUpdatesEnabled( false );
 }
@@ -363,3 +359,4 @@ void PIconView::slotStart() {
 void PIconView::slotEnd() {
-    m_view->setUpdatesEnabled( true );
+    m_view->arrangeItemsInGrid( );
+    m_view->viewport()->setUpdatesEnabled( true );
 }
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 0314659..83ff4f1 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -111,3 +111,3 @@ void PMainWindow::slotConfig() {
         lst.insert( view, _wid );
-        wid->addTab( _wid, QString::null, inf->name() );
+        wid->addTab( _wid, "fileopen", inf->name() );
     }
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
@@ -288,4 +288,5 @@ QString GifSlave::iconViewName(const QString& str) {
 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;
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
@@ -1302,3 +1302,3 @@ QString JpegSlave::iconViewName( const QString& path) {
     QString tag;
-    tag  = QObject::tr( "<qt>Comment: %1\n" ).arg( ImageInfo.getComment() );
+    tag  = QObject::tr( "Comment: %1\n" ).arg( ImageInfo.getComment() );
     {
@@ -1314,3 +1314,2 @@ QString JpegSlave::iconViewName( const QString& path) {
     tag += compression_to_string( ImageInfo.getCompressionLevel() );
-    tag += QObject::tr( "</qt>" );
 
@@ -1329,3 +1328,3 @@ QString JpegSlave::fullImageInfo( const QString& path) {
     QString tag, tmp;
-    tag   = QObject::tr( "Comment: %1\n" ).arg( ImageInfo.getComment() );
+    tag   = QObject::tr( "<qt>Comment: %1\n" ).arg( ImageInfo.getComment() );
 
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
@@ -197,4 +197,5 @@ QString PNGSlave::iconViewName( const QString& path) {
 QString PNGSlave::fullImageInfo( const QString& path) {
-    QString str;
+    QString str = "<qt>";
     read_comment( path, true, str );
+    str += "</qt>";
     return str;