build: split user and data folder, moving user data to Application Support on Mac

This commit is contained in:
Eberhard Graether
2016-02-16 16:44:42 +01:00
parent 89b8d51ab8
commit 86cf1ee62d
51 changed files with 176 additions and 1809 deletions
+3 -9
View File
@@ -5,6 +5,7 @@
#include "utility/messaging/type/MessageActivateNodes.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/scheduling/TaskScheduler.h"
#include "utility/UserPaths.h"
#include "utility/Version.h"
#include "component/view/GraphViewStyle.h"
@@ -15,8 +16,6 @@
#include "settings/ApplicationSettings.h"
#include "settings/ColorScheme.h"
std::string Application::m_appSettingsPath = "data/ApplicationSettings.xml";
std::shared_ptr<Application> Application::create(
const Version& version, ViewFactory* viewFactory, NetworkFactory* networkFactory
){
@@ -53,7 +52,7 @@ std::shared_ptr<Application> Application::create(
void Application::loadSettings()
{
ApplicationSettings::getInstance()->load(FilePath(m_appSettingsPath));
ApplicationSettings::getInstance()->load(FilePath(UserPaths::getAppSettingsPath()));
ColorScheme::getInstance()->load(ApplicationSettings::getInstance()->getColorSchemePath());
GraphViewStyle::loadStyleSettings();
@@ -114,11 +113,6 @@ void Application::showLicenseScreen()
m_mainView->showLicenseScreen();
}
void Application::setAppSettingsPath(const std::string& appSettingsPath)
{
m_appSettingsPath = appSettingsPath;
}
void Application::handleMessage(MessageActivateWindow* message)
{
m_mainView->activateWindow();
@@ -187,5 +181,5 @@ void Application::updateRecentProjects(const FilePath& projectSettingsFilePath)
}
appSettings->setRecentProjects(recentProjects);
appSettings->save(m_appSettingsPath);
appSettings->save(UserPaths::getAppSettingsPath());
}