- Change: The way to calcuate astyle path.
This commit is contained in:
parent
829bc7f9ec
commit
54ee8052ee
4
NEWS.md
4
NEWS.md
|
@ -1,3 +1,7 @@
|
|||
Red Panda C++ Version 3.2
|
||||
|
||||
- Change: The way to calcuate astyle path.
|
||||
|
||||
Red Panda C++ Version 3.1
|
||||
|
||||
- fix: Can't correctly select in column mode.
|
||||
|
|
|
@ -3810,8 +3810,7 @@ void Settings::Environment::doLoad()
|
|||
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);
|
||||
|
@ -3881,19 +3880,17 @@ void Settings::Environment::setTerminalPath(const QString &terminalPath)
|
|||
QString Settings::Environment::AStylePath() const
|
||||
{
|
||||
QString path = mAStylePath;
|
||||
if (isGreenEdition()) {
|
||||
path = replacePrefix(path, "%*APP_DIR*%", pSettings->dirs().appDir());
|
||||
}
|
||||
if (path.isEmpty())
|
||||
path = includeTrailingPathDelimiter(pSettings->dirs().appLibexecDir())+"astyle";
|
||||
else
|
||||
path = replacePrefix(path, "%*APP_DIR*%", pSettings->dirs().appDir());
|
||||
return path;
|
||||
}
|
||||
|
||||
void Settings::Environment::setAStylePath(const QString &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
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
APP_VERSION="3.1"
|
||||
APP_VERSION_SUFFIX=""
|
||||
APP_VERSION="3.2"
|
||||
APP_VERSION_SUFFIX="alpha"
|
||||
|
|
Loading…
Reference in New Issue