rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete font/size setting

This commit is contained in:
Konstantinos Sideris 2018-09-29 14:26:47 +03:00
parent 29f442a9f9
commit d1e08e0008
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@ -22,7 +22,6 @@
#include <QFile> #include <QFile>
#include <QFontDatabase> #include <QFontDatabase>
#include <QLabel> #include <QLabel>
#include <QLayout>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QMessageBox> #include <QMessageBox>
#include <QPoint> #include <QPoint>
@ -113,9 +112,6 @@ main(int argc, char *argv[])
if (factor != -1) if (factor != -1)
qputenv("QT_SCALE_FACTOR", QString::number(factor).toUtf8()); qputenv("QT_SCALE_FACTOR", QString::number(factor).toUtf8());
if (factor == -1 || factor == 1)
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
} }
#endif #endif
@ -124,6 +120,7 @@ main(int argc, char *argv[])
QCoreApplication::setApplicationVersion(nheko::version); QCoreApplication::setApplicationVersion(nheko::version);
QCoreApplication::setOrganizationName("nheko"); QCoreApplication::setOrganizationName("nheko");
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCommandLineParser parser; QCommandLineParser parser;
parser.addHelpOption(); parser.addHelpOption();
@ -153,14 +150,7 @@ main(int argc, char *argv[])
std::exit(1); std::exit(1);
} }
QSettings settings; app.setFont(QFont("Open Sans"));
// Set the default if a value has not been set.
if (settings.value("font/size").toInt() == 0)
settings.setValue("font/size", 12);
QFont font("Open Sans", settings.value("font/size").toInt());
app.setFont(font);
QString lang = QLocale::system().name(); QString lang = QLocale::system().name();
@ -177,6 +167,8 @@ main(int argc, char *argv[])
// Move the MainWindow to the center // Move the MainWindow to the center
w.move(screenCenter(w.width(), w.height())); w.move(screenCenter(w.width(), w.height()));
QSettings settings;
if (!settings.value("user/window/start_in_tray", false).toBool() || if (!settings.value("user/window/start_in_tray", false).toBool() ||
!settings.value("user/window/tray", true).toBool()) !settings.value("user/window/tray", true).toBool())
w.show(); w.show();