1 files changed, 13 insertions, 9 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index b2443e8..59091a8 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -27,24 +27,28 @@
 #include <qlabel.h>
 #include <qhbox.h>
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qtimer.h>
 #include <qstyle.h>
 
 
 using Opie::Core::OKeyConfigItem;
 
+const int PIconView::sMAX_ICON_SIZE = 128;
+const int PIconView::sMIN_ICON_SIZE = 12;
+const int PIconView::sDEF_ICON_SIZE = 64;
+
 /*
  * The Icons, Request Cache and IconViewItem for the IconView
  */
 namespace {
     static QPixmap* _dirPix = 0;
     static QPixmap* _unkPix = 0;
     static QPixmap* _cpyPix = 0;
     static QPixmap* _emptyPix = 0;
     class IconViewItem : public QIconViewItem {
     public:
         IconViewItem( QIconView*, const QString& path, const QString& name,int a_iconsize, bool isDir = false);
         QPixmap* pixmap()const;
@@ -213,26 +217,26 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
 
     m_view->setArrangement( QIconView::LeftToRight );
 
     m_mode = m_cfg->readNumEntry("ListViewMode", 1);
     if (m_mode < 1 || m_mode>3) m_mode = 1;
     m_view->setItemTextPos( QIconView::Right );
     if (m_mode >1) {
         m_view->setResizeMode(QIconView::Adjust);
     } else {
         m_view->setResizeMode(QIconView::Fixed);
     }
     m_iconsize = m_cfg->readNumEntry("iconsize", 32);
-    if (m_iconsize<12)m_iconsize = 12;
-    if (m_iconsize>64)m_iconsize = 64;
+    if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE;
+    if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE;
 
     calculateGrid();
     initKeys();
     loadViews();
 }
 
 void PIconView::setDoccalled(bool how)
 {
     m_setDocCalled = how;
 }
 
 /*
@@ -399,39 +403,39 @@ void PIconView::loadViews() {
     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 (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE;
+        if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE;
         if (osize != m_iconsize) {
             if (_dirPix){
                 delete _dirPix;
                 _dirPix = 0;
             }
             if (_cpyPix){
                 delete _cpyPix;
                 _cpyPix = 0;
             }
             calculateGrid();
         }
     } else {
-        m_iconsize = 64;
+        m_iconsize = sDEF_ICON_SIZE;
     }
     slotViewChanged(m_views->currentItem());
     m_internalReset = false;
 }
 
 void PIconView::polish()
 {
     QVBox::polish();
 
     QString lastView = m_cfg->readEntry("LastView","");
     int cc=0;
     for (; cc<m_views->count();++cc) {
@@ -824,29 +828,29 @@ void PIconView::slotImageInfo( const QString& name) {
 void PIconView::slotChangeMode( int mode ) {
     if ( mode >= 1 && mode <= 3 ) {
         m_mode = mode;
         m_cfg->writeEntry("ListViewMode", m_mode);
         /* performance! */
         m_view->clear();
         if (m_mode >1) {
             m_view->setResizeMode(QIconView::Adjust);
         } else {
             m_view->setResizeMode(QIconView::Fixed);
         }
         if (m_mode==1) {
-            m_iconsize = 64;
+            m_iconsize = sDEF_ICON_SIZE;
         } else {
             m_iconsize = m_cfg->readNumEntry("iconsize", 32);
-            if (m_iconsize<12)m_iconsize = 12;
-            if (m_iconsize>64)m_iconsize = 64;
+            if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE;
+            if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE;
         }
         if (_dirPix){
             delete _dirPix;
             _dirPix = 0;
         }
         if (_cpyPix){
             delete _cpyPix;
             _cpyPix = 0;
         }
         calculateGrid();
         slotReloadDir();
     }
@@ -879,25 +883,25 @@ void PIconView::calculateGrid(QResizeEvent* re)
     case 1:
     default:
         pos = QIconView::Right;
         break;
     }
     int cache = 0;
     m_view->setItemTextPos( pos );
     switch (m_mode) {
         case 2:
             m_view->setSpacing(2);
             m_view->setGridX(m_iconsize);
             m_view->setGridY(-1);
-            cache = (int)((double)64/(double)m_iconsize*40.0);
+            cache = (int)((double)sDEF_ICON_SIZE/(double)m_iconsize*80.0);
             odebug << "cache size: " << cache << oendl;
             PPixmapCache::self()->setMaxImages(cache);
             break;
         case 3:
             m_view->setSpacing(10);
             m_view->setGridX( fontMetrics().width("testimage.jpg")+20);
             m_view->setGridY(8);
             PPixmapCache::self()->setMaxImages(2);
             break;
         case 1:
         default:
             m_view->setSpacing(10);