Added code so that OSX is now supported.

[xestiaab/.git] / source / common / dirs.cpp

diff --git a/source/common/dirs.cpp b/source/common/dirs.cpp
index 0ced7ab..744fe92 100644 (file)
--- a/source/common/dirs.cpp
+++ b/source/common/dirs.cpp
@@ -2,165 +2,207 @@
 
 wxString GetUserDir()
 {
-
-       wxString UserDir;
-
+    
+    wxString UserDir;
+    
 #if defined(__HAIKU__)
-
-       //preffilename = wxT("noo");
-
+    
+    //preffilename = wxT("noo");
+    
 #elif defined(__WIN32__)
-               
-       UserDir.Clear();
-       UserDir.Append(wxString::FromUTF8(getenv("APPDATA")));
-       UserDir.Append(wxT("\\Xestia\\Address Book\\"));
-
+    
+    UserDir.Clear();
+    UserDir.Append(wxString::FromUTF8(getenv("APPDATA")));
+    UserDir.Append(wxT("\\Xestia\\Address Book\\"));
+    
+#elif defined(__APPLE__)
+    
+    UserDir.Clear();
+    UserDir.Append(wxString::FromUTF8(getenv("HOME")));
+    UserDir.Append(wxT("/Library/Preferences/Xestia/Address Book/"));
+    
 #else
-
-       UserDir.Clear();
-       UserDir.Append(wxString::FromUTF8(getenv("HOME")));
-       UserDir.Append(wxT("/.xestiaab/"));
-
-#endif 
-
-       return UserDir;
-
+    
+    UserDir.Clear();
+    UserDir.Append(wxString::FromUTF8(getenv("HOME")));
+    UserDir.Append(wxT("/.xestiaab/"));
+    
+#endif
+    
+    return UserDir;
+    
 }
 
 wxString GetUserPrefDir()
 {
-
-       wxString UserPrefDir;
-
+    
+    wxString UserPrefDir;
+    
 #if defined(__HAIKU__)
-
-       //preffilename = wxT("noo");
-
+    
+    //preffilename = wxT("noo");
+    
 #elif defined(__WIN32__)
-       
-       UserPrefDir.Clear();
-       UserPrefDir.Append(wxString::FromUTF8(getenv("APPDATA")));
-       UserPrefDir.Append(wxT("\\Xestia\\Address Book\\preferences\\"));
-
+    
+    UserPrefDir.Clear();
+    UserPrefDir.Append(wxString::FromUTF8(getenv("APPDATA")));
+    UserPrefDir.Append(wxT("\\Xestia\\Address Book\\preferences\\"));
+    
+#elif defined(__APPLE__)
+    
+    UserPrefDir.Clear();
+    UserPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
+    UserPrefDir.Append(wxT("/Library/Preferences/Xestia/Address Book/preferences/"));
+    
 #else
-
-       UserPrefDir.Clear();
-       UserPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
-       UserPrefDir.Append(wxT("/.xestiaab/preferences/"));
-
-#endif 
-
-       return UserPrefDir;
-
+    
+    UserPrefDir.Clear();
+    UserPrefDir.Append(wxString::FromUTF8(getenv("HOME")));
+    UserPrefDir.Append(wxT("/.xestiaab/preferences/"));
+    
+#endif
+    
+    return UserPrefDir;
+    
 }
 
 wxString GetRecoveryDB()
 {
-
-       wxString RecoveryDBFile;
-
+    
+    wxString RecoveryDBFile;
+    
 #if defined(__HAIKU__)
-
-       //preffilename = wxT("noo");
-
+    
+    //preffilename = wxT("noo");
+    
 #elif defined(__WIN32__)
-
-       RecoveryDBFile.Clear();
-       RecoveryDBFile.Append(wxString::FromUTF8(getenv("APPDATA")));
-       RecoveryDBFile.Append(wxT("\\Xestia\\Address Book\\recovery.db"));
-
+    
+    RecoveryDBFile.Clear();
+    RecoveryDBFile.Append(wxString::FromUTF8(getenv("APPDATA")));
+    RecoveryDBFile.Append(wxT("\\Xestia\\Address Book\\recovery.db"));
+    
+#elif defined(__APPLE__)
+    
+    RecoveryDBFile.Clear();
+    RecoveryDBFile.Append(wxString::FromUTF8(getenv("HOME")));
+    RecoveryDBFile.Append(wxT("/Library/Preferences/Xestia/Address Book/recovery.db"));
+    
 #else
-
-       RecoveryDBFile.Clear();
-       RecoveryDBFile.Append(wxString::FromUTF8(getenv("HOME")));
-       RecoveryDBFile.Append(wxT("/.xestiaab/.recovery.db"));
-
-#endif 
-
-       return RecoveryDBFile;
-
+    
+    RecoveryDBFile.Clear();
+    RecoveryDBFile.Append(wxString::FromUTF8(getenv("HOME")));
+    RecoveryDBFile.Append(wxT("/.xestiaab/.recovery.db"));
+    
+#endif
+    
+    return RecoveryDBFile;
+    
 }
 
 wxString GetAccountDir(wxString AccName, bool ServerCert)
 {
-
-       wxString AccountDir;
-
+    
+    wxString AccountDir;
+    
 #if defined(__HAIKU__)
-
+    
 #elif defined(__WIN32__)
-
-       AccountDir.Clear();
-       AccountDir.Append(wxString::FromUTF8(getenv("APPDATA")));
-       AccountDir.Append(wxT("\\Xestia\\Address Book\\accounts\\"));
-       AccountDir.Append(AccName);
-       AccountDir.Append(wxT("\\"));
-       if (ServerCert == TRUE){
-               AccountDir.Append(wxT("server.crt"));
-       }
-
+    
+    AccountDir.Clear();
+    AccountDir.Append(wxString::FromUTF8(getenv("APPDATA")));
+    AccountDir.Append(wxT("\\Xestia\\Address Book\\accounts\\"));
+    AccountDir.Append(AccName);
+    AccountDir.Append(wxT("\\"));
+    if (ServerCert == TRUE){
+        AccountDir.Append(wxT("server.crt"));
+    }
+    
+#elif defined(__APPLE__)
+    
+    AccountDir.Clear();
+    AccountDir.Append(wxString::FromUTF8(getenv("HOME")));
+    AccountDir.Append(wxT("/Library/Preferences/Xestia/Address Book/accounts/"));
+    AccountDir.Append(AccName);
+    AccountDir.Append(wxT("/"));
+    if (ServerCert == TRUE){
+        AccountDir.Append(wxT("server.crt"));
+    }
+    
 #else
-
-       AccountDir.Clear();
-       AccountDir.Append(wxString::FromUTF8(getenv("HOME")));
-       AccountDir.Append(wxT("/.xestiaab/accounts/"));
-       AccountDir.Append(AccName);
-       AccountDir.Append(wxT("/"));
-       if (ServerCert == TRUE){
-               AccountDir.Append(wxT("server.crt"));
-       }
-
+    
+    AccountDir.Clear();
+    AccountDir.Append(wxString::FromUTF8(getenv("HOME")));
+    AccountDir.Append(wxT("/.xestiaab/accounts/"));
+    AccountDir.Append(AccName);
+    AccountDir.Append(wxT("/"));
+    if (ServerCert == TRUE){
+        AccountDir.Append(wxT("server.crt"));
+    }
+    
 #endif
-
-       return AccountDir;
-
+    
+    return AccountDir;
+    
 }
 
 wxString GetAccountsFile()
 {
-
-       wxString AccountsFile;
-
+    
+    wxString AccountsFile;
+    
 #if defined(__HAIKU__)
-
+    
 #elif defined(__WIN32__)
-
-       AccountsFile.Clear();
-       AccountsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
-       AccountsFile.Append(wxT("\\Xestia\\Address Book\\preferences\\accounts"));
+    
+    AccountsFile.Clear();
+    AccountsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
+    AccountsFile.Append(wxT("\\Xestia\\Address Book\\preferences\\accounts"));
+    
+#elif defined(__WIN32__)
+    
+    AccountsFile.Clear();
+    AccountsFile.Append(wxString::FromUTF8(getenv("HOME")));
+    AccountsFile.Append(wxT("/Library/Preferences/Xestia/Address Book/preferences/accounts"));
+    
 #else
-
-       AccountsFile.Clear();
-       AccountsFile.Append(wxString::FromUTF8(getenv("HOME")));
-       AccountsFile.Append(wxT("/.xestiaab/preferences/accounts"));
-
+    
+    AccountsFile.Clear();
+    AccountsFile.Append(wxString::FromUTF8(getenv("HOME")));
+    AccountsFile.Append(wxT("/.xestiaab/preferences/accounts"));
+    
 #endif
-
-       return AccountsFile;
-
+    
+    return AccountsFile;
+    
 }
 
 wxString GetSettingsFile()
 {
-
-       wxString SettingsFile;
-
+    
+    wxString SettingsFile;
+    
 #if defined(__HAIKU__)
-
+    
 #elif defined(__WIN32__)
-
-       SettingsFile.Clear();
-       SettingsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
-       SettingsFile.Append(wxT("\\Xestia\\Address Book\\preferences\\settings"));
-
+    
+    SettingsFile.Clear();
+    SettingsFile.Append(wxString::FromUTF8(getenv("APPDATA")));
+    SettingsFile.Append(wxT("\\Xestia\\Address Book\\preferences\\settings"));
+    
+#elif defined(__APPLE__)
+    
+    SettingsFile.Clear();
+    SettingsFile.Append(wxString::FromUTF8(getenv("HOME")));
+    SettingsFile.Append(wxT("/Library/Preferences/Xestia/Address Book/preferences/settings"));
+    
 #else
-
-       SettingsFile.Clear();
-       SettingsFile.Append(wxString::FromUTF8(getenv("HOME")));
-       SettingsFile.Append(wxT("/.xestiaab/preferences/settings"));
-
+    
+    SettingsFile.Clear();
+    SettingsFile.Append(wxString::FromUTF8(getenv("HOME")));
+    SettingsFile.Append(wxT("/.xestiaab/preferences/settings"));
+    
 #endif
-
-       return SettingsFile;
-
+    
+    return SettingsFile;
+    
 }
\ No newline at end of file