ok. now we have real working, simple solution how to act with switching fullscreen

when imagewindow is hidden.
It is realy impressive what a brain can generate brainf* ideas finding such a solution
- I should stop programming on holidays.

2 files changed, 12 insertions, 15 deletions

diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index be58c72..ebdfc60 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -33,16 +33,17 @@ void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, Q
 {
     m_gDisplayType = disptypeGroup;
     m_gPrevNext = nextprevGroup;
     m_hGroup = hGroup;
 }
 
 ImageView::~ImageView()
 {
+    odebug << "Destructor imageview" << oendl;
     delete m_viewManager;
 }
 
 Opie::Core::OKeyConfigManager* ImageView::manager()
 {
     if (!m_viewManager) {
         initKeys();
     }
@@ -72,21 +73,23 @@ void ImageView::stopSlide()
     m_slideTimer = 0;
 }
 
 void ImageView::nextSlide()
 {
     if (!m_slideTimer) {
         return;
     }
+#if 0
     if (isHidden()) {
         delete m_slideTimer;
         m_slideTimer = 0;
         return;
     }
+#endif
     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");
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 5eb065f..6660eb2 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -209,26 +209,20 @@ void PMainWindow::slotConfig() {
         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;
+        m_disp->hide();
     }
     if (reminfo) {
-        m_info->disconnect(this, SLOT(slotReturn()));
-        m_info->setDestructiveClose();
-        m_stack->removeWidget(m_info);
-        m_info = 0;
+        m_info->hide();
     }
 }
 
 /*
  * create a new image info component
  * and detach the current one
  * we will make the other delete on exit
  */
@@ -283,24 +277,19 @@ void PMainWindow::slotToggleFullScreen()
 }
 
 void PMainWindow::slotFullScreenButton(bool current)
 {
     if (autoSave) {
         m_cfg->writeEntry("fullscreen",current);
     }
     if (!m_disp) return;
-
-    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;
+    if (m_disp->isVisible()) {
+        setupViewWindow(current, true);
     }
-    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));
@@ -364,32 +353,37 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
         m_aViewfile->setEnabled(true);
         m_aStartSlide->setEnabled(false);
         fsButton->hide();
     }
     m_stack->raiseWidget( ImageInfo );
 }
 
 void PMainWindow::slotDisplay( const QString& inf ) {
+    bool nwindow = false;
     if ( !m_disp ) {
+        nwindow = true;
         initDisp();
     }
     m_disp->setImage( inf );
     if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
         if (m_gPrevNext->isEnabled()==false) {
             m_gPrevNext->addTo(toolBar);
             m_gPrevNext->setEnabled(true);
 
             m_aDirUp->setEnabled(false);
             m_aShowInfo->setEnabled(true);
             m_aViewfile->setEnabled(false);
             m_aStartSlide->setEnabled(false);
             fsButton->hide();
         }
     }
+    if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) {
+        slotFullScreenToggled(m_aFullScreen->isOn());
+    }
     if (m_disp->fullScreen()) {
         qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
     } else {
         m_stack->raiseWidget( ImageDisplay );
     }
 }
 
 void PMainWindow::raiseIconView() {