- removed code which let qpe crash when generating image icons

- when edit properties of an document item it will reread the table of categories

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
@@ -604,5 +604,7 @@ void Launcher::properties( AppLnk *appLnk )
     LnkProperties prop(appLnk,0 );
 
-    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
@@ -277,4 +277,5 @@ LauncherIconView::LauncherIconView( QWidget* parent, const char* name )
 LauncherIconView::~LauncherIconView()
 {
+    odebug << "LauncherIconView::~LauncherIconView()" << oendl;
 #if 0 // debuggery
     QListIterator<AppLnk> it(hidden);
@@ -430,12 +431,5 @@ void LauncherIconView::setEyePixmap(const QPixmap&aPixmap,const QString&aFile,in
     int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
     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;
     item->setEyePixmap(aPixmap);
@@ -466,5 +460,4 @@ void LauncherIconView::requestEyePix(const LauncherItem*item)
         checkCallback();
         int s = ( bigIcns ) ? AppLnk::bigIconSize() : AppLnk::smallIconSize();
-        m_itemCache[item->appLnk()->file()]=(LauncherItem*)item;
         m_EyeCallBack->requestThumb(item->appLnk()->file(),s,s);
     }
@@ -477,5 +470,4 @@ void LauncherIconView::stopEyeTimer()
         m_EyeCallBack=0;
     }
-    m_itemCache.clear();
     m_eyeTimer.stop();
 }
@@ -705,5 +697,4 @@ void LauncherView::setToolsEnabled(bool y)
     if ( y ) {
         tools = new QHBox(this);
-
         // Type filter
         typemb = new QComboBox(tools);
@@ -711,9 +702,7 @@ void LauncherView::setToolsEnabled(bool y)
         p.setHorData(QSizePolicy::Expanding);
         typemb->setSizePolicy(p);
-
         // Category filter
         updateTools();
         tools->show();
-
     } else {
         delete tools;
@@ -727,6 +716,7 @@ void LauncherView::updateTools()
     disconnect( typemb, SIGNAL(activated(int)),
             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)));
+    }
 
     // ### I want to remove this
@@ -762,6 +752,7 @@ void LauncherView::updateTools()
     }
     }
-    if ( prev.isNull() )
+    if ( prev.isNull() ) {
     typemb->setCurrentItem(typemb->count()-1);
+    }
 
     int pcat = catmb ? catmb->currentCategory() : -2;
@@ -809,4 +800,5 @@ void LauncherView::showCategory( int c )
 void LauncherView::setViewMode( ViewMode m )
 {
+    odebug << "LauncherView::setViewMode( ViewMode m )" << oendl;
     if ( vmode != m ) {
     bool bigIcons = m == Icon;
@@ -1047,4 +1039,5 @@ void LauncherView::itemPressed( int btn, QIconViewItem *item )
 void LauncherView::removeAllItems()
 {
+    odebug << "LauncherView::removeAllItems()" << oendl;
     icons->clear();
 }
@@ -1169,5 +1162,5 @@ void LauncherThumbReceiver::requestThumb(const QString&file,int width,int height
     rItem.height = 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
@@ -241,5 +241,4 @@ private:
     BusyIndicatorType busyType;
     QTimer m_eyeTimer;
-    QMap<QString,LauncherItem*> m_itemCache;
 };