Diffstat (limited to 'noncore/graphics/opie-eye/gui/imageinfoui.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageinfoui.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp index 822fd88..0b3250c 100644 --- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp +++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp | |||
@@ -28,8 +28,9 @@ static const int THUMBSIZE = 128; | |||
28 | using namespace Opie::Core; | 28 | using namespace Opie::Core; |
29 | 29 | ||
30 | imageinfo::imageinfo(QWidget* parent, const char* name, WFlags fl ) | 30 | imageinfo::imageinfo(Opie::Core::OConfig *cfg,QWidget* parent, const char* name, WFlags fl ) |
31 | : QWidget( parent, name, fl ) | 31 | : QWidget( parent, name, fl ) |
32 | { | 32 | { |
33 | m_viewManager = 0; | 33 | m_viewManager = 0; |
34 | m_cfg = cfg; | ||
34 | init(name); | 35 | init(name); |
35 | initKeys(); | 36 | initKeys(); |
@@ -40,4 +41,5 @@ imageinfo::imageinfo(const QString&_path, QWidget* parent, const char* name, WF | |||
40 | { | 41 | { |
41 | m_viewManager = 0; | 42 | m_viewManager = 0; |
43 | m_cfg = 0; | ||
42 | init(name); | 44 | init(name); |
43 | initKeys(); | 45 | initKeys(); |
@@ -56,6 +58,10 @@ void imageinfo::initKeys() | |||
56 | { | 58 | { |
57 | odebug << "init imageinfo keys" << oendl; | 59 | odebug << "init imageinfo keys" << oendl; |
58 | m_cfg = new Opie::Core::OConfig("phunkview"); | 60 | #if 0 |
59 | m_cfg->setGroup("Zecke_view" ); | 61 | if (!m_cfg) { |
62 | m_cfg = new Opie::Core::OConfig("phunkview"); | ||
63 | m_cfg->setGroup("imageinfo_keys" ); | ||
64 | } | ||
65 | #endif | ||
60 | Opie::Ui::OKeyPair::List lst; | 66 | Opie::Ui::OKeyPair::List lst; |
61 | lst.append( Opie::Ui::OKeyPair::upArrowKey() ); | 67 | lst.append( Opie::Ui::OKeyPair::upArrowKey() ); |
@@ -65,7 +71,7 @@ void imageinfo::initKeys() | |||
65 | lst.append( Opie::Ui::OKeyPair::returnKey() ); | 71 | lst.append( Opie::Ui::OKeyPair::returnKey() ); |
66 | 72 | ||
67 | m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "Imageinfo-KeyBoard-Config", | 73 | m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "imageinfo_keys", |
68 | lst, false,this, "keyconfig name" ); | 74 | lst, false,this, "keyconfig name" ); |
69 | m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Full Image"), "view", | 75 | m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Full Image"), "infoview", |
70 | Resource::loadPixmap("1to1"), ViewItem, | 76 | Resource::loadPixmap("1to1"), ViewItem, |
71 | Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton), | 77 | Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton), |
@@ -144,5 +150,4 @@ imageinfo::~imageinfo() | |||
144 | } | 150 | } |
145 | if (m_viewManager) { | 151 | if (m_viewManager) { |
146 | m_viewManager->save(); | ||
147 | delete m_viewManager; | 152 | delete m_viewManager; |
148 | } | 153 | } |
@@ -155,6 +160,4 @@ void imageinfo::slot_fullInfo(const QString&_path, const QString&_t) | |||
155 | QString t = _t; | 160 | QString t = _t; |
156 | t.replace(QRegExp("\n"),"<br>"); | 161 | t.replace(QRegExp("\n"),"<br>"); |
157 | /* t.replace(QRegeExp("<qt>",""); | ||
158 | t.replace(QRegeExp("</qt>","");*/ | ||
159 | TextView1->setText(t); | 162 | TextView1->setText(t); |
160 | } | 163 | } |