summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp46
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h8
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp63
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h5
4 files changed, 105 insertions, 17 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 88a8bc6..5b34ca2 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -7,2 +7,4 @@
7#include <qpe/resource.h> 7#include <qpe/resource.h>
8#include <qpe/qpeapplication.h>
9#include <qpopupmenu.h>
8 10
@@ -16,2 +18,3 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
16 m_isFullScreen = false; 18 m_isFullScreen = false;
19 QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold);
17 initKeys(); 20 initKeys();
@@ -21,2 +24,3 @@ ImageView::~ImageView()
21{ 24{
25 odebug << "Delete Imageview" << oendl;
22 if (m_viewManager) { 26 if (m_viewManager) {
@@ -50,2 +54,3 @@ void ImageView::initKeys()
50 lst, false,this, "image_view_keys" ); 54 lst, false,this, "image_view_keys" );
55
51 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo", 56 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
@@ -55,5 +60,14 @@ void ImageView::initKeys()
55 60
61 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate",
62 Resource::loadPixmap("rotate"), Autorotate,
63 Opie::Core::OKeyPair(Qt::Key_R,0),
64 this, SIGNAL(toggleAutorotate())));
65 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale",
66 Resource::loadPixmap("1to1"), Autoscale,
67 Opie::Core::OKeyPair(Qt::Key_S,0),
68 this, SIGNAL(toggleAutoscale())));
69
56 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext", 70 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext",
57 Resource::loadPixmap("forward"), ShowNext, 71 Resource::loadPixmap("forward"), ShowNext,
58 Opie::Core::OKeyPair(Qt::Key_N,0), 72 Opie::Core::OKeyPair(Qt::Key_Return,0),
59 this, SIGNAL(dispNext()))); 73 this, SIGNAL(dispNext())));
@@ -87 +101,31 @@ void ImageView::slotShowImageInfo()
87} 101}
102
103void ImageView::contentsMousePressEvent ( QMouseEvent * e)
104{
105 if (e->button()==1) {
106 return OImageScrollView::contentsMousePressEvent(e);
107 }
108 if (!fullScreen()) return;
109#if 0
110 // doesn't work right (repainting problems)
111 odebug << "Popup " << oendl;
112 QPopupMenu *m = new QPopupMenu(0);
113 if (!m) return;
114 m->insertItem(tr("Previous image"),ShowPrevious);
115 m->insertItem(tr("Next image"),ShowNext);
116 m->insertSeparator();
117 m->insertItem(tr("Toggle fullscreen"),FullScreen);
118 m->insertItem(tr("Toggle autoscale"),Autoscale);
119 m->insertItem(tr("Toggle autorotate"),Autorotate);
120 m->insertItem(tr("Toggle thumbnail"),Zoomer);
121 m->setFocus();
122 m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
123 delete m;
124 parentWidget()->showFullScreen();
125#endif
126}
127
128void ImageView::setFullScreen(bool how)
129{
130 m_isFullScreen = how;
131}
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 6bf930f..445bee9 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -22,2 +22,4 @@ class ImageView:public Opie::MM::OImageScrollView
22 Zoomer, 22 Zoomer,
23 Autorotate,
24 Autoscale
23 }; 25 };
@@ -28,3 +30,3 @@ public:
28 Opie::Core::OKeyConfigManager* manager(); 30 Opie::Core::OKeyConfigManager* manager();
29 void setFullScreen(bool how){m_isFullScreen = how;} 31 void setFullScreen(bool how);
30 bool fullScreen(){return m_isFullScreen;} 32 bool fullScreen(){return m_isFullScreen;}
@@ -38,2 +40,4 @@ signals:
38 void toggleZoomer(); 40 void toggleZoomer();
41 void toggleAutoscale();
42 void toggleAutorotate();
39 43
@@ -48,3 +52,5 @@ protected slots:
48 virtual void keyReleaseEvent(QKeyEvent * e); 52 virtual void keyReleaseEvent(QKeyEvent * e);
53 virtual void contentsMousePressEvent ( QMouseEvent * e);
49}; 54};
55
50#endif 56#endif
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 0484f73..a784f5b 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -32,3 +32,3 @@
32#include <qtimer.h> 32#include <qtimer.h>
33 33#include <qframe.h>
34 34
@@ -44,2 +44,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
44 m_cfg->setGroup("Zecke_view" ); 44 m_cfg->setGroup("Zecke_view" );
45 tFrame = 0;
45// qDebug( "Process-wide OApplication object @ %0x", oApp ); 46// qDebug( "Process-wide OApplication object @ %0x", oApp );
@@ -130,7 +131,7 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
130 131
131 btn = new QToolButton(bar); 132 scaleButton = new QToolButton(bar);
132 btn->setIconSet( Resource::loadIconSet( "1to1" ) ); 133 scaleButton->setIconSet( Resource::loadIconSet( "1to1" ) );
133 btn->setToggleButton(true); 134 scaleButton->setToggleButton(true);
134 btn->setOn(false); 135 scaleButton->setOn(false);
135 connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); 136 connect(scaleButton,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
136 autoScale = true; 137 autoScale = true;
@@ -147,2 +148,4 @@ PMainWindow::~PMainWindow() {
147 odebug << "Shutting down" << oendl; 148 odebug << "Shutting down" << oendl;
149 if (tFrame) delete tFrame;
150 odebug << "Shutting down done" << oendl;
148} 151}
@@ -164,2 +167,17 @@ void PMainWindow::slotZoomerToggled(bool how)
164 167
168void PMainWindow::slotToggleAutorotate()
169{
170 if (!m_disp) return;
171 if (!rotateButton->isEnabled()) return;
172 bool cur = rotateButton->isOn();
173 rotateButton->setOn(!cur);
174}
175
176void PMainWindow::slotToggleAutoscale()
177{
178 if (!m_disp) return;
179 bool cur = scaleButton->isOn();
180 scaleButton->setOn(!cur);
181}
182
165void PMainWindow::slotRotateToggled(bool how) 183void PMainWindow::slotRotateToggled(bool how)
@@ -297,2 +315,4 @@ void PMainWindow::initDisp() {
297 connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer())); 315 connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer()));
316 connect(m_disp,SIGNAL(toggleAutoscale()),this,SLOT(slotToggleAutoscale()));
317 connect(m_disp,SIGNAL(toggleAutorotate()),this,SLOT(slotToggleAutorotate()));
298 } 318 }
@@ -310,3 +330,8 @@ void PMainWindow::slotToggleFullScreen()
310 m_disp->setBackgroundColor(black); 330 m_disp->setBackgroundColor(black);
311 m_disp->reparent(0,QPoint(0,0)); 331 if (!tFrame) {
332 tFrame = new QWidget(0,0,WType_TopLevel|WStyle_NoBorder|WStyle_StaysOnTop);
333 tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height());
334 tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height());
335 }
336 m_disp->reparent(tFrame,QPoint(0,0));
312 m_disp->setVScrollBarMode(QScrollView::AlwaysOff); 337 m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
@@ -314,5 +339,9 @@ void PMainWindow::slotToggleFullScreen()
314 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); 339 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
315 m_disp->showFullScreen(); 340 tFrame->showFullScreen();
316 } else { 341 } else {
317 odebug << "window" << oendl; 342 odebug << "window" << oendl;
343 m_disp->reparent(0,QPoint(0,0));
344 m_disp->showNormal();
345 /* don't forget it! */
346 tFrame->hide();
318 m_disp->setBackgroundColor(white); 347 m_disp->setBackgroundColor(white);
@@ -337,2 +366,5 @@ void PMainWindow::slotToggleFullScreen()
337void PMainWindow::slotShowInfo( const QString& inf ) { 366void PMainWindow::slotShowInfo( const QString& inf ) {
367 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
368 return;
369 }
338 if ( !m_info ) { 370 if ( !m_info ) {
@@ -348,5 +380,2 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
348 } 380 }
349 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
350 m_disp->hide();
351 }
352 m_stack->raiseWidget( ImageInfo ); 381 m_stack->raiseWidget( ImageInfo );
@@ -367,3 +396,4 @@ void PMainWindow::slotDisplay( const QString& inf ) {
367 if (m_disp->fullScreen()) { 396 if (m_disp->fullScreen()) {
368 m_disp->show(); 397 tFrame->setActiveWindow();
398 tFrame->showFullScreen();
369 } else { 399 } else {
@@ -385,6 +415,11 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) {
385 m_stack->visibleWidget() == m_disp ) { 415 m_stack->visibleWidget() == m_disp ) {
386 raiseIconView();
387 ev->ignore(); 416 ev->ignore();
417 raiseIconView();
388 return; 418 return;
389 } 419 }
420 if (m_disp && m_disp->fullScreen()) {
421 /* otherwise opie-eye crashes in bigscreen mode! */
422 m_disp->reparent(0,QPoint(0,0));
423 m_stack->addWidget(m_disp,ImageDisplay);
424 }
390 ev->accept(); 425 ev->accept();
@@ -402,3 +437,3 @@ void PMainWindow::raiseIconView() {
402 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { 437 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
403 m_disp->hide(); 438 tFrame->hide();
404 } 439 }
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index e51a3ff..1f90f9f 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -46,2 +46,4 @@ public slots:
46 void slotToggleZoomer(); 46 void slotToggleZoomer();
47 void slotToggleAutorotate();
48 void slotToggleAutoscale();
47 void setDocument( const QString& ); 49 void setDocument( const QString& );
@@ -67,4 +69,5 @@ private:
67 bool zoomerOn; 69 bool zoomerOn;
70 QWidget*tFrame;
68 QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; 71 QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
69 QToolButton*nextButton,*prevButton,*zoomButton; 72 QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton;
70 73