From efe181bd289f4218b90fcca791c3129839c2bce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 28 May 2022 23:23:45 +0200 Subject: [PATCH] NOISSUE maybe fill in correct FTB App settings paths --- .../pages/modplatform/import_ftb/FTBAPage.h | 2 +- .../ui/pages/modplatform/import_ftb/Model.cpp | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/launcher/ui/pages/modplatform/import_ftb/FTBAPage.h b/launcher/ui/pages/modplatform/import_ftb/FTBAPage.h index eea8c172..e17788c0 100644 --- a/launcher/ui/pages/modplatform/import_ftb/FTBAPage.h +++ b/launcher/ui/pages/modplatform/import_ftb/FTBAPage.h @@ -38,7 +38,7 @@ public: virtual ~FTBAPage(); QString displayName() const override { - return tr("FTBApp Import"); + return tr("FTB App Import"); } QIcon icon() const override { diff --git a/launcher/ui/pages/modplatform/import_ftb/Model.cpp b/launcher/ui/pages/modplatform/import_ftb/Model.cpp index ab6e7f99..f48ae08f 100644 --- a/launcher/ui/pages/modplatform/import_ftb/Model.cpp +++ b/launcher/ui/pages/modplatform/import_ftb/Model.cpp @@ -64,11 +64,29 @@ QVariant Model::data(const QModelIndex &index, int role) const } namespace { + +#if defined (Q_OS_OSX) +QString getFTBASettingsPath() { + return FS::PathCombine(QDir::homePath(), "Library/Application Support/.ftba/bin/settings.json"); +} +#elif defined(Q_OS_WIN32) +QString getFTBASettingsPath() { + auto appDataLocalInner = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); + QDir appdata(appDataLocalInner); + appdata.cdUp(); + return FS::PathCombine(appdata.absolutePath(), ".ftba/bin/settings.json"); +} +#else +QString getFTBASettingsPath() { + return FS::PathCombine(QDir::homePath(), ".ftba/bin/settings.json"); +} +#endif + QString getFTBAInstances() { QByteArray data; try { - auto path = FS::PathCombine(QDir::homePath(), ".ftba/bin/settings.json"); + auto path = getFTBASettingsPath(); data = FS::read(path); } catch (const Exception &e)