summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-15 18:34:42 (UTC)
committer harlekin <harlekin>2002-08-15 18:34:42 (UTC)
commit8cd40434c7011022a8e1706698e5c5075681bd1e (patch) (side-by-side diff)
tree74e8634c40c1b35cdf32620d219d3a98ec3e2ded
parentfc0f625393128d47ef4e2baef4dfcdbe48a18ca7 (diff)
downloadopie-8cd40434c7011022a8e1706698e5c5075681bd1e.zip
opie-8cd40434c7011022a8e1706698e5c5075681bd1e.tar.gz
opie-8cd40434c7011022a8e1706698e5c5075681bd1e.tar.bz2
applied hashs patch
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
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
@@ -630,50 +630,56 @@ 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;
+ /*
+ * not required. if using one of these languages, you might as well install
+ * a custom font.
+
//###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", "helvetica" );
QString styleStr = config.readEntry( "FontStyle", "Regular" );
QString sizeStr = config.readEntry( "FontSize", "10" );
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();