summaryrefslogtreecommitdiff
path: root/core/launcher/documentlist.cpp
Side-by-side diff
Diffstat (limited to 'core/launcher/documentlist.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/documentlist.cpp610
1 files changed, 309 insertions, 301 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index d8e7a83..9781a32 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -100,7 +100,7 @@ public:
* scandocs will be read from Config
*/
DocumentList::DocumentList( ServerInterface *serverGui, bool /*scanDocs*/,
- QObject *parent, const char *name )
+ QObject *parent, const char *name )
: QObject( parent, name )
{
appLnkSet = new AppLnkSet( MimeType::appsFolderName() );
@@ -131,7 +131,7 @@ DocumentList::~DocumentList()
void DocumentList::add( const DocLnk& doc )
{
if ( d->serverGui && QFile::exists( doc.file() ) )
- d->serverGui->documentAdded( doc );
+ d->serverGui->documentAdded( doc );
}
@@ -152,7 +152,7 @@ void DocumentList::pause()
void DocumentList::resume()
{
if ( d->tid == 0 ) {
- d->tid = startTimer( 20 );
+ d->tid = startTimer( 20 );
//odebug << "resumed " << d->tid << "" << oendl;
}
}
@@ -172,7 +172,7 @@ void DocumentList::resendWorker()
{
const QList<DocLnk> &list = d->dls.children();
for ( QListIterator<DocLnk> it( list ); it.current(); ++it )
- add( *(*it) );
+ add( *(*it) );
resume();
}
*/
@@ -189,22 +189,22 @@ void DocumentList::rescan()
void DocumentList::timerEvent( QTimerEvent *te )
{
if ( te->timerId() == d->tid ) {
- // Do 3 at a time
+ // Do 3 at a time
if ( d->serverGui )
d->serverGui->aboutToAddBegin();
- for (int i = 0; i < 3; i++ ) {
- const DocLnk *lnk = d->iterate();
- if ( lnk ) {
- add( *lnk );
- } else {
- // stop when done
- pause();
- if ( d->serverGui )
- d->serverGui->documentScanningProgress( 100 );
- if ( d->needToSendAllDocLinks )
- sendAllDocLinks();
- break;
- }
+ for (int i = 0; i < 3; i++ ) {
+ const DocLnk *lnk = d->iterate();
+ if ( lnk ) {
+ add( *lnk );
+ } else {
+ // stop when done
+ pause();
+ if ( d->serverGui )
+ d->serverGui->documentScanningProgress( 100 );
+ if ( d->needToSendAllDocLinks )
+ sendAllDocLinks();
+ break;
+ }
}
if ( d->serverGui )
d->serverGui->aboutToAddEnd();
@@ -215,114 +215,122 @@ void DocumentList::timerEvent( QTimerEvent *te )
void DocumentList::reloadAppLnks()
{
if ( d->sendAppLnks && d->serverGui ) {
- d->serverGui->applicationScanningProgress( 0 );
- d->serverGui->allApplicationsRemoved();
+ d->serverGui->applicationScanningProgress( 0 );
+ d->serverGui->allApplicationsRemoved();
}
delete appLnkSet;
appLnkSet = new AppLnkSet( MimeType::appsFolderName() );
if ( d->sendAppLnks && d->serverGui ) {
- static QStringList prevTypeList;
- QStringList types = appLnkSet->types();
- for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
- if ( !(*ittypes).isEmpty() ) {
- if ( !prevTypeList.contains(*ittypes) ) {
- QString name = appLnkSet->typeName(*ittypes);
- QPixmap pm = appLnkSet->typePixmap(*ittypes);
- QPixmap bgPm = appLnkSet->typeBigPixmap(*ittypes);
-
- if (pm.isNull()) {
- QImage img( Resource::loadImage( "UnknownDocument" ) );
- pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
- bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
- }
+ static QStringList prevTypeList;
+ QStringList types = appLnkSet->types();
+ for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
+ if ( !(*ittypes).isEmpty() ) {
+ if ( !prevTypeList.contains(*ittypes) ) {
+ QString name = appLnkSet->typeName(*ittypes);
+ QPixmap pm = appLnkSet->typePixmap(*ittypes);
+ QPixmap bgPm = appLnkSet->typeBigPixmap(*ittypes);
+
+ if (pm.isNull()) {
+ QImage img( Resource::loadImage( "UnknownDocument" ) );
+ pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+ bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
+ }
//odebug << "adding type " << (*ittypes) << "" << oendl;
- // ### our current launcher expects docs tab to be last
- d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
- }
- prevTypeList.remove(*ittypes);
- }
- }
- for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
+ // ### our current launcher expects docs tab to be last
+ d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
+ }
+ prevTypeList.remove(*ittypes);
+ }
+ }
+ for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
//odebug << "removing type " << (*ittypes) << "" << oendl;
- d->serverGui->typeRemoved(*ittypes);
- }
- prevTypeList = types;
+ d->serverGui->typeRemoved(*ittypes);
+ }
+ prevTypeList = types;
}
QListIterator<AppLnk> itapp( appLnkSet->children() );
AppLnk* l;
while ( (l=itapp.current()) ) {
- ++itapp;
- if ( d->sendAppLnks && d->serverGui )
- d->serverGui->applicationAdded( l->type(), *l );
+ ++itapp;
+ if ( d->sendAppLnks && d->serverGui )
+ d->serverGui->applicationAdded( l->type(), *l );
}
if ( d->sendAppLnks && d->serverGui )
- d->serverGui->applicationScanningProgress( 100 );
+ d->serverGui->applicationScanningProgress( 100 );
}
void DocumentList::reloadDocLnks()
{
if ( !d->scanDocs )
- return;
+ return;
if ( d->sendDocLnks && d->serverGui ) {
- d->serverGui->documentScanningProgress( 0 );
- d->serverGui->allDocumentsRemoved();
+ d->serverGui->documentScanningProgress( 0 );
+ d->serverGui->allDocumentsRemoved();
}
rescan();
}
+void DocumentList::reforceDocuments()
+{
+ Config cfg( "Launcher" );
+ cfg.setGroup( "DocTab" );
+ d->scanDocs = cfg.readBoolEntry( "Enable", true );
+ reloadDocLnks();
+}
+
void DocumentList::linkChanged( QString arg )
{
- //odebug << "linkchanged( " << arg << " )" << oendl;
+ odebug << "linkchanged( " << arg << " )" << oendl;
if ( arg.isNull() || OGlobal::isAppLnkFileName( arg ) ) {
- reloadAppLnks();
+ reloadAppLnks();
} else {
- const QList<DocLnk> &list = d->dls.children();
- QListIterator<DocLnk> it( list );
- while ( it.current() ) {
- DocLnk *doc = it.current();
- ++it;
- if ( ( doc->linkFileKnown() && doc->linkFile() == arg )
- || ( doc->fileKnown() && doc->file() == arg ) ) {
+ const QList<DocLnk> &list = d->dls.children();
+ QListIterator<DocLnk> it( list );
+ while ( it.current() ) {
+ DocLnk *doc = it.current();
+ ++it;
+ if ( ( doc->linkFileKnown() && doc->linkFile() == arg )
+ || ( doc->fileKnown() && doc->file() == arg ) ) {
//odebug << "found old link" << oendl;
- DocLnk* dl = new DocLnk( arg );
- // add new one if it exists and matches the mimetype
- if ( d->store( dl ) ) {
- // Existing link has been changed, send old link ref and a ref
- // to the new link
+ DocLnk* dl = new DocLnk( arg );
+ // add new one if it exists and matches the mimetype
+ if ( d->store( dl ) ) {
+ // Existing link has been changed, send old link ref and a ref
+ // to the new link
//odebug << "change case" << oendl;
- if ( d->serverGui )
- d->serverGui->documentChanged( *doc, *dl );
+ if ( d->serverGui )
+ d->serverGui->documentChanged( *doc, *dl );
- } else {
- // Link has been removed or doesn't match the mimetypes any more
- // so we aren't interested in it, so take it away from the list
+ } else {
+ // Link has been removed or doesn't match the mimetypes any more
+ // so we aren't interested in it, so take it away from the list
//odebug << "removal case" << oendl;
- if ( d->serverGui )
- d->serverGui->documentRemoved( *doc );
-
- }
- d->dls.remove( doc ); // remove old link from docLnkSet
- delete doc;
- return;
- }
- }
- // Didn't find existing link, must be new
- DocLnk* dl = new DocLnk( arg );
- if ( d->store( dl ) ) {
- // Add if it's a link we are interested in
+ if ( d->serverGui )
+ d->serverGui->documentRemoved( *doc );
+
+ }
+ d->dls.remove( doc ); // remove old link from docLnkSet
+ delete doc;
+ return;
+ }
+ }
+ // Didn't find existing link, must be new
+ DocLnk* dl = new DocLnk( arg );
+ if ( d->store( dl ) ) {
+ // Add if it's a link we are interested in
//odebug << "add case" << oendl;
- add( *dl );
- }
+ add( *dl );
+ }
}
}
@@ -340,34 +348,34 @@ void DocumentList::DiffAppLnks()
appLnkSet2 = new AppLnkSet( MimeType::appsFolderName() );
if ( d->sendAppLnks && d->serverGui ) {
- static QStringList prevTypeList = appLnkSet->types();
- QStringList types = appLnkSet2->types();
- for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
- if ( !(*ittypes).isEmpty() ) {
- if ( !prevTypeList.contains(*ittypes) ) {
- QString name = appLnkSet2->typeName(*ittypes);
- QPixmap pm = appLnkSet2->typePixmap(*ittypes);
- QPixmap bgPm = appLnkSet2->typeBigPixmap(*ittypes);
-
- if (pm.isNull()) {
- QImage img( Resource::loadImage( "UnknownDocument" ) );
- pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
- bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
- }
+ static QStringList prevTypeList = appLnkSet->types();
+ QStringList types = appLnkSet2->types();
+ for ( QStringList::Iterator ittypes=types.begin(); ittypes!=types.end(); ++ittypes) {
+ if ( !(*ittypes).isEmpty() ) {
+ if ( !prevTypeList.contains(*ittypes) ) {
+ QString name = appLnkSet2->typeName(*ittypes);
+ QPixmap pm = appLnkSet2->typePixmap(*ittypes);
+ QPixmap bgPm = appLnkSet2->typeBigPixmap(*ittypes);
+
+ if (pm.isNull()) {
+ QImage img( Resource::loadImage( "UnknownDocument" ) );
+ pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+ bgPm = img.smoothScale( AppLnk::bigIconSize(), AppLnk::bigIconSize() );
+ }
odebug << "adding type " << (*ittypes) << "" << oendl;
- // ### our current launcher expects docs tab to be last
- d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
- }
- prevTypeList.remove(*ittypes);
- }
- }
- for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
+ // ### our current launcher expects docs tab to be last
+ d->serverGui->typeAdded( *ittypes, name.isNull() ? (*ittypes) : name, pm, bgPm );
+ }
+ prevTypeList.remove(*ittypes);
+ }
+ }
+ for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
odebug << "removing type " << (*ittypes) << "" << oendl;
- d->serverGui->typeRemoved(*ittypes);
- }
- prevTypeList = types;
+ d->serverGui->typeRemoved(*ittypes);
+ }
+ prevTypeList = types;
}
@@ -379,35 +387,35 @@ void DocumentList::DiffAppLnks()
bool found;
while ( (j=it2.current()) ) {
- it1 = appLnkSet->children();
- found = false;
- while ( (i=it1.current()) ){
- if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
- found = true;
- ++it1;
- }
- if (!found) {
- odebug << "Item " << j->name().ascii() << " needs to be added" << oendl;
- d->serverGui->applicationAdded( j->type(), *j );
- }
- ++it2;
+ it1 = appLnkSet->children();
+ found = false;
+ while ( (i=it1.current()) ){
+ if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
+ found = true;
+ ++it1;
+ }
+ if (!found) {
+ odebug << "Item " << j->name().ascii() << " needs to be added" << oendl;
+ d->serverGui->applicationAdded( j->type(), *j );
+ }
+ ++it2;
}
it1 = appLnkSet->children();
while ( (i=it1.current()) ) {
- it2 = appLnkSet2->children();
- found = false;
- while ( (j=it2.current()) ){
- if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
- found = true;
- ++it2;
- }
- if (!found) {
- odebug << "Item " << i->name().ascii() << " needs to be removed" << oendl;
- d->serverGui->applicationRemoved( i->type(), *i );
- }
+ it2 = appLnkSet2->children();
+ found = false;
+ while ( (j=it2.current()) ){
+ if (strcmp(i->name().ascii(),j->name().ascii()) == 0)
+ found = true;
+ ++it2;
+ }
+ if (!found) {
+ odebug << "Item " << i->name().ascii() << " needs to be removed" << oendl;
+ d->serverGui->applicationRemoved( i->type(), *i );
+ }
- ++it1;
+ ++it1;
}
delete appLnkSet;
@@ -436,51 +444,51 @@ void DocumentList::storageChanged()
void DocumentList::sendAllDocLinks()
{
if ( d->tid != 0 ) {
- // We are in the middle of scanning, set a flag so
- // we do this when we finish our scanning
- d->needToSendAllDocLinks = true;
- return;
+ // We are in the middle of scanning, set a flag so
+ // we do this when we finish our scanning
+ d->needToSendAllDocLinks = true;
+ return;
}
QString contents;
Categories cats;
for ( QListIterator<DocLnk> it( d->dls.children() ); it.current(); ++it ) {
- DocLnk *doc = it.current();
- QFileInfo fi( doc->file() );
- if ( !fi.exists() )
- continue;
-
- bool fake = !doc->linkFileKnown();
- if ( !fake ) {
- QFile f( doc->linkFile() );
- if ( f.open( IO_ReadOnly ) ) {
- QTextStream ts( &f );
- ts.setEncoding( QTextStream::UnicodeUTF8 );
- QString docLnk = ts.read();
- // Strip out the (stale) LinkFile entry
- int start = docLnk.find( "\nLinkFile = " ) + 1;
- if ( start > 0 ) {
- int end = docLnk.find( "\n", start + 1 ) + 1;
- contents += docLnk.left(start);
- contents += docLnk.mid(end);
- } else {
- contents += docLnk;
- }
- contents += "LinkFile = " + doc->linkFile() + "\n";
-
- f.close();
- } else
- fake = TRUE;
- }
- if (fake) {
- contents += "[Desktop Entry]\n"; // No tr
- contents += "Categories = " + // No tr
- cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr
- contents += "Name = "+doc->name()+"\n"; // No tr
- contents += "Type = "+doc->type()+"\n"; // No tr
- }
- contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)
- contents += QString("Size = %1\n").arg( fi.size() ); // No tr
+ DocLnk *doc = it.current();
+ QFileInfo fi( doc->file() );
+ if ( !fi.exists() )
+ continue;
+
+ bool fake = !doc->linkFileKnown();
+ if ( !fake ) {
+ QFile f( doc->linkFile() );
+ if ( f.open( IO_ReadOnly ) ) {
+ QTextStream ts( &f );
+ ts.setEncoding( QTextStream::UnicodeUTF8 );
+ QString docLnk = ts.read();
+ // Strip out the (stale) LinkFile entry
+ int start = docLnk.find( "\nLinkFile = " ) + 1;
+ if ( start > 0 ) {
+ int end = docLnk.find( "\n", start + 1 ) + 1;
+ contents += docLnk.left(start);
+ contents += docLnk.mid(end);
+ } else {
+ contents += docLnk;
+ }
+ contents += "LinkFile = " + doc->linkFile() + "\n";
+
+ f.close();
+ } else
+ fake = TRUE;
+ }
+ if (fake) {
+ contents += "[Desktop Entry]\n"; // No tr
+ contents += "Categories = " + // No tr
+ cats.labels("Document View",doc->categories()).join(";") + "\n"; // No tr
+ contents += "Name = "+doc->name()+"\n"; // No tr
+ contents += "Type = "+doc->type()+"\n"; // No tr
+ }
+ contents += "File = "+doc->file()+"\n"; // No tr // (resolves path)
+ contents += QString("Size = %1\n").arg( fi.size() ); // No tr
}
//odebug << "sending length " << contents.length() << "" << oendl;
@@ -521,16 +529,16 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui )
storage = new StorageInfo( this );
serverGui = gui;
if ( serverGui ) {
- sendAppLnks = serverGui->requiresApplications();
- sendDocLnks = serverGui->requiresDocuments();
+ sendAppLnks = serverGui->requiresApplications();
+ sendDocLnks = serverGui->requiresDocuments();
} else {
- sendAppLnks = false;
- sendDocLnks = false;
+ sendAppLnks = false;
+ sendDocLnks = false;
}
for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) {
- listDirs[i] = 0;
- lists[i] = 0;
- listPositions[i] = 0;
+ listDirs[i] = 0;
+ lists[i] = 0;
+ listPositions[i] = 0;
}
initialize();
tid = 0;
@@ -581,7 +589,7 @@ void DocumentListPrivate::initialize()
QDir docDir( QPEApplication::documentDir() );
if ( docDir.exists() )
- docPaths += QPEApplication::documentDir();
+ docPaths += QPEApplication::documentDir();
int i = 1;
const QList<FileSystem> &fs = storage->fileSystems();
QListIterator<FileSystem> it( fs );
@@ -593,12 +601,12 @@ void DocumentListPrivate::initialize()
}
for ( int i = 0; i < MAX_SEARCH_DEPTH; ++i ) {
- if ( listDirs[i] ) {
- delete listDirs[i];
- listDirs[i] = 0;
- }
- lists[i] = 0;
- listPositions[i] = 0;
+ if ( listDirs[i] ) {
+ delete listDirs[i];
+ listDirs[i] = 0;
+ }
+ lists[i] = 0;
+ listPositions[i] = 0;
}
docPathsSearched = 0;
@@ -611,8 +619,8 @@ void DocumentListPrivate::initialize()
DocumentListPrivate::~DocumentListPrivate()
{
for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ )
- if ( listDirs[i] )
- delete listDirs[i];
+ if ( listDirs[i] )
+ delete listDirs[i];
delete dit;
}
@@ -624,90 +632,90 @@ void DocumentListPrivate::estimatedPercentScanned()
int topCount = docPaths.count();
if ( topCount > 1 ) {
- levelWeight = levelWeight / topCount;
- overallProgress += (docPathsSearched - 1) * levelWeight;
+ levelWeight = levelWeight / topCount;
+ overallProgress += (docPathsSearched - 1) * levelWeight;
}
for ( int d = 0; d <= searchDepth; d++ ) {
- if ( listDirs[d] ) {
- int items = lists[d]->count();
- if ( items > 1 ) {
- levelWeight = levelWeight / items;
- // Take in to account "." and ".."
- overallProgress += (listPositions[d] - 3) * levelWeight;
- }
- } else {
- break;
- }
+ if ( listDirs[d] ) {
+ int items = lists[d]->count();
+ if ( items > 1 ) {
+ levelWeight = levelWeight / items;
+ // Take in to account "." and ".."
+ overallProgress += (listPositions[d] - 3) * levelWeight;
+ }
+ } else {
+ break;
+ }
}
// odebug << "overallProgress: " << overallProgress << "" << oendl;
if ( serverGui )
- serverGui->documentScanningProgress( (int)overallProgress );
+ serverGui->documentScanningProgress( (int)overallProgress );
}
const QString DocumentListPrivate::nextFile()
{
while ( TRUE ) {
- while ( searchDepth < 0 ) {
- // go to next base path
- if ( docPathsSearched >= docPaths.count() ) {
- // end of base paths
- return QString::null;
- } else {
- QDir dir( docPaths[docPathsSearched] );
+ while ( searchDepth < 0 ) {
+ // go to next base path
+ if ( docPathsSearched >= docPaths.count() ) {
+ // end of base paths
+ return QString::null;
+ } else {
+ QDir dir( docPaths[docPathsSearched] );
// odebug << "now using base path: " << docPaths[docPathsSearched] << "" << oendl;
- docPathsSearched++;
- if ( !dir.exists( ".Qtopia-ignore" ) ) {
- listDirs[0] = new QDir( dir );
- lists[0] = listDirs[0]->entryInfoList();
- listPositions[0] = 0;
- searchDepth = 0;
- }
- }
- }
-
- const QFileInfoList *fil = lists[searchDepth];
+ docPathsSearched++;
+ if ( !dir.exists( ".Qtopia-ignore" ) ) {
+ listDirs[0] = new QDir( dir );
+ lists[0] = listDirs[0]->entryInfoList();
+ listPositions[0] = 0;
+ searchDepth = 0;
+ }
+ }
+ }
+
+ const QFileInfoList *fil = lists[searchDepth];
if (!fil) {
return QString::null;
}
- QFileInfoList *fl = (QFileInfoList *)fil;
- unsigned int pos = listPositions[searchDepth];
-
- if ( pos >= fl->count() ) {
- // go up a depth
- delete listDirs[searchDepth];
- listDirs[searchDepth] = 0;
- lists[searchDepth] = 0;
- listPositions[searchDepth] = 0;
- searchDepth--;
- } else {
- const QFileInfo *fi = fl->at(pos);
- listPositions[searchDepth]++;
- QString bn = fi->fileName();
- if ( bn[0] != '.' ) {
- if ( fi->isDir() ) {
- if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" ) {
- // go down a depth
- QDir dir( fi->filePath() );
+ QFileInfoList *fl = (QFileInfoList *)fil;
+ unsigned int pos = listPositions[searchDepth];
+
+ if ( pos >= fl->count() ) {
+ // go up a depth
+ delete listDirs[searchDepth];
+ listDirs[searchDepth] = 0;
+ lists[searchDepth] = 0;
+ listPositions[searchDepth] = 0;
+ searchDepth--;
+ } else {
+ const QFileInfo *fi = fl->at(pos);
+ listPositions[searchDepth]++;
+ QString bn = fi->fileName();
+ if ( bn[0] != '.' ) {
+ if ( fi->isDir() ) {
+ if ( bn != "CVS" && bn != "Qtopia" && bn != "QtPalmtop" ) {
+ // go down a depth
+ QDir dir( fi->filePath() );
// odebug << "now going in to path: " << bn << "" << oendl;
- if ( !dir.exists( ".Qtopia-ignore" ) ) {
- if ( searchDepth < MAX_SEARCH_DEPTH - 1) {
- searchDepth++;
- listDirs[searchDepth] = new QDir( dir );
- lists[searchDepth] = listDirs[searchDepth]->entryInfoList();
- listPositions[searchDepth] = 0;
- }
- }
- }
- } else {
- estimatedPercentScanned();
- return fl->at(pos)->filePath();
- }
- }
- }
+ if ( !dir.exists( ".Qtopia-ignore" ) ) {
+ if ( searchDepth < MAX_SEARCH_DEPTH - 1) {
+ searchDepth++;
+ listDirs[searchDepth] = new QDir( dir );
+ lists[searchDepth] = listDirs[searchDepth]->entryInfoList();
+ listPositions[searchDepth] = 0;
+ }
+ }
+ }
+ } else {
+ estimatedPercentScanned();
+ return fl->at(pos)->filePath();
+ }
+ }
+ }
}
return QString::null;
@@ -718,8 +726,8 @@ bool DocumentListPrivate::store( DocLnk* dl )
{
// if ( dl->fileKnown() && !dl->file().isEmpty() ) {
if ( dl && dl->fileKnown() ) {
- dls.add( dl ); // store
- return TRUE;
+ dls.add( dl ); // store
+ return TRUE;
}
// don't store - delete
@@ -728,27 +736,27 @@ bool DocumentListPrivate::store( DocLnk* dl )
}
-#define MAGIC_NUMBER ((void*)2)
+#define MAGIC_NUMBER ((void*)2)
const DocLnk *DocumentListPrivate::iterate()
{
if ( state == Find ) {
//odebug << "state Find" << oendl;
- QString file = nextFile();
- while ( !file.isNull() ) {
- if ( file.right(8) == ".desktop" ) { // No tr
- DocLnk* dl = new DocLnk( file );
- if ( store(dl) )
- return dl;
- } else {
- reference.insert( file, MAGIC_NUMBER );
- }
- file = nextFile();
- }
- state = RemoveKnownFiles;
-
- if ( serverGui )
- serverGui->documentScanningProgress( 75 );
+ QString file = nextFile();
+ while ( !file.isNull() ) {
+ if ( file.right(8) == ".desktop" ) { // No tr
+ DocLnk* dl = new DocLnk( file );
+ if ( store(dl) )
+ return dl;
+ } else {
+ reference.insert( file, MAGIC_NUMBER );
+ }
+ file = nextFile();
+ }
+ state = RemoveKnownFiles;
+
+ if ( serverGui )
+ serverGui->documentScanningProgress( 75 );
}
static int iterationI;
@@ -756,40 +764,40 @@ const DocLnk *DocumentListPrivate::iterate()
if ( state == RemoveKnownFiles ) {
//odebug << "state RemoveKnownFiles" << oendl;
- const QList<DocLnk> &list = dls.children();
- for ( QListIterator<DocLnk> it( list ); it.current(); ++it ) {
- reference.remove( (*it)->file() );
- // ### does this need to be deleted?
- }
- dit = new QDictIterator<void>(reference);
- state = MakeUnknownFiles;
+ const QList<DocLnk> &list = dls.children();
+ for ( QListIterator<DocLnk> it( list ); it.current(); ++it ) {
+ reference.remove( (*it)->file() );
+ // ### does this need to be deleted?
+ }
+ dit = new QDictIterator<void>(reference);
+ state = MakeUnknownFiles;
- iterationI = 0;
- iterationCount = dit->count();
+ iterationI = 0;
+ iterationCount = dit->count();
}
if ( state == MakeUnknownFiles ) {
//odebug << "state MakeUnknownFiles" << oendl;
- for (void* c; (c=dit->current()); ++(*dit) ) {
- if ( c == MAGIC_NUMBER ) {
- DocLnk* dl = new DocLnk;
- QFileInfo fi( dit->currentKey() );
- dl->setFile( fi.filePath() );
- dl->setName( fi.baseName() );
- if ( store(dl) ) {
- ++*dit;
- iterationI++;
- if ( serverGui )
- serverGui->documentScanningProgress( 75 + (25*iterationI)/iterationCount );
- return dl;
- }
- }
- iterationI++;
- }
-
- delete dit;
- dit = 0;
- state = Done;
+ for (void* c; (c=dit->current()); ++(*dit) ) {
+ if ( c == MAGIC_NUMBER ) {
+ DocLnk* dl = new DocLnk;
+ QFileInfo fi( dit->currentKey() );
+ dl->setFile( fi.filePath() );
+ dl->setName( fi.baseName() );
+ if ( store(dl) ) {
+ ++*dit;
+ iterationI++;
+ if ( serverGui )
+ serverGui->documentScanningProgress( 75 + (25*iterationI)/iterationCount );
+ return dl;
+ }
+ }
+ iterationI++;
+ }
+
+ delete dit;
+ dit = 0;
+ state = Done;
}
//odebug << "state Done" << oendl;