1 files changed, 76 insertions, 73 deletions

diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index 1f8daa0..6cb7ab2 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -20,11 +20,12 @@
 
 #ifndef __DESKTOP_H__
 #define __DESKTOP_H__
- 
+
 
 #include "shutdownimpl.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/odevicebutton.h>
 
 #include <qwidget.h>
 #include <qdatetime.h>
@@ -41,110 +42,112 @@ class OpieScreenSaver;
 
 class DesktopApplication : public QPEApplication
 {
-  Q_OBJECT
+        Q_OBJECT
 public:
-  DesktopApplication( int& argc, char **argv, Type t );
-  ~DesktopApplication();
+        DesktopApplication( int& argc, char **argv, Type t );
+        ~DesktopApplication();
+
+        static void switchLCD ( bool on ); // only for togglePower in Desktop
 
-  static void switchLCD ( bool on ); // only for togglePower in Desktop
+        static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar
 
 signals:
-  void menu();
-  void home();
-  void datebook();
-  void contacts();
-  void launch();
-  void email();
-  void backlight();
-  void power();
-  void symbol();
-  void numLockStateToggle();
-  void capsLockStateToggle();
-  void prepareForRestart();
+        void menu();
+        void home();
+        void launch();
+        void backlight();
+        void power();
+        void symbol();
+        void numLockStateToggle();
+        void capsLockStateToggle();
+        void prepareForRestart();
 
 protected:
 #ifdef Q_WS_QWS
 
-  bool qwsEventFilter( QWSEvent * );
+        bool qwsEventFilter( QWSEvent * );
 #endif
 
-  void shutdown();
-  void restart();
+        void shutdown();
+        void restart();
 
 public slots:
-  virtual void desktopMessage ( const QCString &msg, const QByteArray &data );
-  virtual void systemMessage ( const QCString &msg, const QByteArray &data );
+        virtual void systemMessage ( const QCString &msg, const QByteArray &data );
+        virtual void launcherMessage ( const QCString &msg, const QByteArray &data );
+        void rereadVolumes();
 
 protected slots:
-  void shutdown( ShutdownImpl::Type );
-  void apmTimeout();
-  void sendCard();
+        void shutdown ( ShutdownImpl::Type );
+        void apmTimeout ( );
+        void sendHeldAction ( );
+
+protected:
+        virtual bool eventFilter ( QObject *o, QEvent *e );
+        void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat );
+        
+private:
+        static DesktopApplication *me ( );
+        
 private:
-    void reloadPowerWarnSettings();
-    DesktopPowerAlerter *pa;
-    PowerStatus *m_ps, *m_ps_last;
-    QTimer *cardSendTimer;
-    QCopChannel *channel;
-    OpieScreenSaver *m_screensaver;
-    QTimer * m_timer;
-    int m_powerVeryLow;
-    int m_powerCritical;
-    int m_currentPowerLevel;
+        void reloadPowerWarnSettings();
+        DesktopPowerAlerter *pa;
+        PowerStatus *m_ps, *m_ps_last;
+        QTimer *cardSendTimer;
+        QCopChannel *channel;
+        OpieScreenSaver *m_screensaver;
+        QTimer * m_timer;
+        int m_powerVeryLow;
+        int m_powerCritical;
+        int m_currentPowerLevel;
+
+        const Opie::ODeviceButton *m_last_button;
+                QTimer *m_button_timer;
+
+        bool m_keyclick_sound  : 1;
+        bool m_screentap_sound : 1;
+        bool m_alarm_sound     : 1;
 };
 
 
 class Desktop : public QWidget
 {
-  Q_OBJECT
+        Q_OBJECT
 public:
-  Desktop();
-  ~Desktop();
-
-  static bool screenLocked();
+        Desktop();
+        ~Desktop();
 
-  void show();
-  void checkMemory();
+        static bool screenLocked();
 
-  void keyClick();
-  void screenClick();
-  static void soundAlarm();
+        void show();
+        void checkMemory();
 
 public slots:
-  void raiseDatebook();
-  void raiseContacts();
-  void raiseMenu();
-  void raiseLauncher();
-  void raiseEmail();
-  void execAutoStart();
-  void togglePower();
-  void toggleLight();
-  void toggleNumLockState();
-  void toggleCapsLockState();
-  void toggleSymbolInput();
-  void terminateServers();
-  void rereadVolumes();
-
-  void home ( );
+        void execAutoStart();
+        void togglePower();
+        void toggleLight();
+        void toggleNumLockState();
+        void toggleCapsLockState();
+        void toggleSymbolInput();
+        void terminateServers();
 
 protected:
-  void executeOrModify( const QString& appLnkFile );
-  void styleChange( QStyle & );
-  void timerEvent( QTimerEvent *e );
+        void executeOrModify( const QString& appLnkFile );
+        void styleChange( QStyle & );
+        void timerEvent( QTimerEvent *e );
 
-  QWidget *bg;
-  Launcher *launcher;
-  TaskBar *tb;
+        QWidget *bg;
+        Launcher *launcher;
+        TaskBar *tb;
 
 private:
-  void startTransferServer();
-  bool recoverMemory();
+        void startTransferServer();
+        bool recoverMemory();
 
-  QCopBridge *qcopBridge;
-  TransferServer *transferServer;
-  PackageSlave *packageSlave;
+        QCopBridge *qcopBridge;
+        TransferServer *transferServer;
+        PackageSlave *packageSlave;
 
-  QDateTime suspendTime;
-  bool keyclick, touchclick, alarmsound;
+        QDateTime suspendTime;
 };