| -rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 46 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.h | 8 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 63 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 5 |
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 @@ -5,6 +5,8 @@ #include <opie2/okeyconfigwidget.h> #include <qpe/resource.h> +#include <qpe/qpeapplication.h> +#include <qpopupmenu.h> using namespace Opie::Core; @@ -14,11 +16,13 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name m_viewManager = 0; m_cfg = cfg; m_isFullScreen = false; + QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold); initKeys(); } ImageView::~ImageView() { + odebug << "Delete Imageview" << oendl; if (m_viewManager) { delete m_viewManager; } @@ -48,14 +52,24 @@ void ImageView::initKeys() m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", lst, false,this, "image_view_keys" ); + m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo", Resource::loadPixmap("1to1"), ViewInfo, Opie::Core::OKeyPair(Qt::Key_I,0), this, SLOT(slotShowImageInfo()))); + m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate", + Resource::loadPixmap("rotate"), Autorotate, + Opie::Core::OKeyPair(Qt::Key_R,0), + this, SIGNAL(toggleAutorotate()))); + m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale", + Resource::loadPixmap("1to1"), Autoscale, + Opie::Core::OKeyPair(Qt::Key_S,0), + this, SIGNAL(toggleAutoscale()))); + m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext", Resource::loadPixmap("forward"), ShowNext, - Opie::Core::OKeyPair(Qt::Key_N,0), + Opie::Core::OKeyPair(Qt::Key_Return,0), this, SIGNAL(dispNext()))); m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev", Resource::loadPixmap("back"), ShowPrevious, @@ -85,3 +99,33 @@ void ImageView::slotShowImageInfo() { emit dispImageInfo(m_lastName); } + +void ImageView::contentsMousePressEvent ( QMouseEvent * e) +{ + if (e->button()==1) { + return OImageScrollView::contentsMousePressEvent(e); + } + if (!fullScreen()) return; +#if 0 + // doesn't work right (repainting problems) + odebug << "Popup " << oendl; + QPopupMenu *m = new QPopupMenu(0); + if (!m) return; + m->insertItem(tr("Previous image"),ShowPrevious); + m->insertItem(tr("Next image"),ShowNext); + m->insertSeparator(); + m->insertItem(tr("Toggle fullscreen"),FullScreen); + m->insertItem(tr("Toggle autoscale"),Autoscale); + m->insertItem(tr("Toggle autorotate"),Autorotate); + m->insertItem(tr("Toggle thumbnail"),Zoomer); + m->setFocus(); + m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); + delete m; + parentWidget()->showFullScreen(); +#endif +} + +void ImageView::setFullScreen(bool how) +{ + m_isFullScreen = how; +} 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 @@ -20,13 +20,15 @@ class ImageView:public Opie::MM::OImageScrollView ShowNext, ShowPrevious, Zoomer, + Autorotate, + Autoscale }; public: ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 ); virtual ~ImageView(); Opie::Core::OKeyConfigManager* manager(); - void setFullScreen(bool how){m_isFullScreen = how;} + void setFullScreen(bool how); bool fullScreen(){return m_isFullScreen;} signals: @@ -36,6 +38,8 @@ signals: void toggleFullScreen(); void hideMe(); void toggleZoomer(); + void toggleAutoscale(); + void toggleAutorotate(); protected: Opie::Core::OConfig * m_cfg; @@ -46,5 +50,7 @@ protected: protected slots: virtual void slotShowImageInfo(); virtual void keyReleaseEvent(QKeyEvent * e); + virtual void contentsMousePressEvent ( QMouseEvent * e); }; + #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 @@ -30,7 +30,7 @@ #include <qdialog.h> #include <qmap.h> #include <qtimer.h> - +#include <qframe.h> @@ -42,6 +42,7 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) setCaption( QObject::tr("Opie Eye Caramba" ) ); m_cfg = new Opie::Core::OConfig("phunkview"); m_cfg->setGroup("Zecke_view" ); + tFrame = 0; // qDebug( "Process-wide OApplication object @ %0x", oApp ); /* * Initialize ToolBar and IconView @@ -128,11 +129,11 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); - btn = new QToolButton(bar); - btn->setIconSet( Resource::loadIconSet( "1to1" ) ); - btn->setToggleButton(true); - btn->setOn(false); - connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); + scaleButton = new QToolButton(bar); + scaleButton->setIconSet( Resource::loadIconSet( "1to1" ) ); + scaleButton->setToggleButton(true); + scaleButton->setOn(false); + connect(scaleButton,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); autoScale = true; zoomButton = new QToolButton(bar); @@ -145,6 +146,8 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) PMainWindow::~PMainWindow() { odebug << "Shutting down" << oendl; + if (tFrame) delete tFrame; + odebug << "Shutting down done" << oendl; } void PMainWindow::slotToggleZoomer() @@ -162,6 +165,21 @@ void PMainWindow::slotZoomerToggled(bool how) } } +void PMainWindow::slotToggleAutorotate() +{ + if (!m_disp) return; + if (!rotateButton->isEnabled()) return; + bool cur = rotateButton->isOn(); + rotateButton->setOn(!cur); +} + +void PMainWindow::slotToggleAutoscale() +{ + if (!m_disp) return; + bool cur = scaleButton->isOn(); + scaleButton->setOn(!cur); +} + void PMainWindow::slotRotateToggled(bool how) { autoRotate = how; @@ -295,6 +313,8 @@ void PMainWindow::initDisp() { connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView())); connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer())); + connect(m_disp,SIGNAL(toggleAutoscale()),this,SLOT(slotToggleAutoscale())); + connect(m_disp,SIGNAL(toggleAutorotate()),this,SLOT(slotToggleAutorotate())); } } @@ -308,13 +328,22 @@ void PMainWindow::slotToggleFullScreen() if (current) { odebug << "full" << oendl; m_disp->setBackgroundColor(black); - m_disp->reparent(0,QPoint(0,0)); + if (!tFrame) { + tFrame = new QWidget(0,0,WType_TopLevel|WStyle_NoBorder|WStyle_StaysOnTop); + tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height()); + tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height()); + } + m_disp->reparent(tFrame,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(); + tFrame->showFullScreen(); } else { odebug << "window" << oendl; + m_disp->reparent(0,QPoint(0,0)); + m_disp->showNormal(); + /* don't forget it! */ + tFrame->hide(); m_disp->setBackgroundColor(white); m_stack->addWidget(m_disp,ImageDisplay); m_disp->setVScrollBarMode(QScrollView::Auto); @@ -335,6 +364,9 @@ void PMainWindow::slotToggleFullScreen() * ### FIXME and talk to alwin */ void PMainWindow::slotShowInfo( const QString& inf ) { + if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { + return; + } if ( !m_info ) { initInfo(); } @@ -346,9 +378,6 @@ 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 ); } @@ -365,7 +394,8 @@ void PMainWindow::slotDisplay( const QString& inf ) { viewModeButton->hide(); } if (m_disp->fullScreen()) { - m_disp->show(); + tFrame->setActiveWindow(); + tFrame->showFullScreen(); } else { m_stack->raiseWidget( ImageDisplay ); } @@ -383,10 +413,15 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { */ if ( m_stack->visibleWidget() == m_info || m_stack->visibleWidget() == m_disp ) { - raiseIconView(); ev->ignore(); + raiseIconView(); return; } + if (m_disp && m_disp->fullScreen()) { + /* otherwise opie-eye crashes in bigscreen mode! */ + m_disp->reparent(0,QPoint(0,0)); + m_stack->addWidget(m_disp,ImageDisplay); + } ev->accept(); QTimer::singleShot(0, qApp, SLOT(closeAllWindows())); } @@ -400,7 +435,7 @@ void PMainWindow::raiseIconView() { viewModeButton->show(); } if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { - m_disp->hide(); + tFrame->hide(); } m_stack->raiseWidget( IconView ); } 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 @@ -44,6 +44,8 @@ public slots: void slotScaleToggled(bool); void slotZoomerToggled(bool); void slotToggleZoomer(); + void slotToggleAutorotate(); + void slotToggleAutoscale(); void setDocument( const QString& ); virtual void slotToggleFullScreen(); @@ -65,8 +67,9 @@ private: bool autoRotate; bool autoScale; bool zoomerOn; + QWidget*tFrame; QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; - QToolButton*nextButton,*prevButton,*zoomButton; + QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton; private slots: void slotConfig(); |