Porting Opie to MacOS-X.

The base system and all platform independent applications and platforms
should work.
Please see $OPIEDIR/development/macosx for details

1 files changed, 4 insertions, 0 deletions

diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp
index 014418d..08ae885 100644
--- a/core/launcher/startmenu.cpp
+++ b/core/launcher/startmenu.cpp
@@ -163,171 +163,175 @@ bool StartMenu::loadMenu( QPopupMenu *menu )
             if ( cfg.isValid() ) {
                 QString nm = cfg.readEntry("Name");
                 QString ic = cfg.readEntry("Icon");
                 if ( !!nm && !!ic ) {
                     tabs.append(d);
                     menu->insertItem( Resource::loadIconSet(ic), nm, ntabs++ );
                 }
             } else if ( lot && d.right(8)==".desktop") {
                 AppLnk* applnk = new AppLnk(dir.path()+"/"+d);
                 if ( applnk->isValid() ) {
                     if ( applnk->type() == "Separator" ) { // No tr
                         if ( lot ) {
                             menu->insertSeparator();
                             sepfirst = f && !ltabs;
                         }
                         delete applnk;
                     } else {
                         f = FALSE;
                         other.append(applnk);
                         menu->insertItem( Resource::loadIconSet(applnk->icon()),
                                 applnk->name(), 20+nother++ );
                     }
                 } else {
                     delete applnk;
                 }
             }
         }
 
         if ( !menu->count() )
             sepfirst = TRUE;
     }
 
     launchMenu->setName(sepfirst ? "accessories" : "accessories_need_sep"); // No tr
 
     return (nother || ntabs );
 }
 
 
 void StartMenu::launch()
 {
     int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height();
 
     if ( launchMenu->isVisible() )
         launchMenu->hide();
     else
         launchMenu->popup( QPoint( 1, y ) );
 }
 
 
 
 
 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()
 {
     if (launchMenu )
         launchMenu-> hide();
 
     for ( QIntDictIterator<MenuApplet> it ( m_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;
     }
     m_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
     // 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";
+#ifdef Q_OS_MACX
+    QDir dir( path, "lib*.dylib" );
+#else
     QDir dir( path, "lib*.so" );
+#endif /* Q_OS_MACX */
     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(m_applets[0]),compareAppletPositions);
 
 
     int foo = ( launchMenu-> count ( )) ? launchMenu-> insertSeparator ( ) : 0;
 
     while (napplets--) {
         MenuApplet *applet = xapplets[napplets];
 
         applet-> popup = applet-> iface-> popup ( this );
 
         if ( applet-> popup )
                     applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup );
         else
                     applet-> id = launchMenu-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) );
 
 
         m_applets.insert ( applet-> id, new MenuApplet(*applet));
     }
     delete [] xapplets;
 
 }
 
 
 /*
  * Launcher calls loadMenu too often fix that
  */
 void StartMenu::addApplets(QPopupMenu* pop) {
     QIntDict<MenuApplet> dict;
     if( pop-> count ( ))
         pop-> insertSeparator ( );
 
     for ( QIntDictIterator<MenuApplet> it ( m_applets ); it. current ( ); ++it ) {
             MenuApplet *applet = it. current ( );
         if ( applet-> popup )
             applet-> id = pop-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ), applet-> popup );
         else
             applet-> id = pop-> insertItem ( applet-> iface-> icon ( ), applet-> iface-> text ( ) );
 
         dict.insert( applet->id, new MenuApplet(*applet) );
     }
     /* need to update the key */
     m_applets.setAutoDelete( true );
     m_applets.clear();
     m_applets.setAutoDelete( false );
     m_applets = dict;
 }