4 files changed, 47 insertions, 8 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index a06844a..e61f9d9 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -473,3 +473,3 @@ void PIconView::slotImageInfo( const QString& name) {
 void PIconView::slotChangeMode( int mode ) {
-    if ( mode >= 0 && mode <= 3 )
+    if ( mode >= 1 && mode <= 3 )
         m_mode = mode;
@@ -478,7 +478,7 @@ void PIconView::slotChangeMode( int mode ) {
     switch( m_mode ) {
-    case 1:
+    case 2:
         pos = QIconView::Bottom;
         break;
-    case 2:
-    case 0:
+    case 3:
+    case 1:
     default:
@@ -489,3 +489,15 @@ void PIconView::slotChangeMode( int mode ) {
 
+    calculateGrid();
     slotReloadDir();
 }
+
+
+void PIconView::resizeEvent( QResizeEvent* re ) {
+    QVBox::resizeEvent( re );
+    calculateGrid();
+}
+
+
+void PIconView::calculateGrid() {
+
+}
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h
index af41aef..903c4fd 100644
--- a/noncore/graphics/opie-eye/gui/iconview.h
+++ b/noncore/graphics/opie-eye/gui/iconview.h
@@ -41,2 +41,5 @@ signals:
 
+protected:
+    void resizeEvent( QResizeEvent* );
+
 private:
@@ -45,2 +48,3 @@ private:
     void loadViews();
+    void calculateGrid();
 
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
index fdf4e77..0e4a7cb 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
@@ -2,2 +2,4 @@
 
+#include <opie2/odebug.h>
+
 #include <qtoolbar.h>
@@ -8,10 +10,12 @@ ViewModeButton::ViewModeButton( QToolBar* bar )
 {
-    setIconSet( Resource::loadIconSet( "toys" ) );
+    slotChange( 1 );
     QPopupMenu *pop= new QPopupMenu( this );
     pop->setCheckable( true );
-    pop->insertItem( tr("Thumbnail and Imageinfo"), 0 );
-    pop->insertItem( tr("Thumbnail and Name" ), 1 );
-    pop->insertItem( tr("Name Only" ), 2 );
+    pop->insertItem( tr("Thumbnail and Imageinfo"), 1 );
+    pop->insertItem( tr("Thumbnail and Name" ), 2 );
+    pop->insertItem( tr("Name Only" ), 3 );
     connect(pop, SIGNAL(activated(int)),
             this, SIGNAL(changeMode(int)) );
+    connect(pop, SIGNAL(activated(int)),
+            this, SLOT(slotChange(int)) );
 
@@ -22,3 +26,20 @@ ViewModeButton::ViewModeButton( QToolBar* bar )
 ViewModeButton::~ViewModeButton() {
+}
+
+void ViewModeButton::slotChange( int i ) {
+    QString name;
+    switch( i ) {
+    case 1:
+        name = "opie-eye/opie-eye-thumb";
+        break;
+    case 2:
+        name = "opie-eye/opie-eye-thumbonly";
+        break;
+    case 3:
+        name = "opie-eye/opie-eye-textview";
+        break;
+    }
 
+    qWarning("foo %d" +name, i );
+    setIconSet( Resource::loadIconSet( name ) );
 }
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.h b/noncore/graphics/opie-eye/gui/viewmodebutton.h
index 44f2228..3247114 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.h
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.h
@@ -20,2 +20,4 @@ signals:
     void changeMode( int );
+private slots:
+    void slotChange( int i );
 };