6 files changed, 115 insertions, 62 deletions

diff --git a/noncore/graphics/opie-eye/gui/basesetup.cpp b/noncore/graphics/opie-eye/gui/basesetup.cpp
index 1a354a5..20dda5a 100644
--- a/noncore/graphics/opie-eye/gui/basesetup.cpp
+++ b/noncore/graphics/opie-eye/gui/basesetup.cpp
@@ -1,56 +1,60 @@
 #include "basesetup.h"
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 
 BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * name, WFlags f)
-    :QWidget(parent,name,f)
+    :QFrame(parent,name,f)
 {
+    setFrameStyle(Box|Raised);
     m_cfg = a_cfg;
     m_MainLayout = new QVBoxLayout( this, 11, 6, "m_MainLayout");
 
     m_SlidetimeLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_SlidetimeLayout");
 
     m_SlideShowTime = new QSpinBox( this, "m_SlideShowTime" );
     m_SlideShowTime->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
     m_SlideShowTime->setButtonSymbols( QSpinBox::PlusMinus );
     m_SlideShowTime->setMaxValue( 60 );
-    m_SlideShowTime->setMinValue(1);
+    m_SlideShowTime->setMinValue(0);
     m_SlideShowTime->setValue( 2 );
     m_SlideShowTime->setSuffix(tr(" seconds"));
 
     m_SlidetimeLayout->addWidget( m_SlideShowTime, 0, 1 );
 
     m_SlidetimeLabel = new QLabel( this, "m_SlidetimeLabel" );
     m_SlidetimeLabel->setText(tr("Slideshow timeout:"));
     m_SlidetimeLayout->addWidget( m_SlidetimeLabel, 0, 0 );
     m_MainLayout->addLayout( m_SlidetimeLayout );
 
+#if 0
     m_ShowToolBar = new QCheckBox( this, "m_ShowToolBar" );
     m_ShowToolBar->setText(tr("Show toolbar on startup"));
     m_MainLayout->addWidget( m_ShowToolBar );
+#endif
+    m_SaveStateAuto = new QCheckBox( this, "m_SaveStateAuto" );
+    m_SaveStateAuto->setText(tr("Save status of fullscreen/autorotate"));
+    m_MainLayout->addWidget( m_SaveStateAuto );
 
     spacer1 = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
     m_MainLayout->addItem( spacer1 );
 
     int stime = m_cfg->readNumEntry("base_slideshowtimeout",2);
-    if (stime<1) stime=2;
+    if (stime<0) stime=2;
     if (stime>60) stime=60;
     m_SlideShowTime->setValue(stime);
-
-    bool stoolbar = m_cfg->readBoolEntry("base_showtoolbar",true);
-    m_ShowToolBar->setChecked(stoolbar);
+    m_SaveStateAuto->setChecked(m_cfg->readBoolEntry("base_savestatus",false));
 }
 
 BaseSetup::~BaseSetup()
 {
 }
 
 void BaseSetup::save_values()
 {
     if (!m_cfg) return;
     m_cfg->writeEntry("base_slideshowtimeout",m_SlideShowTime->value());
-    m_cfg->writeEntry("base_showtoolbar",m_ShowToolBar->isChecked());
+    m_cfg->writeEntry("base_savestatus",m_SaveStateAuto->isChecked());
 }
diff --git a/noncore/graphics/opie-eye/gui/basesetup.h b/noncore/graphics/opie-eye/gui/basesetup.h
index c13e2af..c343f88 100644
--- a/noncore/graphics/opie-eye/gui/basesetup.h
+++ b/noncore/graphics/opie-eye/gui/basesetup.h
@@ -1,35 +1,35 @@
 #ifndef _BASESETUP_H
 #define _BASESETUP_H
 
 #include <opie2/oconfig.h>
 
-#include <qwidget.h>
+#include <qframe.h>
 
 class QVBoxLayout;
 class QGridLayout;
 class QSpinBox;
 class QLabel;
 class QCheckBox;
 class QSpacerItem;
 
-class BaseSetup:public QWidget
+class BaseSetup:public QFrame
 {
     Q_OBJECT
 public:
     BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent=0, const char * name=0, WFlags f=0);
     virtual ~BaseSetup();
 
 public slots:
     virtual void save_values();
 
 protected:
     Opie::Core::OConfig *m_cfg;
     QVBoxLayout * m_MainLayout;
     QGridLayout * m_SlidetimeLayout;
     QSpinBox * m_SlideShowTime;
     QLabel * m_SlidetimeLabel;
