| -rw-r--r-- | inputmethods/multikey/keyboard.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 92da8ca..3e43978 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp @@ -42,12 +42,17 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), useLargeKeys(TRUE), usePicks(0), pressedKeyRow(-1), pressedKeyCol(-1), unicode(-1), qkeycode(0), modifiers(0), LANG("ko"), schar(0), mchar(0), echar(0) { + // get the default font + Config qpeConfig( "qpe" ); + qpeConfig.setGroup( "Appearance" ); + QString familyStr = qpeConfig.readEntry( "FontFamily", "fixed" ); + + setFont( QFont( familyStr, 8 ) ); picks = new KeyboardPicks( this ); - picks->setFont( QFont( "helvetica", 8 ) ); - setFont( QFont( "helvetica", 8 ) ); + picks->setFont( QFont( familyStr, 8 ) ); picks->initialise(); if (usePicks) { QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), @@ -56,10 +61,10 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : } else picks->hide(); Config config("locale"); config.setGroup( "Language" ); - LANG = config.readEntry( "Language" ); - if(LANG.isEmpty()) LANG = "en"; + //LANG = config.readEntry( "Language", "en" ); + LANG = "ko"; repeatTimer = new QTimer( this ); connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); @@ -445,9 +450,9 @@ void Keyboard::clearHighlight() /* Keyboard::sizeHint {{{1 */ QSize Keyboard::sizeHint() const { QFontMetrics fm=fontMetrics(); - int keyHeight = fm.lineSpacing()+2; + int keyHeight = fm.lineSpacing(); return QSize( 240, keyHeight * 5 + (usePicks ? picks->sizeHint().height() : 0) + 1); } @@ -767,9 +772,11 @@ Keys::Keys() { config.setGroup( "Language" ); QString l = config.readEntry( "Language" ); if(l.isEmpty()) l = "en"; - QString key_map = QPEApplication::qpeDir() + "/i18n/" + l + "/keyboard"; + QString key_map = QPEApplication::qpeDir() + "/share/multikey/" + + /* l // testing korean for now */ + + "ko.keymap"; setKeysFromFile(key_map); } |