remove hard coded fonts for dvorak, keyboard, multikey, pickboard, and unikeyboard

1 files changed, 10 insertions, 5 deletions

diff --git a/inputmethods/pickboard/pickboard.cpp b/inputmethods/pickboard/pickboard.cpp
index 1611cb0..e5365ba 100644
--- a/inputmethods/pickboard/pickboard.cpp
+++ b/inputmethods/pickboard/pickboard.cpp
@@ -9,33 +9,33 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "pickboard.h"
 #include "pickboardpicks.h"
 #include "pickboardcfg.h"
 
 #include <qpe/global.h>
-
+#include <qpe/config.h>
 #include <qpainter.h>
 #include <qlist.h>
 #include <qbitmap.h>
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qdialog.h>
 #include <qscrollview.h>
 #include <qpopupmenu.h>
 #include <qhbuttongroup.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #ifdef QWS
 #include <qwindowsystem_qws.h>
 #endif
 
 /*! \class Pickboard
@@ -79,32 +79,37 @@ public:
 	menu->setSizePolicy(QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding));
 	menu->setPixmap(QPixmap((const char **)menu_xpm));
 	QObject::connect(menu,SIGNAL(clicked()),picks,SLOT(doMenu()));
 	QObject::connect(picks,SIGNAL(key(ushort,ushort,ushort,bool,bool)),
 	    parent,SIGNAL(key(ushort,ushort,ushort,bool,bool)));
     }
 
     PickboardPicks* picks;
     QPushButton* menu;
 };
 
 Pickboard::Pickboard(QWidget* parent, const char* name, WFlags f) :
     QFrame(parent,name,f)
 {
     (new QHBoxLayout(this))->setAutoAdd(TRUE);
     d = new PickboardPrivate(this);
-// under Win32 we may not have smallsmooth font
-#ifndef Q_OS_WIN32
-    setFont( QFont( "smallsmooth", 9 ) );
-#endif
+
+    // get the default font
+    Config *config = new Config( "qpe" );
+    config->setGroup( "Appearance" );
+    QString familyStr = config->readEntry( "FontFamily", "smallsmooth" );
+    int fontSize = config->readNumEntry( "FontSize", 10 );
+    delete config;
+
+    setFont( QFont( familyStr, fontSize ) );
 }
 
 Pickboard::~Pickboard()
 {
     delete d;
 }
 
 void Pickboard::resetState()
 {
     d->picks->resetState();
 }