summaryrefslogtreecommitdiff
path: root/noncore/graphics
authoralwin <alwin>2004-04-20 14:08:54 (UTC)
committer alwin <alwin>2004-04-20 14:08:54 (UTC)
commitccba33667c0152cb58a6d0502170b388889571c9 (patch) (side-by-side diff)
tree435da693facffec996bcaa8d8ae500c773794d7f /noncore/graphics
parent135990877f009bd05f00b064a1a255be3e5ab087 (diff)
downloadopie-ccba33667c0152cb58a6d0502170b388889571c9.zip
opie-ccba33667c0152cb58a6d0502170b388889571c9.tar.gz
opie-ccba33667c0152cb58a6d0502170b388889571c9.tar.bz2
keys in imageview handled via keyconfig manager again
Diffstat (limited to 'noncore/graphics') (more/less context) (ignore 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
@@ -44,9 +44,7 @@ void ImageView::initKeys()
lst.append( Opie::Core::OKeyPair::downArrowKey() );
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",
lst, false,this, "image_view_keys" );
@@ -54,6 +52,23 @@ void ImageView::initKeys()
Resource::loadPixmap("1to1"), ViewInfo,
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();
}
@@ -63,22 +78,9 @@ void ImageView::keyReleaseEvent(QKeyEvent * e)
if (!e || e->state()!=0) {
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()
{
emit dispImageInfo(m_lastName);
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
@@ -16,7 +16,10 @@ class ImageView:public Opie::MM::OImageScrollView
enum ActionIds {
ViewInfo,
- FullScreen
+ FullScreen,
+ ShowNext,
+ ShowPrevious,
+ Zoomer,
};
public:
@@ -32,6 +35,7 @@ signals:
void dispPrev();
void toggleFullScreen();
void hideMe();
+ void toggleZoomer();
protected:
Opie::Core::OConfig * m_cfg;
@@ -41,8 +45,6 @@ protected:
protected slots:
virtual void slotShowImageInfo();
- virtual void slotDispNext();
- virtual void slotDispPrev();
virtual void keyReleaseEvent(QKeyEvent * e);
};
#endif
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
@@ -135,11 +135,11 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
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;
}
@@ -147,6 +147,13 @@ PMainWindow::~PMainWindow() {
odebug << "Shutting down" << oendl;
}
+void PMainWindow::slotToggleZoomer()
+{
+ if (!m_disp) return;
+ bool cur = zoomButton->isOn();
+ zoomButton->setOn(!cur);
+}
+
void PMainWindow::slotZoomerToggled(bool how)
{
zoomerOn = how;
@@ -287,6 +294,7 @@ void PMainWindow::initDisp() {
connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev()));
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
@@ -43,6 +43,7 @@ public slots:
void slotRotateToggled(bool);
void slotScaleToggled(bool);
void slotZoomerToggled(bool);
+ void slotToggleZoomer();
void setDocument( const QString& );
virtual void slotToggleFullScreen();
@@ -65,7 +66,7 @@ private:
bool autoScale;
bool zoomerOn;
QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
- QToolButton*nextButton,*prevButton;
+ QToolButton*nextButton,*prevButton,*zoomButton;
private slots:
void slotConfig();