3 files changed, 23 insertions, 5 deletions

diff --git a/noncore/graphics/opie-eye/gui/gui.pro b/noncore/graphics/opie-eye/gui/gui.pro
index b9f0bf8..2759dd5 100644
--- a/noncore/graphics/opie-eye/gui/gui.pro
+++ b/noncore/graphics/opie-eye/gui/gui.pro
@@ -3,13 +3,15 @@ HEADERS +=    gui/filesystem.h       \
               gui/imageinfoui.h      \
               gui/imageview.h        \
               gui/mainwindow.h       \
-              gui/viewmodebutton.h  
+              gui/viewmodebutton.h   \
+              gui/basesetup.h
 
 SOURCES +=    gui/filesystem.cpp     \
               gui/iconview.cpp       \
               gui/imageinfoui.cpp    \
               gui/imageview.cpp      \
               gui/mainwindow.cpp     \
-              gui/viewmodebutton.cpp 
+              gui/viewmodebutton.cpp \
+              gui/basesetup.cpp
 
 
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index a41ce9f..7c8c88d 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -685,7 +685,8 @@ void PIconView::slotStartSlide() {
     } else {
         slotShowImage( name );
     }
-    emit sig_startslide(2);
+    int t = m_cfg->readNumEntry("base_slideshowtimeout", 2);
+    emit sig_startslide(t);
 }
 
 void PIconView::slotImageInfo() {
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index e714e84..570ee45 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -9,6 +9,7 @@
 #include "filesystem.h"
 #include "imageinfoui.h"
 #include "viewmodebutton.h"
+#include "basesetup.h"
 
 #include <iface/ifaceinfo.h>
 #include <iface/dirview.h>
@@ -69,6 +70,7 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     setupActions();
     setupToolbar();
     setupMenu();
+    m_aHideToolbar->setOn(m_cfg->readBoolEntry("base_showtoolbar",true));
 }
 
 PMainWindow::~PMainWindow() {
@@ -140,6 +142,10 @@ void PMainWindow::slotConfig() {
     QHBoxLayout *lay = new QHBoxLayout(&dlg);
     Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg );
     lay->addWidget( wid );
+
+    BaseSetup*bSetup = new BaseSetup(m_cfg,wid);
+    wid->addTab(bSetup,"SettingsIcon","Basics setup");
+
     ViewMap *vM = viewMap();
     ViewMap::Iterator _it = vM->begin();
     QMap<PDirView*, QWidget*> lst;
@@ -196,6 +202,7 @@ void PMainWindow::slotConfig() {
         m_disp->manager()->save();
         m_info->manager()->save();
         m_view->manager()->save();
+        bSetup->save_values();
     }
     delete keyWid;
 }
@@ -268,8 +275,16 @@ void PMainWindow::slotFullScreenToggled(bool current)
     } else {
         setUpdatesEnabled(false);
         odebug << "window" << oendl;
-        m_disp->setMinimumSize(10,10);
-        m_disp->reparent(0,QPoint(0,0));
+        if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
+            m_disp->setMinimumSize(QApplication::desktop()->size()/2);
+        } else {
+            m_disp->setMinimumSize(10,10);
+        }
+        if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
+            m_disp->reparent(0,QPoint(50,50));
+        } else {
+            m_disp->reparent(0,QPoint(0,0));
+        }
         m_disp->setBackgroundColor(white);
         m_stack->addWidget(m_disp,ImageDisplay);
         m_disp->setVScrollBarMode(QScrollView::Auto);