mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-16 20:14:34 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extracted default templateengine setting to Startup, so base code is no longer modified.

Browse Source
This commit is contained in:
Luis Ángel San Martín
2016-06-17 20:11:32 +02:00
parent 95cb741880
commit d2b7487149
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
YACReaderLibrary/server/lib/templateengine/templateloader.cpp
View File

@ -9,12 +9,11 @@
#include <QStringList>
#include <QDir>
#include <QSet>
#include <QCoreApplication>
TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
: QObject(parent)
{
templatePath=settings->value("path","./server/templates").toString();
templatePath=settings->value("path",".").toString();
// Convert relative path to absolute, based on the directory of the config file.
#ifdef Q_OS_WIN32
if (QDir::isRelativePath(templatePath) && settings->format()!=QSettings::NativeFormat)
@ -22,13 +21,8 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
if (QDir::isRelativePath(templatePath))
#endif
{
#if defined Q_OS_UNIX && !defined Q_OS_MAC
QFileInfo configFile(QString(DATADIR)+"/yacreader");
templatePath=QFileInfo(QString(DATADIR)+"/yacreader",templatePath).absoluteFilePath();
#else
QFileInfo configFile(QCoreApplication::applicationDirPath());
templatePath=QFileInfo(QCoreApplication::applicationDirPath(),templatePath).absoluteFilePath();
#endif
QFileInfo configFile(settings->fileName());
templatePath=QFileInfo(configFile.absolutePath(),templatePath).absoluteFilePath();
}
fileNameSuffix=settings->value("suffix",".tpl").toString();
QString encoding=settings->value("encoding").toString();