- reversed the sort order of menu applet positions

- added logout applet to the base opie-taskbar ipk

2 files changed, 3 insertions, 3 deletions

diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 8b88ec6..13e5715 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
-Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so*
+Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so*
 Priority: required
 Section: opie/system
 Maintainer: Project Opie <opie@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: qt-embedded (>=$QTE_VERSION)
 Description: Launcher for Opie
  The "finder" or "explorer", or whatever you want to call it.
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 647d0f2..917f4c1 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -211,131 +211,131 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu )
                 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
         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 = ab->iface->position() - aa->iface->position();
+    int d = aa->iface->position() - ab->iface->position();
     if ( d ) return d;
-    return QString::compare(ab->library->library(),aa->library->library());
+    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 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;
         } else {
             exclude += *it;
             delete lib;
         }
     }
     cfg.writeEntry( "ExcludeApplets", exclude, ',' );
     qsort(xapplets,napplets,sizeof(applets[0]),compareAppletPositions);
 
         if ( sepId )
                 launchMenu-> removeItem ( sepId );
         sepId = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0;