Diffstat (limited to 'inputmethods/unikeyboard/unikeyboard.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/unikeyboard/unikeyboard.cpp | 12 |
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 @@ -8,33 +8,33 @@ ** 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 @@ -122,33 +122,41 @@ static const BlockMap blockMap[] = {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 ) |