napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new CalamaresUtils::installTranslator.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-11-10 12:26:39 +01:00
parent 058be8beb2
commit 78075d7412
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calamares/CalamaresApplication.cpp
View File

@ -46,7 +46,8 @@ CalamaresApplication::CalamaresApplication( int& argc, char *argv[] )
setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) ); setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) );
setApplicationVersion( QLatin1String( CALAMARES_VERSION ) ); setApplicationVersion( QLatin1String( CALAMARES_VERSION ) );
CalamaresUtils::installTranslator( this ); QString startupLocale = QLocale::system().uiLanguages().first();
CalamaresUtils::installTranslator( startupLocale, this );
QFont f = font(); QFont f = font();
@ -59,13 +60,15 @@ CalamaresApplication::CalamaresApplication( int& argc, char *argv[] )
// The following line blocks for 15s on Qt 5.1.0 // The following line blocks for 15s on Qt 5.1.0
cDebug() << "Font height:" << QFontMetrics( f ).height(); cDebug() << "Font height:" << QFontMetrics( f ).height();
CalamaresUtils::setDefaultFontSize( f.pointSize() ); CalamaresUtils::setDefaultFontSize( f.pointSize() );
cDebug() << "Available languages:" << QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';' );
} }
void void
CalamaresApplication::init() CalamaresApplication::init()
{ {
qDebug() << "CalamaresApplication thread:" << thread(); cDebug() << "CalamaresApplication thread:" << thread();
//TODO: Icon loader //TODO: Icon loader
Logger::setupLogfile(); Logger::setupLogfile();