Diff
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14629 => 14630)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-25 03:34:23 UTC (rev 14629)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-25 04:36:48 UTC (rev 14630)
@@ -132,6 +132,12 @@
QSettings settings;
QString dir = settings.value("PluginDir", FSGUI_PLUGINDIR).toString();
pluginsDir->setCurrent(dir);
+#if defined(Q_OS_MAC)
+ dir = qApp->applicationDirPath();
+ qDebug() << dir;
+ pluginsDir->setCurrent(dir);
+ pluginsDir->cd("../PlugIns/fsgui/");
+#endif
pluginConfigPage->linePluginDir->setText(pluginsDir->absolutePath());
}
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro (14629 => 14630)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-25 03:34:23 UTC (rev 14629)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-25 04:36:48 UTC (rev 14630)
@@ -33,6 +33,8 @@
DEFINES += FSGUI_PLUGINDIR='\\"$${PLUGINDIR}\\"'
######################################
+macx:ICON=../resources/mac_icon.icns
+
QT += network
TARGET = fsgui
DESTDIR = ../../bin/
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro (14629 => 14630)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-25 03:34:23 UTC (rev 14629)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-25 04:36:48 UTC (rev 14630)
@@ -22,7 +22,10 @@
QT += network
TEMPLATE = lib
TARGET = consoleplugin
+
DESTDIR = ../../../bin/plugins/
+macx:DESTDIR = ../../../bin/fsgui.app/Contents/PlugIns/fsgui
+
CONFIG += plugin
INCLUDEPATH = ../../fsgui/ \
../../interfaces \
Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/resources/mac_icon.icns
(Binary files differ)