add dynamic settings load

fix setTray() function
This commit is contained in:
arcan1s
2014-08-07 17:06:52 +04:00
parent 4e027ec19f
commit 516c4b5a22
12 changed files with 246 additions and 205 deletions

View File

@ -164,7 +164,7 @@ int main(int argc, char *argv[])
if (args[QString("select")].toString() != QString("PROFILE"))
args[QString("tab")] = (int) 1;
// reread translations
// reread translations according to flags
a.removeTranslator(&translator);
language = Language::defineLanguage(args[QString("config")].toString(),
args[QString("options")].toString());
@ -190,6 +190,6 @@ int main(int argc, char *argv[])
cout << versionMessage().toUtf8().data();
return 0;
}
MainWindow w(0, args);
MainWindow w(0, args, &translator);
return a.exec();
}