1 files changed, 21 insertions, 10 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 660c4fa..087db30 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -342,13 +342,13 @@ void PIconView::slotTrash() {
  * see what views are available
  */
 void PIconView::loadViews() {
     ViewMap::Iterator it;
     ViewMap* map = viewMap();
     for ( it = map->begin(); it != map->end(); ++it )
-        m_views->insertItem(  QObject::tr(it.key() ) );
+        m_views->insertItem(  it.key()  );
 }
 
 void PIconView::resetView() {
     slotViewChanged(m_views->currentItem());
 }
 
@@ -359,15 +359,21 @@ void PIconView::slotViewChanged( int i) {
     if (!m_views->count() ) {
         setCurrentView( 0l);
         return;
     }
 
     PDirView* cur = currentView();
-    delete cur;
+    if (cur) delete cur;
     QString str = m_views->text(i);
-    cur = (*(*viewMap())[str])(*m_cfg);
+    ViewMap* map = viewMap();
+    if (!map) {setCurrentView(0l); return;}
+    if (map->find(str) == map->end()) {
+        owarn << "Key not found" << oendl;
+        setCurrentView(0l); return;
+    }
+    cur = (*(*map)[str])(*m_cfg);
     setCurrentView( cur );
 
     /* connect to the signals of the lister */
     PDirLister* lis = cur->dirLister();
     connect(lis, SIGNAL(sig_thumbInfo(const QString&, const QString& )),
             this, SLOT( slotThumbInfo(const QString&, const QString&)));
@@ -403,15 +409,19 @@ void PIconView::addFolders(  const QStringList& lst) {
 }
 
 void PIconView::addFiles(  const QStringList& lst) {
     QStringList::ConstIterator it;
     IconViewItem * _iv;
     QPixmap*m_pix = 0;
+    QString pre = "";
+    if (!m_path.isEmpty()) {
+        pre = m_path+"/";
+    }
     for (it=lst.begin(); it!= lst.end(); ++it ) {
-         m_pix = PPixmapCache::self()->cachedImage( m_path+"/"+(*it), 64, 64 );
-        _iv = new IconViewItem( m_view, m_path+"/"+(*it), (*it) );
+         m_pix = PPixmapCache::self()->cachedImage( pre+(*it), 64, 64 );
+        _iv = new IconViewItem( m_view, pre+(*it), (*it) );
         if (m_mode==3) {
             _iv->setTextOnly(true);
             _iv->setPixmap(QPixmap());
         } else {
             if (m_pix) _iv->setPixmap(*m_pix);
         }
@@ -540,28 +550,31 @@ void PIconView::slotShowPrev()
 
 void PIconView::slotShowImage()
 {
     bool isDir = false;
     QString name = currentFileName(isDir);
     if (isDir) return;
-
     slotShowImage( name );
 }
 void PIconView::slotShowImage( const QString& name) {
-    emit sig_display( name );
+    PDirLister *lister = currentView()->dirLister();
+    QString r_name = lister->nameToFname(name);
+    emit sig_display( r_name );
 }
 void PIconView::slotImageInfo() {
     bool isDir = false;
     QString name = currentFileName(isDir);
     if (isDir) return;
 
     slotImageInfo( name );
 }
 
 void PIconView::slotImageInfo( const QString& name) {
-     emit sig_showInfo( name );
+    PDirLister *lister = currentView()->dirLister();
+    QString r_name = lister->nameToFname(name);
+    emit sig_showInfo(r_name );
 }
 
 
 void PIconView::slotChangeMode( int mode ) {
     if ( mode >= 1 && mode <= 3 )
         m_mode = mode;
@@ -576,14 +589,12 @@ void PIconView::resizeEvent( QResizeEvent* re ) {
     QVBox::resizeEvent( re );
     calculateGrid();
 }
 
 
 void PIconView::calculateGrid() {
-    odebug << "Calc grid: x=" << m_view->gridX() << " y=" << m_view->gridY() << oendl;
-    odebug << "Size of view: " << m_view->size() << oendl;
     int dw = QApplication::desktop()->width();
     int viewerWidth = dw-style().scrollBarExtent().width();
 
     QIconView::ItemTextPos pos;
     switch( m_mode ) {
     case 2: