author | harlekin <harlekin> | 2002-08-15 18:34:42 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-15 18:34:42 (UTC) |
commit | 8cd40434c7011022a8e1706698e5c5075681bd1e (patch) (unidiff) | |
tree | 74e8634c40c1b35cdf32620d219d3a98ec3e2ded /library | |
parent | fc0f625393128d47ef4e2baef4dfcdbe48a18ca7 (diff) | |
download | opie-8cd40434c7011022a8e1706698e5c5075681bd1e.zip opie-8cd40434c7011022a8e1706698e5c5075681bd1e.tar.gz opie-8cd40434c7011022a8e1706698e5c5075681bd1e.tar.bz2 |
applied hashs patch
-rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 187a7e2..8448352 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -640,30 +640,36 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
640 | tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm"; | 640 | tfn = qpeDir() + "/i18n/" + lang + "/" + d->appName + ".qm"; |
641 | if ( trans->load( tfn ) ) | 641 | if ( trans->load( tfn ) ) |
642 | installTranslator( trans ); | 642 | installTranslator( trans ); |
643 | else | 643 | else |
644 | delete trans; | 644 | delete trans; |
645 | 645 | ||
646 | /* | ||
647 | * not required. if using one of these languages, you might as well install | ||
648 | * a custom font. | ||
649 | |||
646 | //###language/font hack; should look it up somewhere | 650 | //###language/font hack; should look it up somewhere |
647 | if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { | 651 | if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { |
648 | QFont fn = FontManager::unicodeFont( FontManager::Proportional ); | 652 | QFont fn = FontManager::unicodeFont( FontManager::Proportional ); |
649 | setFont( fn ); | 653 | setFont( fn ); |
650 | } | 654 | } |
655 | |||
651 | else { | 656 | else { |
657 | */ | ||
652 | Config config( "qpe" ); | 658 | Config config( "qpe" ); |
653 | config.setGroup( "Appearance" ); | 659 | config.setGroup( "Appearance" ); |
654 | QString familyStr = config.readEntry( "FontFamily", "helvetica" ); | 660 | QString familyStr = config.readEntry( "FontFamily", "helvetica" ); |
655 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); | 661 | QString styleStr = config.readEntry( "FontStyle", "Regular" ); |
656 | QString sizeStr = config.readEntry( "FontSize", "10" ); | 662 | QString sizeStr = config.readEntry( "FontSize", "10" ); |
657 | QString charSetStr = config.readEntry( "FontCharSet", QString::null ); | 663 | QString charSetStr = config.readEntry( "FontCharSet", QString::null ); |
658 | bool ok; | 664 | bool ok; |
659 | int i_size = sizeStr.toInt( &ok, 10 ); | 665 | int i_size = sizeStr.toInt( &ok, 10 ); |
660 | FontDatabase fdb; | 666 | FontDatabase fdb; |
661 | QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr ); | 667 | QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr ); |
662 | setFont( selectedFont ); | 668 | setFont( selectedFont ); |
663 | } | 669 | //} |
664 | } | 670 | } |
665 | 671 | ||
666 | #endif | 672 | #endif |
667 | 673 | ||
668 | applyStyle(); | 674 | applyStyle(); |
669 | 675 | ||