fix Main/Language not saving on ini file
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
class SavvyCANApplication : public QApplication
|
class SavvyCANApplication : public QApplication
|
||||||
{
|
{
|
||||||
@@ -34,17 +35,6 @@ int main(int argc, char *argv[])
|
|||||||
|
|
||||||
SavvyCANApplication a(argc, argv);
|
SavvyCANApplication a(argc, argv);
|
||||||
|
|
||||||
QTranslator translator;
|
|
||||||
QLocale locale = QLocale::system();
|
|
||||||
QString lang = locale.name();
|
|
||||||
QString shortLang = locale.name().left(2); // pt
|
|
||||||
|
|
||||||
if (!translator.load("savvycan_" + lang, "translations"))
|
|
||||||
{
|
|
||||||
translator.load("savvycan_" + lang, "translations");
|
|
||||||
}
|
|
||||||
a.installTranslator(&translator);
|
|
||||||
|
|
||||||
//Add a local path for Qt extensions, to allow for per-application extensions.
|
//Add a local path for Qt extensions, to allow for per-application extensions.
|
||||||
a.addLibraryPath("plugins");
|
a.addLibraryPath("plugins");
|
||||||
|
|
||||||
@@ -52,11 +42,20 @@ int main(int argc, char *argv[])
|
|||||||
a.setOrganizationName("EVTV");
|
a.setOrganizationName("EVTV");
|
||||||
a.setApplicationName("SavvyCAN");
|
a.setApplicationName("SavvyCAN");
|
||||||
a.setOrganizationDomain("evtv.me");
|
a.setOrganizationDomain("evtv.me");
|
||||||
|
|
||||||
QSettings::setDefaultFormat(QSettings::IniFormat);
|
QSettings::setDefaultFormat(QSettings::IniFormat);
|
||||||
|
QSettings settings;
|
||||||
|
|
||||||
|
QString localeString = settings.value("Main/Language").toString();
|
||||||
|
if (localeString.isEmpty()) {
|
||||||
|
QLocale sysLocale = QLocale::system();
|
||||||
|
localeString = sysLocale.name();
|
||||||
|
settings.setValue("Main/Language", localeString);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
a.mainWindow = new MainWindow();
|
a.mainWindow = new MainWindow();
|
||||||
|
|
||||||
QSettings settings;
|
|
||||||
int fontSize = settings.value("Main/FontSize", 9).toUInt();
|
int fontSize = settings.value("Main/FontSize", 9).toUInt();
|
||||||
QFont sysFont = QFont(); //get default font
|
QFont sysFont = QFont(); //get default font
|
||||||
sysFont.setPointSize(fontSize);
|
sysFont.setPointSize(fontSize);
|
||||||
|
|||||||
Reference in New Issue
Block a user