1 files changed, 1 insertions, 1 deletions

diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 24a9d7e..d03af89 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -178,193 +178,193 @@ void StartMenu::createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool l
     Config cfg( dir.path() + "/" + file + "/.directory", Config::File );

     if ( !cfg.isValid() ) return;

 

            QString name = cfg.readEntry( "Name" );

     QString icon = cfg.readEntry( "Icon" );

         if ( !name || !icon ) return;

 

     QDir subdir = QDir( dir );

     subdir.cd( file );

     subdir.setFilter( QDir::Files );

     subdir.setNameFilter( "*.desktop" );

     // we don' t show the menu if there are no entries

     // perhaps one should check if there exist subsubdirs with entries...

     if ( subdir.entryList().isEmpty() ) return;

 

     // checks were ok

 

     QPixmap pixmap = OResource::loadPixmap( icon, OResource::SmallIcon );

         if ( useWidePopupMenu ) {

         // generate submenu

         QPopupMenu *submenu = new QPopupMenu( menu );

         connect( submenu,  SIGNAL(activated(int)), SLOT(itemSelected(int)) );

         menu->insertItem( pixmap, name, submenu, NO_ID );

 

         // ltabs is true cause else we wouldn't stuck around..

         createMenuEntries( submenu, subdir, true, lot );

     } else {

         // no submenus - just bring corresponding tab to front

         menu->insertItem( pixmap, name, currentItem );

         tabNames.insert( currentItem, new QString( file ) );

         currentItem++;

     }

 }

 

 void StartMenu::createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool lot )

 {

     if ( lot ) {

         dir.setFilter( QDir::Files );

         dir.setNameFilter( "*.desktop" );

         QStringList files = dir.entryList();

         files.sort();

 

         for ( QStringList::Iterator it = files.begin(); it != files.end(); it++ ) {

             createAppEntry( menu, dir, *it );

         }

     }

     if ( ltabs ) {

         dir.setNameFilter( "*" );

         dir.setFilter( QDir::Dirs );

         QStringList dirs = dir.entryList();

         dirs.sort();

 

         for ( QStringList::Iterator it = dirs.begin(); it != dirs.end(); it++ ) {

             createDirEntry( menu, dir, *it, lot );

             }

     }

 }

 

 bool StartMenu::loadMenu( QPopupMenu *menu )

 {

     Config cfg("StartMenu");

     cfg.setGroup("Menu");

 

     bool ltabs = cfg.readBoolEntry("LauncherTabs", TRUE);

     bool lot = cfg.readBoolEntry("LauncherOther", TRUE);

     useWidePopupMenu = cfg.readBoolEntry(  "LauncherSubPopup",  TRUE );

     bool sepfirst = !ltabs && !lot;

 

     currentItem = 0;

         launchMenu->clear();

 

     appLnks.setAutoDelete( true );

     tabNames.setAutoDelete( true );

     appLnks.clear();

     tabNames.clear();

     appLnks.setAutoDelete( false );

     tabNames.setAutoDelete( false );

 

     QDir dir( MimeType::appsFolderName(), QString::null, QDir::Name );

     createMenuEntries( menu, dir, ltabs, lot );

 

            if ( !menu->count() ) sepfirst = TRUE;

 

     launchMenu->setName( sepfirst ? "accessories" : "accessories_need_sep" ); // No tr

 

     return currentItem;

 }

 

 

 void StartMenu::launch()

 {

     int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();

 

     if ( launchMenu->isVisible() )

         launchMenu->hide();

     else

-        launchMenu->popup( QPoint( 1, y ) );

+        launchMenu->popup( QPoint( 0, y ) );

 }

 

 

 

 

 static int compareAppletPositions(const void *b, const void *a)

 {

     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()

 {

     if ( launchMenu )

         launchMenu-> hide();

 

     for ( QIntDictIterator<MenuApplet> it( menuApplets ); 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;

     }

     menuApplets.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

     // removed in the remerge PluginManager could handle it

     // we don't currently use it -zecke

 

     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(menuApplets[0]), compareAppletPositions);

 

 

     while ( napplets-- ) {

         MenuApplet *applet = xapplets[napplets];

         applet->popup = applet->iface->popup( this );

 

         // menuApplets got an id < -1

         menuApplets.insert( -( currentItem + 2 ), new MenuApplet( *applet ) );

         currentItem++;

     }

     delete [] xapplets;

 

     addApplets( launchMenu );

 }