-    QCheckBox *m_ShowToolBar;
+    QCheckBox *m_SaveStateAuto;
     QSpacerItem *spacer1;
 };
 
 #endif
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 86db732..be58c72 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -1,124 +1,126 @@
 #include "imageview.h"
 
 #include <opie2/odebug.h>
 #include <opie2/oconfig.h>
 #include <opie2/okeyconfigwidget.h>
 
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qaction.h>
 
 using namespace Opie::Core;
 
 ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl )
     : Opie::MM::OImageScrollView(parent,name,fl)
 {
     m_viewManager = 0;
     focus_in_count = 0;
     m_cfg = cfg;
     m_isFullScreen = false;
     m_ignore_next_in = false;
     m_slideTimer = 0;
     QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold);
     initKeys();
     m_slideValue = 5;
     m_gDisplayType = 0;
     m_gPrevNext = 0;
     m_hGroup = 0;
 }
 
 void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup)
 {
     m_gDisplayType = disptypeGroup;
     m_gPrevNext = nextprevGroup;
     m_hGroup = hGroup;
 }
 
 ImageView::~ImageView()
 {
-    odebug << "Delete Imageview" << oendl;
     delete m_viewManager;
 }
 
 Opie::Core::OKeyConfigManager* ImageView::manager()
 {
     if (!m_viewManager) {
         initKeys();
     }
     return m_viewManager;
 }
 
 void ImageView::startSlide(int value)
 {
     if (!m_slideTimer) {
         m_slideTimer = new QTimer(this);
     }
     m_slideValue=value;
     connect(m_slideTimer,SIGNAL(timeout()),SLOT(nextSlide()));
-    m_slideTimer->start(m_slideValue*1000,true);
+    /* this "+1" is one millisecond. with that we can setup a slideshowvalue
+       of 0. eg "as fast as possible".
+     */
+    m_slideTimer->start(m_slideValue*1000+1,true);
 }
 
 void ImageView::stopSlide()
 {
     if (!m_slideTimer) {
         return;
     }
     m_slideTimer->stop();
     delete m_slideTimer;
     m_slideTimer = 0;
 }
 
 void ImageView::nextSlide()
 {
     if (!m_slideTimer) {
         return;
     }
     if (isHidden()) {
         delete m_slideTimer;
         m_slideTimer = 0;
         return;
     }
     emit dispNext();
     m_slideTimer->start(m_slideValue*1000,true);
 }
 void ImageView::initKeys()
 {
     odebug << "init imageview keys" << oendl;
     if (!m_cfg) {
         m_cfg = new Opie::Core::OConfig("opie-eye");
         m_cfg->setGroup("image_view_keys" );
     }
     Opie::Core::OKeyPair::List lst;
     lst.append( Opie::Core::OKeyPair::upArrowKey() );
     lst.append( Opie::Core::OKeyPair::downArrowKey() );
     lst.append( Opie::Core::OKeyPair::leftArrowKey() );
     lst.append( Opie::Core::OKeyPair::rightArrowKey() );
     lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0));
 
     m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
                                                     lst, false,this, "image_view_keys" );
 
     /**
      * Handle KeyEvents when they're pressed. This avoids problems
      * with 'double next' on Return.
      * The Return press would switch to this view and the return
      * release would emit the dispNext Signal.
      */
     m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed );
 
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
                                                 Resource::loadPixmap("1to1"), ViewInfo,
                                                 Opie::Core::OKeyPair(Qt::Key_I,0),
                                                 this, SLOT(slotShowImageInfo())));
 
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate",
                                                 Resource::loadPixmap("rotate"), Autorotate,
                                                 Opie::Core::OKeyPair(Qt::Key_R,0),
                                                 this, SIGNAL(toggleAutorotate())));
     m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale",
                                                 Resource::loadPixmap("1to1"), Autoscale,
                                                 Opie::Core::OKeyPair(Qt::Key_S,0),
                                                 this, SIGNAL(toggleAutoscale())));
 
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index ece51a1..5eb065f 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -1,342 +1,361 @@
 /*
  * GPLv2 zecke@handhelds.org
  * No WArranty...
  */
 #include "mainwindow.h"
 #include "imageview.h"
 
 #include "iconview.h"
 #include "filesystem.h"
 #include "imageinfoui.h"
 #include "viewmodebutton.h"
 #include "basesetup.h"
 
 #include <iface/ifaceinfo.h>
 #include <iface/dirview.h>
 
 #include <opie2/odebug.h>
 #include <opie2/owidgetstack.h>
 #include <opie2/oapplicationfactory.h>
 #include <opie2/otabwidget.h>
 #include <opie2/okeyconfigwidget.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/ir.h>
 #include <qpe/storage.h>
 #include <qpe/applnk.h>
 
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qmap.h>
 #include <qtimer.h>
 #include <qframe.h>
 #include <qmenubar.h>
 #include <qaction.h>
 
 //OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
 OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>)
 
 PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 )
 {
     setCaption( QObject::tr("Opie Eye Caramba" ) );
     m_cfg = new Opie::Core::OConfig("opie-eye");
     m_cfg->setGroup("main" );
+    readConfig();
 
     m_storage = new StorageInfo();
     connect(m_storage, SIGNAL(disksChanged() ),
             this, SLOT( dirChanged() ) );
 
     m_stack = new Opie::Ui::OWidgetStack( this );
     setCentralWidget( m_stack );
 
     m_view = new PIconView( m_stack, m_cfg );
     m_stack->addWidget( m_view, IconView );
     m_stack->raiseWidget( IconView );
 
     connect(m_view, SIGNAL(sig_display(const QString&)),
             this, SLOT(slotDisplay(const QString&)));
     connect(m_view, SIGNAL(sig_showInfo(const QString&)),
             this, SLOT(slotShowInfo(const QString&)) );
     connect(this,SIGNAL(changeListMode(int)),m_view,SLOT(slotChangeMode(int)));
 
     m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce);
 
     listviewMenu = 0;
     /* setup menu and toolbar */
     setupActions();
     setupToolbar();
     setupMenu();
