summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp3
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp24
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
@@ -39,4 +39,5 @@ void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, Q
ImageView::~ImageView()
{
+ odebug << "Destructor imageview" << oendl;
delete m_viewManager;
}
@@ -78,4 +79,5 @@ void ImageView::nextSlide()
return;
}
+#if 0
if (isHidden()) {
delete m_slideTimer;
@@ -83,4 +85,5 @@ void ImageView::nextSlide()
return;
}
+#endif
emit dispNext();
m_slideTimer->start(m_slideValue*1000,true);
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
@@ -215,14 +215,8 @@ void PMainWindow::slotConfig() {
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();
}
}
@@ -289,12 +283,7 @@ 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);
}
@@ -370,5 +359,7 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
void PMainWindow::slotDisplay( const QString& inf ) {
+ bool nwindow = false;
if ( !m_disp ) {
+ nwindow = true;
initDisp();
}
@@ -386,4 +377,7 @@ void PMainWindow::slotDisplay( const QString& inf ) {
}
}
+ if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) {
+ slotFullScreenToggled(m_aFullScreen->isOn());
+ }
if (m_disp->fullScreen()) {
qwsDisplay()->requestFocus( m_disp->winId(), TRUE);