Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 47 |
1 files changed, 35 insertions, 12 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index f443ccb..295f93f 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -47,4 +47,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) m_cfg->setGroup("main" ); readConfig(); + m_setDocCalled = false; + m_polishDone = false; m_storage = new StorageInfo(); @@ -420,9 +422,11 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { * or properly quit */ - if ( m_stack->visibleWidget() == m_info || - m_stack->visibleWidget() == m_disp ) { - ev->ignore(); - raiseIconView(); - return; + if (!m_setDocCalled) { + if ( m_stack->visibleWidget() == m_info || + m_stack->visibleWidget() == m_disp ) { + ev->ignore(); + raiseIconView(); + return; + } } if (m_disp && m_disp->fullScreen()) { @@ -437,6 +441,4 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { void PMainWindow::setDocument( const QString& showImg ) { - bool first_start = m_disp==0; - QString file = showImg; DocLnk lnk(showImg); @@ -444,7 +446,9 @@ void PMainWindow::setDocument( const QString& showImg ) file = lnk.file(); slotDisplay( file ); - if (first_start && m_aFullScreen->isOn()) { +#if 0 + if (!m_polishDone) { QTimer::singleShot(0,this,SLOT(check_view_fullscreen())); } +#endif } @@ -690,15 +694,11 @@ 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); @@ -709,2 +709,25 @@ void PMainWindow::readConfig() autoSave =m_cfg->readBoolEntry("savestatus",true); } + +void PMainWindow::polish() +{ + if (m_disp) { + odebug << "======================\n" + << "Called via setdocument\n" + << "======================" << oendl; + m_setDocCalled = true; + m_view->setDoccalled(true); + m_disp->setCloseIfHide(true); + } else { + m_setDocCalled = false; + m_view->setDoccalled(false); + } + m_polishDone = true; + QMainWindow::polish(); + if (m_setDocCalled) { + if (m_aFullScreen->isOn()) { + QTimer::singleShot(0,this,SLOT(check_view_fullscreen())); + } else if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { + } + } +} |