*** empty log message ***

3 files changed, 10 insertions, 21 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 3e8c731..34b52d2 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -259,196 +259,196 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray &
   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 == "reloadPowerWarnSettings()" ) {
       reloadPowerWarnSettings();
   }
   else if ( msg == "setDisplayState(int)" ) {
     int state;
     stream >> state;
     m_screensaver-> setDisplayState ( state != 0 );
   }
   else if ( msg == "suspend()" ) {
     emit power();
   }
 }
 
 void DesktopApplication::reloadPowerWarnSettings() {
     Config cfg( "apm" );
     cfg.setGroup( "Warnings" );
 
     //  m_timer->changeInterval( cfg.readNumEntry( "checkinterval", 10000 ) );
     m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 );
     m_powerCritical = cfg.readNumEntry( "powervcritical", 5 );
 }
 
 
 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;
       }
 
-//         if ( ke->simpleData.keycode == Key_F11 ) {
-//         if ( press ) emit menu();
-//         return TRUE;
-//         }
+      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 ) {
       if ( press )
         QCopEnvelope e( "QPE/Desktop", "startSync()" );
       return TRUE;
     }
     if ( ke->simpleData.keycode == Key_F31 && !ke->simpleData.modifiers ) {
       if ( press )
         emit symbol();
       return TRUE;
     }
     if ( ke->simpleData.keycode == Key_NumLock ) {
       if ( press )
         emit numLockStateToggle();
     }
     if ( ke->simpleData.keycode == Key_CapsLock ) {
       if ( press )
         emit capsLockStateToggle();
     }
     if ( ( press && !autoRepeat ) || ( !press && autoRepeat ) )
       qpedesktop->keyClick();
   }
   else {
     if ( e->type == QWSEvent::Mouse ) {
       QWSMouseEvent * me = ( QWSMouseEvent * ) e;
       static bool up = TRUE;
       if ( me->simpleData.state & LeftButton ) {
         if ( up ) {
           up = FALSE;
           qpedesktop->screenClick();
         }
       }
       else {
         up = TRUE;
       }
     }
   }
 
   return QPEApplication::qwsEventFilter( e );
 }
 #endif
 
 
 void DesktopApplication::sendCard()
 {
   delete cardSendTimer;
   cardSendTimer = 0;
   QString card = getenv( "HOME" );
   card += "/Applications/addressbook/businesscard.vcf";
 
   if ( QFile::exists( card ) ) {
     QCopEnvelope e( "QPE/Obex", "send(QString,QString,QString)" );
     QString mimetype = "text/x-vCard";
     e << tr( "business card" ) << card << mimetype;
   }
 }
 
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
 #endif
 
 //===========================================================================
 
 Desktop::Desktop() :
     QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
@@ -810,111 +810,96 @@ void DesktopApplication::shutdown( ShutdownImpl::Type t )
       break;
     case ShutdownImpl::TerminateDesktop:
       prepareForTermination( FALSE );
 
       // This is a workaround for a Qt bug
       // clipboard applet has to stop its poll timer, or Qt/E
       // will hang on quit() right before it emits aboutToQuit()
       emit aboutToQuit ( );
 
       quit();
       break;
   }
 }
 
 void DesktopApplication::restart()
 {
   prepareForTermination( TRUE );
 
 #ifdef Q_WS_QWS
 
   for ( int fd = 3; fd < 100; fd++ )
     close( fd );
 #if defined(QT_DEMO_SINGLE_FLOPPY)
 
   execl( "/sbin/init", "qpe", 0 );
 #elif defined(QT_QWS_CASSIOPEIA)
 
   execl( "/bin/sh", "sh", 0 );
 #else
 
   execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
 #endif
 
   exit( 1 );
 #endif
 }
 
 void Desktop::startTransferServer()
 {
   // start qcop bridge server
   qcopBridge = new QCopBridge( 4243 );
   if ( !qcopBridge->ok() ) {
     delete qcopBridge;
     qcopBridge = 0;
   }
   // start transfer server
   transferServer = new TransferServer( 4242 );
   if ( !transferServer->ok() ) {
     delete transferServer;
     transferServer = 0;
   }
   if ( !transferServer || !qcopBridge )
     startTimer( 2000 );
 }
 
 void Desktop::timerEvent( QTimerEvent *e )
 {
   killTimer( e->timerId() );
   startTransferServer();
 }
 
 void Desktop::terminateServers()
 {
   delete transferServer;
   delete qcopBridge;
   transferServer = 0;
   qcopBridge = 0;
 }
 
 void Desktop::rereadVolumes()
 {
   Config cfg( "qpe" );
   cfg.setGroup( "Volume" );
   touchclick = cfg.readBoolEntry( "TouchSound" );
   keyclick = cfg.readBoolEntry( "KeySound" );
   alarmsound = cfg.readBoolEntry( "AlarmSound" );
 }
 
 void Desktop::keyClick()
 {
   if ( keyclick )
     ODevice::inst ( ) -> keySound ( );
 }
 
 void Desktop::screenClick()
 {
   if ( touchclick )
     ODevice::inst ( ) -> touchSound ( );
 }
 
 void Desktop::soundAlarm()
 {
   if ( qpedesktop-> alarmsound )
     ODevice::inst ( ) -> alarmSound ( );
 }
 
