fix menu button on zaurus F11 raising opie menu

3 files changed, 72 insertions, 70 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 3546e28..9863187 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -414,9 +414,9 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray &
     m_screensaver-> setMode ( mode );
   }
   else if ( msg == "setDisplayState(int)" ) {
-          int state;
-          stream >> state;
-          m_screensaver-> setDisplayState ( state != 0 );
+    int state;
+    stream >> state;
+    m_screensaver-> setDisplayState ( state != 0 );
   }
   else if ( msg == "suspend()" ) {
     emit power();
@@ -475,12 +475,12 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
         }
         return TRUE;
       }
-      /* menu key now opens application menu/toolbar
+//       menu key now opens application menu/toolbar
        if ( ke->simpleData.keycode == Key_F11 ) {
        if ( press ) emit menu();
        return TRUE;
        }
-      */
+      
       if ( ke->simpleData.keycode == Key_F12 ) {
         while ( activePopupWidget() )
           activePopupWidget() ->close();
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index 09ffe1c..5de85f4 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -41,104 +41,105 @@ class QPEScreenSaver;
 
 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
 
 signals:
-        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 datebook();
+  void contacts();
+  void launch();
+  void email();
+  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 desktopMessage ( const QCString &msg, const QByteArray &data );
+  virtual void systemMessage ( const QCString &msg, const QByteArray &data );
 
 protected slots:
-        void shutdown( ShutdownImpl::Type );
-        void psTimeout();
-        void sendCard();
+  void shutdown( ShutdownImpl::Type );
+  void psTimeout();
+  void sendCard();
 private:
-        DesktopPowerAlerter *pa;
-        PowerStatus *ps;
-        QTimer *cardSendTimer;
-        QCopChannel *channel;
-        QPEScreenSaver *m_screensaver;
+  DesktopPowerAlerter *pa;
+  PowerStatus *ps;
+  QTimer *cardSendTimer;
+  QCopChannel *channel;
+  QPEScreenSaver *m_screensaver;
 };
 
 
 class Desktop : public QWidget
 {
-        Q_OBJECT
+  Q_OBJECT
 public:
-        Desktop();
-        ~Desktop();
+  Desktop();
+  ~Desktop();
 
-        static bool screenLocked();
+  static bool screenLocked();
 
-        void show();
-        void checkMemory();
+  void show();
+  void checkMemory();
 
-        void keyClick();
-        void screenClick();
-        static void soundAlarm();
+  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 ( );
+  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 & );
-        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;
+  bool keyclick, touchclick, alarmsound;
 };
 
 
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 762a596..8974ced 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -91,6 +91,7 @@ int initApplication( int argc, char ** argv )
 
     Desktop *d = new Desktop();
 
+    QObject::connect( &a, SIGNAL(menu()), d, SLOT(raiseMenu()) );
     QObject::connect( &a, SIGNAL(datebook()), d, SLOT(raiseDatebook()) );
     QObject::connect( &a, SIGNAL(contacts()), d, SLOT(raiseContacts()) );
     QObject::connect( &a, SIGNAL(launch()),   d, SLOT(raiseLauncher()) );