summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -6,4 +6,6 @@
#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+#include <qpopupmenu.h>
using namespace Opie::Core;
@@ -15,4 +17,5 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
m_cfg = cfg;
m_isFullScreen = false;
+ QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold);
initKeys();
}
@@ -20,4 +23,5 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
ImageView::~ImageView()
{
+ odebug << "Delete Imageview" << oendl;
if (m_viewManager) {
delete m_viewManager;
@@ -49,4 +53,5 @@ 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,
@@ -54,7 +59,16 @@ void ImageView::initKeys()
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",
@@ -86,2 +100,32 @@ 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
@@ -21,4 +21,6 @@ class ImageView:public Opie::MM::OImageScrollView
ShowPrevious,
Zoomer,
+ Autorotate,
+ Autoscale
};
@@ -27,5 +29,5 @@ public:
virtual ~ImageView();
Opie::Core::OKeyConfigManager* manager();
- void setFullScreen(bool how){m_isFullScreen = how;}
+ void setFullScreen(bool how);
bool fullScreen(){return m_isFullScreen;}
@@ -37,4 +39,6 @@ signals:
void hideMe();
void toggleZoomer();
+ void toggleAutoscale();
+ void toggleAutorotate();
protected:
@@ -47,4 +51,6 @@ 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
@@ -31,5 +31,5 @@
#include <qmap.h>
#include <qtimer.h>
-
+#include <qframe.h>
@@ -43,4 +43,5 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
m_cfg = new Opie::Core::OConfig("phunkview");
m_cfg->setGroup("Zecke_view" );
+ tFrame = 0;
// qDebug( "Process-wide OApplication object @ %0x", oApp );
/*
@@ -129,9 +130,9 @@ 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;
@@ -146,4 +147,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
PMainWindow::~PMainWindow() {
odebug << "Shutting down" << oendl;
+ if (tFrame) delete tFrame;
+ odebug << "Shutting down done" << oendl;
}
@@ -163,4 +166,19 @@ 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)
{
@@ -296,4 +314,6 @@ void PMainWindow::initDisp() {
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()));
}
}
@@ -309,11 +329,20 @@ void PMainWindow::slotToggleFullScreen()
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);
@@ -336,4 +365,7 @@ void PMainWindow::slotToggleFullScreen()
*/
void PMainWindow::slotShowInfo( const QString& inf ) {
+ if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
+ return;
+ }
if ( !m_info ) {
initInfo();
@@ -347,7 +379,4 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
viewModeButton->hide();
}
- if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
- m_disp->hide();
- }
m_stack->raiseWidget( ImageInfo );
}
@@ -366,5 +395,6 @@ void PMainWindow::slotDisplay( const QString& inf ) {
}
if (m_disp->fullScreen()) {
- m_disp->show();
+ tFrame->setActiveWindow();
+ tFrame->showFullScreen();
} else {
m_stack->raiseWidget( ImageDisplay );
@@ -384,8 +414,13 @@ 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()));
@@ -401,5 +436,5 @@ void PMainWindow::raiseIconView() {
}
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
@@ -45,4 +45,6 @@ public slots:
void slotZoomerToggled(bool);
void slotToggleZoomer();
+ void slotToggleAutorotate();
+ void slotToggleAutoscale();
void setDocument( const QString& );
virtual void slotToggleFullScreen();
@@ -66,6 +68,7 @@ private:
bool autoScale;
bool zoomerOn;
+ QWidget*tFrame;
QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
- QToolButton*nextButton,*prevButton,*zoomButton;
+ QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton;
private slots: