summaryrefslogtreecommitdiff
authorbrad <brad>2004-04-12 07:01:55 (UTC)
committer brad <brad>2004-04-12 07:01:55 (UTC)
commit2c087dc52d50eb9b13670254f70347d7b1147b20 (patch) (side-by-side diff)
tree79814aa2618a6a512a0e669ba2b6829ca13b7bdd
parent66f497a5c7990d7e54cc1ae26995231ade55b86c (diff)
downloadopie-2c087dc52d50eb9b13670254f70347d7b1147b20.zip
opie-2c087dc52d50eb9b13670254f70347d7b1147b20.tar.gz
opie-2c087dc52d50eb9b13670254f70347d7b1147b20.tar.bz2
Changed launcher to only add/remove icons/tabs that have changed when removable
media is mounted/unmounted. A card insert on my machine used to take 7500ms. It now takes 548ms. Same with card removal. Old code has been left as is an can be re-enabled with a simple comment.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/documentlist.cpp90
-rw-r--r--core/launcher/documentlist.h1
2 files changed, 90 insertions, 1 deletions
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 92b8c25..59dd721 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -326,17 +326,105 @@ void DocumentList::linkChanged( QString arg )
void DocumentList::restoreDone()
{
reloadAppLnks();
reloadDocLnks();
}
+void DocumentList::DiffAppLnks()
+{
+ static AppLnkSet *appLnkSet2;
+
+ 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() );
+ }
+
+ 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) {
+ odebug << "removing type " << (*ittypes) << "" << oendl;
+ d->serverGui->typeRemoved(*ittypes);
+ }
+ prevTypeList = types;
+ }
+
+
+ QListIterator<AppLnk> it1( appLnkSet->children() );
+ QListIterator<AppLnk> it2( appLnkSet2->children() );
+
+ AppLnk *i;
+ AppLnk *j;
+ 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) {
+ qDebug("Item %s needs to be added",j->name().ascii() );
+ 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) {
+ qDebug("Item %s needs to be removed",i->name().ascii() );
+ d->serverGui->applicationRemoved( i->type(), *i );
+ }
+
+ ++it1;
+ }
+
+ delete appLnkSet;
+ appLnkSet = appLnkSet2;
+
+}
void DocumentList::storageChanged()
{
+ QTime t;
// ### can implement better
- reloadAppLnks();
+
+ t.start();
+ DiffAppLnks();
+// reloadAppLnks();
+ qDebug("Reload App links took %i ms",t.elapsed() );
reloadDocLnks();
+// odebug << "Reload links took " << t.elapsed() << " ms " << oendl;
+ qDebug("Reload All links took %i ms",t.elapsed() );
// ### Optimization opportunity
// Could be a bit more intelligent and somehow work out which
// mtab entry has changed and then only scan that and add and remove
// links appropriately.
// rescan();
}
diff --git a/core/launcher/documentlist.h b/core/launcher/documentlist.h
index bd5c031..232bb6a 100644
--- a/core/launcher/documentlist.h
+++ b/core/launcher/documentlist.h
@@ -39,12 +39,13 @@ public:
void restoreDone();
void storageChanged();
void sendAllDocLinks();
void reloadAppLnks();
void reloadDocLnks();
+ void DiffAppLnks();
// Orig DocList stuff
void start();
void pause();
void resume();
void rescan();