| -rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 11 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.h | 8 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 26 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 1 |
4 files changed, 38 insertions, 8 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index fbc4494..8e7f982 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp @@ -15,2 +15,3 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name m_cfg = cfg; + m_isFullScreen = false; initKeys(); @@ -47,2 +48,3 @@ void ImageView::initKeys() lst.append( Opie::Core::OKeyPair(Qt::Key_P,0)); + lst.append( Opie::Core::OKeyPair(Qt::Key_F,0)); @@ -52,10 +54,4 @@ void ImageView::initKeys() Resource::loadPixmap("1to1"), ViewInfo, - Opie::Core::OKeyPair(Qt::Key_I,Qt::ShiftButton), + Opie::Core::OKeyPair(Qt::Key_I,0), this, SLOT(slotShowImageInfo()))); -#if 0 - m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Next image"), "nextimage", - Resource::loadPixmap("next"), ViewInfo, - Opie::Core::OKeyPair(Qt::Key_N,0), - this, SLOT(slotDispNext()))); -#endif m_viewManager->handleWidget( this ); @@ -71,2 +67,3 @@ void ImageView::keyReleaseEvent(QKeyEvent * e) if (e->key()==Qt::Key_P) slotDispPrev(); + if (e->key()==Qt::Key_F) emit toggleFullScreen(); } diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h index f467f00..32f7e11 100644 --- a/noncore/graphics/opie-eye/gui/imageview.h +++ b/noncore/graphics/opie-eye/gui/imageview.h @@ -17,3 +17,4 @@ class ImageView:public Opie::MM::OImageScrollView enum ActionIds { - ViewInfo + ViewInfo, + FullScreen }; @@ -24,2 +25,4 @@ public: Opie::Core::OKeyConfigManager* manager(); + void setFullScreen(bool how){m_isFullScreen = how;} + bool fullScreen(){return m_isFullScreen;} @@ -29,2 +32,3 @@ signals: void dispPrev(); + void toggleFullScreen(); @@ -34,2 +38,4 @@ protected: void initKeys(); + bool m_isFullScreen:1; + protected slots: diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 4852bf6..9b929a1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -281,2 +281,3 @@ void PMainWindow::initDisp() { m_disp->setShowZoomer(zoomerOn); + m_disp->setBackgroundColor(white); connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); @@ -284,2 +285,27 @@ void PMainWindow::initDisp() { connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev())); + connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); + } +} + +void PMainWindow::slotToggleFullScreen() +{ + odebug << "Toggle full " << oendl; + if (!m_disp) return; + bool current = !m_disp->fullScreen(); + m_disp->setFullScreen(current); + odebug << "Current = " << current << oendl; + if (current) { + odebug << "full" << oendl; + m_disp->setBackgroundColor(black); + m_disp->reparent(0,QPoint(0,0)); + 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_stack->raiseWidget(m_disp); + if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { + m_disp->resize(m_disp->minimumSize()); + } } diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 1967ef7..4cfc39c 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h @@ -46,2 +46,3 @@ public slots: void setDocument( const QString& ); + virtual void slotToggleFullScreen(); |