-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 6 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/lib/slavemaster.cpp | 7 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/slave/slavereciever.cpp | 7 |
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 @@ -94,5 +94,5 @@ PIconView::PIconView( QWidget* wid, Config* cfg ) { { - QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" ); +// QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" ); } m_path = QDir::homeDirPath(); @@ -147,4 +147,8 @@ void PIconView::slotChangeDir(const QString& path) { 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 ) ); 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 @@ -19,6 +19,11 @@ QDataStream & operator >> (QDataStream & str, bool & b) 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 ) { 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 @@ -32,6 +32,11 @@ 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; } |