-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index 8bcf01d..4a491e2 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp @@ -62,48 +62,49 @@ bool Doc_DirLister::matchCat(const AppLnk* app)const QString Doc_DirLister::setStartPath(const QString&) { static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); if (!m_docreads) { Global::findDocuments(&m_ds,Mtype_str); m_docreads = true; } return QString::null; } QString Doc_DirLister::currentPath()const { return QString::null; } QStringList Doc_DirLister::folders()const { return QStringList(); } QStringList Doc_DirLister::files()const { QStringList out; QListIterator<DocLnk> dit(m_ds.children()); for( ; dit.current(); ++dit) { + if (!(*dit)->isValid()) continue; if (!matchCat((*dit))) continue; QString s = (*dit)->name(); s+=char(0); s+=(*dit)->file(); out.append(s); } return out; } void Doc_DirLister::deleteImage( const QString& ) { } void Doc_DirLister::thumbNail( const QString& str, int w, int h) { SlaveMaster::self()->thumbNail( str, w, h ); } QImage Doc_DirLister::image( const QString& str, Factor f, int m) { return SlaveMaster::self()->image(str, f, m ); } void Doc_DirLister::imageInfo( const QString& str) { @@ -134,68 +135,74 @@ QString Doc_DirLister::nameToFname(const QString&name)const return name; } QString Doc_DirLister::dirUp( const QString& p ) const{ return p; } QWidget* Doc_DirLister::widget(QWidget*parent) { CategorySelect * catmb = new CategorySelect(parent); Categories cats( 0 ); cats.load( categoryFileName() ); QArray<int> vl( 0 ); catmb->setCategories( vl, "Document View", // No tr "Document View" ); catmb->setRemoveCategoryEdit( TRUE ); catmb->setAllCategories( TRUE ); connect(catmb, SIGNAL(signalSelected(int)), this, SLOT(showCategory(int))); catmb->setCurrentCategory(-2); return catmb; } void Doc_DirLister::showCategory(int which) { + odebug<<"Show cat " << which << oendl; m_catFilter = which==-2?0:which; setStartPath(""); + odebug<<"Show cat before emit" << oendl; emit sig_reloadDir(); + odebug<<"Show cat - emit signal finished" << oendl; } void Doc_DirLister::systemMsg(const QCString &msg, const QByteArray &data) { if ( msg != "linkChanged(QString)"||!m_docreads) { return; } +#if 0 + // makes big problems on zaurus! QString link; QDataStream stream( data, IO_ReadOnly ); stream >> link; odebug << "Doc_DirLister systemMsg -> linkchanged( " << link << " )" << oendl; if ( link.isNull() || OGlobal::isAppLnkFileName(link) ) { return; } QListIterator<DocLnk> dit(m_ds.children()); bool must_reload = false; bool found = false; while ( dit.current() ) { DocLnk *doc = dit.current(); ++dit; if (doc->linkFile() == link) { found = true; DocLnk* dl = new DocLnk(link); if (dl->fileKnown()) { // changing m_ds.add(dl); } else { delete dl; } if (matchCat(doc) || matchCat(dl)) { must_reload = true; } m_ds.remove( doc ); // remove old link from docLnkSet delete doc; } } if (must_reload) { setStartPath(""); emit sig_reloadDir(); } +#endif } |