-rw-r--r-- | library/qpeapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 1534b0b..87a9739 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -584,52 +584,52 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t ) | |||
584 | QString tfn; | 584 | QString tfn; |
585 | 585 | ||
586 | trans = new QTranslator(this); | 586 | trans = new QTranslator(this); |
587 | tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; | 587 | tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; |
588 | if ( trans->load( tfn )) | 588 | if ( trans->load( tfn )) |
589 | installTranslator( trans ); | 589 | installTranslator( trans ); |
590 | else | 590 | else |
591 | delete trans; | 591 | delete trans; |
592 | 592 | ||
593 | trans = new QTranslator(this); | 593 | trans = new QTranslator(this); |
594 | tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; | 594 | tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; |
595 | if ( trans->load( tfn )) | 595 | if ( trans->load( tfn )) |
596 | installTranslator( trans ); | 596 | installTranslator( trans ); |
597 | else | 597 | else |
598 | delete trans; | 598 | delete trans; |
599 | 599 | ||
600 | //###language/font hack; should look it up somewhere | 600 | //###language/font hack; should look it up somewhere |
601 | if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { | 601 | if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { |
602 | QFont fn = FontManager::unicodeFont( FontManager::Proportional ); | 602 | QFont fn = FontManager::unicodeFont( FontManager::Proportional ); |
603 | setFont( fn ); | 603 | setFont( fn ); |
604 | } | 604 | } |
605 | else { | 605 | else { |
606 | Config config( "qpe" ); | 606 | Config config( "qpe" ); |
607 | config.setGroup( "Appearance" ); | 607 | config.setGroup( "Appearance" ); |
608 | QString familyStr = config.readEntry( "FontFamily", "fixed" ); | 608 | QString familyStr = config.readEntry( "FontFamily", "helvetica" ); |
609 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); | 609 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); |
610 | QString sizeStr = config.readEntry( "FontSize", "10" ); | 610 | QString sizeStr = config.readEntry( "FontSize", "10" ); |
611 | QString charSetStr = config.readEntry( "FontCharSet", "iso10646-1" ); | 611 | QString charSetStr = config.readEntry( "FontCharSet", QString::null ); |
612 | bool ok; | 612 | bool ok; |
613 | int i_size = sizeStr.toInt( &ok, 10 ); | 613 | int i_size = sizeStr.toInt( &ok, 10 ); |
614 | FontDatabase fdb; | 614 | FontDatabase fdb; |
615 | QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr ); | 615 | QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr ); |
616 | setFont( selectedFont ); | 616 | setFont( selectedFont ); |
617 | } | 617 | } |
618 | } | 618 | } |
619 | 619 | ||
620 | #endif | 620 | #endif |
621 | 621 | ||
622 | applyStyle(); | 622 | applyStyle(); |
623 | 623 | ||
624 | if ( type() == GuiServer ) { | 624 | if ( type() == GuiServer ) { |
625 | setScreenSaverInterval(-1); | 625 | setScreenSaverInterval(-1); |
626 | setVolume(); | 626 | setVolume(); |
627 | QWSServer::setScreenSaver(new QPEScreenSaver); | 627 | QWSServer::setScreenSaver(new QPEScreenSaver); |
628 | } | 628 | } |
629 | 629 | ||
630 | installEventFilter( this ); | 630 | installEventFilter( this ); |
631 | 631 | ||
632 | QPEMenuToolFocusManager::initialize(); | 632 | QPEMenuToolFocusManager::initialize(); |
633 | 633 | ||
634 | #ifdef QT_NO_QWS_CURSOR | 634 | #ifdef QT_NO_QWS_CURSOR |
635 | // if we have no cursor, probably don't want tooltips | 635 | // if we have no cursor, probably don't want tooltips |