-bool Desktop::eventFilter( QObject *, QEvent *ev )
-{
-    if ( ev->type() == QEvent::KeyPress ) {
-        QKeyEvent *ke = (QKeyEvent *)ev;
-        if ( ke->key() == Qt::Key_F11 ) { // menu key
-            QWidget *active = qApp->activeWindow();
-            if ( active && active->isPopup() ) {
-                active->close();
-            }
-            raiseMenu();
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index f6059b8..13f28b3 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -37,117 +37,116 @@ class QCopBridge;
 class TransferServer;
 class DesktopPowerAlerter;
 class PackageSlave;
 class OpieScreenSaver;
 
 class DesktopApplication : public QPEApplication
 {
   Q_OBJECT
 public:
   DesktopApplication( int& argc, char **argv, Type t );
   ~DesktopApplication();
 
   static void switchLCD ( bool on ); // only for togglePower in Desktop
 
 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();
 
 protected:
 #ifdef Q_WS_QWS
 
   bool qwsEventFilter( QWSEvent * );
 #endif
 
   void shutdown();
   void restart();
 
 public slots:
   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 apmTimeout();
   void sendCard();
 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;
 };
 
 
 class Desktop : public QWidget
 {
   Q_OBJECT
 public:
   Desktop();
   ~Desktop();
 
   static bool screenLocked();
 
   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 & );
   void timerEvent( QTimerEvent *e );
-  bool eventFilter( QObject *, QEvent * );
 
   QWidget *bg;
   Launcher *launcher;
   TaskBar *tb;
 
 private:
   void startTransferServer();
   bool recoverMemory();
 
   QCopBridge *qcopBridge;
   TransferServer *transferServer;
   PackageSlave *packageSlave;
 
   QDateTime suspendTime;
   bool keyclick, touchclick, alarmsound;
 };
 
 
 #endif // __DESKTOP_H__
 
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index d9382d2..e663072 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -154,194 +154,199 @@ void StartMenu::reloadApplets()
 void StartMenu::itemSelected( int id )
 {
     const AppLnk *app = apps->find( id );
     if ( app )
         app->execute();
     else {
             MenuApplet *applet = applets. find ( id );
             
             if ( applet )
                 applet-> iface-> activated ( );
         }   
 }
 
 bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
 {
     bool result = FALSE;
 
     Config cfg("StartMenu");
     cfg.setGroup("Menu");
 
     bool ltabs = cfg.readBoolEntry("LauncherTabs",TRUE);
     bool lot = cfg.readBoolEntry("LauncherOther",TRUE);
     
     tabdict. clear ( );
     
     if ( sepId )
             menu-> removeItem ( sepId );
     sepId = ( menu-> count ( )) ? menu-> insertSeparator ( 0 ) : 0;
 
     if ( ltabs || lot ) {
         QDict<QPopupMenu> typpop;
         QStringList typs = folder->types();
         for (QStringList::Iterator tit=typs.fromLast(); ; --tit) {
             if ( !(*tit).isEmpty() ) {
                 QPopupMenu *new_menu;
                 if ( ltabs ) {
                     new_menu = new StartPopupMenu( menu );
                     connect( new_menu, SIGNAL(activated(int)), SLOT(itemSelected(int)) );
                     int id = menu->insertItem( folder->typePixmap(*tit), folder->typeName(*tit), new_menu, -1, 0 );
                     tabdict. insert ( id, new_menu );
                 } else {
                     new_menu = (QPopupMenu*)1;
                 }
                 typpop.insert(*tit, new_menu);
             }
             if ( tit == typs. begin ( ))
                     break;
         }
         QListIterator<AppLnk> it( folder->children() );
         bool f=TRUE;
         for ( ; it.current(); ++it ) {
             AppLnk *app = it.current();
             if ( app->type() == "Separator" ) { // No tr
                 if ( lot ) {
                     menu->insertSeparator();
                 }
             } else {
                 f = FALSE;
                 QString t = app->type();
                 QPopupMenu* pmenu = typpop.find(t);
                 if ( ltabs ) {
                     if ( !pmenu && lot )
                         pmenu = menu;
                 } else {
                     if ( !pmenu )
                         pmenu = menu;
                     else
                         pmenu = 0;
                 }
                 if ( pmenu ) {
                     QString t = app->name();
                     t.replace(QRegExp("&"),"&&"); // escape shortcut character
                     pmenu->insertItem( app->pixmap(), t, app->id() );
                 }
                 result=TRUE;
             }
         }
     }
 
     if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries 
             menu-> removeItem ( sepId );
             sepId = 0;
         }
         if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later
                 sepId = menu-> insertSeparator ( );
                 
     return result;
 }
 
 
 void StartMenu::launch()
 {
     int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();
 
     if ( launchMenu->isVisible() ) 
         launchMenu->hide();
-    else
+    else {
+        QWidget *active = qApp->activeWindow();
+        if ( active && active->isPopup() )
+            active->close();
+            
         launchMenu->popup( QPoint( 1, y ) );
+    }
 }
 
 const AppLnk* StartMenu::execToLink(const QString& appname)
 {
     const AppLnk* a = apps->findExec( appname );
     return a;
 }
 
 void StartPopupMenu::keyPressEvent( QKeyEvent *e )
 {
     if ( e->key() == Key_F33 || e->key() == Key_Space ) {
         // "OK" button, little hacky
         QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0);
         QPopupMenu::keyPressEvent( &ke );
     } else {
         QPopupMenu::keyPressEvent( e );
     }
 }
 
 static int compareAppletPositions(const void *a, const void *b)
 {
     const MenuApplet* aa = *(const MenuApplet**)a;
     const MenuApplet* ab = *(const MenuApplet**)b;
     int d = aa->iface->position() - ab->iface->position();
     if ( d ) return d;
     return QString::compare(aa->library->library(),ab->library->library());
 }
 
 void StartMenu::clearApplets()
 {
     launchMenu-> hide();
 
     for ( QIntDictIterator<MenuApplet> it ( applets ); it. current ( ); ++it ) {
             MenuApplet *applet = it. current ( );
             if ( launchMenu ) {
                 launchMenu-> removeItem ( applet-> id );
                 delete applet-> popup;
             }
     
         applet-> iface-> release();
         applet-> library-> unload();
         delete applet-> library;
     }
     applets.clear();
 }
 
 
 
 void StartMenu::loadApplets()
 {
     Config cfg( "StartMenu" );
     cfg.setGroup( "Applets" );
     
     // SafeMode causes too much problems, so we disable it for now --
     // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
     
     bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
     if ( safe && !safety_tid )
         return;
     cfg.writeEntry("SafeMode",TRUE);
     cfg.write();
     QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
 
     QString lang = getenv( "LANG" );
     QString path = QPEApplication::qpeDir() + "/plugins/applets";
     QDir dir( path, "lib*.so" );
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     int napplets=0;
     MenuApplet* *xapplets = new MenuApplet*[list.count()];
     for ( it = list.begin(); it != list.end(); ++it ) {
         if ( exclude.find( *it ) != exclude.end() )
             continue;
         MenuAppletInterface *iface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
         if (( lib->queryInterface( IID_MenuApplet, (QUnknownInterface**)&iface ) == QS_OK ) && iface ) {
             MenuApplet *applet = new MenuApplet;
             xapplets[napplets++] = applet;
             applet->library = lib;
             applet->iface = iface;
             
             QTranslator *trans = new QTranslator(qApp);
             QString type = (*it).left( (*it).find(".") );
             QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm";
             if ( trans->load( tfn ))
                 qApp->installTranslator( trans );
             else
                 delete trans;            
         } else {
             exclude += *it;
             delete lib;
         }
     }
     cfg.writeEntry( "ExcludeApplets", exclude, ',' );
     qsort(xapplets,napplets,sizeof(applets[0]),compareAppletPositions);