read more settings from opiestorage.cf

1 files changed, 5 insertions, 0 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index fdba687..9736e65 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -396,96 +396,101 @@ void DocumentList::sendAllDocLinks()
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 DocumentListPrivate::DocumentListPrivate( ServerInterface *gui )
 {
     storage = new StorageInfo( this );
     serverGui = gui;
     if ( serverGui ) {
         sendAppLnks = serverGui->requiresApplications();
         sendDocLnks = serverGui->requiresDocuments();
     } else {
         sendAppLnks = false;
         sendDocLnks = false;
     }
     for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) {
         listDirs[i] = 0;
         lists[i] = 0;
         listPositions[i] = 0;
     }
     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");
+    bool read_all = conf.readBoolEntry("wholemedia",true);
+    if (read_all) {
+        docPaths+=fs->path();
+        return;
+    }
     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
     dls.clear();
     docPaths.clear();
     reference.clear();
 
     QDir docDir( QPEApplication::documentDir() );
     if ( docDir.exists() )
         docPaths += QPEApplication::documentDir();
     int i = 1;
     const QList<FileSystem> &fs = storage->fileSystems();
     QListIterator<FileSystem> it( fs );
     for ( ; it.current(); ++it ) {
         if ( (*it)->isRemovable() ) {
             appendDocpath((*it));
             ++i;
         }
     }
 
     for ( int i = 0; i < MAX_SEARCH_DEPTH; ++i ) {
         if ( listDirs[i] ) {
             delete listDirs[i];
             listDirs[i] = 0;
         }
         lists[i] = 0;
         listPositions[i] = 0;
     }
 
     docPathsSearched = 0;
     searchDepth = -1;
     state = Find;
     dit = 0;