Diffstat (limited to 'noncore/graphics/opie-eye/gui/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 3a89dfd..d11e4e1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -304,13 +304,13 @@ void PMainWindow::setupViewWindow(bool current, bool forceDisplay) | |||
304 | { | 304 | { |
305 | if (!m_disp) { | 305 | if (!m_disp) { |
306 | return; | 306 | return; |
307 | } | 307 | } |
308 | if (current) { | 308 | if (current) { |
309 | m_disp->setBackgroundColor(black); | 309 | m_disp->setBackgroundColor(black); |
310 | m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); | 310 | m_disp->reparent(0, WStyle_Customize | WStyle_NoBorderEx, QPoint(0,0)); |
311 | m_disp->setVScrollBarMode(QScrollView::AlwaysOff); | 311 | m_disp->setVScrollBarMode(QScrollView::AlwaysOff); |
312 | m_disp->setHScrollBarMode(QScrollView::AlwaysOff); | 312 | m_disp->setHScrollBarMode(QScrollView::AlwaysOff); |
313 | m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); | 313 | m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); |
314 | m_disp->setFullScreen(current,forceDisplay); | 314 | m_disp->setFullScreen(current,forceDisplay); |
315 | } else { | 315 | } else { |
316 | setUpdatesEnabled(false); | 316 | setUpdatesEnabled(false); |
@@ -372,35 +372,19 @@ void PMainWindow::slotShowInfo( const QString& inf ) { | |||
372 | m_aStartSlide->setEnabled(false); | 372 | m_aStartSlide->setEnabled(false); |
373 | m_stack->raiseWidget( ImageInfo ); | 373 | m_stack->raiseWidget( ImageInfo ); |
374 | } | 374 | } |
375 | 375 | ||
376 | void PMainWindow::slotDisplay( const QString& inf ) { | 376 | void PMainWindow::slotDisplay( const QString& inf ) { |
377 | bool nwindow = false; | 377 | bool nwindow = false; |
378 | bool disp_hack = false; | ||
379 | int lb; | ||
380 | if (m_disp && m_disp->fullScreen()) { | ||
381 | lb = m_disp->Intensity(); | ||
382 | delete m_disp; | ||
383 | m_disp = 0; | ||
384 | |||
385 | disp_hack = true; | ||
386 | } | ||
387 | if ( !m_disp ) { | 378 | if ( !m_disp ) { |
388 | nwindow = true; | 379 | nwindow = true; |
389 | initDisp(); | 380 | initDisp(); |
390 | m_disp->setIntensity((disp_hack?lb:m_Intensity)); | 381 | m_disp->setIntensity(m_Intensity); |
391 | } | ||
392 | m_setCurrentBrightness->setEnabled(true); | 382 | m_setCurrentBrightness->setEnabled(true); |
393 | 383 | } | |
394 | Opie::Ui::OWait wdlg; | ||
395 | wdlg.setTimerLength(30); | ||
396 | wdlg.show(); | ||
397 | //qApp->processEvents(20); | ||
398 | m_disp->setImage( inf ); | 384 | m_disp->setImage( inf ); |
399 | wdlg.hide(); | ||
400 | //qApp->processEvents(20); | ||
401 | if (m_SmallWindow) { | 385 | if (m_SmallWindow) { |
402 | if (m_gPrevNext->isEnabled()==false) { | 386 | if (m_gPrevNext->isEnabled()==false) { |
403 | m_gPrevNext->addTo(toolBar); | 387 | m_gPrevNext->addTo(toolBar); |
404 | fsButton->hide(); | 388 | fsButton->hide(); |
405 | } | 389 | } |
406 | } | 390 | } |
@@ -411,13 +395,16 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
411 | m_aStartSlide->setEnabled(false); | 395 | m_aStartSlide->setEnabled(false); |
412 | 396 | ||
413 | if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) { | 397 | if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) { |
414 | slotFullScreenToggled(m_aFullScreen->isOn()); | 398 | slotFullScreenToggled(m_aFullScreen->isOn()); |
415 | } | 399 | } |
416 | if (m_disp->fullScreen()) { | 400 | if (m_disp->fullScreen()) { |
401 | if (!m_disp->isVisible()) { | ||
402 | m_disp->showFullScreen(); | ||
417 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); | 403 | qwsDisplay()->requestFocus( m_disp->winId(), TRUE); |
404 | } | ||
418 | } else { | 405 | } else { |
419 | m_stack->raiseWidget( ImageDisplay ); | 406 | m_stack->raiseWidget( ImageDisplay ); |
420 | } | 407 | } |
421 | } | 408 | } |
422 | 409 | ||
423 | void PMainWindow::raiseIconView() { | 410 | void PMainWindow::raiseIconView() { |