summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp
index 9fac51b..8a8647e 100644
--- a/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp
+++ b/noncore/applets/keyhelper/keyhelperapplet/applet/KeyHelperWidget.cpp
@@ -201,193 +201,193 @@ void KeyHelperWidget::doEvent(const QString& key, int isPress)
if(pos > 0){
modifiers |= Qt::AltButton;
keyname.remove(pos, 4);
}
if(keyname.length() > 1){
unicode = 0xffff;
keycode = KeyNames::getCode(keyname);
/* get unicode */
const QWSServer::KeyMap* m;
for(m=QWSServer::keyMap(); m->key_code != 0; m++){
if(m->key_code == keycode){
if(modifiers & Qt::ControlButton){
unicode = m->ctrl_unicode;
} else if(modifiers & Qt::ShiftButton){
unicode = m->shift_unicode;
} else {
unicode = m->unicode;
}
break;
}
}
} else {
const QWSServer::KeyMap* m;
keycode = 0;
unicode = keyname[0].unicode();
/* check unicode */
for(m=QWSServer::keyMap(); keycode == 0 && m->key_code != 0; m++){
if(m->unicode == unicode){
keycode = m->key_code;
break;
}
}
/* check shift_unicode */
for(m=QWSServer::keyMap(); keycode == 0 && m->key_code != 0; m++){
if(m->shift_unicode == unicode){
keycode = m->key_code;
modifiers |= Qt::ShiftButton;
break;
}
}
/* check ctrl_unicode */
for(m=QWSServer::keyMap(); keycode == 0 && m->key_code != 0; m++){
if(m->ctrl_unicode == unicode){
keycode = m->key_code;
modifiers |= Qt::ControlButton;
break;
}
}
}
doEvent(unicode, keycode, modifiers, isPress, 0);
}
void KeyHelperWidget::sysMessage(
const QCString& msg, const QByteArray& data)
{
QSafeDataStream stream(data, IO_ReadOnly);
if(msg == "linkChanged(QString)"){
ConfigEx& cfg = ConfigEx::getInstance("keyhelper");
QString oldgroup = cfg.getGroup();
if(cfg.readNumEntry("DetectLinkChange", 1) == 1){
AppLnkManager::init(true);
reload();
}
cfg.setGroup(oldgroup);
}
}
void MsgHandler(QtMsgType type, const char* msg)
{
switch(type){
case QtDebugMsg:
if(g_level >= 2){
syslog(LOG_LOCAL5|LOG_DEBUG,
"<2>%s", msg);
}
break;
case QtWarningMsg:
if(g_level >= 1){
syslog(LOG_LOCAL5|LOG_DEBUG,
"<1>%s", msg);
}
break;
default:
break;
}
}
void KeyHelperWidget::initDebugLevel()
{
ConfigEx& cfg = ConfigEx::getInstance("keyhelper");
cfg.setGroup("Global");
int level = cfg.readNumEntry("DebugLevel", 0);
setDebugLevel(level);
}
-void KeyHelperWidget::setDebugLevel(int /*level*/)
+void KeyHelperWidget::setDebugLevel(int level)
{
#ifdef QT_QWS_EBX
static bool noDebug = true;
g_level = level;
if(g_level > 0){
if(noDebug){
m_defHandler = qInstallMsgHandler(MsgHandler);
noDebug = false;
}
} else {
qInstallMsgHandler(m_defHandler);
noDebug = true;
}
#endif
}
void KeyHelperWidget::enable()
{
m_enable = true;
m_pHelper->enable();
//set();
QTimer::singleShot(0, this, SLOT(set()));
}
void KeyHelperWidget::disable()
{
m_enable = false;
m_pHelper->disable();
unset();
}
void KeyHelperWidget::pause()
{
m_saved = m_enable;
disable();
}
void KeyHelperWidget::restart()
{
if(m_saved){
enable();
}
}
void KeyHelperWidget::reload()
{
disable();
ConfigEx& cfg = ConfigEx::getInstance("keyhelper");
cfg.reload();
if(m_pHelper->reload(m_xmlfile) == false){
if(m_status){
Global::statusMessage("KeyHelper: Load Error");
}
}
init();
if(m_status){
QCopEnvelope e("QPE/System", "notBusy(QString)");
const QString app = KHUtil::currentApp();
e << app;
m_status = false;
}
}
void KeyHelperWidget::version()
{
QString ver = "KeyHelper ";
ver.append(_version_);
Global::statusMessage(ver);
}
void KeyHelperWidget::init()
{
AppLnkManager::init();
#if 0
if(m_pHelper == NULL){
m_pHelper = new KeyHelper();
}
#endif
loadUseFilterApps();
enable();
}
void KeyHelperWidget::set()
{
if(m_pHelper != NULL && m_enable == true && m_useFilter == false){
qWarning("KeyHelperWidget::set()");
m_pHelper->set();
}
}
void KeyHelperWidget::unset()
{
m_pHelper->unset();
}
void KeyHelperWidget::loadUseFilterApps()