jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

minor cleanups and optimizations

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-03-06 22:10:50 +01:00
parent b2f83541e7
commit 2c9a8c2b57
15 changed files with 391 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/main.cpp
View file

@ -31,11 +31,13 @@
#include "main.h"
#include "window_main.h"
#include "carddatabase.h"
#include "settingscache.h"
//Q_IMPORT_PLUGIN(qjpeg)
CardDatabase *db;
QTranslator *translator;
SettingsCache *settingsCache;
void myMessageOutput(QtMsgType /*type*/, const char *msg)
{
@ -57,6 +59,7 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationDomain("cockatrice.de");
QCoreApplication::setApplicationName("Cockatrice");
settingsCache = new SettingsCache;
db = new CardDatabase;
QString localeName;// = QLocale::system().name();
@ -65,9 +68,7 @@ int main(int argc, char *argv[])
app.installTranslator(&qtTranslator);
translator = new QTranslator;
QSettings settings;
settings.beginGroup("personal");
QString lang = settings.value("lang").toString();
QString lang = settingsCache->getLang();
if (lang.isEmpty())
translator->load("cockatrice_" + localeName, ":/translations", QString(), ".qm");
else
@ -88,6 +89,7 @@ int main(int argc, char *argv[])
int retval = app.exec();
delete db;
delete settingsCache;
return retval;
}