author | alwin <alwin> | 2004-02-22 20:11:56 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-02-22 20:11:56 (UTC) |
commit | 936fc191ac5756a4de2e8b2a83c8bc910f918b95 (patch) (unidiff) | |
tree | 3b3b3ef8b9abd9ebe1eb9e3180eafe8313bc32d5 | |
parent | 63e45b90437e78ee11753c6782516dc38c30dd24 (diff) | |
download | opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.zip opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.tar.gz opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.tar.bz2 |
read more options from opiestorage.cf
-rw-r--r-- | library/global.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/library/global.cpp b/library/global.cpp index 6c0a66a..6182de8 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -770,20 +770,25 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter) | |||
770 | // this is a candidate look at the cf and see if we should search on it | 770 | // this is a candidate look at the cf and see if we should search on it |
771 | QString path = (*it)->path(); | 771 | QString path = (*it)->path(); |
772 | if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) ) | 772 | if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) ) |
773 | continue; | 773 | continue; |
774 | Config conf((*it)->path() + "/.opiestorage.cf", Config::File ); | 774 | Config conf((*it)->path() + "/.opiestorage.cf", Config::File ); |
775 | conf.setGroup("subdirs"); | 775 | conf.setGroup("subdirs"); |
776 | if (conf.readBoolEntry("wholemedia",true)) { | ||
777 | DocLnkSet ide( path,mimefilter); | ||
778 | folder->appendFrom(ide); | ||
779 | } else { | ||
776 | QStringList subDirs = conf.readListEntry("subdirs",':'); | 780 | QStringList subDirs = conf.readListEntry("subdirs",':'); |
777 | if (subDirs.isEmpty()) { | 781 | if (subDirs.isEmpty()) { |
778 | subDirs.append("Documents"); | 782 | subDirs.append("Documents"); |
779 | } | 783 | } |
780 | for (unsigned c = 0; c < subDirs.count();++c) { | 784 | for (unsigned c = 0; c < subDirs.count();++c) { |
781 | DocLnkSet ide( path+"/"+subDirs[c], mimefilter ); | 785 | DocLnkSet ide( path+"/"+subDirs[c], mimefilter ); |
782 | folder->appendFrom(ide); | 786 | folder->appendFrom(ide); |
783 | } | 787 | } |
788 | } | ||
784 | } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { | 789 | } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { |
785 | QString path = (*it)->path() + "/Documents"; | 790 | QString path = (*it)->path() + "/Documents"; |
786 | DocLnkSet ide( path, mimefilter ); | 791 | DocLnkSet ide( path, mimefilter ); |
787 | folder->appendFrom(ide); | 792 | folder->appendFrom(ide); |
788 | } | 793 | } |
789 | } | 794 | } |