-    m_aHideToolbar->setOn(m_cfg->readBoolEntry("base_showtoolbar",true));
+    m_aHideToolbar->setOn(m_cfg->readBoolEntry("showtoolbar",true));
+    m_aAutoRotate->setEnabled(!m_aUnscaled->isOn());
 }
 
 PMainWindow::~PMainWindow() {
 }
 
 void PMainWindow::slotToggleZoomer()
 {
-    if (!m_disp) return;
-    bool cur = m_aZoomer->isOn();
-    m_aZoomer->setOn(!cur);
+    m_aZoomer->setOn(!m_aZoomer->isOn());
 }
 
 void PMainWindow::slotZoomerToggled(bool how)
 {
-    zoomerOn = how;
     if (m_disp) {
-        m_disp->setShowZoomer(zoomerOn);
+        m_disp->setShowZoomer(how);
+    }
+    if (autoSave) {
+        m_cfg->writeEntry("zoomeron",how);
     }
 }
 
 void PMainWindow::slotToggleAutorotate()
 {
-    if (!m_disp) return;
     if (!m_aAutoRotate->isEnabled()) return;
-    bool cur = m_aAutoRotate->isOn();
-    m_aAutoRotate->setOn(!cur);
+    m_aAutoRotate->setOn(!m_aAutoRotate->isOn());
 }
 
 void PMainWindow::slotToggleAutoscale()
 {
-    if (!m_disp) return;
-    bool cur = m_aAutoScale->isOn();
-    m_aAutoScale->setOn(!cur);
+    m_aUnscaled->setOn(!m_aUnscaled->isOn());
 }
 
 void PMainWindow::slotRotateToggled(bool how)
 {
-    autoRotate = how;
+   if (autoSave) {
+        m_cfg->writeEntry("autorotate",how);
+    }
     if (m_disp) {
-        m_disp->setAutoScaleRotate(!m_aAutoScale->isOn(),m_aAutoRotate->isOn());
+        m_disp->setAutoScaleRotate(!m_aUnscaled->isOn(),how);
     }
 }
 
 void PMainWindow::slotScaleToggled(bool how)
 {
-    autoScale = !how;
-    if (!how) {
-        autoRotate = how;
+   if (autoSave) {
+        m_cfg->writeEntry("unscaled",how);
     }
-    if (!autoScale) {
+    odebug << "Unscaled: " << m_aUnscaled->isOn() << oendl;
+    odebug << "How: " << how << oendl;
+    if (how) {
         m_aAutoRotate->setOn(false);
     }
     if (m_disp) {
-        m_disp->setAutoScaleRotate(!m_aAutoScale->isOn(),m_aAutoRotate->isOn());
+        m_disp->setAutoScaleRotate(!m_aUnscaled->isOn(),m_aAutoRotate->isOn());
     }
     m_aAutoRotate->setEnabled(!how);
+    odebug << "Autorotate: " << m_aAutoRotate->isOn() << oendl;
 }
 
 void PMainWindow::slotConfig() {
    /*
     * have a tab with the possible views
     * a tab for globals image cache size.. scaled loading
     * and one tab for the  KeyConfigs
     */
     QDialog dlg(this, 0, true);
-    dlg.setCaption( tr("Phunk View - Config" ) );
+    dlg.setCaption( tr("Opie Eye - Config" ) );
 
     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;
 
     for( ; _it != vM->end(); ++_it ) {
         PDirView *view = (_it.data())(*m_cfg);
         PInterfaceInfo *inf =  view->interfaceInfo();
         QWidget *_wid = inf->configWidget( *m_cfg );
         if (!_wid) continue;
         _wid->reparent(wid, QPoint() );
         lst.insert( view, _wid );
         wid->addTab( _wid, "fileopen", inf->name() );
     }
 
 /*
  * Add the KeyConfigWidget
  */
     Opie::Ui::OKeyConfigWidget* keyWid = new Opie::Ui::OKeyConfigWidget( wid, "key config" );
     keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue );
     keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() );
+    QWidget*w = m_stack->visibleWidget();
 
+    bool reminfo = false;
     if ( !m_info ) {
+        reminfo = true;
         initInfo();
     }
     keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() );
 
