From d34dc773591a2d467c68875a68a671d6a809f861 Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Mon, 03 Nov 2003 16:52:18 +0000
Subject: Porting Opie to MacOS-X.

The base system and all platform independent applications and platforms
should work.
Please see $OPIEDIR/development/macosx for details
---
(limited to 'core/settings')

diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index 5a9fada..6fca621 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -79,7 +79,11 @@ void MenuSettings::init ( )
 	QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
 	QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+#ifdef Q_OS_MACX
+	QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
+#else
 	QStringList list = QDir ( path, "lib*.so" ). entryList ( );
+#endif /* Q_OS_MACX */
 
 	for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
 		QString name;
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index b3e302a..d03ea49 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -75,16 +75,23 @@ void TaskbarSettings::init ( )
 	QStringList exclude = cfg. readListEntry ( "ExcludeApplets", ',' );
 
 	QString path = QPEApplication::qpeDir ( ) + "/plugins/applets";
+#ifdef Q_OS_MACX
+	QStringList list = QDir ( path, "lib*.dylib" ). entryList ( );
+#else
 	QStringList list = QDir ( path, "lib*.so" ). entryList ( );
+#endif /* Q_OS_MACX */
 
 	for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
 		QString name;
 		QPixmap icon;
 		TaskbarNamedAppletInterface *iface = 0;
 
+		qWarning("Load applet: %s", (*it).latin1() );
 		QLibrary *lib = new QLibrary ( path + "/" + *it );
 		lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
+		qWarning("<1>");
 		if ( iface ) {
+			qWarning("<2>");
 			QString lang = getenv( "LANG" );
 			QTranslator *trans = new QTranslator ( qApp );
 			QString type = (*it). left ((*it). find ("."));
@@ -97,12 +104,20 @@ void TaskbarSettings::init ( )
 			icon = iface-> icon ( );
 			iface-> release ( );
 		}
+		qWarning("<3>");
 		if ( !iface ) {
+			qWarning("<4>");
 			lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
 			
 			if ( iface ) {
+				qWarning("<5>");
 				name = (*it). mid ( 3 );
+				qWarning("Found applet: %s", name.latin1() );
+#ifdef Q_OS_MACX
+				int sep = name. find( ".dylib" );
+#else
 				int sep = name. find( ".so" );
+#endif /* Q_OS_MACX */
 				if ( sep > 0 )
 					name. truncate ( sep );
 				sep = name. find ( "applet" );
@@ -112,8 +127,10 @@ void TaskbarSettings::init ( )
 				iface-> release ( );			
 			}					
 		}
+		qWarning("<6>");
 		
 		if ( iface ) {
+			qWarning("<7>");
 			QCheckListItem *item;
 			item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
 			if ( !icon. isNull ( ))
--
cgit v0.9.0.2