author | alwin <alwin> | 2005-03-01 07:34:24 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-01 07:34:24 (UTC) |
commit | e12f0049687c84c24f0b7b737b65df2ed6a500a5 (patch) (unidiff) | |
tree | d35007beb337e020e997eec7758fdd88a3f3d56c | |
parent | 73faad9d936d5af7a331411a9572fd362907e023 (diff) | |
download | opie-e12f0049687c84c24f0b7b737b65df2ed6a500a5.zip opie-e12f0049687c84c24f0b7b737b65df2ed6a500a5.tar.gz opie-e12f0049687c84c24f0b7b737b65df2ed6a500a5.tar.bz2 |
*** empty log message ***
-rw-r--r-- | noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelper.cpp | 2 | ||||
-rw-r--r-- | noncore/applets/keyhelper/keyhelperapplet/config/KeycfgReader.cpp | 2 |
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,56 +1,58 @@ | |||
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 | ||
4 | KeyHelper::KeyHelper() | 5 | KeyHelper::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 | ||
16 | KeyHelper::~KeyHelper() | 17 | KeyHelper::~KeyHelper() |
17 | { | 18 | { |
18 | unset(); | 19 | unset(); |
19 | qDebug("KeyHelper::~KeyHelper()"); | 20 | qDebug("KeyHelper::~KeyHelper()"); |
20 | } | 21 | } |
21 | 22 | ||
22 | bool KeyHelper::filter(int unicode, int keycode, int modifiers, | 23 | bool 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 | ||
30 | void KeyHelper::unset() | 32 | void KeyHelper::unset() |
31 | { | 33 | { |
32 | Opie::Core::OKeyFilter::inst()->remHandler(this);; | 34 | Opie::Core::OKeyFilter::inst()->remHandler(this);; |
33 | } | 35 | } |
34 | 36 | ||
35 | void KeyHelper::set() | 37 | void 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 | ||
41 | void KeyHelper::enable() | 43 | void KeyHelper::enable() |
42 | { | 44 | { |
43 | m_oAction.enable(); | 45 | m_oAction.enable(); |
44 | } | 46 | } |
45 | 47 | ||
46 | void KeyHelper::disable() | 48 | void KeyHelper::disable() |
47 | { | 49 | { |
48 | m_oAction.disable(); | 50 | m_oAction.disable(); |
49 | m_oRepeater.stop(); | 51 | m_oRepeater.stop(); |
50 | } | 52 | } |
51 | 53 | ||
52 | bool KeyHelper::load(const QString& file) | 54 | bool 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); |
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,55 +1,55 @@ | |||
1 | #include "KeycfgReader.h" | 1 | #include "KeycfgReader.h" |
2 | 2 | ||
3 | KeycfgReader::KeycfgReader() | 3 | KeycfgReader::KeycfgReader() |
4 | { | 4 | { |
5 | qDebug("KeycfgReader::KeycfgReader()"); | 5 | qDebug("KeycfgReader::KeycfgReader()"); |
6 | } | 6 | } |
7 | 7 | ||
8 | KeycfgReader::~KeycfgReader() | 8 | KeycfgReader::~KeycfgReader() |
9 | { | 9 | { |
10 | qDebug("KeycfgReader::~KeycfgReader()"); | 10 | qDebug("KeycfgReader::~KeycfgReader()"); |
11 | } | 11 | } |
12 | 12 | ||
13 | bool KeycfgReader::load() | 13 | bool 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 | ||
28 | bool KeycfgReader::load(const QString& path) | 28 | bool 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 | ||