summaryrefslogtreecommitdiff
authoralwin <alwin>2004-02-22 20:11:56 (UTC)
committer alwin <alwin>2004-02-22 20:11:56 (UTC)
commit936fc191ac5756a4de2e8b2a83c8bc910f918b95 (patch) (unidiff)
tree3b3b3ef8b9abd9ebe1eb9e3180eafe8313bc32d5
parent63e45b90437e78ee11753c6782516dc38c30dd24 (diff)
downloadopie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.zip
opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.tar.gz
opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.tar.bz2
read more options from opiestorage.cf
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/library/global.cpp b/library/global.cpp
index 6c0a66a..6182de8 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -773,13 +773,18 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
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 QStringList subDirs = conf.readListEntry("subdirs",':'); 776 if (conf.readBoolEntry("wholemedia",true)) {
777 if (subDirs.isEmpty()) { 777 DocLnkSet ide( path,mimefilter);
778 subDirs.append("Documents"); 778 folder->appendFrom(ide);
779 } 779 } else {
780 for (unsigned c = 0; c < subDirs.count();++c) { 780 QStringList subDirs = conf.readListEntry("subdirs",':');
781 DocLnkSet ide( path+"/"+subDirs[c], mimefilter ); 781 if (subDirs.isEmpty()) {
782 folder->appendFrom(ide); 782 subDirs.append("Documents");
783 }
784 for (unsigned c = 0; c < subDirs.count();++c) {
785 DocLnkSet ide( path+"/"+subDirs[c], mimefilter );
786 folder->appendFrom(ide);
787 }
783 } 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";