+    bool remdisp = false;
     if ( !m_disp ) {
+        remdisp = true;
         initDisp();
     }
     keyWid->insert( tr("Imageview Keyboard Actions"), m_disp->manager() );
 
     keyWid->load();
     wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") );
-
-
+    wid->setCurrentTab(0);
     bool act = ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted );
 
 /*
  * clean up
  *apply changes
  */
 
     QMap<PDirView*, QWidget*>::Iterator it;
     for ( it = lst.begin(); it != lst.end(); ++it ) {
         if ( act )
             it.key()->interfaceInfo()->writeConfig(it.data(),  *m_cfg);
         delete it.key();
     }
 
 
     if ( act ) {
         m_view->resetView();
         keyWid->save();
         m_disp->manager()->save();
         m_info->manager()->save();
         m_view->manager()->save();
         bSetup->save_values();
+        readConfig();
     }
     delete keyWid;
+
+    m_stack->raiseWidget(w);
+    if (remdisp) {
+        m_disp->disconnect(this, SLOT(slotReturn()));
+        m_disp->setDestructiveClose();
+        m_stack->removeWidget(m_disp);
+        m_disp = 0;
+    }
+    if (reminfo) {
+        m_info->disconnect(this, SLOT(slotReturn()));
+        m_info->setDestructiveClose();
+        m_stack->removeWidget(m_info);
+        m_info = 0;
+    }
 }
 
 /*
  * create a new image info component
  * and detach the current one
  * we will make the other delete on exit
  */
 template<class T>
 void PMainWindow::initT( const char* name, T** ptr, int id) {
     if ( *ptr ) {
         (*ptr)->disconnect(this, SLOT(slotReturn()));
         (*ptr)->setDestructiveClose();
         m_stack->removeWidget( *ptr );
     }
     *ptr = new T(m_cfg, m_stack, name );
     m_stack->addWidget( *ptr, id );
 
     connect(*ptr, SIGNAL(sig_return()),
             this,SLOT(slotReturn()));
 
 }
 
 void PMainWindow::initInfo() {
     initT<imageinfo>( "Image Info", &m_info, ImageInfo );
     connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&)));
 }
 
 void PMainWindow::initDisp() {
     initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay );
     if (m_disp) {
         if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
             m_disp->setMinimumSize(QApplication::desktop()->size()/2);
         }
         m_disp->setMenuActions(m_hGroup,m_gPrevNext,m_gDisplayType);
