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
@@ -385,131 +385,131 @@ void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &
 
     qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m );
     keyRegisterList.append( QCopKeyRegister( k, c, m ) );
   }
 }
 
 
 void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data )
 {
   QDataStream stream ( data, IO_ReadOnly );
 
   if ( msg == "setScreenSaverInterval(int)" ) {
     int time;
     stream >> time;
     m_screensaver-> setInterval( time );
   }
   else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
     int t1, t2, t3;
     stream >> t1 >> t2 >> t3;
     m_screensaver-> setIntervals( t1, t2, t3 );
   }
   else if ( msg == "setBacklight(int)" ) {
     int bright;
     stream >> bright;
     m_screensaver-> setBacklight( bright );
   }
   else if ( msg == "setScreenSaverMode(int)" ) {
     int mode;
     stream >> mode;
     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();
   }
 }
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown;
 
 #ifdef Q_WS_QWS
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 {
   qpedesktop->checkMemory();
 
   if ( e->type == QWSEvent::Key ) {
     QWSKeyEvent * ke = ( QWSKeyEvent * ) e;
     if ( !loggedin && ke->simpleData.keycode != Key_F34 )
       return TRUE;
     bool press = ke->simpleData.is_press;
     bool autoRepeat = ke->simpleData.is_auto_repeat;
 
     /*
       app that registers key/message to be sent back to the app, when it doesn't have focus,
       when user presses key, unless keyboard has been requested from app.
       will not send multiple repeats if user holds key
       i.e. one shot
      */
     if ( !keyRegisterList.isEmpty() &&  ke->simpleData.keycode !=0 && press) {
 //        qDebug("<<<<<<<<<<<<<keycode %d", ke->simpleData.keycode);
       KeyRegisterList::Iterator it;
       for ( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
         if ( ( *it ).getKeyCode() == ke->simpleData.keycode && !autoRepeat && !keyboardGrabbed() ) {
           if ( press )
             qDebug( "press" );
           else
             qDebug( "release" );
           QCopEnvelope( ( *it ).getChannel().utf8(), ( *it ).getMessage().utf8() );
         }
       }
     }
 
     if ( !keyboardGrabbed() ) {
       if ( ke->simpleData.keycode == Key_F9 ) {
         if ( press )
           emit datebook();
         return TRUE;
       }
       if ( ke->simpleData.keycode == Key_F10 ) {
         if ( !press && cardSendTimer ) {
           emit contacts();
           delete cardSendTimer;
         }
         else if ( press ) {
           cardSendTimer = new QTimer();
           cardSendTimer->start( 2000, TRUE );
           connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
         }
         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();
         if ( press )
           emit launch();
         return TRUE;
       }
       if ( ke->simpleData.keycode == Key_F13 ) {
         if ( press )
           emit email();
         return TRUE;
       }
     }
 
     if ( ke->simpleData.keycode == Key_F34 ) {
       if ( press )
         emit power();
       return TRUE;
     }
     // This was used for the iPAQ PowerButton
     // See main.cpp for new KeyboardFilter
     //
     //    if ( ke->simpleData.keycode == Key_SysReq ) {
     //      if ( press ) emit power();
     //      return TRUE;
     //    }
     if ( ke->simpleData.keycode == Key_F35 ) {
       if ( press )
         emit backlight();
       return TRUE;
     }
     if ( ke->simpleData.keycode == Key_F32 ) {
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
@@ -12,135 +12,136 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef __DESKTOP_H__
 #define __DESKTOP_H__
 
 
 #include "shutdownimpl.h"
 
 #include <qpe/qpeapplication.h>
 
 #include <qwidget.h>
 #include <qdatetime.h>
 
 class Background;
 class Launcher;
 class TaskBar;
 class PowerStatus;
 class QCopBridge;
 class TransferServer;
 class DesktopPowerAlerter;
 class PackageSlave;
 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;
 };
 
 
 #endif // __DESKTOP_H__
 
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
@@ -62,64 +62,65 @@ void initEnvironment()
   config.writeEntry( "Timezone", tz);
 
   config.setGroup( "Language" );
   QString lang = config.readEntry( "Language", getenv("LANG") );
   if ( !lang.isNull() )
     setenv( "LANG", lang, 1 );
 }
 
 
 int initApplication( int argc, char ** argv )
 {
     initEnvironment();
 
 #if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_EBX)
     setenv( "QWS_SIZE", "240x320", 0 );
 #endif
 
     //Don't flicker at startup:
     QWSServer::setDesktopBackground( QImage() );
     DesktopApplication a( argc, argv, QApplication::GuiServer );
 
         ODevice::inst ( )-> setSoftSuspend ( true );
 
         { // init backlight
             QCopEnvelope e("QPE/System", "setBacklight(int)" );
             e << -3; // Forced on
         }
 
     AlarmServer::initialize();
 
     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()) );
     QObject::connect( &a, SIGNAL(email()),   d, SLOT(raiseEmail()) );
     QObject::connect( &a, SIGNAL(power()),   d, SLOT(togglePower()) );
     QObject::connect( &a, SIGNAL(backlight()),   d, SLOT(toggleLight()) );
     QObject::connect( &a, SIGNAL(symbol()),   d, SLOT(toggleSymbolInput()) );
     QObject::connect( &a, SIGNAL(numLockStateToggle()),   d, SLOT(toggleNumLockState()) );
     QObject::connect( &a, SIGNAL(capsLockStateToggle()),   d, SLOT(toggleCapsLockState()) );
     QObject::connect( &a, SIGNAL(prepareForRestart()),   d, SLOT(terminateServers()) );
 
     (void)new SysFileMonitor(d);
     Network::createServer(d);
 
 #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
     if ( !QFile::exists( "/etc/pointercal" ) ) {
         // Make sure calibration widget starts on top.
         Calibrate *cal = new Calibrate;
         cal->exec();
         delete cal;
     }
 #endif
 
     d->show();
 
     int rv =  a.exec();
 
     delete d;
 
         ODevice::inst ( )-> setSoftSuspend ( false );
 
     return rv;