main.cpp   main.cpp 
skipping to change at line 324 skipping to change at line 324
QString outputFile = StelFileMgr::getUserDir()+"/output.txt"; QString outputFile = StelFileMgr::getUserDir()+"/output.txt";
if (confSettings->value("main/use_separate_output_file", false).toBo ol()) if (confSettings->value("main/use_separate_output_file", false).toBo ol())
outputFile = StelFileMgr::getUserDir()+"/output-"+QDateTime: :currentDateTime().toString("yyyyMMdd-HHmmss")+".txt"; outputFile = StelFileMgr::getUserDir()+"/output-"+QDateTime: :currentDateTime().toString("yyyyMMdd-HHmmss")+".txt";
StelScriptOutput::init(outputFile); StelScriptOutput::init(outputFile);
#endif #endif
// Override config file values from CLI. // Override config file values from CLI.
CLIProcessor::parseCLIArgsPostConfig(argList, confSettings); CLIProcessor::parseCLIArgsPostConfig(argList, confSettings);
// Support hi-dpi pixmaps // Support hi-dpi pixmaps
app.setAttribute(Qt::AA_UseHighDpiPixmaps); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
// Add the DejaVu font that we use everywhere in the program // Add the DejaVu font that we use everywhere in the program
const QString& fName = StelFileMgr::findFile("data/DejaVuSans.ttf"); const QString& fName = StelFileMgr::findFile("data/DejaVuSans.ttf");
if (!fName.isEmpty()) if (!fName.isEmpty())
QFontDatabase::addApplicationFont(fName); QFontDatabase::addApplicationFont(fName);
QString fileFont = confSettings->value("gui/base_font_file", "").toS tring(); QString fileFont = confSettings->value("gui/base_font_file", "").toS tring();
if (!fileFont.isEmpty()) if (!fileFont.isEmpty())
{ {
const QString& afName = StelFileMgr::findFile(QString("data/ %1").arg(fileFont)); const QString& afName = StelFileMgr::findFile(QString("data/ %1").arg(fileFont));
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/