Add a special MessageBox to squeeze the path to fit onto the screen.

This is a fix for #1539

1 files changed, 5 insertions, 8 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 138e661..b2443e8 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -1,30 +1,31 @@
 /*
  * GPLv2 zecke@handhelds.org
  * No WArranty...
  */
 
 #include "iconview.h"
+#include "messagebox.h"
 
 #include <lib/imagecache.h>
 #include <gui/imageinfoui.h>
 
 #include <iface/dirview.h>
 #include <iface/dirlister.h>
 
 #include <opie2/oconfig.h>
 #include <opie2/okeyconfigwidget.h>
 #include <opie2/odebug.h>
 #include <opie2/oimagescrollview.h>
 
 #include <qpe/resource.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 
 #include <qiconview.h>
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qapplication.h>
@@ -356,104 +357,100 @@ QString PIconView::nextFileName(bool &isDir)const
     QIconViewItem* _it = _it1->nextItem();
     if ( !_it )
         return QString::null;
     IconViewItem* it = static_cast<IconViewItem*>( _it );
     isDir = it->isDir();
     return it->path();
 }
 
 QString PIconView::prevFileName(bool &isDir)const{
     isDir = false;
     QIconViewItem* _it = m_view->currentItem();
     if ( !_it )
         return QString::null;
     _it = _it->prevItem();
     if ( !_it )
         return QString::null;
     IconViewItem* it = static_cast<IconViewItem*>( _it );
     isDir = it->isDir();
     return it->path();
 }
 
 void PIconView::slotTrash() {
     bool isDir;
     QString pa = currentFileName( isDir );
-    if ( isDir && pa.isEmpty() )
+    if ( isDir || pa.isEmpty() )
         return;
 
-    if (!QPEMessageBox::confirmDelete( this,
-                                      tr("Delete Image" ),
-                                      tr("the Image %1" ).arg(pa)))
-        return
+    if (!OMessageBox::confirmDelete( this, tr("the Image"),
+                                     pa, tr("Delete Image" )))
+        return;
 
 
     currentView()->dirLister()->deleteImage( pa );
     delete m_view->currentItem();
 }
 
 /*
  * 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(  it.key()  );
 }
 
 void PIconView::resetView() {
     m_internalReset = true;
     // Also invalidate the cache. We can't cancel the operations anyway
     g_stringPix.clear();
     g_stringInf.clear();
     if (m_mode>1) {
         int osize = m_iconsize;
         m_iconsize = m_cfg->readNumEntry("iconsize", 32);
         if (m_iconsize<12)m_iconsize = 12;
         if (m_iconsize>64)m_iconsize = 64;
         if (osize != m_iconsize) {
             if (_dirPix){
                 delete _dirPix;
                 _dirPix = 0;
             }
             if (_cpyPix){
                 delete _cpyPix;
                 _cpyPix = 0;
             }
             calculateGrid();
         }
     } else {
         m_iconsize = 64;
     }
     slotViewChanged(m_views->currentItem());
     m_internalReset = false;
 }
 
 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)) );
 }
 
 /*
  *swicth view reloadDir and connect signals
  */
 void PIconView::slotViewChanged( int i) {
     if (!m_views->count() ) {