-        m_disp->setAutoScale(!m_aAutoScale->isOn());
+        m_disp->setAutoScale(!m_aUnscaled->isOn());
         m_disp->setAutoRotate(m_aAutoRotate->isOn());
         m_disp->setShowZoomer(m_aZoomer->isOn());
         m_disp->setBackgroundColor(white);
         connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
         connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext()));
         connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev()));
         connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen()));
         connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView()));
         connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer()));
         connect(m_disp,SIGNAL(toggleAutoscale()),this,SLOT(slotToggleAutoscale()));
         connect(m_disp,SIGNAL(toggleAutorotate()),this,SLOT(slotToggleAutorotate()));
         connect(m_view,SIGNAL(sig_startslide(int)),m_disp,SLOT(startSlide(int)));
         slotFullScreenToggled(m_aFullScreen->isOn());
     }
 }
 
 void PMainWindow::slotToggleFullScreen()
 {
     bool current = !m_aFullScreen->isOn();
     m_aFullScreen->setOn(current);
 }
 
 void PMainWindow::slotFullScreenButton(bool current)
 {
-    if (m_disp) odebug << "Disp fenster ist hidden: "<<m_disp->isHidden()<<oendl;
+    if (autoSave) {
+        m_cfg->writeEntry("fullscreen",current);
+    }
     if (!m_disp) return;
 
-    /* I can not solve this effects here - it seems that we require some
-       status variable, too. so we will live with some interesting effects
-       meanwhile */
-#if 0
-    bool th = m_disp->isHidden();
-    setupViewWindow(current, false);
-    /* realy - after setting up the fullscreenmode while the window is hidden
-       it is unvisibile not hidden!!!!! Hell. */
-    if (th) m_disp->hide();
-#endif
+    if (m_disp->isHidden()) {
+        /* it must get some setups for switch we can just do if the window is visible.
+           so we must delete the imageview window and re-create it when displaying new
+           image */
+        return;
+    }
     setupViewWindow(current, true);
 }
 
 void PMainWindow::setupViewWindow(bool current, bool forceDisplay)
 {
     if (!m_disp) return;
     if (current) {
         m_disp->setBackgroundColor(black);
         m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
         m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
         m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
         m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
     } else {
         setUpdatesEnabled(false);
         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);
         m_disp->setHScrollBarMode(QScrollView::Auto);
         if (forceDisplay || m_disp->isVisible())
             m_stack->raiseWidget(m_disp);
         if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
             m_disp->resize(m_disp->minimumSize());
         }
         setUpdatesEnabled(true);
     }
     m_disp->setFullScreen(current,forceDisplay);
 }
 
 void PMainWindow::slotFullScreenToggled(bool current)
 {
     setupViewWindow(current,true);
 }
 
 /**
  * With big Screen the plan could be to 'detach' the image
  * window if visible and to create a ne wone
  * init* already supports it but I make no use of it for
  * now. We set filename and raise
  *
  * ### FIXME and talk to alwin
  */
 void PMainWindow::slotShowInfo( const QString& inf ) {
     if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
         return;
     }
     if ( !m_info ) {
         initInfo();
     }
     m_info->setPath( inf );
     if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
         m_aNext->removeFrom(toolBar);
         m_aPrevious->removeFrom(toolBar);
         m_aNext->setEnabled(false);
         m_aPrevious->setEnabled(false);
