author | alwin <alwin> | 2004-04-16 21:53:37 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-16 21:53:37 (UTC) |
commit | a33ef3772b9603ef60de8c9cfd029436e6cf0399 (patch) (side-by-side diff) | |
tree | bc90f3b3b552be411c18acf3e571316fe2623e0b /noncore/graphics | |
parent | 217d387def6d97f912352899fd83908b28d75dfc (diff) | |
download | opie-a33ef3772b9603ef60de8c9cfd029436e6cf0399.zip opie-a33ef3772b9603ef60de8c9cfd029436e6cf0399.tar.gz opie-a33ef3772b9603ef60de8c9cfd029436e6cf0399.tar.bz2 |
after hard-testing on real device I hade made some beauty to
the fullscreen mode, now it seems working real fine.
Zecke: I think, on real frontend side most work is finish, now we should
resolve the problems with iconview and co. And find a faster rotate-algorithm ;)
-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 | 17 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 2 |
4 files changed, 19 insertions, 2 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 @@ -66,6 +66,7 @@ void ImageView::keyReleaseEvent(QKeyEvent * e) if (e->key()==Qt::Key_N) slotDispNext(); if (e->key()==Qt::Key_P) slotDispPrev(); if (e->key()==Qt::Key_F) emit toggleFullScreen(); + if (e->key()==Qt::Key_Escape && fullScreen()) emit hideMe(); } void ImageView::slotDispNext() 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 @@ -31,6 +31,7 @@ signals: void dispNext(); void dispPrev(); void toggleFullScreen(); + void hideMe(); protected: Opie::Core::OConfig * m_cfg; 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() { connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext())); connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev())); connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); + connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView())); } } @@ -298,12 +299,16 @@ void PMainWindow::slotToggleFullScreen() odebug << "full" << oendl; m_disp->setBackgroundColor(black); m_disp->reparent(0,QPoint(0,0)); + m_disp->setVScrollBarMode(QScrollView::AlwaysOff); + m_disp->setHScrollBarMode(QScrollView::AlwaysOff); m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); m_disp->showFullScreen(); } else { odebug << "window" << oendl; m_disp->setBackgroundColor(white); m_stack->addWidget(m_disp,ImageDisplay); + m_disp->setVScrollBarMode(QScrollView::Auto); + m_disp->setHScrollBarMode(QScrollView::Auto); m_stack->raiseWidget(m_disp); if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { m_disp->resize(m_disp->minimumSize()); @@ -331,6 +336,9 @@ void PMainWindow::slotShowInfo( const QString& inf ) { fsButton->hide(); viewModeButton->hide(); } + if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { + m_disp->hide(); + } m_stack->raiseWidget( ImageInfo ); } @@ -346,7 +354,11 @@ void PMainWindow::slotDisplay( const QString& inf ) { fsButton->hide(); viewModeButton->hide(); } - m_stack->raiseWidget( ImageDisplay ); + if (m_disp->fullScreen()) { + m_disp->show(); + } else { + m_stack->raiseWidget( ImageDisplay ); + } } void PMainWindow::slotReturn() { @@ -377,6 +389,9 @@ void PMainWindow::raiseIconView() { fsButton->show(); viewModeButton->show(); } + if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { + m_disp->hide(); + } 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 @@ -46,7 +46,7 @@ public slots: void setDocument( const QString& ); virtual void slotToggleFullScreen(); -protected: +protected slots: void raiseIconView(); void closeEvent( QCloseEvent* ); |