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 | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 9b929a1..ef6e6df 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -284,6 +284,7 @@ void PMainWindow::initDisp() { | |||
284 | connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext())); | 284 | connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext())); |
285 | connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev())); | 285 | connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev())); |
286 | connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); | 286 | connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); |
287 | connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView())); | ||
287 | } | 288 | } |
288 | } | 289 | } |
289 | 290 | ||
@@ -298,12 +299,16 @@ void PMainWindow::slotToggleFullScreen() | |||
298 | odebug << "full" << oendl; | 299 | odebug << "full" << oendl; |
299 | m_disp->setBackgroundColor(black); | 300 | m_disp->setBackgroundColor(black); |
300 | m_disp->reparent(0,QPoint(0,0)); | 301 | m_disp->reparent(0,QPoint(0,0)); |
302 | m_disp->setVScrollBarMode(QScrollView::AlwaysOff); | ||
303 | m_disp->setHScrollBarMode(QScrollView::AlwaysOff); | ||
301 | m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); | 304 | m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); |
302 | m_disp->showFullScreen(); | 305 | m_disp->showFullScreen(); |
303 | } else { | 306 | } else { |
304 | odebug << "window" << oendl; | 307 | odebug << "window" << oendl; |
305 | m_disp->setBackgroundColor(white); | 308 | m_disp->setBackgroundColor(white); |
306 | m_stack->addWidget(m_disp,ImageDisplay); | 309 | m_stack->addWidget(m_disp,ImageDisplay); |
310 | m_disp->setVScrollBarMode(QScrollView::Auto); | ||
311 | m_disp->setHScrollBarMode(QScrollView::Auto); | ||
307 | m_stack->raiseWidget(m_disp); | 312 | m_stack->raiseWidget(m_disp); |
308 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { | 313 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { |
309 | m_disp->resize(m_disp->minimumSize()); | 314 | m_disp->resize(m_disp->minimumSize()); |
@@ -331,6 +336,9 @@ void PMainWindow::slotShowInfo( const QString& inf ) { | |||
331 | fsButton->hide(); | 336 | fsButton->hide(); |
332 | viewModeButton->hide(); | 337 | viewModeButton->hide(); |
333 | } | 338 | } |
339 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { | ||
340 | m_disp->hide(); | ||
341 | } | ||
334 | m_stack->raiseWidget( ImageInfo ); | 342 | m_stack->raiseWidget( ImageInfo ); |
335 | } | 343 | } |
336 | 344 | ||
@@ -346,7 +354,11 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
346 | fsButton->hide(); | 354 | fsButton->hide(); |
347 | viewModeButton->hide(); | 355 | viewModeButton->hide(); |
348 | } | 356 | } |
349 | m_stack->raiseWidget( ImageDisplay ); | 357 | if (m_disp->fullScreen()) { |
358 | m_disp->show(); | ||
359 | } else { | ||
360 | m_stack->raiseWidget( ImageDisplay ); | ||
361 | } | ||
350 | } | 362 | } |
351 | 363 | ||
352 | void PMainWindow::slotReturn() { | 364 | void PMainWindow::slotReturn() { |
@@ -377,6 +389,9 @@ void PMainWindow::raiseIconView() { | |||
377 | fsButton->show(); | 389 | fsButton->show(); |
378 | viewModeButton->show(); | 390 | viewModeButton->show(); |
379 | } | 391 | } |
392 | if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { | ||
393 | m_disp->hide(); | ||
394 | } | ||
380 | m_stack->raiseWidget( IconView ); | 395 | m_stack->raiseWidget( IconView ); |
381 | } | 396 | } |
382 | 397 | ||