[bug fixes]
This commit is contained in:
18
src/main.cpp
18
src/main.cpp
@@ -3,7 +3,7 @@
|
||||
#include "loginwindow.h"
|
||||
#include "InputObject.h"
|
||||
#include <QQmlApplicationEngine>
|
||||
#include <src/db/SQLHelper.h>
|
||||
#include "db/SQLHelper.h"
|
||||
#include <QTextCodec>
|
||||
#include <QFontDatabase>
|
||||
#include <QDebug>
|
||||
@@ -47,10 +47,16 @@ int main(int argc, char* argv[])
|
||||
QTextCodec* codec = QTextCodec::codecForName("utf8");
|
||||
QTextCodec::setCodecForLocale(codec);
|
||||
|
||||
|
||||
//multi-language suppport
|
||||
QTranslator translator;
|
||||
LanguageSwitcher::Instance()->setTranslator(&translator);
|
||||
LanguageSwitcher::Instance()->setDefaultLanguage(JsonObject::Instance()->defaultLanguage());
|
||||
a.installTranslator(&translator);
|
||||
|
||||
|
||||
//QString fontName = loadFontFromFile(":/fonts/MicrosoftYahei.ttf");
|
||||
QString fontName = loadFontFromFile(":/fonts/DroidSansFallback.ttf");
|
||||
|
||||
|
||||
QFont font(fontName);
|
||||
QApplication::setFont(font);
|
||||
|
||||
@@ -65,11 +71,7 @@ int main(int argc, char* argv[])
|
||||
//QObject::connect(obj, SIGNAL(touchScreen()), Locker::Instance(), SLOT(refreshTimer()));
|
||||
|
||||
|
||||
//multi-language suppport
|
||||
QTranslator translator;
|
||||
LanguageSwitcher::Instance()->setTranslator(&translator);
|
||||
LanguageSwitcher::Instance()->setDefaultLanguage(JsonObject::Instance()->defaultLanguage());
|
||||
a.installTranslator(&translator);
|
||||
|
||||
|
||||
|
||||
QStringList app_args = a.arguments();
|
||||
|
||||
Reference in New Issue
Block a user