redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 04:57:44 +00:00
Code Activity

Fill out more default settings when creating a profile through the UI

Browse source 
Now wine prefix, version, and game paths are set correctly in the UI
just like at start-up.
This commit is contained in:
Joshua Goins 2022-02-25 20:37:38 -05:00
parent be92d48a23
commit 92fce532b3
2 changed files with 47 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/launchercore.h
View file

@ -141,5 +141,9 @@ private:
void readExpansionVersions(ProfileSettings& info, int max); void readExpansionVersions(ProfileSettings& info, int max);
bool checkIfInPath(QString program); bool checkIfInPath(QString program);
QString getDefaultGamePath();
QString getDefaultWinePrefixPath();
int getDefaultWineVersion();
QVector<ProfileSettings> profileSettings; QVector<ProfileSettings> profileSettings;
}; };

67
src/launchercore.cpp
View file

@ -278,12 +278,8 @@ void LauncherCore::readInitialInformation() {
settings.beginGroup(uuid); settings.beginGroup(uuid);
profile.name = settings.value("name", "Default").toString(); profile.name = settings.value("name", "Default").toString();
profile.wineVersion = settings.value("wineVersion", getDefaultWineVersion()).toInt();
#if defined(Q_OS_MAC)
profile.wineVersion = settings.value("wineVersion", 2).toInt();
#else
profile.wineVersion = settings.value("wineVersion", 0).toInt();
#endif
readWineInfo(profile); readWineInfo(profile);
const QString dataDir = const QString dataDir =
@ -324,29 +320,13 @@ void LauncherCore::readInitialInformation() {
if(settings.contains("gamePath") && settings.value("gamePath").canConvert<QString>() && !settings.value("gamePath").toString().isEmpty()) { if(settings.contains("gamePath") && settings.value("gamePath").canConvert<QString>() && !settings.value("gamePath").toString().isEmpty()) {
profile.gamePath = settings.value("gamePath").toString(); profile.gamePath = settings.value("gamePath").toString();
} else { } else {
#if defined(Q_OS_WIN) profile.gamePath = getDefaultGamePath();
profile.gamePath = "C:\\Program Files (x86)\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn";
#endif
#if defined(Q_OS_MAC)
profile.gamePath = QDir::homePath() + "/Library/Application Support/FINAL FANTASY XIV ONLINE/Bottles/published_Final_Fantasy/drive_c/Program Files (x86)/SquareEnix/FINAL FANTASY XIV - A Realm Reborn";
#endif
#if defined(Q_OS_LINUX)
profile.gamePath = QDir::homePath() + "/.wine/drive_c/Program Files (x86)/SquareEnix/FINAL FANTASY XIV - A Realm Reborn";
#endif
} }
if(settings.contains("winePrefixPath") && settings.value("winePrefixPath").canConvert<QString>() && !settings.value("winePrefixPath").toString().isEmpty()) { if(settings.contains("winePrefixPath") && settings.value("winePrefixPath").canConvert<QString>() && !settings.value("winePrefixPath").toString().isEmpty()) {
profile.winePrefixPath = settings.value("winePrefixPath").toString(); profile.winePrefixPath = settings.value("winePrefixPath").toString();
} else { } else {
#if defined(Q_OS_MACOS) profile.winePrefixPath = getDefaultWinePrefixPath();
profile.winePrefixPath = QDir::homePath() + "/Library/Application Support/FINAL FANTASY XIV ONLINE/Bottles/published_Final_Fantasy";
#endif
#if defined(Q_OS_LINUX)
profile.winePrefixPath = QDir::homePath() + "/.wine";
#endif
} }
ProfileSettings defaultSettings; ProfileSettings defaultSettings;
@ -493,6 +473,13 @@ int LauncherCore::addProfile() {
newProfile.uuid = QUuid::createUuid(); newProfile.uuid = QUuid::createUuid();
newProfile.name = "New Profile"; newProfile.name = "New Profile";
newProfile.wineVersion = getDefaultWineVersion();
readWineInfo(newProfile);
newProfile.gamePath = getDefaultGamePath();
newProfile.winePrefixPath = getDefaultWinePrefixPath();
profileSettings.append(newProfile); profileSettings.append(newProfile);
settingsChanged(); settingsChanged();
@ -587,4 +574,36 @@ bool LauncherCore::checkIfInPath(const QString program) {
QFileInfo fileInfo(directory + "/" + program); QFileInfo fileInfo(directory + "/" + program);
return fileInfo.exists() && fileInfo.isFile(); return fileInfo.exists() && fileInfo.isFile();
} }
QString LauncherCore::getDefaultWinePrefixPath() {
#if defined(Q_OS_MACOS)
return QDir::homePath() + "/Library/Application Support/FINAL FANTASY XIV ONLINE/Bottles/published_Final_Fantasy";
#endif
#if defined(Q_OS_LINUX)
return QDir::homePath() + "/.wine";
#endif
}
QString LauncherCore::getDefaultGamePath() {
#if defined(Q_OS_WIN)
return "C:\\Program Files (x86)\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn";
#endif
#if defined(Q_OS_MAC)
return QDir::homePath() + "/Library/Application Support/FINAL FANTASY XIV ONLINE/Bottles/published_Final_Fantasy/drive_c/Program Files (x86)/SquareEnix/FINAL FANTASY XIV - A Realm Reborn";
#endif
#if defined(Q_OS_LINUX)
return QDir::homePath() + "/.wine/drive_c/Program Files (x86)/SquareEnix/FINAL FANTASY XIV - A Realm Reborn";
#endif
}
int LauncherCore::getDefaultWineVersion() {
#if defined(Q_OS_MAC)
return 2;
#else
return 0;
#endif
}