summaryrefslogtreecommitdiff
authoralwin <alwin>2004-02-22 20:06:29 (UTC)
committer alwin <alwin>2004-02-22 20:06:29 (UTC)
commit63e45b90437e78ee11753c6782516dc38c30dd24 (patch) (unidiff)
treeb9a700b759ef5ee03c04f2df0e59e43c5a0bfa50
parent5738a3d33bdaeb69994f70fd5ec8aa49df98ceeb (diff)
downloadopie-63e45b90437e78ee11753c6782516dc38c30dd24.zip
opie-63e45b90437e78ee11753c6782516dc38c30dd24.tar.gz
opie-63e45b90437e78ee11753c6782516dc38c30dd24.tar.bz2
read more settings from opiestorage.cf
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/documentlist.cpp5
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
@@ -420,48 +420,53 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui )
420 sendAppLnks = false; 420 sendAppLnks = false;
421 sendDocLnks = false; 421 sendDocLnks = false;
422 } 422 }
423 for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) { 423 for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) {
424 listDirs[i] = 0; 424 listDirs[i] = 0;
425 lists[i] = 0; 425 lists[i] = 0;
426 listPositions[i] = 0; 426 listPositions[i] = 0;
427 } 427 }
428 initialize(); 428 initialize();
429 tid = 0; 429 tid = 0;
430} 430}
431 431
432void DocumentListPrivate::appendDocpath(FileSystem*fs) 432void 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 }
456 } 461 }
457} 462}
458 463
459void DocumentListPrivate::initialize() 464void DocumentListPrivate::initialize()
460{ 465{
461 // Reset 466 // Reset
462 dls.clear(); 467 dls.clear();
463 docPaths.clear(); 468 docPaths.clear();
464 reference.clear(); 469 reference.clear();
465 470
466 QDir docDir( QPEApplication::documentDir() ); 471 QDir docDir( QPEApplication::documentDir() );
467 if ( docDir.exists() ) 472 if ( docDir.exists() )