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

- Change: The way to calcuate astyle path.

This commit is contained in:
Roy Qu 2024-06-16 09:52:35 +08:00
parent 829bc7f9ec
commit 54ee8052ee
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS.md
View File

@ -1,3 +1,7 @@
Red Panda C++ Version 3.2
- Change: The way to calcuate astyle path.
Red Panda C++ Version 3.1 Red Panda C++ Version 3.1
- fix: Can't correctly select in column mode. - fix: Can't correctly select in column mode.

11
RedPandaIDE/settings.cpp
View File

@ -3810,8 +3810,7 @@ void Settings::Environment::doLoad()
break; break;
} }
} }
if (isGreenEdition()) mAStylePath = replacePrefix(mAStylePath, pSettings->dirs().appDir() , "%*APP_DIR*%");
mAStylePath = replacePrefix(mAStylePath, pSettings->dirs().appDir() , "%*APP_DIR*%");
} }
mHideNonSupportFilesInFileView=boolValue("hide_non_support_files_file_view",true); mHideNonSupportFilesInFileView=boolValue("hide_non_support_files_file_view",true);
@ -3881,19 +3880,17 @@ void Settings::Environment::setTerminalPath(const QString &terminalPath)
QString Settings::Environment::AStylePath() const QString Settings::Environment::AStylePath() const
{ {
QString path = mAStylePath; QString path = mAStylePath;
if (isGreenEdition()) {
path = replacePrefix(path, "%*APP_DIR*%", pSettings->dirs().appDir());
}
if (path.isEmpty()) if (path.isEmpty())
path = includeTrailingPathDelimiter(pSettings->dirs().appLibexecDir())+"astyle"; path = includeTrailingPathDelimiter(pSettings->dirs().appLibexecDir())+"astyle";
else
path = replacePrefix(path, "%*APP_DIR*%", pSettings->dirs().appDir());
return path; return path;
} }
void Settings::Environment::setAStylePath(const QString &aStylePath) void Settings::Environment::setAStylePath(const QString &aStylePath)
{ {
mAStylePath = aStylePath; mAStylePath = aStylePath;
if (isGreenEdition()) mAStylePath = replacePrefix(mAStylePath, pSettings->dirs().appDir() , "%*APP_DIR*%");
mAStylePath = replacePrefix(mAStylePath, pSettings->dirs().appDir() , "%*APP_DIR*%");
} }
QString Settings::Environment::terminalArgumentsPattern() const QString Settings::Environment::terminalArgumentsPattern() const

4
version.inc
View File

@ -1,2 +1,2 @@
APP_VERSION="3.1" APP_VERSION="3.2"
APP_VERSION_SUFFIX="" APP_VERSION_SUFFIX="alpha"