summaryrefslogtreecommitdiff
path: root/noncore/graphics/opie-eye/gui/imageview.cpp
Side-by-side diff
Diffstat (limited to 'noncore/graphics/opie-eye/gui/imageview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp20
1 files changed, 13 insertions, 7 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 8fc258e..e43bbff 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -10,3 +10,3 @@ using namespace Opie::Core;
-ImageView::ImageView( QWidget* parent, const char* name, WFlags fl )
+ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl )
: ImageScrollView(parent,name,fl)
@@ -14,2 +14,3 @@ ImageView::ImageView( QWidget* parent, const char* name, WFlags fl )
m_viewManager = 0;
+ m_cfg = cfg;
initKeys();
@@ -19,2 +20,5 @@ ImageView::~ImageView()
{
+ if (m_viewManager) {
+ delete m_viewManager;
+ }
}
@@ -32,4 +36,6 @@ void ImageView::initKeys()
odebug << "init imageview keys" << oendl;
- m_cfg = new Opie::Core::OConfig("phunkview");
- m_cfg->setGroup("Zecke_view" );
+ if (!m_cfg) {
+ m_cfg = new Opie::Core::OConfig("phunkview");
+ m_cfg->setGroup("image_view_keys" );
+ }
Opie::Ui::OKeyPair::List lst;
@@ -41,5 +47,5 @@ void ImageView::initKeys()
- m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "Imageview-KeyBoard-Config",
- lst, false,this, "keyconfig name" );
- m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Image Info"), "view",
+ m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "image_view_keys",
+ lst, false,this, "image_view_keys" );
+ m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
Resource::loadPixmap("1to1"), ViewInfo,
@@ -47,4 +53,4 @@ void ImageView::initKeys()
this, SLOT(slotShowImageInfo())));
- m_viewManager->load();
m_viewManager->handleWidget( this );
+ m_viewManager->load();
}