rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

limit config appDir substitution to portable app only (#391)

This commit is contained in:
Cyano Hao 2024-04-24 12:01:15 +08:00 committed by GitHub
parent 5e9d9504d2
commit 334be5b76a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
RedPandaIDE/settings.cpp
View File

@ -3461,6 +3461,11 @@ Settings::PCompilerSet Settings::CompilerSets::getSet(int index)
} }
void Settings::CompilerSets::savePath(const QString& name, const QString& path) { void Settings::CompilerSets::savePath(const QString& name, const QString& path) {
if (!isGreenEdition()) {
mSettings->mSettings.setValue(name, path);
return;
}
QString s; QString s;
QString prefix1 = excludeTrailingPathDelimiter(mSettings->mDirs.appDir()) + "/"; QString prefix1 = excludeTrailingPathDelimiter(mSettings->mDirs.appDir()) + "/";
QString prefix2 = excludeTrailingPathDelimiter(mSettings->mDirs.appDir()) + QDir::separator(); QString prefix2 = excludeTrailingPathDelimiter(mSettings->mDirs.appDir()) + QDir::separator();
@ -3475,6 +3480,11 @@ void Settings::CompilerSets::savePath(const QString& name, const QString& path)
} }
void Settings::CompilerSets::savePathList(const QString& name, const QStringList& pathList) { void Settings::CompilerSets::savePathList(const QString& name, const QStringList& pathList) {
if (!isGreenEdition()) {
mSettings->mSettings.setValue(name, pathList);
return;
}
QStringList sl; QStringList sl;
for (const QString& path: pathList) { for (const QString& path: pathList) {
QString s; QString s;
@ -3549,6 +3559,7 @@ void Settings::CompilerSets::saveSet(int index)
QString Settings::CompilerSets::loadPath(const QString &name) QString Settings::CompilerSets::loadPath(const QString &name)
{ {
// always do substitution for backward compatibility
QString s = mSettings->mSettings.value(name).toString(); QString s = mSettings->mSettings.value(name).toString();
QString prefix = "%AppPath%/"; QString prefix = "%AppPath%/";
if (s.startsWith(prefix)) { if (s.startsWith(prefix)) {
@ -3559,6 +3570,7 @@ QString Settings::CompilerSets::loadPath(const QString &name)
void Settings::CompilerSets::loadPathList(const QString &name, QStringList& list) void Settings::CompilerSets::loadPathList(const QString &name, QStringList& list)
{ {
// always do substitution for backward compatibility
list.clear(); list.clear();
QStringList sl = mSettings->mSettings.value(name).toStringList(); QStringList sl = mSettings->mSettings.value(name).toStringList();
QString prefix = "%AppPath%/"; QString prefix = "%AppPath%/";
@ -3772,11 +3784,8 @@ void Settings::Environment::doLoad()
// check saved terminal path // check saved terminal path
mTerminalPath = stringValue("terminal_path", ""); mTerminalPath = stringValue("terminal_path", "");
#ifdef Q_OS_WINDOWS // always do substitution for backward compatibility
// APP_DIR trick for windows portable app
// on other platforms multiple instances share the same configuration and thus the trick may break terminal path
mTerminalPath.replace("%*APP_DIR*%",pSettings->dirs().appDir()); mTerminalPath.replace("%*APP_DIR*%",pSettings->dirs().appDir());
#endif
mTerminalArgumentsPattern = stringValue("terminal_arguments_pattern", ""); mTerminalArgumentsPattern = stringValue("terminal_arguments_pattern", "");
checkAndSetTerminal(); checkAndSetTerminal();
@ -4046,13 +4055,15 @@ void Settings::Environment::doSave()
saveValue("current_folder",mCurrentFolder); saveValue("current_folder",mCurrentFolder);
saveValue("default_open_folder",mDefaultOpenFolder); saveValue("default_open_folder",mDefaultOpenFolder);
QString terminalPath = mTerminalPath; QString terminalPath = mTerminalPath;
#ifdef Q_OS_WINDOWS if (isGreenEdition())
// APP_DIR trick for windows portable app {
// on other platforms multiple instances share the same configuration and thus the trick may break terminal path // APP_DIR trick for windows portable app
if (terminalPath.startsWith(pSettings->dirs().appDir())) { // For non-portable app (other platform or Windows installer), multiple instances
terminalPath="%*APP_DIR*%"+terminalPath.mid(pSettings->dirs().appDir().length()); // share the same configuration and thus the trick may break terminal path
if (terminalPath.startsWith(pSettings->dirs().appDir())) {
terminalPath="%*APP_DIR*%"+terminalPath.mid(pSettings->dirs().appDir().length());
}
} }
#endif
saveValue("terminal_path",terminalPath); saveValue("terminal_path",terminalPath);
saveValue("terminal_arguments_pattern",mTerminalArgumentsPattern); saveValue("terminal_arguments_pattern",mTerminalArgumentsPattern);