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
@@ -27,2 +27,3 @@
 #include <qpe/qpeapplication.h>
+#include <opie/odevicebutton.h>
 
@@ -50,2 +51,4 @@ public:
 
+	static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar
+
 signals:
@@ -53,6 +56,3 @@ signals:
   void home();
-  void datebook();
-  void contacts();
   void launch();
-  void email();
   void backlight();
@@ -74,4 +74,5 @@ protected:
 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();
 
@@ -80,3 +81,11 @@ protected slots:
   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:
@@ -92,2 +101,9 @@ private:
     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;
 };
@@ -107,12 +123,3 @@ public:
 
-  void keyClick();
-  void screenClick();
-  static void soundAlarm();
-
 public slots:
-  void raiseDatebook();
-  void raiseContacts();
-  void raiseMenu();
-  void raiseLauncher();
-  void raiseEmail();
   void execAutoStart();
@@ -124,5 +131,2 @@ public slots:
   void terminateServers();
-  void rereadVolumes();
-
-  void home ( );
 
@@ -146,3 +150,2 @@ private:
   QDateTime suspendTime;
-  bool keyclick, touchclick, alarmsound;
 };