- flush icon cache if reloading all documents

- send QCop message when the doctab is enabled/disabled so the
  disabled widget appears or the doc-list will reread

6 files changed, 37 insertions, 6 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
@@ -278,9 +278,17 @@ void DocumentList::reloadDocLnks()
     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();
diff --git a/core/launcher/documentlist.h b/core/launcher/documentlist.h
index 232bb6a..8b69e95 100644
--- a/core/launcher/documentlist.h
+++ b/core/launcher/documentlist.h
@@ -42,6 +42,7 @@ public:
 
     void reloadAppLnks();
     void reloadDocLnks();
+    void reforceDocuments();
     void DiffAppLnks();
 
 // Orig DocList stuff
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index ccc2114..970b8cb 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -441,12 +441,33 @@ void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray &
         if ( isVisibleWindow( static_cast<QWidget*>(parent())->winId() ) ) {
             if (categoryBar)
                 categoryBar->nextTab();
-        }else
+        }else {
             static_cast<QWidget*>(parent())->raise();
     }
+    } else if (msg=="doctabEnabled(int)") {
+        int id; stream >> id;
+        odebug << "Doctab enabled " << id << oendl;
+        reCheckDoctab(id);
+    }
 }
 
-
+void LauncherTabWidget::reCheckDoctab(int how)
+{
+    if ((bool)how == docTabEnabled) {
+        /* nothing to do */
+        return;
+    }
+    if (docLoadingWidget) {
+        stack->removeWidget(docLoadingWidget);
+        delete docLoadingWidget;
+        docLoadingWidget = 0;
+    }
+    createDocLoadingWidget();
+    {
+        QCopEnvelope( "QPE/System", "reforceDocuments()" );
+        odebug << "Sending doc rescan" << oendl;
+    }
+}
 
 //---------------------------------------------------------------------------
 
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index db6ac54..b741064 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -81,6 +81,7 @@ private slots:
 protected:
     void paletteChange( const QPalette &p );
     void styleChange( QStyle & );
+    void reCheckDoctab(int how);
 
 private:
     Launcher *launcher;
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index c9efacb..2783423 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -332,9 +332,6 @@ void LauncherIconView::setSortMethod( SortMethod m )
 
 void LauncherIconView::setCategoryFilter( int catfilter, bool resort )
 {
-        Categories cat;
-        cat.load( categoryFileName() );
-        QString str;
         if ( catfilter == -2 )
             cf = 0;
         else
@@ -1083,6 +1080,7 @@ void LauncherView::itemPressed( int btn, QIconViewItem *item )
 void LauncherView::removeAllItems()
 {
     odebug << "LauncherView::removeAllItems()" << oendl;
+    if (LauncherIconView::sm_EyeCache) LauncherIconView::sm_EyeCache->clear();
     icons->clear();
 }
 
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 42186d3..15cd686 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -342,6 +342,8 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
         stream >> link;
         odebug << "desktop.cpp systemMsg -> linkchanged( " << link << " )" << oendl;
         docList->linkChanged(link);
+    } else if (msg =="reforceDocuments()") {
+        docList->reforceDocuments();
     } else if ( msg == "serviceChanged(QString)" ) {
         MimeType::updateApplications();
     } else if ( msg == "mkdir(QString)" ) {