summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp34
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h8
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp18
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h3
4 files changed, 38 insertions, 25 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index ee4b0a1..88a8bc6 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -45,7 +45,5 @@ void ImageView::initKeys()
lst.append( Opie::Core::OKeyPair::leftArrowKey() );
lst.append( Opie::Core::OKeyPair::rightArrowKey() );
- 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));
+ lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0));
m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
@@ -55,4 +53,21 @@ void ImageView::initKeys()
Opie::Core::OKeyPair(Qt::Key_I,0),
this, SLOT(slotShowImageInfo())));
+
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext",
+ Resource::loadPixmap("forward"), ShowNext,
+ Opie::Core::OKeyPair(Qt::Key_N,0),
+ this, SIGNAL(dispNext())));
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev",
+ Resource::loadPixmap("back"), ShowPrevious,
+ Opie::Core::OKeyPair(Qt::Key_P,0),
+ this, SIGNAL(dispPrev())));
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle fullscreen"), "imagefullscreen",
+ Resource::loadPixmap("fullscreen"), FullScreen,
+ Opie::Core::OKeyPair(Qt::Key_F,0),
+ this, SIGNAL(toggleFullScreen())));
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle thumbnail"), "imagezoomer",
+ Resource::loadPixmap("mag"), Zoomer,
+ Opie::Core::OKeyPair(Qt::Key_T,0),
+ this, SIGNAL(toggleZoomer())));
m_viewManager->handleWidget( this );
m_viewManager->load();
@@ -64,20 +79,7 @@ void ImageView::keyReleaseEvent(QKeyEvent * e)
return;
}
- if (e->key()==Qt::Key_N) slotDispNext();
- if (e->key()==Qt::Key_P) slotDispPrev();
- if (e->key()==Qt::Key_F) emit toggleFullScreen();
if (e->key()==Qt::Key_Escape && fullScreen()) emit hideMe();
}
-void ImageView::slotDispNext()
-{
- emit dispNext();
-}
-
-void ImageView::slotDispPrev()
-{
- emit dispPrev();
-}
-
void ImageView::slotShowImageInfo()
{
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 75f798c..6bf930f 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -17,5 +17,8 @@ class ImageView:public Opie::MM::OImageScrollView
enum ActionIds {
ViewInfo,
- FullScreen
+ FullScreen,
+ ShowNext,
+ ShowPrevious,
+ Zoomer,
};
@@ -33,4 +36,5 @@ signals:
void toggleFullScreen();
void hideMe();
+ void toggleZoomer();
protected:
@@ -42,6 +46,4 @@ protected:
protected slots:
virtual void slotShowImageInfo();
- virtual void slotDispNext();
- virtual void slotDispPrev();
virtual void keyReleaseEvent(QKeyEvent * e);
};
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index a90231b..0484f73 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -136,9 +136,9 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
autoScale = true;
- btn = new QToolButton(bar);
- btn->setIconSet( Resource::loadIconSet( "mag" ) );
- btn->setToggleButton(true);
- btn->setOn(true);
- connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
+ zoomButton = new QToolButton(bar);
+ zoomButton->setIconSet( Resource::loadIconSet( "mag" ) );
+ zoomButton->setToggleButton(true);
+ zoomButton->setOn(true);
+ connect(zoomButton,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
zoomerOn = true;
}
@@ -148,4 +148,11 @@ PMainWindow::~PMainWindow() {
}
+void PMainWindow::slotToggleZoomer()
+{
+ if (!m_disp) return;
+ bool cur = zoomButton->isOn();
+ zoomButton->setOn(!cur);
+}
+
void PMainWindow::slotZoomerToggled(bool how)
{
@@ -288,4 +295,5 @@ 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()));
}
}
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index d238763..e51a3ff 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -44,4 +44,5 @@ public slots:
void slotScaleToggled(bool);
void slotZoomerToggled(bool);
+ void slotToggleZoomer();
void setDocument( const QString& );
virtual void slotToggleFullScreen();
@@ -66,5 +67,5 @@ private:
bool zoomerOn;
QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
- QToolButton*nextButton,*prevButton;
+ QToolButton*nextButton,*prevButton,*zoomButton;
private slots: