1 files changed, 8 insertions, 6 deletions

diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index f17c7f8..b84eed8 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -103,102 +103,104 @@ void StartMenu::createMenu()
 void StartMenu::refreshMenu()

 {

     Config cfg( "StartMenu" );

     cfg.setGroup( "Menu" );

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

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

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

 

     if ( launchMenu && !(ltabs || lot) ) return; // nothing to do

 

         createMenu();

 }

 

 void StartMenu::itemSelected( int id )

 {

     if ( id == NO_ID ) return;

 

     if ( id < 0 ) {

         MenuApplet *applet = menuApplets.find( id );

         if ( applet ) {

             applet->iface->activated();

         }

     } else if ( id >= APPLNK_ID_OFFSET ) {

             AppLnk * appLnk = appLnks.find( id );

         if ( appLnk ) {

                     appLnk->execute();

         }

     } else {

             QString *tabName = tabNames.find( id );

         if ( tabName ) {

                 emit tabSelected( *tabName );

             }

     }

 }

 

 void StartMenu::createAppEntry( QPopupMenu *menu, QDir dir, QString file )

 {

     if ( file.right(8) == ".desktop" ) {

                 AppLnk* applnk = new AppLnk( dir.path() + "/" + file );

             if ( !applnk->isValid() ) {

             delete applnk;

             return;

         }

 

             if ( applnk->type() == "Separator" ) { // No tr

                     menu->insertSeparator();

                 delete applnk;

                } else {

-                   QPixmap test;

-            test.convertFromImage(

-                Resource::loadImage( applnk->icon() ).smoothScale(

-                    AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

-

-                    menu->insertItem( test, applnk->name(),

+                QPixmap test;

+                QImage img = Resource::loadImage( applnk->icon() );

+                if(!img.isNull() )

+                    test.convertFromImage(

+                           img.smoothScale(

+                            AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

+

+                menu->insertItem( test, applnk->name(),

                               currentItem + APPLNK_ID_OFFSET );

             appLnks.insert( currentItem + APPLNK_ID_OFFSET, applnk );

             currentItem++;

                 }

     }

 

 }

 

 void StartMenu::createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot )

 {

     // do some sanity checks and collect information

 

     if ( file == "." || file == ".." ) return;

 

     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 test;

     test.convertFromImage( Resource::loadImage( icon ).smoothScale(

         AppLnk::smallIconSize(), AppLnk::smallIconSize() ), 0 );

 

         if ( useWidePopupMenu ) {

         // generate submenu

         QPopupMenu *submenu = new QPopupMenu( menu );

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

         menu->insertItem( test, 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( test, name, currentItem );

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

         currentItem++;