| -rw-r--r-- | core/launcher/desktop.cpp | 24 | ||||
| -rw-r--r-- | core/launcher/desktop.h | 2 |
2 files changed, 15 insertions, 11 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 649862b..6771a66 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -41,9 +41,6 @@ #ifdef QT_QWS_CUSTOM #include "qpe/custom.h" #endif -#if defined(QT_QWS_IPAQ) -#include "qpe/custom-ipaq.h" -#endif #include <qgfx_qws.h> #include <qmainwindow.h> @@ -168,12 +165,11 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data ) { int k; QString c, m; - stream >> k; stream >> c; stream >> m; - qWarning("KeyRegisterRecieved: %i, %s, %s", k, (const char*)c, (const char *)m); + qWarning("KeyRegisterReceived: %i, %s, %s", k, (const char*)c, (const char *)m ); keyRegisterList.append(QCopKeyRegister(k,c,m)); } else if (msg == "suspend()"){ @@ -200,10 +196,12 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) KeyRegisterList::Iterator it; for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) { - if ((*it).getKeyCode() == ke->simpleData.keycode && !autoRepeat) + if ((*it).getKeyCode() == ke->simpleData.keycode && !autoRepeat) { + if(press) qDebug("press"); else qDebug("release"); QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8()); } } + } if ( !keyboardGrabbed() ) { if ( ke->simpleData.keycode == Key_F9 ) { @@ -741,10 +739,15 @@ void Desktop::terminateServers() void Desktop::rereadVolumes() { - Config cfg("Sound"); - cfg.setGroup("System"); - touchclick = cfg.readBoolEntry("Touch"); - keyclick = cfg.readBoolEntry("Key"); + Config cfg("qpe"); + cfg.setGroup("Volume"); + touchclick = cfg.readBoolEntry("TouchSound"); + keyclick = cfg.readBoolEntry("KeySound"); + alarmsound = cfg.readBoolEntry("AlarmSound"); +// Config cfg("Sound"); +// cfg.setGroup("System"); +// touchclick = cfg.readBoolEntry("Touch"); +// keyclick = cfg.readBoolEntry("Key"); } void Desktop::keyClick() @@ -766,6 +769,7 @@ void Desktop::screenClick() void Desktop::soundAlarm() { #ifdef CUSTOM_SOUND_ALARM + if (alarmsound) CUSTOM_SOUND_ALARM; #endif } diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index e094dc0..9bc4be9 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h @@ -128,7 +128,7 @@ private: PackageSlave *packageSlave; QDateTime suspendTime; - bool keyclick,touchclick; + bool keyclick,touchclick,alarmsound; }; |