Allow apps to use font selected in appearance app

1 files changed, 18 insertions, 2 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index cf437da..f84bc0e 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -65,16 +65,18 @@
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #include "fontmanager.h"
+#include "fontdatabase.h"
+
 #include "power.h"
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
@@ -380,17 +382,17 @@ public:
         fd=open("/dev/fb0",O_RDWR);
         if (fd != -1) { ioctl(fd,FBIOBLANK,VESA_POWERDOWN); close(fd); }
     LcdOn = FALSE;
     }        
        else // We're going to suspend the whole machine
     {
         if ( disable_suspend > 2 && !powerOnline() && !networkOnline() ) {
       QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
-      return TRUE; 
+      return TRUE;
       }
     }
       break;
   }
   return FALSE;
     }
 };
 
@@ -499,17 +501,17 @@ static void setScreenSaverInterval(int interval)
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 */
 QPEApplication::QPEApplication( int& argc, char **argv, Type t )
     : QApplication( hack(argc), argv, t )
 {
     int dw = desktop()->width();
     if ( dw < 200 ) {
-  setFont( QFont( "helvetica", 8 ) );
+//  setFont( QFont( "helvetica", 8 ) );
   AppLnk::setSmallIconSize(10);
   AppLnk::setBigIconSize(28);
     }
 
     d = new QPEApplicationData;
     QMimeSourceFactory::setDefaultFactory(new ResourceMimeFactory);
 
     connect(this, SIGNAL(lastWindowClosed()), this, SLOT(hideOrQuit()));
@@ -594,17 +596,31 @@ QPEApplication::QPEApplication( int& argc, char **argv, Type t )
   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 styleStr = config.readEntry( "FontStyle", "Regular" );
+      QString sizeStr = config.readEntry( "FontSize", "10" );
+      QString charSetStr = config.readEntry( "FontCharSet", "iso10646-1" );
+      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);