Use KeyPressed instead of KeyReleased for the Accelerator

Key in the Image Display component. This fixes the
double 'next' problem when going from the browser to the viewer/display

1 files changed, 8 insertions, 2 deletions

diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index b4f3110..5522131 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -22,16 +22,14 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
     initKeys();
 }
 
 ImageView::~ImageView()
 {
     odebug << "Delete Imageview" << oendl;
-    if (m_viewManager) {
         delete m_viewManager;
     }
-}
 
 Opie::Core::OKeyConfigManager* ImageView::manager()
 {
     if (!m_viewManager) {
         initKeys();
     }
@@ -52,12 +50,20 @@ void ImageView::initKeys()
     lst.append( Opie::Core::OKeyPair::rightArrowKey() );
     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" );
 
+    /**
+     * Handle KeyEvents when they're pressed. This avoids problems
+     * with 'double next' on Return.
+     * The Return press would switch to this view and the return
+     * release would emit the dispNext Signal.
+     */
+    m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed );
+
     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",