Default font should be helvetica (compatiblity and looks nicer IMHO)

Do not hard-code the encoding, let FontDatabase pick it, when not
explicitly specified

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
@@ -560,100 +560,100 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t )
       d->preloaded = TRUE;
       argc-=1;
   } else if ( qstrcmp(argv[a],"-preload-show")==0 ) {
       argv[a] = argv[a+1];
       a++;
       d->preloaded = TRUE;
       d->forceshow = TRUE;
       argc-=1;
   }
     }
 
     /* overide stored arguments */
     setArgs(argc, argv);
 
 #endif
 
     qwsSetDecoration( new QPEDecoration() );
 
 #ifndef QT_NO_TRANSLATION
     QStringList langs = Global::languageList();
     for (QStringList::ConstIterator it = langs.begin(); it!=langs.end(); ++it) {
   QString lang = *it;
 
   QTranslator * trans;
   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
     QToolTip::setEnabled( FALSE );
 #endif
 }
 
 static QPtrDict<void>* inputMethodDict=0;
 static void createInputMethodDict()
 {
     if ( !inputMethodDict )
   inputMethodDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the currently set hint to the system as to whether
   \a w has any use for text input methods.
 
   \sa setInputMethodHint()
 */
 QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget* w )
 {
     if ( inputMethodDict && w )
   return (InputMethodHint)(int)inputMethodDict->find(w);
     return Normal;
 }