summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-01 07:34:24 (UTC)
committer alwin <alwin>2005-03-01 07:34:24 (UTC)
commite12f0049687c84c24f0b7b737b65df2ed6a500a5 (patch) (unidiff)
treed35007beb337e020e997eec7758fdd88a3f3d56c
parent73faad9d936d5af7a331411a9572fd362907e023 (diff)
downloadopie-e12f0049687c84c24f0b7b737b65df2ed6a500a5.zip
opie-e12f0049687c84c24f0b7b737b65df2ed6a500a5.tar.gz
opie-e12f0049687c84c24f0b7b737b65df2ed6a500a5.tar.bz2
*** empty log message ***
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelper.cpp2
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/config/KeycfgReader.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelper.cpp b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelper.cpp
index 4afdc1f..4723699 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelper.cpp
+++ b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelper.cpp
@@ -1,48 +1,50 @@
1#include "KeyHelper.h" 1#include "KeyHelper.h"
2#include <opie2/okeyfilter.h> 2#include <opie2/okeyfilter.h>
3#include <opie2/odebug.h>
3 4
4KeyHelper::KeyHelper() 5KeyHelper::KeyHelper()
5{ 6{
6 qDebug("KeyHelper::KeyHelper()"); 7 qDebug("KeyHelper::KeyHelper()");
7 load(); 8 load();
8 9
9 m_oAction.setKeyModifiers(&m_oModifiers); 10 m_oAction.setKeyModifiers(&m_oModifiers);
10 m_oAction.setKeyMappings(&m_oMappings); 11 m_oAction.setKeyMappings(&m_oMappings);
11 m_oAction.setKeyExtensions(&m_oExtensions); 12 m_oAction.setKeyExtensions(&m_oExtensions);
12 m_oAction.setKeyRepeater(&m_oRepeater); 13 m_oAction.setKeyRepeater(&m_oRepeater);
13 m_oExtensions.setKeyModifiers(&m_oModifiers); 14 m_oExtensions.setKeyModifiers(&m_oModifiers);
14} 15}
15 16
16KeyHelper::~KeyHelper() 17KeyHelper::~KeyHelper()
17{ 18{
18 unset(); 19 unset();
19 qDebug("KeyHelper::~KeyHelper()"); 20 qDebug("KeyHelper::~KeyHelper()");
20} 21}
21 22
22bool KeyHelper::filter(int unicode, int keycode, int modifiers, 23bool KeyHelper::filter(int unicode, int keycode, int modifiers,
23 bool isPress, bool autoRepeat) 24 bool isPress, bool autoRepeat)
24{ 25{
26 odebug << "KeyHelper <<< "<<unicode<<" - "<<keycode<<" - "<<modifiers<<"\n";
25 m_oAction.setAction(unicode, keycode, modifiers, 27 m_oAction.setAction(unicode, keycode, modifiers,
26 isPress, autoRepeat); 28 isPress, autoRepeat);
27 return(m_oAction.doAction()); 29 return(m_oAction.doAction());
28} 30}
29 31
30void KeyHelper::unset() 32void KeyHelper::unset()
31{ 33{
32 Opie::Core::OKeyFilter::inst()->remHandler(this);; 34 Opie::Core::OKeyFilter::inst()->remHandler(this);;
33} 35}
34 36
35void KeyHelper::set() 37void KeyHelper::set()
36{ 38{
37 Opie::Core::OKeyFilter::inst()->addHandler(this); 39 Opie::Core::OKeyFilter::inst()->addHandler(this);
38 m_oModifiers.resetStates(); 40 m_oModifiers.resetStates();
39} 41}
40 42
41void KeyHelper::enable() 43void KeyHelper::enable()
42{ 44{
43 m_oAction.enable(); 45 m_oAction.enable();
44} 46}
45 47
46void KeyHelper::disable() 48void KeyHelper::disable()
47{ 49{
48 m_oAction.disable(); 50 m_oAction.disable();
diff --git a/noncore/applets/keyhelper/keyhelperapplet/config/KeycfgReader.cpp b/noncore/applets/keyhelper/keyhelperapplet/config/KeycfgReader.cpp
index 44b4b2f..14e8a37 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/config/KeycfgReader.cpp
+++ b/noncore/applets/keyhelper/keyhelperapplet/config/KeycfgReader.cpp
@@ -1,47 +1,47 @@
1#include "KeycfgReader.h" 1#include "KeycfgReader.h"
2 2
3KeycfgReader::KeycfgReader() 3KeycfgReader::KeycfgReader()
4{ 4{
5 qDebug("KeycfgReader::KeycfgReader()"); 5 qDebug("KeycfgReader::KeycfgReader()");
6} 6}
7 7
8KeycfgReader::~KeycfgReader() 8KeycfgReader::~KeycfgReader()
9{ 9{
10 qDebug("KeycfgReader::~KeycfgReader()"); 10 qDebug("KeycfgReader::~KeycfgReader()");
11} 11}
12 12
13bool KeycfgReader::load() 13bool KeycfgReader::load()
14{ 14{
15 QString file; 15 QString file;
16 ConfigEx& cfg = ConfigEx::getInstance("keyhelper"); 16 ConfigEx& cfg = ConfigEx::getInstance("keyhelper");
17 17
18 cfg.setGroup("Global"); 18 cfg.setGroup("Global");
19 19
20 file = cfg.readEntry("XmlFile"); 20 file = cfg.readEntry("XmlFile");
21 if(file.length() == 0 || !QFile::exists(file)){ 21 if(file.length() == 0 || !QFile::exists(file)){
22 /* default */ 22 /* default */
23 file = QDir::homeDirPath() + "/Settings/keyhelper.xml"; 23 file = QString(getenv( "HOME" )) + QString("/Settings/keyhelper.xml");
24 } 24 }
25 return(load(file)); 25 return(load(file));
26} 26}
27 27
28bool KeycfgReader::load(const QString& path) 28bool KeycfgReader::load(const QString& path)
29{ 29{
30 bool success = false; 30 bool success = false;
31 31
32 KeyNames::reset(); 32 KeyNames::reset();
33 33
34 QXmlSimpleReader parser; 34 QXmlSimpleReader parser;
35 KeycfgHandler handler(&parser); 35 KeycfgHandler handler(&parser);
36 KeycfgErrorHandler errhandler; 36 KeycfgErrorHandler errhandler;
37 QFile file(path); 37 QFile file(path);
38 38
39 qWarning("KeycfgReader::load()[%s]", path.latin1()); 39 qWarning("KeycfgReader::load()[%s]", path.latin1());
40 40
41 if(file.exists()){ 41 if(file.exists()){
42 QXmlInputSource source(file); 42 QXmlInputSource source(file);
43 43
44 handler.setKeyModifiers(m_pModifiers); 44 handler.setKeyModifiers(m_pModifiers);
45 handler.setKeyMappings(m_pMappings); 45 handler.setKeyMappings(m_pMappings);
46 handler.setKeyExtensions(m_pExtensions); 46 handler.setKeyExtensions(m_pExtensions);
47 handler.setKeyRepeater(m_pRepeater); 47 handler.setKeyRepeater(m_pRepeater);