@@ -396,265 +415,286 @@ void PMainWindow::raiseIconView() {
 void PMainWindow::slotReturn() {
     raiseIconView();
 }
 
 
 void PMainWindow::closeEvent( QCloseEvent* ev ) {
     /*
      * return from view
      * or properly quit
      */
     if ( m_stack->visibleWidget() == m_info ||
          m_stack->visibleWidget() == m_disp ) {
         ev->ignore();
         raiseIconView();
         return;
     }
     if (m_disp && m_disp->fullScreen()) {
         /* otherwise opie-eye crashes in bigscreen mode! */
         m_disp->reparent(0,QPoint(0,0));
         m_stack->addWidget(m_disp,ImageDisplay);
     }
     ev->accept();
     QTimer::singleShot(0, qApp, SLOT(closeAllWindows()));
 }
 
 void PMainWindow::setDocument( const QString& showImg ) {
     QString file = showImg;
     DocLnk lnk(showImg);
     if (lnk.isValid() )
         file = lnk.file();
 
     slotDisplay( file );
 }
 
 void PMainWindow::slotSelectDir(int id)
 {
     emit changeDir( m_dev[fsMenu->text(id )] );
 }
 
 void PMainWindow::dirChanged()
 {
     fsMenu->clear();
     m_dev.clear();
 
     /* home dir, too */
     QString f = getenv( "HOME" );
     if (!f.isEmpty()) {
         m_dev.insert("Home directory",f);
         fsMenu->insertItem("Home directory");
     }
     const QList<FileSystem> &fs = m_storage->fileSystems();
     QListIterator<FileSystem> it(fs );
     for ( ; it.current(); ++it ) {
         const QString disk = (*it)->name();
         const QString path = (*it)->path();
         m_dev.insert( disk, path );
         fsMenu->insertItem( disk );
     }
 }
 
 void PMainWindow::showToolbar(bool how)
 {
     if (!how) toolBar->hide();
     else toolBar->show();
+    if (autoSave) {
+        m_cfg->writeEntry("showtoolbar",how);
+    }
 }
 
 void PMainWindow::setupActions()
 {
     m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true );
     m_aDirUp->setToggleAction(false);
     connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp()));
 
     if ( Ir::supported() ) {
         m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true );
         m_aBeam->setToggleAction(false);
         connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam()));
     } else {
         m_aBeam = 0;
     }
 
     m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true );
     m_aShowInfo->setToggleAction(false);
     connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo()));
 
     m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true );
     m_aTrash->setToggleAction(false);
     connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash()));
 
     m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true );
     m_aViewfile->setToggleAction(false);
     connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage()));
 
     m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true );
     m_aStartSlide->setToggleAction(false);
     connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide()));
 
     m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true );
     m_aHideToolbar->setOn (true);
     connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool)));
 
     m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true );
     m_aSetup->setToggleAction(false);
     connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig()));
 
     m_gListViewMode = new QActionGroup(this,"Select listmode",true);
     connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*)));
 
     m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true );
     m_aDirLong->setToggleAction(true);
     m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true );
     m_aDirShort->setToggleAction(true);
     m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true );
     m_aDirName->setToggleAction(true);
     int mode = m_cfg->readNumEntry("ListViewMode", 1);
     if (mode < 1 || mode>3) mode = 1;
     switch (mode) {
         case 3:
             m_aDirName->setOn(true);
             break;
         case 2:
             m_aDirShort->setOn(true);
             break;
         case 1:
         default:
             m_aDirLong->setOn(true);
     }
     m_gListViewMode->insert(m_aDirLong);
     m_gListViewMode->insert(m_aDirShort);
     m_gListViewMode->insert(m_aDirName);
 
     m_gPrevNext = new QActionGroup(this,"imageprevnext",false);
     m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true );
     m_aNext->setToggleAction(false);
     connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext()));
     m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true );
     m_aPrevious->setToggleAction(false);
     connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev()));
     m_gPrevNext->insert(m_aPrevious);
     m_gPrevNext->insert(m_aNext);
 
     m_aFullScreen = new QAction( tr( "Show images fullscreen" ),
         Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true );
     m_aFullScreen->setToggleAction(true);
-    m_aFullScreen->setOn(false);
+    if (autoSave) {
+        m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false));
+    } else {
+        m_aFullScreen->setOn(false);
+    }
     connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool)));
 
     m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false);
     m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true );
     m_aAutoRotate->setToggleAction(true);
+
     if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
         m_aAutoRotate->setOn(true);
-        autoRotate = true;
     } else {
         m_aAutoRotate->setOn(false);
-        autoRotate = false;
+    }
+    if (autoSave) {
+        m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn()));
     }
     connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
 
-    m_aAutoScale = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true );
-    m_aAutoScale->setToggleAction(true);
-    m_aAutoScale->setOn (false);
-    connect(m_aAutoScale,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
+    m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true );
+    m_aUnscaled->setToggleAction(true);
+    connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
+    if (autoSave) {
+        m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false));
+    } else {
+        m_aUnscaled->setOn(false);
+    }
 
     m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true );
     m_aZoomer->setToggleAction(true);
