summaryrefslogtreecommitdiff
Unidiff
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
@@ -13,6 +13,7 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
13{ 13{
14 m_viewManager = 0; 14 m_viewManager = 0;
15 m_cfg = cfg; 15 m_cfg = cfg;
16 m_isFullScreen = false;
16 initKeys(); 17 initKeys();
17} 18}
18 19
@@ -45,19 +46,14 @@ void ImageView::initKeys()
45 lst.append( Opie::Core::OKeyPair::rightArrowKey() ); 46 lst.append( Opie::Core::OKeyPair::rightArrowKey() );
46 lst.append( Opie::Core::OKeyPair(Qt::Key_N,0)); 47 lst.append( Opie::Core::OKeyPair(Qt::Key_N,0));
47 lst.append( Opie::Core::OKeyPair(Qt::Key_P,0)); 48 lst.append( Opie::Core::OKeyPair(Qt::Key_P,0));
49 lst.append( Opie::Core::OKeyPair(Qt::Key_F,0));
48 50
49 m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", 51 m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
50 lst, false,this, "image_view_keys" ); 52 lst, false,this, "image_view_keys" );
51 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo", 53 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
52 Resource::loadPixmap("1to1"), ViewInfo, 54 Resource::loadPixmap("1to1"), ViewInfo,
53 Opie::Core::OKeyPair(Qt::Key_I,Qt::ShiftButton), 55 Opie::Core::OKeyPair(Qt::Key_I,0),
54 this, SLOT(slotShowImageInfo()))); 56 this, SLOT(slotShowImageInfo())));
55#if 0
56 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Next image"), "nextimage",
57 Resource::loadPixmap("next"), ViewInfo,
58 Opie::Core::OKeyPair(Qt::Key_N,0),
59 this, SLOT(slotDispNext())));
60#endif
61 m_viewManager->handleWidget( this ); 57 m_viewManager->handleWidget( this );
62 m_viewManager->load(); 58 m_viewManager->load();
63} 59}
@@ -69,6 +65,7 @@ void ImageView::keyReleaseEvent(QKeyEvent * e)
69 } 65 }
70 if (e->key()==Qt::Key_N) slotDispNext(); 66 if (e->key()==Qt::Key_N) slotDispNext();
71 if (e->key()==Qt::Key_P) slotDispPrev(); 67 if (e->key()==Qt::Key_P) slotDispPrev();
68 if (e->key()==Qt::Key_F) emit toggleFullScreen();
72} 69}
73 70
74void ImageView::slotDispNext() 71void ImageView::slotDispNext()
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
@@ -15,23 +15,29 @@ class ImageView:public Opie::MM::OImageScrollView
15 Q_OBJECT 15 Q_OBJECT
16 16
17 enum ActionIds { 17 enum ActionIds {
18 ViewInfo 18 ViewInfo,
19 FullScreen
19 }; 20 };
20 21
21public: 22public:
22 ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 ); 23 ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 );
23 virtual ~ImageView(); 24 virtual ~ImageView();
24 Opie::Core::OKeyConfigManager* manager(); 25 Opie::Core::OKeyConfigManager* manager();
26 void setFullScreen(bool how){m_isFullScreen = how;}
27 bool fullScreen(){return m_isFullScreen;}
25 28
26signals: 29signals:
27 void dispImageInfo(const QString&); 30 void dispImageInfo(const QString&);
28 void dispNext(); 31 void dispNext();
29 void dispPrev(); 32 void dispPrev();
33 void toggleFullScreen();
30 34
31protected: 35protected:
32 Opie::Core::OConfig * m_cfg; 36 Opie::Core::OConfig * m_cfg;
33 Opie::Core::OKeyConfigManager*m_viewManager; 37 Opie::Core::OKeyConfigManager*m_viewManager;
34 void initKeys(); 38 void initKeys();
39 bool m_isFullScreen:1;
40
35protected slots: 41protected slots:
36 virtual void slotShowImageInfo(); 42 virtual void slotShowImageInfo();
37 virtual void slotDispNext(); 43 virtual void slotDispNext();
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
@@ -279,9 +279,35 @@ void PMainWindow::initDisp() {
279 m_disp->setAutoScale(autoScale); 279 m_disp->setAutoScale(autoScale);
280 m_disp->setAutoRotate(autoRotate); 280 m_disp->setAutoRotate(autoRotate);
281 m_disp->setShowZoomer(zoomerOn); 281 m_disp->setShowZoomer(zoomerOn);
282 m_disp->setBackgroundColor(white);
282 connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); 283 connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
283 connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext())); 284 connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext()));
284 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()));
287 }
288}
289
290void PMainWindow::slotToggleFullScreen()
291{
292 odebug << "Toggle full " << oendl;
293 if (!m_disp) return;
294 bool current = !m_disp->fullScreen();
295 m_disp->setFullScreen(current);
296 odebug << "Current = " << current << oendl;
297 if (current) {
298 odebug << "full" << oendl;
299 m_disp->setBackgroundColor(black);
300 m_disp->reparent(0,QPoint(0,0));
301 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
302 m_disp->showFullScreen();
303 } else {
304 odebug << "window" << oendl;
305 m_disp->setBackgroundColor(white);
306 m_stack->addWidget(m_disp,ImageDisplay);
307 m_stack->raiseWidget(m_disp);
308 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
309 m_disp->resize(m_disp->minimumSize());
310 }
285 } 311 }
286} 312}
287 313
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
@@ -44,6 +44,7 @@ public slots:
44 void slotScaleToggled(bool); 44 void slotScaleToggled(bool);
45 void slotZoomerToggled(bool); 45 void slotZoomerToggled(bool);
46 void setDocument( const QString& ); 46 void setDocument( const QString& );
47 virtual void slotToggleFullScreen();
47 48
48protected: 49protected:
49 void raiseIconView(); 50 void raiseIconView();