1 files changed, 21 insertions, 18 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
@@ -24,8 +24,9 @@
 
 #include "shutdownimpl.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/odevicebutton.h>
 
 #include <qwidget.h>
 #include <qdatetime.h>
 
@@ -47,15 +48,14 @@ public:
   ~DesktopApplication();
 
   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();
@@ -71,15 +71,24 @@ protected:
   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 launcherMessage ( const QCString &msg, const QByteArray &data );
+        void rereadVolumes();
 
 protected slots:
   void shutdown( ShutdownImpl::Type );
   void apmTimeout();
-  void sendCard();
+        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;
@@ -89,8 +98,15 @@ private:
     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
@@ -104,28 +120,16 @@ public:
 
   void show();
   void checkMemory();
 
-  void keyClick();
-  void screenClick();
-  static void soundAlarm();
-
 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 ( );
 
 protected:
   void executeOrModify( const QString& appLnkFile );
   void styleChange( QStyle & );
@@ -143,9 +147,8 @@ private:
   TransferServer *transferServer;
   PackageSlave *packageSlave;
 
   QDateTime suspendTime;
-  bool keyclick, touchclick, alarmsound;
 };
 
 
 #endif // __DESKTOP_H__