-    m_aZoomer->setOn (true);
-    zoomerOn = true;
+    if (autoSave) {
+        m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true));
+    } else {
+        m_aZoomer->setOn (true);
+    }
     connect(m_aZoomer,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
     m_gDisplayType->insert(m_aAutoRotate);
-    m_gDisplayType->insert(m_aAutoScale);
+    m_gDisplayType->insert(m_aUnscaled);
     m_gDisplayType->insert(m_aZoomer);
 
     m_hGroup = new QActionGroup(this,"actioncollection",false);
     m_hGroup->insert(m_aFullScreen);
 }
 
 void PMainWindow::setupToolbar()
 {
     toolBar = new QToolBar( this );
     addToolBar(toolBar);
     toolBar->setHorizontalStretchable( true );
     setToolBarsMovable( false );
     m_aDirUp->addTo( toolBar );
 
     fsButton = new PFileSystem( toolBar );
     connect( fsButton, SIGNAL( changeDir( const QString& ) ),
              m_view, SLOT(slotChangeDir( const QString& ) ) );
     connect( this, SIGNAL( changeDir( const QString& ) ),
              m_view, SLOT(slotChangeDir( const QString& ) ) );
 
     if (m_aBeam) {
         m_aBeam->addTo( toolBar );
     }
     m_aShowInfo->addTo(toolBar);
     m_aTrash->addTo(toolBar);
 //    m_aSetup->addTo(toolBar);
 
     m_gDisplayType->addTo(toolBar);
 
     if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
         m_gPrevNext->addTo(toolBar);
     } else {
         m_gPrevNext->setEnabled(false);
     }
 }
 
 void PMainWindow::setupMenu()
 {
     fileMenu = new QPopupMenu( menuBar() );
     menuBar()->insertItem( tr( "File" ), fileMenu );
     dispMenu = new QPopupMenu( menuBar() );
     menuBar()->insertItem( tr( "Show" ), dispMenu );
     settingsMenu = new QPopupMenu( menuBar() );
     menuBar()->insertItem( tr( "Settings" ), settingsMenu );
 
     m_aViewfile->addTo(fileMenu);
     m_aShowInfo->addTo(fileMenu);
     m_aStartSlide->addTo(fileMenu);
 
     fileMenu->insertSeparator();
     m_aDirUp->addTo( fileMenu );
 
     fsMenu = new QPopupMenu(fileMenu);
     fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu);
     connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) );
     dirChanged();
 
     if ( m_aBeam ) {
         fileMenu->insertSeparator();
         m_aBeam->addTo( fileMenu );
     }
     fileMenu->insertSeparator();
     m_aTrash->addTo(fileMenu);
 
     listviewMenu = new QPopupMenu(dispMenu);
     dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu);
     m_gListViewMode->addTo(listviewMenu);
     dispMenu->insertSeparator();
     m_aFullScreen->addTo(dispMenu);
     m_gDisplayType->addTo(dispMenu);
     dispMenu->insertSeparator();
     m_gPrevNext->addTo(dispMenu);
 
     m_aSetup->addTo(settingsMenu);
     m_aHideToolbar->addTo(settingsMenu);
 }
 
 void PMainWindow::listviewselected(QAction*which)
 {
     if (!which || which->isOn()==false) return;
     int val = 1;
 //    QString name;
 
     if (which==m_aDirName) {
         val = 3;
 //        name = "opie-eye/opie-eye-textview";
     } else if (which==m_aDirShort) {
         val = 2;
 //        name = "opie-eye/opie-eye-thumbonly";
     } else if (which==m_aDirLong) {
         val = 1;
 //        name = "opie-eye/opie-eye-thumb";
     }
     emit changeListMode(val);
 }
