author | sandman <sandman> | 2002-06-24 22:38:00 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-24 22:38:00 (UTC) |
commit | 1a3970869e87b41d475368e089a656de96a27561 (patch) (side-by-side diff) | |
tree | 8e247a5ea8092e7d3abfda0a4d42b5e24653f9f0 /library | |
parent | b5e6ed78ad6075550985b092211318da47904897 (diff) | |
download | opie-1a3970869e87b41d475368e089a656de96a27561.zip opie-1a3970869e87b41d475368e089a656de96a27561.tar.gz opie-1a3970869e87b41d475368e089a656de96a27561.tar.bz2 |
Default font should be helvetica (compatiblity and looks nicer IMHO)
Do not hard-code the encoding, let FontDatabase pick it, when not
explicitly specified
-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 ) QString tfn; trans = new QTranslator(this); tfn = qpeDir()+"/i18n/"+lang+"/libqpe.qm"; if ( trans->load( tfn )) installTranslator( trans ); else delete trans; trans = new QTranslator(this); tfn = qpeDir()+"/i18n/"+lang+"/"+d->appName+".qm"; if ( trans->load( tfn )) installTranslator( trans ); else delete trans; //###language/font hack; should look it up somewhere if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) { QFont fn = FontManager::unicodeFont( FontManager::Proportional ); setFont( fn ); } else { Config config( "qpe" ); config.setGroup( "Appearance" ); - QString familyStr = config.readEntry( "FontFamily", "fixed" ); + QString familyStr = config.readEntry( "FontFamily", "helvetica" ); QString styleStr = config.readEntry( "FontStyle", "Regular" ); QString sizeStr = config.readEntry( "FontSize", "10" ); - QString charSetStr = config.readEntry( "FontCharSet", "iso10646-1" ); + QString charSetStr = config.readEntry( "FontCharSet", QString::null ); bool ok; int i_size = sizeStr.toInt( &ok, 10 ); FontDatabase fdb; QFont selectedFont = fdb.font( familyStr, styleStr, i_size, charSetStr ); setFont( selectedFont ); } } #endif applyStyle(); if ( type() == GuiServer ) { setScreenSaverInterval(-1); setVolume(); QWSServer::setScreenSaver(new QPEScreenSaver); } installEventFilter( this ); QPEMenuToolFocusManager::initialize(); #ifdef QT_NO_QWS_CURSOR // if we have no cursor, probably don't want tooltips |