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) (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,10 +1,11 @@
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);
@@ -17,16 +18,17 @@ KeyHelper::~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);;
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
@@ -15,17 +15,17 @@ bool KeycfgReader::load()
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