summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageinfoui.cpp57
-rw-r--r--noncore/graphics/opie-eye/gui/imageinfoui.h23
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp16
3 files changed, 85 insertions, 11 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
index 74a9ea4..039dfa3 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp
@@ -15,4 +15,9 @@
15 15
16#include <lib/slavemaster.h> 16#include "lib/slavemaster.h"
17#include <lib/imagecache.h> 17#include "lib/imagecache.h"
18
19#include <opie2/oconfig.h>
20#include <opie2/oconfig.h>
21#include <opie2/okeyconfigwidget.h>
22#include <opie2/odebug.h>
18 23
@@ -23,2 +28,3 @@ static const int THUMBSIZE = 128;
23 28
29using namespace Opie::Core;
24 30
@@ -27,3 +33,5 @@ imageinfo::imageinfo(QWidget* parent, const char* name, WFlags fl )
27{ 33{
34 m_viewManager = 0;
28 init(name); 35 init(name);
36 initKeys();
29} 37}
@@ -33,5 +41,44 @@ imageinfo::imageinfo(const QString&_path, QWidget* parent, const char* name, WF
33{ 41{
42 m_viewManager = 0;
34 init(name); 43 init(name);
44 initKeys();
35 slotChangeName(_path); 45 slotChangeName(_path);
36} 46}
47
48Opie::Ui::OKeyConfigManager* imageinfo::manager()
49{
50 if (!m_viewManager) {
51 initKeys();
52 }
53 return m_viewManager;
54}
55
56void imageinfo::initKeys()
57{
58 odebug << "init imageinfo keys" << oendl;
59 m_cfg = new Opie::Core::OConfig("phunkview");
60 m_cfg->setGroup("Zecke_view" );
61 Opie::Ui::OKeyPair::List lst;
62 lst.append( Opie::Ui::OKeyPair::upArrowKey() );
63 lst.append( Opie::Ui::OKeyPair::downArrowKey() );
64 lst.append( Opie::Ui::OKeyPair::leftArrowKey() );
65 lst.append( Opie::Ui::OKeyPair::rightArrowKey() );
66// lst.append( Opie::Ui::OKeyPair::returnKey() );
67
68 m_viewManager = new Opie::Ui::OKeyConfigManager(m_cfg, "Imageinfo-KeyBoard-Config",
69 lst, false,this, "keyconfig name" );
70 m_viewManager->addKeyConfig( Opie::Ui::OKeyConfigItem(tr("View Full Image"), "view",
71 Resource::loadPixmap("1to1"), ViewItem,
72 Opie::Ui::OKeyPair(Qt::Key_V, Qt::ShiftButton),
73 this, SLOT(slotShowImage())));
74 m_viewManager->load();
75 m_viewManager->handleWidget( this );
76 m_viewManager->handleWidget( TextView1 );
77}
78
79void imageinfo::slotShowImage()
80{
81 emit dispImage(currentFile);
82}
83
37void imageinfo::init(const char* name) { 84void imageinfo::init(const char* name) {
@@ -41,3 +88,3 @@ void imageinfo::init(const char* name) {
41 if ( !name ) 88 if ( !name )
42 setName( "imageinfo" ); 89 setName( "imageinfo" );
43 resize( 289, 335 ); 90 resize( 289, 335 );
@@ -98,2 +145,6 @@ imageinfo::~imageinfo()
98 } 145 }
146 if (m_viewManager) {
147 m_viewManager->save();
148 delete m_viewManager;
149 }
99} 150}
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.h b/noncore/graphics/opie-eye/gui/imageinfoui.h
index 300c92a..0a5e183 100644
--- a/noncore/graphics/opie-eye/gui/imageinfoui.h
+++ b/noncore/graphics/opie-eye/gui/imageinfoui.h
@@ -14,2 +14,11 @@ class QTextView;
14 14
15namespace Opie {
16 namespace Core {
17 class OConfig;
18 }
19 namespace Ui {
20 class OKeyConfigManager;
21 }
22}
23
15class imageinfo : public QWidget 24class imageinfo : public QWidget
@@ -17,2 +26,5 @@ class imageinfo : public QWidget
17 Q_OBJECT 26 Q_OBJECT
27 enum ActionIds {
28 ViewItem
29 };
18 30
@@ -24,2 +36,6 @@ public:
24 void setDestructiveClose(); 36 void setDestructiveClose();
37 Opie::Ui::OKeyConfigManager* manager();
38
39signals:
40 void dispImage(const QString&);
25 41
@@ -27,2 +43,3 @@ public slots:
27 void setPath( const QString& path ); 43 void setPath( const QString& path );
44 void slotShowImage();
28 45
@@ -36,4 +53,2 @@ protected:
36 QTextView* TextView1; 53 QTextView* TextView1;
37
38protected:
39 QVBoxLayout* imageinfoLayout; 54 QVBoxLayout* imageinfoLayout;
@@ -41,2 +56,6 @@ protected:
41 56
57 Opie::Core::OConfig * m_cfg;
58 Opie::Ui::OKeyConfigManager*m_viewManager;
59 void initKeys();
60
42protected slots: 61protected slots:
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 88acd59..5e94f93 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -20,3 +20,2 @@
20 20
21
22#include <qpe/resource.h> 21#include <qpe/resource.h>
@@ -35,3 +34,3 @@
35 34
36OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow> ) 35OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
37 36
@@ -43,4 +42,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
43 m_cfg->setGroup("Zecke_view" ); 42 m_cfg->setGroup("Zecke_view" );
44 43// qDebug( "Process-wide OApplication object @ %0x", oApp );
45
46 /* 44 /*
@@ -94,3 +92,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
94 this, SLOT(slotConfig() ) ); 92 this, SLOT(slotConfig() ) );
95 93
96 rotateButton = new QToolButton(bar); 94 rotateButton = new QToolButton(bar);
@@ -166,2 +164,6 @@ void PMainWindow::slotConfig() {
166 keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() ); 164 keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() );
165 if ( !m_info ) {
166 initInfo();
167 }
168 keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() );
167 keyWid->load(); 169 keyWid->load();
@@ -212,2 +214,3 @@ void PMainWindow::initInfo() {
212 initT<imageinfo>( "Image Info", &m_info, ImageInfo ); 214 initT<imageinfo>( "Image Info", &m_info, ImageInfo );
215 connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&)));
213} 216}
@@ -231,4 +234,5 @@ void PMainWindow::initDisp() {
231void PMainWindow::slotShowInfo( const QString& inf ) { 234void PMainWindow::slotShowInfo( const QString& inf ) {
232 if ( !m_info ) 235 if ( !m_info ) {
233 initInfo(); 236 initInfo();
237 }
234 m_info->setPath( inf ); 238 m_info->setPath( inf );