1 files changed, 40 insertions, 24 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 948477c..138e661 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -198,2 +198,3 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
     m_customWidget = 0;
+    m_setDocCalled = false;
 
@@ -214,6 +215,3 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
     m_mode = m_cfg->readNumEntry("ListViewMode", 1);
-    QString lastView = m_cfg->readEntry("LastView","");
-
     if (m_mode < 1 || m_mode>3) m_mode = 1;
-
     m_view->setItemTextPos( QIconView::Right );
@@ -229,20 +227,9 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
     calculateGrid();
-
     initKeys();
-
     loadViews();
-    int cc=0;
-    for (; cc<m_views->count();++cc) {
-        if (m_views->text(cc)==lastView) {
-            break;
-        }
-    }
-    if (cc<m_views->count()) {
-        m_views->setCurrentItem(cc);
-        slotViewChanged(cc);
-    } else {
-        slotViewChanged(m_views->currentItem());
-    }
-    connect( m_views, SIGNAL(activated(int)),
-             this, SLOT(slotViewChanged(int)) );
+}
+
+void PIconView::setDoccalled(bool how)
+{
+    m_setDocCalled = how;
 }
@@ -443,2 +430,26 @@ void PIconView::resetView() {
 
+void PIconView::polish()
+{
+    odebug << "===\n"
+            << "PIconView::polish()\n"
+            << "====" << oendl;
+    QVBox::polish();
+
+    QString lastView = m_cfg->readEntry("LastView","");
+    int cc=0;
+    for (; cc<m_views->count();++cc) {
+        if (m_views->text(cc)==lastView) {
+            break;
+        }
+    }
+    if (cc<m_views->count()) {
+        m_views->setCurrentItem(cc);
+        slotViewChanged(cc);
+    } else {
+        slotViewChanged(m_views->currentItem());
+    }
+    connect( m_views, SIGNAL(activated(int)),
+             this, SLOT(slotViewChanged(int)) );
+}
+
 /*
@@ -531,5 +542,13 @@ void PIconView::addFiles(  const QStringList& lst) {
     }
+    QString s = "";
+    int pos;
     for (it=lst.begin(); it!= lst.end(); ++it ) {
-         m_pix = PPixmapCache::self()->cachedImage( pre+(*it), m_iconsize, m_iconsize );
-        _iv = new IconViewItem( m_view, pre+(*it), (*it),m_iconsize );
+        s = (*it);
+        pos = s.find(char(0));
+        m_pix = PPixmapCache::self()->cachedImage( pre+(*it), m_iconsize, m_iconsize );
+        if (pos>-1) {
+            _iv = new IconViewItem( m_view, s.mid(pos+1), s.left(pos),m_iconsize );
+        } else {
+            _iv = new IconViewItem( m_view, pre+(*it), (*it),m_iconsize );
+        }
         if (m_mode==3) {
@@ -537,5 +556,2 @@ void PIconView::addFiles(  const QStringList& lst) {
             _iv->setPixmap(QPixmap());
-
-
-
         } else {