| -rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 3 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 24 |
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 @@ -40,2 +40,3 @@ ImageView::~ImageView() { + odebug << "Destructor imageview" << oendl; delete m_viewManager; @@ -79,2 +80,3 @@ void ImageView::nextSlide() } +#if 0 if (isHidden()) { @@ -84,2 +86,3 @@ void ImageView::nextSlide() } +#endif emit dispNext(); 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 @@ -216,12 +216,6 @@ void PMainWindow::slotConfig() { 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(); } @@ -290,10 +284,5 @@ void PMainWindow::slotFullScreenButton(bool 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); } @@ -371,3 +360,5 @@ void PMainWindow::slotShowInfo( const QString& inf ) { void PMainWindow::slotDisplay( const QString& inf ) { + bool nwindow = false; if ( !m_disp ) { + nwindow = true; initDisp(); @@ -387,2 +378,5 @@ void PMainWindow::slotDisplay( const QString& inf ) { } + if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) { + slotFullScreenToggled(m_aFullScreen->isOn()); + } if (m_disp->fullScreen()) { |