author | zecke <zecke> | 2005-06-14 21:29:17 (UTC) |
---|---|---|
committer | zecke <zecke> | 2005-06-14 21:29:17 (UTC) |
commit | 1c8aab0c489b9d469646a0e0ab08f500f1bbb507 (patch) (unidiff) | |
tree | 899752b16b9c00029ffd76696e6d87096a1e6d2e | |
parent | dc9c09480660793768851e36d089e0c36e7f3eae (diff) | |
download | opie-1c8aab0c489b9d469646a0e0ab08f500f1bbb507.zip opie-1c8aab0c489b9d469646a0e0ab08f500f1bbb507.tar.gz opie-1c8aab0c489b9d469646a0e0ab08f500f1bbb507.tar.bz2 |
Opie Eye:
-Change the keyboard shortcut configuration to not blacklist
keys found on the joypad (up,down,left,right,enter).
This was done on request of Gints Polis
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 5 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageinfoui.cpp | 6 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 4 |
3 files changed, 0 insertions, 15 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 9365932..ca5746d 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -252,29 +252,24 @@ PIconView::~PIconView() { | |||
252 | 252 | ||
253 | Opie::Core::OKeyConfigManager* PIconView::manager() { | 253 | Opie::Core::OKeyConfigManager* PIconView::manager() { |
254 | return m_viewManager; | 254 | return m_viewManager; |
255 | } | 255 | } |
256 | 256 | ||
257 | 257 | ||
258 | /* | 258 | /* |
259 | * init the KeyBoard Shortcuts | 259 | * init the KeyBoard Shortcuts |
260 | * called from the c'tor | 260 | * called from the c'tor |
261 | */ | 261 | */ |
262 | void PIconView::initKeys() { | 262 | void PIconView::initKeys() { |
263 | Opie::Core::OKeyPair::List lst; | 263 | Opie::Core::OKeyPair::List lst; |
264 | lst.append( Opie::Core::OKeyPair::upArrowKey() ); | ||
265 | lst.append( Opie::Core::OKeyPair::downArrowKey() ); | ||
266 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); | ||
267 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); | ||
268 | lst.append( Opie::Core::OKeyPair::returnKey() ); | ||
269 | 264 | ||
270 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "View-KeyBoard-Config", | 265 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "View-KeyBoard-Config", |
271 | lst, false,this, "keyconfig name" ); | 266 | lst, false,this, "keyconfig name" ); |
272 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam", | 267 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Beam Current Item") , "beam", |
273 | Opie::Core::OResource::loadPixmap("beam", Opie::Core::OResource::SmallIcon), | 268 | Opie::Core::OResource::loadPixmap("beam", Opie::Core::OResource::SmallIcon), |
274 | BeamItem, Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton), | 269 | BeamItem, Opie::Core::OKeyPair(Qt::Key_B, Qt::ShiftButton), |
275 | this, SLOT(slotBeam())) ); | 270 | this, SLOT(slotBeam())) ); |
276 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete", | 271 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("Delete Current Item"), "delete", |
277 | Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), | 272 | Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon), |
278 | DeleteItem, Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton), | 273 | DeleteItem, Opie::Core::OKeyPair(Qt::Key_D, Qt::ShiftButton), |
279 | this, SLOT(slotTrash())) ); | 274 | this, SLOT(slotTrash())) ); |
280 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view", | 275 | m_viewManager->addKeyConfig( OKeyConfigItem(tr("View Current Item"), "view", |
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp index 8f70602..8e31521 100644 --- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp +++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp | |||
@@ -54,30 +54,24 @@ Opie::Core::OKeyConfigManager* imageinfo::manager() | |||
54 | return m_viewManager; | 54 | return m_viewManager; |
55 | } | 55 | } |
56 | 56 | ||
57 | void imageinfo::initKeys() | 57 | void imageinfo::initKeys() |
58 | { | 58 | { |
59 | #if 0 | 59 | #if 0 |
60 | if (!m_cfg) { | 60 | if (!m_cfg) { |
61 | m_cfg = new Opie::Core::OConfig("phunkview"); | 61 | m_cfg = new Opie::Core::OConfig("phunkview"); |
62 | m_cfg->setGroup("imageinfo_keys" ); | 62 | m_cfg->setGroup("imageinfo_keys" ); |
63 | } | 63 | } |
64 | #endif | 64 | #endif |
65 | Opie::Core::OKeyPair::List lst; | 65 | Opie::Core::OKeyPair::List lst; |
66 | lst.append( Opie::Core::OKeyPair::upArrowKey() ); | ||
67 | lst.append( Opie::Core::OKeyPair::downArrowKey() ); | ||
68 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); | ||
69 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); | ||
70 | lst.append( Opie::Core::OKeyPair::returnKey() ); | ||
71 | |||
72 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys", | 66 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "imageinfo_keys", |
73 | lst, false,this, "keyconfig name" ); | 67 | lst, false,this, "keyconfig name" ); |
74 | m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview", | 68 | m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Full Image"), "infoview", |
75 | Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), | 69 | Opie::Core::OResource::loadPixmap("1to1", Opie::Core::OResource::SmallIcon), |
76 | ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), | 70 | ViewItem, Opie::Core::OKeyPair(Qt::Key_V, Qt::ShiftButton), |
77 | this, SLOT(slotShowImage()))); | 71 | this, SLOT(slotShowImage()))); |
78 | m_viewManager->load(); | 72 | m_viewManager->load(); |
79 | m_viewManager->handleWidget( this ); | 73 | m_viewManager->handleWidget( this ); |
80 | m_viewManager->handleWidget( TextView1 ); | 74 | m_viewManager->handleWidget( TextView1 ); |
81 | } | 75 | } |
82 | 76 | ||
83 | void imageinfo::slotShowImage() | 77 | void imageinfo::slotShowImage() |
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index cda1a96..ec891a8 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp | |||
@@ -136,28 +136,24 @@ void ImageView::nextSlide() | |||
136 | #endif | 136 | #endif |
137 | emit dispNext(); | 137 | emit dispNext(); |
138 | m_slideTimer->start(m_slideValue*1000,true); | 138 | m_slideTimer->start(m_slideValue*1000,true); |
139 | } | 139 | } |
140 | void ImageView::initKeys() | 140 | void ImageView::initKeys() |
141 | { | 141 | { |
142 | odebug << "init imageview keys" << oendl; | 142 | odebug << "init imageview keys" << oendl; |
143 | if (!m_cfg) { | 143 | if (!m_cfg) { |
144 | m_cfg = new Opie::Core::OConfig("opie-eye"); | 144 | m_cfg = new Opie::Core::OConfig("opie-eye"); |
145 | m_cfg->setGroup("image_view_keys" ); | 145 | m_cfg->setGroup("image_view_keys" ); |
146 | } | 146 | } |
147 | Opie::Core::OKeyPair::List lst; | 147 | Opie::Core::OKeyPair::List lst; |
148 | lst.append( Opie::Core::OKeyPair::upArrowKey() ); | ||
149 | lst.append( Opie::Core::OKeyPair::downArrowKey() ); | ||
150 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); | ||
151 | lst.append( Opie::Core::OKeyPair::rightArrowKey() ); | ||
152 | lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0)); | 148 | lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0)); |
153 | 149 | ||
154 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", | 150 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", |
155 | lst, false,this, "image_view_keys" ); | 151 | lst, false,this, "image_view_keys" ); |
156 | 152 | ||
157 | /** | 153 | /** |
158 | * Handle KeyEvents when they're pressed. This avoids problems | 154 | * Handle KeyEvents when they're pressed. This avoids problems |
159 | * with 'double next' on Return. | 155 | * with 'double next' on Return. |
160 | * The Return press would switch to this view and the return | 156 | * The Return press would switch to this view and the return |
161 | * release would emit the dispNext Signal. | 157 | * release would emit the dispNext Signal. |
162 | */ | 158 | */ |
163 | m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed ); | 159 | m_viewManager->setEventMask( Opie::Core::OKeyConfigManager::MaskPressed ); |