+ support user template parameter file for branding

This commit is contained in:
wmayer 2015-07-11 12:46:55 +02:00
parent 66de19b162
commit 7bd6dccac7
2 changed files with 16 additions and 0 deletions

View File

@ -1410,6 +1410,21 @@ void Application::LoadParameters(void)
try {
if (_pcUserParamMngr->LoadOrCreateDocument(mConfig["UserParameter"].c_str()) && !(mConfig["Verbose"] == "Strict")) {
// The user parameter file doesn't exist. When an alternative parameter file is offered
// this will be used.
std::map<std::string, std::string>::iterator it = mConfig.find("UserParameterTemplate");
if (it != mConfig.end()) {
QString path = QString::fromUtf8(it->second.c_str());
if (QDir(path).isRelative()) {
QString home = QString::fromUtf8(mConfig["AppHomePath"].c_str());
path = QFileInfo(QDir(home), path).absoluteFilePath();
}
QFileInfo fi(path);
if (fi.exists()) {
_pcUserParamMngr->LoadDocument(path.toUtf8().constData());
}
}
// Configuration file optional when using as Python module
if (!Py_IsInitialized()) {
Console().Warning(" User settings not existing, write initial one\n");

View File

@ -60,6 +60,7 @@ Branding::Branding()
filter.push_back("ExeName");
filter.push_back("ExeVendor");
filter.push_back("NavigationStyle");
filter.push_back("UserParameterTemplate");
}
bool Branding::readFile(const QString& fn)