-rw-r--r-- | core/launcher/documentlist.cpp | 5 |
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 | |||
@@ -432,24 +432,29 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui ) | |||
432 | void DocumentListPrivate::appendDocpath(FileSystem*fs) | 432 | void DocumentListPrivate::appendDocpath(FileSystem*fs) |
433 | { | 433 | { |
434 | QDir defPath(fs->path()+"/Documents"); | 434 | QDir defPath(fs->path()+"/Documents"); |
435 | QFileInfo f(fs->path()+"/.opiestorage.cf"); | 435 | QFileInfo f(fs->path()+"/.opiestorage.cf"); |
436 | if (!f.exists()) { | 436 | if (!f.exists()) { |
437 | if (defPath.exists()) { | 437 | if (defPath.exists()) { |
438 | docPaths+=defPath.path(); | 438 | docPaths+=defPath.path(); |
439 | } | 439 | } |
440 | return; | 440 | return; |
441 | } | 441 | } |
442 | Config conf(f.filePath(), Config::File ); | 442 | Config conf(f.filePath(), Config::File ); |
443 | conf.setGroup("subdirs"); | 443 | conf.setGroup("subdirs"); |
444 | bool read_all = conf.readBoolEntry("wholemedia",true); | ||
445 | if (read_all) { | ||
446 | docPaths+=fs->path(); | ||
447 | return; | ||
448 | } | ||
444 | QStringList subDirs = conf.readListEntry("subdirs",':'); | 449 | QStringList subDirs = conf.readListEntry("subdirs",':'); |
445 | if (subDirs.isEmpty()) { | 450 | if (subDirs.isEmpty()) { |
446 | if (defPath.exists()) { | 451 | if (defPath.exists()) { |
447 | docPaths+=defPath.path(); | 452 | docPaths+=defPath.path(); |
448 | } | 453 | } |
449 | return; | 454 | return; |
450 | } | 455 | } |
451 | for (unsigned c = 0; c < subDirs.count();++c) { | 456 | for (unsigned c = 0; c < subDirs.count();++c) { |
452 | QDir docDir(QString(fs->path()+"/"+subDirs[c])); | 457 | QDir docDir(QString(fs->path()+"/"+subDirs[c])); |
453 | if (docDir.exists()) { | 458 | if (docDir.exists()) { |
454 | docPaths+=docDir.path(); | 459 | docPaths+=docDir.path(); |
455 | } | 460 | } |