summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp28
-rw-r--r--core/launcher/desktop.h4
2 files changed, 18 insertions, 14 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
@@ -43,5 +43,2 @@
#endif
-#if defined(QT_QWS_IPAQ)
-#include "qpe/custom-ipaq.h"
-#endif
@@ -170,3 +167,2 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
QString c, m;
-
stream >> k;
@@ -175,3 +171,3 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
- 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));
@@ -196,3 +192,3 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
bool press = ke->simpleData.is_press;
- bool autoRepeat = ke ->simpleData.is_auto_repeat;
+ bool autoRepeat= ke->simpleData.is_auto_repeat;
if (!keyRegisterList.isEmpty())
@@ -202,4 +198,6 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
{
- if ((*it).getKeyCode() == ke->simpleData.keycode && !autoRepeat)
- QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
+ if ((*it).getKeyCode() == ke->simpleData.keycode && !autoRepeat) {
+ if(press) qDebug("press"); else qDebug("release");
+ QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
+ }
}
@@ -743,6 +741,11 @@ 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");
}
@@ -768,2 +771,3 @@ void Desktop::soundAlarm()
#ifdef CUSTOM_SOUND_ALARM
+ if (alarmsound)
CUSTOM_SOUND_ALARM;
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
@@ -77,3 +77,3 @@ private:
QTimer *cardSendTimer;
- QCopChannel *channel;
+ QCopChannel *channel;
};
@@ -130,3 +130,3 @@ private:
QDateTime suspendTime;
- bool keyclick,touchclick;
+ bool keyclick,touchclick,alarmsound;
};