X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fdirs.cpp;h=0abe0a6a45952745862b69c2ed92067e6eb489fe;hb=735fd842be7625b7fc4d65832dff8e33f6fb463b;hp=0ced7abc56c490a2cc64ff0957838251ef0b6db6;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git
diff --git a/source/common/dirs.cpp b/source/common/dirs.cpp
index 0ced7ab..0abe0a6 100644
--- a/source/common/dirs.cpp
+++ b/source/common/dirs.cpp
@@ -1,166 +1,226 @@
+// dirs.cpp - Directory subroutines.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see
+
#include
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