| -rw-r--r-- | core/launcher/launcher.cpp | 4 | ||||
| -rw-r--r-- | core/launcher/launcherview.cpp | 27 | ||||
| -rw-r--r-- | core/launcher/launcherview.h | 1 |
3 files changed, 13 insertions, 19 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 010a2e9..5ec1cf8 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp @@ -605,3 +605,5 @@ void Launcher::properties( AppLnk *appLnk ) - QPEApplication::execDialog( &prop ); + if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) { + tabs->docView()->updateTools(); + } } diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp index 72313e3..ff26133 100644 --- a/core/launcher/launcherview.cpp +++ b/core/launcher/launcherview.cpp @@ -278,2 +278,3 @@ LauncherIconView::~LauncherIconView() { + odebug << "LauncherIconView::~LauncherIconView()" << oendl; #if 0 // debuggery @@ -431,10 +432,3 @@ void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,in if (s!=width) return; - LauncherItem*item = 0; - QMap<QString,LauncherItem*>::Iterator it; - if ( ( it = m_itemCache.find(aFile))!=m_itemCache.end()) { - item = it.data(); - m_itemCache.remove(it); - } else { - item = findDocItem(aFile); - } + LauncherItem*item = findDocItem(aFile); if (!item||!item->isEyeImage()) return; @@ -467,3 +461,2 @@ void LauncherIconView::requestEyePix(const LauncherItem*item) int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize(); - m_itemCache[item->appLnk()->file()]=(LauncherItem*)item; m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s); @@ -478,3 +471,2 @@ void LauncherIconView::stopEyeTimer() } - m_itemCache.clear(); m_eyeTimer.stop(); @@ -706,3 +698,2 @@ void LauncherView::setToolsEnabled(bool y) tools = new QHBox(this); - // Type filter @@ -712,3 +703,2 @@ void LauncherView::setToolsEnabled(bool y) typemb->setSizePolicy(p); - // Category filter @@ -716,3 +706,2 @@ void LauncherView::setToolsEnabled(bool y) tools->show(); - } else { @@ -728,4 +717,5 @@ void LauncherView::updateTools() this, SLOT(showType(int)) ); - if ( catmb ) disconnect( catmb, SIGNAL(signalSelected(int)), - this, SLOT(showCategory(int)) ); + if ( catmb ) { + disconnect( catmb, SIGNAL(signalSelected(int)),this,SLOT(showCategory(int))); + } @@ -763,4 +753,5 @@ void LauncherView::updateTools() } - if ( prev.isNull() ) + if ( prev.isNull() ) { typemb->setCurrentItem(typemb->count()-1); + } @@ -810,2 +801,3 @@ void LauncherView::setViewMode( ViewMode m ) { + odebug << "LauncherView::setViewMode( ViewMode m )" << oendl; if ( vmode != m ) { @@ -1048,2 +1040,3 @@ void LauncherView::removeAllItems() { + odebug << "LauncherView::removeAllItems()" << oendl; icons->clear(); @@ -1170,3 +1163,3 @@ void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height m_inThumbNail.append(rItem); - QTimer::singleShot(0, this, SLOT(sendRequest())); + QTimer::singleShot(2, this, SLOT(sendRequest())); } diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h index 94c367c..6d94539 100644 --- a/core/launcher/launcherview.h +++ b/core/launcher/launcherview.h @@ -242,3 +242,2 @@ private: QTimer m_eyeTimer; - QMap<QString,LauncherItem*> m_itemCache; }; |