| -rw-r--r-- | core/launcher/documentlist.cpp | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp index 440bf1e..fdba687 100644 --- a/core/launcher/documentlist.cpp +++ b/core/launcher/documentlist.cpp @@ -62,8 +62,10 @@ public: const QString nextFile(); const DocLnk *iterate(); bool store( DocLnk* dl ); void estimatedPercentScanned(); + void appendDocpath(FileSystem*); + DocLnkSet dls; QDict<void> reference; QDictIterator<void> *dit; @@ -426,8 +428,34 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui ) initialize(); tid = 0; } +void DocumentListPrivate::appendDocpath(FileSystem*fs) +{ + QDir defPath(fs->path()+"/Documents"); + QFileInfo f(fs->path()+"/.opiestorage.cf"); + if (!f.exists()) { + if (defPath.exists()) { + docPaths+=defPath.path(); + } + return; + } + Config conf(f.filePath(), Config::File ); + conf.setGroup("subdirs"); + QStringList subDirs = conf.readListEntry("subdirs",':'); + if (subDirs.isEmpty()) { + if (defPath.exists()) { + docPaths+=defPath.path(); + } + return; + } + for (unsigned c = 0; c < subDirs.count();++c) { + QDir docDir(QString(fs->path()+"/"+subDirs[c])); + if (docDir.exists()) { + docPaths+=docDir.path(); + } + } +} void DocumentListPrivate::initialize() { // Reset @@ -440,15 +468,16 @@ void DocumentListPrivate::initialize() docPaths += QPEApplication::documentDir(); int i = 1; const QList<FileSystem> &fs = storage->fileSystems(); QListIterator<FileSystem> it( fs ); - for ( ; it.current(); ++it ) - if ( (*it)->isRemovable() ) { - docPaths += (*it)->path(); - i++; - } + for ( ; it.current(); ++it ) { + if ( (*it)->isRemovable() ) { + appendDocpath((*it)); + ++i; + } + } - for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) { + for ( int i = 0; i < MAX_SEARCH_DEPTH; ++i ) { if ( listDirs[i] ) { delete listDirs[i]; listDirs[i] = 0; } |