Fix communication. It seems like QPixmap and QDataStream

do not mix well if the QPixmap is not valid..


invalidate image requests if we change the dir

3 files changed, 17 insertions, 3 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 0b80012..38a621e 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -80,33 +80,33 @@ namespace {
             }
             return m_pix ? m_pix : _unkPix;
         }
     }
     inline void IconViewItem::setText( const QString& str ) {
         QString text = QIconViewItem::text()+"\n"+str;
         m_noInfo = true;
         QIconViewItem::setText( text );
     }
 }
 
 
 PIconView::PIconView( QWidget* wid, Config* cfg )
     : QVBox( wid ), m_cfg( cfg )
 {
     {
-        QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
+//        QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
     }
     m_path = QDir::homeDirPath();
 
     QHBox *hbox = new QHBox( this );
     QLabel* lbl = new QLabel( hbox );
     lbl->setText(  tr("View as" ) );
 
     m_views = new QComboBox( hbox, "View As" );
     connect( m_views, SIGNAL(activated(int)),
              this, SLOT(slotViewChanged(int)) );
 
     m_view= new QIconView( this );
     connect(m_view, SIGNAL(clicked(QIconViewItem*) ),
             this, SLOT(slotClicked(QIconViewItem*)) );
 
     m_view->setArrangement( QIconView::LeftToRight );
@@ -133,32 +133,36 @@ void PIconView::slotDirUp() {
 
 void PIconView::slotChangeDir(const QString& path) {
     if ( !currentView() )
         return;
 
     PDirLister *lister = currentView()->dirLister();
     if (!lister )
         return;
 
     lister->setStartPath(  path );
     m_path = lister->currentPath();
 
     m_view->clear();
     addFolders( lister->folders() );
     addFiles( lister->files() );
 
+    // Also invalidate the cache. We can't cancel the operations anyway
+    g_stringPix.clear();
+    g_stringInf.clear();
+
     // looks ugly
     static_cast<QMainWindow*>(parent())->setCaption( QObject::tr("%1 - O View", "Name of the dir").arg( m_path ) );
 }
 
 QString PIconView::currentFileName(bool &isDir)const {
     isDir = false;
     QIconViewItem* _it = m_view->currentItem();
     if ( !_it )
         return QString::null;
 
     IconViewItem* it = static_cast<IconViewItem*>( _it );
     isDir = it->isDir();
     return it->path();
 }
 
 void PIconView::slotTrash() {
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp
index 18dc883..4e28535 100644
--- a/noncore/graphics/opie-eye/lib/slavemaster.cpp
+++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp
@@ -5,34 +5,39 @@
 
 #include <qcopchannel_qws.h>
 #include <qtimer.h>
 
 QDataStream & operator << (QDataStream & str, bool b)
 {
   str << Q_INT8(b);
   return str;
 }
 QDataStream & operator >> (QDataStream & str, bool & b)
 {
   Q_INT8 l;
   str >> l;
   b = bool(l);
   return str;
 }
+
+/*
+ * ! We don't put a Pixmap in!!!!
+ */
 QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
-    return s << inf.file << inf.pixmap << inf.width << inf.height;
+    qWarning( "Image request is %s %d %d", inf.file.latin1(), inf.width, inf.height );
+    return s << inf.file  << inf.width << inf.height;
 }
 QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) {
     s >> inf.file >> inf.pixmap >> inf.width >> inf.height;
     return s;
 }
 QDataStream &operator<<( QDataStream& s, const ImageInfo& i) {
     return s << i.kind << i.file << i.info;
 }
 QDataStream &operator>>( QDataStream& s, ImageInfo& i ) {
     s >> i.kind >> i.file >> i.info;
     return s;
 }
 
 
 
 SlaveMaster* SlaveMaster::m_master = 0;
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp
index 951f3df..c8e33d4 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.cpp
+++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp
@@ -18,34 +18,39 @@ QDataStream & operator << (QDataStream & str, bool b)
   return str;
 }
 
 QDataStream & operator >> (QDataStream & str, bool & b)
 {
   Q_INT8 l;
   str >> l;
   b = bool(l);
   return str;
 }
 
 
 
 QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
     return s << inf.file << inf.pixmap << inf.width << inf.height;
 }
+
+/*
+ * GUI sends no QPIxmap!!!
+ */
 QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) {
-    s >> inf.file >> inf.pixmap >> inf.width >> inf.height;
+    s >> inf.file >> inf.width >> inf.height;
+    qWarning( "Recieved %s %d %d", inf.file.latin1(), inf.width, inf.height );
     return s;
 }
 QDataStream &operator<<( QDataStream& s, const ImageInfo& i) {
     return s << i.kind << i.file << i.info;
 }
 QDataStream &operator>>( QDataStream& s, ImageInfo& i ) {
     s >> i.kind >> i.file >> i.info;
     return s;
 }
 
 
 
 SlaveObjects* slaveObjects() {
     if ( !_slaveObj )
         _slaveObj = new SlaveObjects;
     return _slaveObj;