- 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
|
Red Panda C++ Version 3.1
|
||||||
|
|
||||||
- fix: Can't correctly select in column mode.
|
- fix: Can't correctly select in column mode.
|
||||||
|
|
|
@ -3810,7 +3810,6 @@ void Settings::Environment::doLoad()
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isGreenEdition())
|
|
||||||
mAStylePath = replacePrefix(mAStylePath, pSettings->dirs().appDir() , "%*APP_DIR*%");
|
mAStylePath = replacePrefix(mAStylePath, pSettings->dirs().appDir() , "%*APP_DIR*%");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3881,18 +3880,16 @@ 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*%");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
APP_VERSION="3.1"
|
APP_VERSION="3.2"
|
||||||
APP_VERSION_SUFFIX=""
|
APP_VERSION_SUFFIX="alpha"
|
||||||
|
|
Loading…
Reference in New Issue