author | alwin <alwin> | 2004-11-11 21:10:16 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-11 21:10:16 (UTC) |
commit | d2d25a3c1e60a34436cd93e5214a35b3edd05c6c (patch) (unidiff) | |
tree | 0c1bd62dd09e7a86292399f68c823b7eb6ae031e | |
parent | e85cf7184c3444e26c1858d0564fa5d3614dd7b5 (diff) | |
download | opie-d2d25a3c1e60a34436cd93e5214a35b3edd05c6c.zip opie-d2d25a3c1e60a34436cd93e5214a35b3edd05c6c.tar.gz opie-d2d25a3c1e60a34436cd93e5214a35b3edd05c6c.tar.bz2 |
- 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
-rw-r--r-- | core/launcher/documentlist.cpp | 10 | ||||
-rw-r--r-- | core/launcher/documentlist.h | 1 | ||||
-rw-r--r-- | core/launcher/launcher.cpp | 25 | ||||
-rw-r--r-- | core/launcher/launcher.h | 1 | ||||
-rw-r--r-- | core/launcher/launcherview.cpp | 4 | ||||
-rw-r--r-- | core/launcher/server.cpp | 2 |
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 | |||
@@ -280,5 +280,13 @@ void DocumentList::reloadDocLnks() | |||
280 | 280 | ||
281 | void DocumentList::reforceDocuments() | ||
282 | { | ||
283 | Config cfg( "Launcher" ); | ||
284 | cfg.setGroup( "DocTab" ); | ||
285 | d->scanDocs = cfg.readBoolEntry( "Enable", true ); | ||
286 | reloadDocLnks(); | ||
287 | } | ||
288 | |||
281 | void DocumentList::linkChanged( QString arg ) | 289 | void DocumentList::linkChanged( QString arg ) |
282 | { | 290 | { |
283 | //odebug << "linkchanged( " << arg << " )" << oendl; | 291 | odebug << "linkchanged( " << arg << " )" << oendl; |
284 | 292 | ||
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 | |||
@@ -44,2 +44,3 @@ public: | |||
44 | void reloadDocLnks(); | 44 | void reloadDocLnks(); |
45 | void reforceDocuments(); | ||
45 | void DiffAppLnks(); | 46 | void DiffAppLnks(); |
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 | |||
@@ -443,8 +443,29 @@ void LauncherTabWidget::launcherMessage( const QCString &msg, const QByteArray & | |||
443 | categoryBar->nextTab(); | 443 | categoryBar->nextTab(); |
444 | }else | 444 | }else { |
445 | static_cast<QWidget*>(parent())->raise(); | 445 | static_cast<QWidget*>(parent())->raise(); |
446 | } | 446 | } |
447 | } else if (msg=="doctabEnabled(int)") { | ||
448 | int id; stream >> id; | ||
449 | odebug << "Doctab enabled " << id << oendl; | ||
450 | reCheckDoctab(id); | ||
451 | } | ||
447 | } | 452 | } |
448 | 453 | ||
449 | 454 | void LauncherTabWidget::reCheckDoctab(int how) | |
455 | { | ||
456 | if ((bool)how == docTabEnabled) { | ||
457 | /* nothing to do */ | ||
458 | return; | ||
459 | } | ||
460 | if (docLoadingWidget) { | ||
461 | stack->removeWidget(docLoadingWidget); | ||
462 | delete docLoadingWidget; | ||
463 | docLoadingWidget = 0; | ||
464 | } | ||
465 | createDocLoadingWidget(); | ||
466 | { | ||
467 | QCopEnvelope( "QPE/System", "reforceDocuments()" ); | ||
468 | odebug << "Sending doc rescan" << oendl; | ||
469 | } | ||
470 | } | ||
450 | 471 | ||
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 | |||
@@ -83,2 +83,3 @@ protected: | |||
83 | void styleChange( QStyle & ); | 83 | void styleChange( QStyle & ); |
84 | void reCheckDoctab(int how); | ||
84 | 85 | ||
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 | |||
@@ -334,5 +334,2 @@ void LauncherIconView::setCategoryFilter( int catfilter, bool resort ) | |||
334 | { | 334 | { |
335 | Categories cat; | ||
336 | cat.load( categoryFileName() ); | ||
337 | QString str; | ||
338 | if ( catfilter == -2 ) | 335 | if ( catfilter == -2 ) |
@@ -1085,2 +1082,3 @@ void LauncherView::removeAllItems() | |||
1085 | odebug << "LauncherView::removeAllItems()" << oendl; | 1082 | odebug << "LauncherView::removeAllItems()" << oendl; |
1083 | if (LauncherIconView::sm_EyeCache) LauncherIconView::sm_EyeCache->clear(); | ||
1086 | icons->clear(); | 1084 | 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 | |||
@@ -344,2 +344,4 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) | |||
344 | docList->linkChanged(link); | 344 | docList->linkChanged(link); |
345 | } else if (msg =="reforceDocuments()") { | ||
346 | docList->reforceDocuments(); | ||
345 | } else if ( msg == "serviceChanged(QString)" ) { | 347 | } else if ( msg == "serviceChanged(QString)" ) { |