Changeset 232

Timestamp:

02/14/08 13:40:02 (4 years ago)

Author:

uncle_fungus

Message:

Fixed osx build, added xcode project

Files:

• branches/osx/FahMon-Info.plist (added)
• branches/osx/FahMon.xcodeproj (added)
• branches/osx/FahMon.xcodeproj/project.pbxproj (added)
• branches/osx/FahMon.xcodeproj/uncle_fungus.mode1 (added)
• branches/osx/FahMon.xcodeproj/uncle_fungus.pbxuser (added)
• branches/osx/mac (added)
• branches/osx/mac/FahMon-Info.plist (added)
• branches/osx/mac/fahmon.icns (added)
• branches/osx/src/benchmarksDialog.cpp (modified) (2 diffs)
• branches/osx/src/clientDialog.cpp (modified) (4 diffs)
• branches/osx/src/include/fahmonConsts.h (modified) (1 diff)
• branches/osx/src/include/mainDialog.h (modified) (1 diff)
• branches/osx/src/include/preferencesDialog.h (modified) (8 diffs)
• branches/osx/src/main.cpp (modified) (6 diffs)
• branches/osx/src/mainDialog.cpp (modified) (10 diffs)
• branches/osx/src/pathManager.cpp (modified) (2 diffs)
• branches/osx/src/preferencesDialog.cpp (modified) (24 diffs)
• branches/osx/src/preferencesManager.cpp (modified) (1 diff)
• branches/osx/src/queue.cpp (modified) (6 diffs)
• branches/osx/src/tools.cpp (modified) (1 diff)

branches/osx/src/benchmarksDialog.cpp