+
+void PMainWindow::readConfig()
+{
+    autoSave =m_cfg->readBoolEntry("base_savestatus",true);
+}
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index 703965b..5707568 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -17,91 +17,90 @@ namespace Ui{
     class OWidgetStack;
 }
 namespace Core{
     class OKeyConfigManager;
 }
 }
 
 class ImageView;
 class ImageWidget;
 class PIconView;
 class imageinfo;
 class QMenuBar;
 class QToolBar;
 class QPopupMenu;
 class QAction;
 class QActionGroup;
 class StorageInfo;
 
 class PMainWindow : public QMainWindow {
     Q_OBJECT
     enum Views { IconView,  ImageInfo, ImageDisplay };
 public:
     static QString appName() { return QString::fromLatin1("opie-eye" ); }
     PMainWindow(QWidget*, const char*, WFlags );
     ~PMainWindow();
 
 signals:
     void configChanged();
     void changeDir( const QString& );
     void changeListMode(int);
 
 public slots:
     void slotShowInfo( const QString& inf );
     void slotDisplay( const QString& inf );
     void slotReturn();
     void slotRotateToggled(bool);
     void slotScaleToggled(bool);
     void slotZoomerToggled(bool);
     void slotToggleZoomer();
     void slotToggleAutorotate();
     void slotToggleAutoscale();
     void setDocument( const QString& );
     virtual void slotToggleFullScreen();
     virtual void slotFullScreenToggled(bool);
 
 protected slots:
     void raiseIconView();
     void closeEvent( QCloseEvent* );
     void showToolbar(bool);
     void listviewselected(QAction*);
     void slotFullScreenButton(bool);
 
 private:
     template<class T>  void initT( const char* name, T**, int );
     void initInfo();
     void initDisp();
     void setupViewWindow(bool full, bool forceDisplay);
 
 private:
     Opie::Core::OConfig *m_cfg;
     Opie::Ui::OWidgetStack *m_stack;
     PIconView* m_view;
     imageinfo *m_info;
     ImageView *m_disp;
-    bool autoRotate;
-    bool autoScale;
-    bool zoomerOn;
+    bool autoSave;
     QToolButton*fsButton;
     QToolBar *toolBar;
     QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu,*settingsMenu;
     QAction*m_aShowInfo,*m_aBeam,*m_aTrash,*m_aViewfile,*m_aDirUp,*m_aStartSlide;
     QAction*m_aHideToolbar,*m_aSetup,*m_aDirName,*m_aDirShort,*m_aDirLong;
     QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup;
     QAction *m_aNext,*m_aPrevious,*m_aFullScreen;
-    QAction *m_aAutoRotate,*m_aAutoScale,*m_aZoomer;
+    QAction *m_aAutoRotate,*m_aUnscaled,*m_aZoomer;
 
     /* init funs */
+    void readConfig();
     void setupActions();
     void setupToolbar();
     void setupMenu();
     /* for the device submenu - ToDo: Merge with the special button */
     StorageInfo *m_storage;
     QMap<QString, QString> m_dev;
 
 private slots:
     void slotConfig();
     void slotSelectDir(int);
     void dirChanged();
 };
 
 #endif
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
index f4a6a87..9c69ce5 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
@@ -1,50 +1,58 @@
 /*
  * GPLv2
  * zecke@handhelds.org
  */
 
 #include "dir_ifaceinfo.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qwidget.h>
 #include <qcheckbox.h>
+#include <qframe.h>
 #include <qhbox.h>
 #include <qlabel.h>
+#include <qlayout.h>
 
 namespace {
-    class DirImageWidget : public QHBox {
+    class DirImageWidget : public QFrame {
     public:
-        DirImageWidget() {
+        DirImageWidget(): QFrame() {
+            setFrameStyle(Box|Raised);
+            QVBoxLayout *m_MainLayout = new QVBoxLayout( this, 6, 2, "m_MainLayout");
             chkbox = new QCheckBox( QObject::tr("Show all files"), this );
+            m_MainLayout->addWidget(chkbox);
+            QSpacerItem *spacer1 = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
+            m_MainLayout->addItem( spacer1 );
+
         }
         ~DirImageWidget() {}
         QCheckBox* chkbox;
     };
 }
 
 
 DirInterfaceInfo::DirInterfaceInfo() {
 }
 DirInterfaceInfo::~DirInterfaceInfo() {
 }
 
 QString DirInterfaceInfo::name()const {
     return QObject::tr("Directory View" );
 }
 
 QWidget* DirInterfaceInfo::configWidget(const Config& cfg) {
     DirImageWidget* wid = new DirImageWidget();
     wid->chkbox->setChecked(  cfg.readBoolEntry("Dir_Check_All_Files", true) );
 
     return wid;
 }
 
 void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) {
     owarn << "Write Config" << oendl;
     DirImageWidget* wid = static_cast<DirImageWidget*>(_wid);
     cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() );
 }