-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 1 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.h | 1 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 15 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index 8e7f982..ee4b0a1 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp | |||
@@ -68,2 +68,3 @@ void ImageView::keyReleaseEvent(QKeyEvent * e) | |||
68 | if (e->key()==Qt::Key_F) emit toggleFullScreen(); | 68 | if (e->key()==Qt::Key_F) emit toggleFullScreen(); |
69 | if (e->key()==Qt::Key_Escape && fullScreen()) emit hideMe(); | ||
69 | } | 70 | } |
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h index 32f7e11..75f798c 100644 --- a/noncore/graphics/opie-eye/gui/imageview.h +++ b/noncore/graphics/opie-eye/gui/imageview.h | |||
@@ -33,2 +33,3 @@ signals: | |||
33 | void toggleFullScreen(); | 33 | void toggleFullScreen(); |
34 | void hideMe(); | ||
34 | 35 | ||
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 | |||
@@ -286,2 +286,3 @@ void PMainWindow::initDisp() { | |||
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 | } |
@@ -300,2 +301,4 @@ void PMainWindow::slotToggleFullScreen() | |||
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()); |
@@ -306,2 +309,4 @@ void PMainWindow::slotToggleFullScreen() | |||
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); |
@@ -333,2 +338,5 @@ void PMainWindow::slotShowInfo( const QString& inf ) { | |||
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 ); |
@@ -348,4 +356,8 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
348 | } | 356 | } |
357 | if (m_disp->fullScreen()) { | ||
358 | m_disp->show(); | ||
359 | } else { | ||
349 | m_stack->raiseWidget( ImageDisplay ); | 360 | m_stack->raiseWidget( ImageDisplay ); |
350 | } | 361 | } |
362 | } | ||
351 | 363 | ||
@@ -379,2 +391,5 @@ void PMainWindow::raiseIconView() { | |||
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 ); |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 4cfc39c..d238763 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h | |||
@@ -48,3 +48,3 @@ public slots: | |||
48 | 48 | ||
49 | protected: | 49 | protected slots: |
50 | void raiseIconView(); | 50 | void raiseIconView(); |