@@ -80 +80 @@
-        mSplitter->SetMinimumPaneSize(20);
-
+#ifndef __WXMAC__
-        mBenchmarksInformation->SetFont(wxFont(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
+#else
+        mBenchmarksInformation->SetFont(wxFont(9, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL));
+#endif
-
-        _PrefsGetUint(PREF_BENCHMARKSDIALOG_COLUMNWIDTH, columnWidth);
@@ -91 +95 @@
-        mainSizer->Add(mSplitter, 1, wxEXPAND);
-        mainSizer->AddSpacer(FMC_GUI_SPACING_HIGH);
+#ifndef __WXMAC__
-        mainSizer->Add(new wxButton(this, wxID_CLOSE), 0, wxALIGN_CENTER_HORIZONTAL);
+#endif
-
-        // ---

branches/osx/src/clientDialog.cpp

@@ -19 +19 @@
- * The client edition dialog.
- * Creates the dialog to add and edit new clients.
-ç
+Á
- * \author Andrew Schofield
- **/
@@ -58 +58 @@
-ClientDialog::ClientDialog(wxWindow* parent) : wxDialog(parent, wxID_ANY, wxString::Format(_("Client Edition / %s"), wxT(FMC_PRODUCT)))
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        // The wxTextCtrl used for the location has an associated button to show the directory chooser
-
+
+
+
-        locationSizer       = new wxBoxSizer(wxHORIZONTAL);
+        buttonsSizer        = new wxBoxSizer(wxHORIZONTAL);
+        nameSizer           = new wxBoxSizer(wxHORIZONTAL);
+        locationLSizer      = new wxBoxSizer(wxHORIZONTAL);
+        nameLSizer          = new wxBoxSizer(wxHORIZONTAL);
+        groupSizer          = new wxStaticBoxSizer(wxVERTICAL, this, _("Client information"));
+        clientInfoSizer     = new wxFlexGridSizer(2, FMC_GUI_SPACING_LOW, FMC_GUI_SPACING_LOW);
+        
-        mClientNameCtrl     = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(FMC_GUI_TEXTCTRL_MIN_LENGTH, -1));
-        mClientLocationCtrl = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(FMC_GUI_TEXTCTRL_MIN_LENGTH, -1));
-
+        locationLSizer->Add(new StaticBoldedText(this, wxID_ANY, _("Location:")),0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT);
+        locationLSizer->AddSpacer(FMC_GUI_SPACING_LOW);
-        locationSizer->Add(mClientLocationCtrl, 1, wxALIGN_CENTER_VERTICAL);
-        locationSizer->AddSpacer(FMC_GUI_SPACING_LOW);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        // The top part: it contains the two wxTextCtrl and their labels
-
- = new wxFlexGridSizer(2, FMC_GUI_SPACING_LOW, FMC_GUI_SPACING_LOW
-
-(new StaticBoldedText(this, wxID_ANY, _("Name:")), 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT
-(mClientNameCtrl, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND
-new StaticBoldedText(this, wxID_ANY, _("Location:"))
-
-, 1, wxEXPAND | wxALL, FMC_GUI_BORDER
+
+->Add(nameLSizer, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT
+
+Spacer(FMC_GUI_SPACING_LOW
+Spacer(FMC_GUI_SPACING_LOW
+locationLSizer
+ | wxEXPAND
+
-
-        // The bottom part contains the Ok and Cancel buttons
-
+//
-
-        buttonsSizer->Add(new wxButton(this, wxID_CANCEL), 0, wxALIGN_RIGHT);
@@ -93 +118 @@
-
-        // Construct the main sizer
-
+//
-
-        mainSizer->Add(groupSizer, 1, wxEXPAND);
@@ -100 +125 @@
-
-        // And the top level sizer
-
+//
-
-        topLevelSizer->Add(mainSizer, 1, wxEXPAND | wxALL, FMC_GUI_BORDER);

branches/osx/src/include/fahmonConsts.h

@@ -89 +89 @@
-#elif _FAHMON_WIN32_
-#define FMC_GUI_BORDER 5     // Windows does not have default borders, so we use ours
+#elif __WXMAC__
+#define FMC_GUI_BORDER 5
-#endif
-

branches/osx/src/include/mainDialog.h

@@ -97 +97 @@
-#elif __WXGTK__
-#define PREF_TOOLS_FILEMANAGER_DV wxT("konqueror --profile filemanagement"); /**< Default value for Linux filemanager */
+#elif __WXMAC__
+#define PREF_TOOLS_FILEMANAGER_DV wxT("open");
-#endif
-

branches/osx/src/include/preferencesDialog.h

@@ -30 +30 @@
-#include "wx/dialog.h"
-#include "wx/choice.h"
-
+
+
+
+
+
-#include "wx/textctrl.h"
-#include "wx/checkbox.h"
@@ -139 +143 @@
-         * @return A wxPanel object.
-         **/
-Notebook
+BookCtrlBase
-
-        /**
@@ -146 +150 @@
-         * @return A wxPanel object.
-         **/
-Notebook
+BookCtrlBase
-
-        /**
@@ -153 +157 @@
-         * @return A wxPanel object.
-         **/
-Notebook
+BookCtrlBase
-
-        /**
@@ -160 +164 @@
-         * @return A wxPanel object.
-         **/
-Notebook
+BookCtrlBase
-
-        /**
@@ -167 +171 @@
-         * @return A wxPanel object.
-         **/
-Notebook
-Notebook
+BookCtrlBase
+BookCtrlBase
-
-        /**
@@ -175 +179 @@
-         * @return A wxPanel object.
-         **/
-Notebook
+BookCtrlBase
-
-        /**
@@ -236 +240 @@
-        void OnChoices(wxCommandEvent& event);
-
+        #ifdef __WXMAC__ 
+        void OnClose(wxCloseEvent& event); 
+        #endif 
-
-public:

branches/osx/src/main.cpp

@@ -29 +29 @@
-#include "wx/image.h"
-#include "wx/intl.h"
+#include "wx/filename.h"
-#include "mainDialog.h"
-#include "pathManager.h"
@@ -60 +61 @@
-
-        // Check for another instance
+        #ifndef __WXMAC__
-        mInstanceChecker = new wxSingleInstanceChecker(wxT(FMC_UID));
-        if(mInstanceChecker->IsAnotherRunning() == true)
@@ -87 +89 @@
-                Tools::ErrorMsgBox(wxString::Format(_T("Could create socket, auto-raising will not function!")));
-        }
+        #endif
-
-        if ( !m_locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_CONV_ENCODING) )
@@ -105 +108 @@
-        {
-                wxLocale::AddCatalogLookupPathPrefix(wxT(DATADIR));
+        }
+#endif
+#ifdef __WXMAC__
+        {
+                wxFileName appPath = wxFileName(wxTheApp->argv[0]).GetPath (wxPATH_GET_VOLUME);
+                appPath.RemoveLastDir();
+        
+                wxString resourcesPath = appPath.GetPath();
+        
+                resourcesPath += _T("/Contents/SharedSupport/lang/");
+                
+                wxLocale::AddCatalogLookupPathPrefix(resourcesPath);
-        }
-#endif
@@ -136 +151 @@
-        if(!wxDirExists(PathManager::GetCfgPath())) {
-                requiresFirstRunDialog = true;
+                // The following is necessary on OSX as the wxMkDir function doesn't seem to be able to create folders with more
+                // than one level at once. Therefore we need to create the "~/Library/Application Support/FahMon" folder first.
+                #ifdef __WXMAC__
+                wxFileName topPath = PathManager::GetCfgPath();
+                topPath.RemoveLastDir();
+                if(!wxMkdir(topPath.GetPath()))
+                {
+                        Tools::ErrorMsgBox(wxString::Format(_("Could not create directory <%s>"), topPath.GetPath().c_str()));
+                        return false;
+                }
+                #endif
-                if(!wxMkdir(PathManager::GetCfgPath()))
-                {
@@ -193 +219 @@
-        PreferencesManager::DestroyInstance();        // MUST be destroyed last, so that other managers can save their preferences when they are destroyed
-        MessagesManager::DestroyInstance();
-
-
+
+
+
+
+
-
-        return 0;

branches/osx/src/mainDialog.cpp

@@ -46 +46 @@
-#include "preferencesManager.h"
-#include "listViewClients.h"
+#ifdef __WXMAC__
+#include "wx/sysopt.h"
+#endif
-
-
@@ -59 +62 @@
-        MID_TOGGLE_ETADATE,
-        MID_BENCHMARKS,
-        MID_PREFERENCES,
-        MID_WWWJMOL,
-        MID_WWWMYSTATS,
@@ -109 +111 @@
-        EVT_MENU    (MID_TOGGLE_ETADATE,        MainDialog::OnMenuToggleETADate)
-        EVT_MENU    (MID_BENCHMARKS,            MainDialog::OnMenuBenchmarks)
-MID_PREFERENCES, 
+wxID_PREFERENCES,
-        EVT_MENU    (MID_WWWJMOL,               MainDialog::OnMenuWeb)
-        EVT_MENU    (MID_WWWFAHINFO,            MainDialog::OnMenuWeb)
@@ -608 +610 @@
-        // Create the menubar
-        menuBar = new wxMenuBar();
-        SetMenuBar(menuBar);
-
-        // The 'Main' menu
@@ -618 +619 @@
-        menu->AppendSeparator();
-        menu->Append(MID_BENCHMARKS, _("&Benchmarks...\tCTRL+B"), _("Open the benchmarks dialog"));
-M
+wx
-        menu->AppendSeparator();
-#ifdef _FAHMON_WIN32_
@@ -628 +629 @@
-        menu->Append(wxID_EXIT, _("&Quit\tCtrl+Q"), wxString::Format(_T("%s "FMC_APPNAME), _("Quit")));
-#endif
+#ifndef __WXMAC__
-        menuBar->Append(menu, wxString::Format(wxT("&%s"), wxT(FMC_APPNAME)));
+#else
+        menuBar->Append(menu, _("&Tools"));
+#endif
-
-        // The 'Monitoring' menu
-        menu = new wxMenu();
+        #ifndef __WXMAC__
-        menu->Append(MID_RELOAD, _("Reload &Selection\tF5"), _("Reload the selected client"));
-        menu->Append(MID_RELOAD_ALL, _("Reload &All\tF6"), _("Reload all the clients"));
@@ -638 +644 @@
-        menu->AppendSeparator();
-        menu->Append(MID_TOGGLE_ETADATE, _("&Cycle ETA Style\tF9"), _("Cycle through the different ETA display styles"));
+        #else
+        menu->Append(MID_RELOAD, _("Reload &Selection\tCtrl+R"), _("Reload the selected client"));
+        menu->Append(MID_RELOAD_ALL, _("Reload &All\tCtrl+Shift+R"), _("Reload all the clients"));
+        menu->AppendSeparator();
+        menu->Append(MID_TOGGLELOG, _("&Show/Hide FAHLog\tCtrl+L"), _("Toggle the log file"));
+        menu->AppendSeparator();
+        menu->Append(MID_TOGGLE_ETADATE, _("&Cycle ETA Style\tCtrl+E"), _("Cycle through the different ETA display styles"));
+        #endif
-        menuBar->Append(menu, _("&Monitoring"));
-
-        // The 'Web' menu
-        menu = new wxMenu();
+        #ifndef __WXMAC__
-        menu->Append(MID_WWWMYSTATS, _("&My Stats\tF2"), _("View the personal statistics for the selected client"));
-        menu->Append(MID_WWWJMOL, _("&Jmol\tF3"), _("View the current project on the Jmol website"));
-        menu->Append(MID_WWWFAHINFO, _("&fahinfo\tF4"), _("View the current project on fahinfo.org"));
+        #else
+        menu->Append(MID_WWWMYSTATS, _("&My Stats\tCtrl+Shift+M"), _("View the personal statistics for the selected client"));
+        menu->Append(MID_WWWJMOL, _("&Jmol\tCtrl+J"), _("View the current project on the Jmol website"));
+        menu->Append(MID_WWWFAHINFO, _("&fahinfo\tCtrl+F"), _("View the current project on fahinfo.org"));
+        #endif
-        menu->AppendSeparator();
-        menu->Append(MID_WWWFOLDING, _("F@H &Website"), _("Open to the official Stanford website"));
@@ -654 +674 @@
-        // The 'Help' menu
-        menu = new wxMenu();
+        #ifndef __WXMAC__
-        menu->Append(wxID_HELP_CONTENTS, _("&Help Contents\tF1"), _("See help contents"));
+        #else
+        menu->Append(wxID_HELP_CONTENTS, _("&Help Contents\tCtrl+?"), _("See help contents"));
+        #endif
-#ifdef _FAHMON_WIN32_
-        // MSVC stupidity
@@ -663 +687 @@
-        menu->Append(wxID_ABOUT, _("&About"), wxString::Format(_T("%s "FMC_APPNAME),  _("About")));
-#endif
+#ifdef __WXMAC__
+        {
+                //wxApp::s_macHelpMenuTitleName = _("&Help");
+            wxApp::s_macAboutMenuItemId = wxID_ABOUT;
+        }
+#endif
-        menuBar->Append(menu, _("&Help"));
+        
+        SetMenuBar(menuBar);
-}
-
@@ -677 +709 @@
-        wxGridSizer      *infoSizer;
-        wxStaticBoxSizer *topRightSizer;
-
+
+
+
-        // We need to use a panel as a top level component in our frame
-        // Without that, the frame looks ugly under Windows (dark grey background)

branches/osx/src/pathManager.cpp

@@ -26 +26 @@
-
-#include "wx/utils.h"
+#include "wx/filename.h"
+#include "wx/app.h"
-
-
@@ -64 +66 @@
-        mUserTplPath = wxT("./templates/");
-        mMsgPath = wxT("./");
+        
+#elif __WXMAC__
+
+        // On OSX systems, the preferences are stored in ~/Library/Application Support
+        // by convention
+        
+        wxFileName appPath = wxFileName(wxTheApp->argv[0]).GetPath (wxPATH_GET_VOLUME);
+        appPath.RemoveLastDir();
+        
+        wxString resourcesPath = appPath.GetPath();
+        
+        resourcesPath += _T("/Contents/Resources/");
+
+        wxString homeDir;
+        
+        homeDir = wxGetHomeDir();
+        if(homeDir.Last() != '/')
+                homeDir += wxT("/");
+        
+        mImgPath = resourcesPath;
+        mCfgPath = homeDir + wxT("Library/Application Support/FahMon/config/");
+        mXYZPath = homeDir + wxT("Library/Application Support/FahMon/xyz/");
+        mMsgPath = homeDir + wxT("Library/Application Support/FahMon/");
+        mGlobalTplPath = resourcesPath;
+        mUserTplPath = homeDir + wxT("Library/Application Support/FahMon/templates/");
-
-#endif

branches/osx/src/preferencesDialog.cpp

@@ -83 +83 @@
-        EVT_CHOICE(CHC_FILEMANAGER,                 PreferencesDialog::OnChoices)
-        // EVT_CHOICE(CHK_PPDTYPE, PreferencesDialog::OnChoices)
+        #ifdef __WXMAC__ 
+        EVT_CLOSE(PreferencesDialog::OnClose) 
+        #endif 
-
-END_EVENT_TABLE()
@@ -95 +98 @@
-        wxBoxSizer *topLevelSizer;
-        wxBoxSizer *mainSizer;
+#ifndef __WXMAC__
-        wxBoxSizer *buttonsSizer;
-        wxNotebook *noteBook;
+#else
+        wxChoicebook *noteBook;
+#endif
-
-        // Preferences are divided into groups, thanks to a wxNoteBook (tabbed control)
+#ifndef __WXMAC__
-        noteBook = new wxNotebook(this, wxID_ANY);
+#else
+        noteBook = new wxChoicebook(this, wxID_ANY);
+#endif
-
-        noteBook->AddPage(CreateGeneralTab(noteBook),    _("General"));
@@ -110 +121 @@
-
-        // Buttons 'Ok' and 'Cancel' are right-aligned
+#ifndef __WXMAC__
-        buttonsSizer = new wxBoxSizer(wxHORIZONTAL);
-
@@ -115 +127 @@
-        buttonsSizer->AddSpacer(FMC_GUI_SPACING_LOW);
-        buttonsSizer->Add(new wxButton(this, wxID_OK), 0, wxALIGN_RIGHT);
+#endif
-
-        // Construct the dialog
@@ -121 +134 @@
-        mainSizer->Add(noteBook, 1, wxEXPAND);
-        mainSizer->AddSpacer(FMC_GUI_SPACING_HIGH);
+#ifndef __WXMAC__
-        mainSizer->Add(buttonsSizer, 0, wxALIGN_RIGHT);
+#endif
-
-        // The final sizer
@@ -158 +173 @@
-
-
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -167 +182 @@
-        sizer                               = new wxBoxSizer(wxVERTICAL);
-        topLevelSizer                       = new wxBoxSizer(wxVERTICAL);
+        #ifndef __WXMAC__
-        mGeneralEnableTrayIcon              = new wxCheckBox(panel, wxID_ANY, _("Enable system tray icon"));
+        #endif
-        mGeneralStartMinimised              = new wxCheckBox(panel, wxID_ANY, _("Start minimized"));
-        mGeneralCollectXYZFiles             = new wxCheckBox(panel, wxID_ANY, _("Collect .xyz files"));
@@ -174 +191 @@
-        mGeneralUpdateCheck                 = new wxCheckBox(panel, wxID_ANY, _("Check for FahMon updates on startup"));
-
+        #ifndef __WXMAC__
-        sizer->AddStretchSpacer();
-        sizer->Add(mGeneralEnableTrayIcon, 0, wxALIGN_LEFT);
+        #endif
-        sizer->AddStretchSpacer();
-        sizer->Add(mGeneralCollectXYZFiles, 0, wxALIGN_LEFT);
@@ -195 +214 @@
-
-
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -255 +274 @@
-
-
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -309 +328 @@
-
-
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -331 +350 @@
-        mAdvancedLocalFileLocation                      = new wxTextCtrl(panel, wxID_ANY, wxT(""), wxDefaultPosition);
-        mAdvancedLabelLocalFile                         = new wxStaticText(panel, wxID_ANY, _("Filename:"));
+#ifndef __WXMAC__
-        mAdvancedLocationChooser                        = new wxButton(panel, BTN_BROWSE, wxT("..."), wxDefaultPosition, wxSize(26, 26));
+#else
+        mAdvancedLocationChooser                        = new wxButton(panel, BTN_BROWSE, _("Choose"), wxDefaultPosition);
+#endif
-
-        LocalFileSizer->Add(mAdvancedLabelLocalFile, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT);
@@ -357 +380 @@
-
-
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -388 +411 @@
-        const wxString    fileManagers[5] = {wxT("Konqueror (KDE 3)"), wxT("Dolphin (KDE 4)"), wxT("Nautilus (Gnome)"), wxT("Thunar (Xfce 4.4)"), _("Other")};
-        mSystemFileManager     = new wxChoice(panel, CHC_FILEMANAGER, wxDefaultPosition, wxDefaultSize, 5, fileManagers);
+        #elif __WXMAC__
+        const wxString fileManagers[2] = {_("Finder"), _("Other")};
+        mSystemFileManager     = new wxChoice(panel, CHC_FILEMANAGER, wxDefaultPosition, wxDefaultSize, 2, fileManagers);
-        #endif
-
@@ -431 +457 @@
-* Create the tab containing fahinfo.org integration preferences
-**/
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -441 +467 @@
-
-
-Notebook
+BookCtrlBase
-{
-        wxPanel    *panel;
@@ -466 +492 @@
-        mWebAppWebAppLocation            = new wxTextCtrl(panel, wxID_ANY, wxT(""), wxDefaultPosition);
-        mWebAppWebAppLabel               = new wxStaticText(panel, wxID_ANY, _("Filename:"));
+#ifndef __WXMAC__
-        mWebAppWebAppLocationChooser     = new wxButton(panel, BTN_BROWSE_WEBAPP, wxT("..."), wxDefaultPosition, wxSize(26, 26));
+#else
+        mWebAppWebAppLocationChooser     = new wxButton(panel, BTN_BROWSE_WEBAPP, _("Choose"), wxDefaultPosition);
+#endif
-
-        mWebAppUseSimpleWeb              = new wxCheckBox(panel, CHK_USESIMPLEWEB, _("Export Simple Web page"));
-        mWebAppSimpleWebLocation         = new wxTextCtrl(panel, wxID_ANY, wxT(""), wxDefaultPosition);
-        mWebAppSimpleWebLabel            = new wxStaticText(panel, wxID_ANY, _("Filename:"));
+#ifndef __WXMAC__
-        mWebAppSimpleWebLocationChooser  = new wxButton(panel, BTN_BROWSE_SIMPLEWEB, wxT("..."), wxDefaultPosition, wxSize(26, 26));
+#else
+        mWebAppSimpleWebLocationChooser  = new wxButton(panel, BTN_BROWSE_SIMPLEWEB, _("Choose"), wxDefaultPosition);
+#endif
-
-        mWebAppUseSimpleText             = new wxCheckBox(panel, CHK_USESIMPLETEXT, _("Export Simple Text file"));
-        mWebAppSimpleTextLocation        = new wxTextCtrl(panel, wxID_ANY, wxT(""), wxDefaultPosition);
-        mWebAppSimpleTextLabel           = new wxStaticText(panel, wxID_ANY, _("Filename:"));
+#ifndef __WXMAC__
-        mWebAppSimpleTextLocationChooser = new wxButton(panel, BTN_BROWSE_SIMPLETEXT, wxT("..."), wxDefaultPosition, wxSize(26, 26));
+#else
+        mWebAppSimpleTextLocationChooser = new wxButton(panel, BTN_BROWSE_SIMPLETEXT, _("Choose"), wxDefaultPosition);
+#endif
-
-        webAppSizer->Add(mWebAppUseWebApp, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT);
@@ -552 +590 @@
-        _PrefsGetBool(PREF_FAHCLIENT_COLLECTXYZFILES,     isCollectingXYZFiles);
-        _PrefsGetBool(PREF_MAINDIALOG_AUTOUPDATEPROJECTS, autoUpdateProjects);
+        #ifndef __WXMAC__
-        _PrefsGetBool(PREF_MAINDIALOG_ENABLE_TRAY_ICON,   mInitEnableTrayIcon);
+        #endif
-        _PrefsGetBool(PREF_LISTCLIENTS_KEEP_DEAD_LAST,    keepInaccessibleLast);
-        _PrefsGetBool(PREF_MAINDIALOG_START_MINIMISED,    startMinimised);
@@ -559 +599 @@
-
-        mGeneralCollectXYZFiles->SetValue(isCollectingXYZFiles);
+        #ifndef __WXMAC__
-        mGeneralEnableTrayIcon->SetValue(mInitEnableTrayIcon);
+        #endif
-        mGeneralAutoUpdateProjectsDatabase->SetValue(autoUpdateProjects);
-        mGeneralKeepInaccessibleClientsLast->SetValue(keepInaccessibleLast);
@@ -745 +787 @@
-                mSystemFileManager->Select(4);
-        }
+        #elif __WXMAC__ 
+        if(filemanager == wxT("open")) 
+        { 
+                mSystemFileManager->Select(0); 
+        } 
+        else // other filemanager 
+        { 
+                mSystemFileManager->Select(1); 
+        }
-        #endif
-
-        if (mInitOverrideTz == true)
-        {
@@ -767 +817 @@
-        _PrefsSetBool(PREF_FAHCLIENT_COLLECTXYZFILES,     mGeneralCollectXYZFiles->GetValue());
-        _PrefsSetBool(PREF_MAINDIALOG_START_MINIMISED,    mGeneralStartMinimised->GetValue());
+        #ifndef __WXMAC__
-        _PrefsSetBool(PREF_MAINDIALOG_ENABLE_TRAY_ICON,   mGeneralEnableTrayIcon->GetValue());
+        #endif
-        _PrefsSetBool(PREF_MAINDIALOG_AUTOUPDATEPROJECTS, mGeneralAutoUpdateProjectsDatabase->GetValue());
-        _PrefsSetBool(PREF_LISTCLIENTS_KEEP_DEAD_LAST,    mGeneralKeepInaccessibleClientsLast->GetValue());
@@ -812 +864 @@
-
-        // -----===== Alert components when important prefs have changed =====-----
+        #ifndef __WXMAC__
-        if(mGeneralEnableTrayIcon->GetValue() != mInitEnableTrayIcon)
-        {
-                MainDialog::GetInstance()->OnTrayIconPrefChanged();
-        }
+        #endif
-
-        if(mMonitoringAdvancedReload->GetValue() != mInitAdvancedReload || (wxUint32)mMonitoringAutoReloadFrequency->GetValue() != mInitAutoReloadFrequency)
@@ -1078 +1132 @@
-                                        break;
-                        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        #endif
-                        break;
@@ -1087 +1155 @@
-        }
-}
+
+#ifdef __WXMAC__ 
+/** 
+ * Mac Specific close routine to save the preferences: no close button 
+ **/ 
+void PreferencesDialog::OnClose(wxCloseEvent& event) 
+{ 
+        SavePreferences(); 
+        PreferencesManager::GetInstance()->Save(); 
+        event.Skip(); 
+} 
+#endif 

branches/osx/src/preferencesManager.cpp

@@ -225 +225 @@
-
-
-inline 
+
-{
-        DataOutputStream             out(PathManager::GetCfgPath() + wxT(FMC_FILE_PREFS));

branches/osx/src/queue.cpp

@@ -65 +65 @@
-#elif _FAHMON_WIN32_
-        systype = 1;
-__WXMAC_PPC__
+defined(__ppc__) && defined(__WXMAC__)
-        systype = 2;
-__WXMAC__
+defined(__i386__) && defined(__WXMAC__)
-        systype = 3;
-#endif
@@ -115 +115 @@
-                                queueversion = 324;
-tl:                             if (genome)
-def __WXMAC_PPC__
+ defined(__ppc__) && defined(__WXMAC__)
-                                        q = "0Linux";
-#else
@@ -129 +129 @@
-                                queueversion = 500;
-tt:                             if (genome)
-def __WXMAC_PPC__
+ defined(__ppc__) && defined(__WXMAC__)
-                                        q = "1Linux, Windows or Mac/x86";
-#else
@@ -142 +142 @@
-                //endian swap for PPC machines and queues
-                endianswap = FALSE;
-def __WXMAC_PPC__
+ defined(__ppc__) && defined(__WXMAC__)
-                if (systype != 2)
-                        endianswap = TRUE;
@@ -249 +249 @@
-u32 Queue::es32(u32 i)
-{
-
-
+
-}
-
@@ -258 +257 @@
-        int                     i, n;
-        struct queueformat::qs *p;
+
-        bp->version = es32(bp->version);
-        bp->current = es32(bp->current);

branches/osx/src/tools.cpp

@@ -63 +63 @@
-        }
-
+#elif __WXMAC__
+
+        wxLaunchDefaultBrowser(url);
+
-#else
-