summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-16 20:35:35 (UTC)
committer alwin <alwin>2004-04-16 20:35:35 (UTC)
commit217d387def6d97f912352899fd83908b28d75dfc (patch) (side-by-side diff)
tree14135801a52bbbfca4395a4cbf4b7fdffdeb45ad
parentcc56768485c3785439883dd1c456493f7ece2d84 (diff)
downloadopie-217d387def6d97f912352899fd83908b28d75dfc.zip
opie-217d387def6d97f912352899fd83908b28d75dfc.tar.gz
opie-217d387def6d97f912352899fd83908b28d75dfc.tar.bz2
Implemented fullscreen mode (f-key)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp11
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h8
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp26
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h1
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
@@ -14,4 +14,5 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
m_viewManager = 0;
m_cfg = cfg;
+ m_isFullScreen = false;
initKeys();
}
@@ -46,4 +47,5 @@ void ImageView::initKeys()
lst.append( Opie::Core::OKeyPair(Qt::Key_N,0));
lst.append( Opie::Core::OKeyPair(Qt::Key_P,0));
+ lst.append( Opie::Core::OKeyPair(Qt::Key_F,0));
m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
@@ -51,12 +53,6 @@ void ImageView::initKeys()
m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
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 );
m_viewManager->load();
@@ -70,4 +66,5 @@ 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();
}
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
@@ -16,5 +16,6 @@ class ImageView:public Opie::MM::OImageScrollView
enum ActionIds {
- ViewInfo
+ ViewInfo,
+ FullScreen
};
@@ -23,4 +24,6 @@ public:
virtual ~ImageView();
Opie::Core::OKeyConfigManager* manager();
+ void setFullScreen(bool how){m_isFullScreen = how;}
+ bool fullScreen(){return m_isFullScreen;}
signals:
@@ -28,4 +31,5 @@ signals:
void dispNext();
void dispPrev();
+ void toggleFullScreen();
protected:
@@ -33,4 +37,6 @@ protected:
Opie::Core::OKeyConfigManager*m_viewManager;
void initKeys();
+ bool m_isFullScreen:1;
+
protected slots:
virtual void slotShowImageInfo();
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
@@ -280,7 +280,33 @@ void PMainWindow::initDisp() {
m_disp->setAutoRotate(autoRotate);
m_disp->setShowZoomer(zoomerOn);
+ m_disp->setBackgroundColor(white);
connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
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()));
+ }
+}
+
+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
@@ -45,4 +45,5 @@ public slots:
void slotZoomerToggled(bool);
void setDocument( const QString& );
+ virtual void slotToggleFullScreen();
protected: