summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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,88 +1,90 @@
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();
49 m_oRepeater.stop(); 51 m_oRepeater.stop();
50} 52}
51 53
52bool KeyHelper::load(const QString& file) 54bool KeyHelper::load(const QString& file)
53{ 55{
54 KeycfgReader oReader; 56 KeycfgReader oReader;
55 oReader.setKeyModifiers(&m_oModifiers); 57 oReader.setKeyModifiers(&m_oModifiers);
56 oReader.setKeyMappings(&m_oMappings); 58 oReader.setKeyMappings(&m_oMappings);
57 oReader.setKeyExtensions(&m_oExtensions); 59 oReader.setKeyExtensions(&m_oExtensions);
58 oReader.setKeyRepeater(&m_oRepeater); 60 oReader.setKeyRepeater(&m_oRepeater);
59 61
60 bool success; 62 bool success;
61 if(file.length() == 0){ 63 if(file.length() == 0){
62 success = oReader.load(); 64 success = oReader.load();
63 } else if(file[0] == '/'){ 65 } else if(file[0] == '/'){
64 success = oReader.load(file); 66 success = oReader.load(file);
65 } else { 67 } else {
66 //QString filepath = QString(::getenv("HOME")) + "/Settings/" + file; 68 //QString filepath = QString(::getenv("HOME")) + "/Settings/" + file;
67 QString filepath = QDir::homeDirPath() + "/Settings/" + file; 69 QString filepath = QDir::homeDirPath() + "/Settings/" + file;
68 success = oReader.load(filepath); 70 success = oReader.load(filepath);
69 } 71 }
70 if(success == false){ 72 if(success == false){
71 qDebug("config xml load error"); 73 qDebug("config xml load error");
72 setDefault(); 74 setDefault();
73 } 75 }
74 return(success); 76 return(success);
75} 77}
76 78
77bool KeyHelper::reload(const QString& file) 79bool KeyHelper::reload(const QString& file)
78{ 80{
79 m_oModifiers.reset(); 81 m_oModifiers.reset();
80 m_oMappings.reset(); 82 m_oMappings.reset();
81 m_oExtensions.reset(); 83 m_oExtensions.reset();
82 m_oRepeater.reset(); 84 m_oRepeater.reset();
83 85
84 return(load(file)); 86 return(load(file));
85} 87}
86 88
87void KeyHelper::setDefault() 89void KeyHelper::setDefault()
88{ 90{
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,70 +1,70 @@
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);
48 48
49 parser.setContentHandler(&handler); 49 parser.setContentHandler(&handler);
50 parser.setErrorHandler(&errhandler); 50 parser.setErrorHandler(&errhandler);
51 success = parser.parse(source); 51 success = parser.parse(source);
52 52
53 file.close(); 53 file.close();
54 } 54 }
55 55
56 if(success){ 56 if(success){
57 m_pModifiers->statistics(); 57 m_pModifiers->statistics();
58 m_pMappings->statistics(); 58 m_pMappings->statistics();
59 m_pExtensions->statistics(); 59 m_pExtensions->statistics();
60 m_pRepeater->statistics(); 60 m_pRepeater->statistics();
61 } else { 61 } else {
62 m_pModifiers->reset(); 62 m_pModifiers->reset();
63 m_pMappings->reset(); 63 m_pMappings->reset();
64 m_pExtensions->reset(); 64 m_pExtensions->reset();
65 m_pRepeater->reset(); 65 m_pRepeater->reset();
66 } 66 }
67 KeyNames::clearCode(); 67 KeyNames::clearCode();
68 68
69 return(success); 69 return(success);
70} 70}