summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp14
1 files changed, 10 insertions, 4 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
@@ -25,9 +25,7 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
25ImageView::~ImageView() 25ImageView::~ImageView()
26{ 26{
27 odebug << "Delete Imageview" << oendl; 27 odebug << "Delete Imageview" << oendl;
28 if (m_viewManager) { 28 delete m_viewManager;
29 delete m_viewManager;
30 }
31} 29}
32 30
33Opie::Core::OKeyConfigManager* ImageView::manager() 31Opie::Core::OKeyConfigManager* ImageView::manager()
@@ -55,6 +53,14 @@ void ImageView::initKeys()
55 m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", 53 m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
56 lst, false,this, "image_view_keys" ); 54 lst, false,this, "image_view_keys" );
57 55
56 /**
57 * Handle KeyEvents when they're pressed. This avoids problems
58 * with 'double next' on Return.
59 * The Return press would switch to this view and the return
60 * release would emit the dispNext Signal.
61 */
62 m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed );
63
58 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo", 64 m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
59 Resource::loadPixmap("1to1"), ViewInfo, 65 Resource::loadPixmap("1to1"), ViewInfo,
60 Opie::Core::OKeyPair(Qt::Key_I,0), 66 Opie::Core::OKeyPair(Qt::Key_I,0),
@@ -146,7 +152,7 @@ void ImageView::focusInEvent(QFocusEvent *)
146 if (fullScreen()) enableFullscreen(); 152 if (fullScreen()) enableFullscreen();
147} 153}
148 154
149void ImageView::hide() 155void ImageView::hide()
150{ 156{
151 if (fullScreen()) { 157 if (fullScreen()) {
152 m_ignore_next_in = true; 158 m_ignore_next_in = true;