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

1 files changed, 10 insertions, 2 deletions

diff --git a/inputmethods/unikeyboard/unikeyboard.cpp b/inputmethods/unikeyboard/unikeyboard.cpp
index aa74c66..23d96ad 100644
--- a/inputmethods/unikeyboard/unikeyboard.cpp
+++ b/inputmethods/unikeyboard/unikeyboard.cpp
@@ -1,48 +1,48 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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 "unikeyboard.h"
 
 #include <qpe/fontmanager.h>
-
+#include <qpe/config.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
 #include <qcombobox.h>
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 #include <qwindowsystem_qws.h>
 #endif
 
 static const int nw = 8;
 
 typedef struct BlockMap {
     ushort start;
     ushort stop;
     const char *name;
 };
 
 //# Start Code; Block Name
 
 static const BlockMap blockMap[] = 
 {
 {0x0000, 0x007F, "Basic Latin"},
 {0x0080, 0x00FF, "Latin-1 Supplement"},
 {0x0100, 0x017F, "Latin Extended-A"},
 {0x0180, 0x024F, "Latin Extended-B"},
 {0x0250, 0x02AF, "IPA Extensions"},
@@ -114,49 +114,57 @@ static const BlockMap blockMap[] =
 {0x4E00, 0x9FFF, "CJK Unified Ideographs"},
 {0xA000, 0xA48F, "Yi Syllables"},
 {0xA490, 0xA4CF, "Yi Radicals"},
 {0xAC00, 0xD7A3, "Hangul Syllables"},
 {0xD800, 0xDB7F, "High Surrogates"},
 {0xDB80, 0xDBFF, "High Private Use Surrogates"},
 {0xDC00, 0xDFFF, "Low Surrogates"},
 {0xE000, 0xF8FF, "Private Use"},
 {0xF900, 0xFAFF, "CJK Compatibility Ideographs"},
 {0xFB00, 0xFB4F, "Alphabetic Presentation Forms"},
 {0xFB50, 0xFDFF, "Arabic Presentation Forms-A"},
 {0xFE20, 0xFE2F, "Combining Half Marks"},
 {0xFE30, 0xFE4F, "CJK Compatibility Forms"},
 {0xFE50, 0xFE6F, "Small Form Variants"},
 {0xFE70, 0xFEFE, "Arabic Presentation Forms-B"},
 {0xFF00, 0xFEFF, "Halfwidth and Fullwidth Forms"},
 {0xFFF0, 0xFFEF, "Specials"},
 {0xFFFF, 0xFFFF, 	0} };
 
 
 UniScrollview::UniScrollview(QWidget* parent, const char* name, int f) :
     QScrollView(parent, name, f)
 {
     //    smallFont.setRawName( "-adobe-courier-medium-r-normal--10-100-75-75-m-60-iso8859-1" ); //######
-    smallFont = QFont( "Helvetica", 8 );
+
+    // get the default font
+    Config *config = new Config( "qpe" );
+    config->setGroup( "Appearance" );
+    QString familyStr = config->readEntry( "FontFamily", "Helvetica" );
+    int fontSize = config->readNumEntry( "FontSize", 8 ) - 2;
+    delete config;
+
+    smallFont = QFont( familyStr, fontSize );
     QFontMetrics sfm( smallFont );
     xoff = sfm.width( "AAA" );
     setFont( FontManager::unicodeFont( FontManager::Fixed ) );
     QFontMetrics fm( font() );
     cellsize = fm.lineSpacing() + 2;
     resizeContents( cellsize*nw, cellsize*65536/nw );
     verticalScrollBar()->setLineStep(cellsize);
     
     viewport()->setBackgroundMode( QWidget::PaletteBase );
 }
 
 
 
 void UniScrollview::contentsMousePressEvent(QMouseEvent* e)
 {
     if ( e->x() < xoff || e->x() > xoff + nw*cellsize )
 	return;
     int row = e->y()/cellsize;
     int col = (e->x()-xoff)/cellsize;
     int u = row*nw+col;
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     emit key( u, 0, 0, true, false );
     emit key( u, 0, 0, false, false );
 #endif