summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp19
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
@@ -45,6 +45,11 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
{
+ // 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();
@@ -59,4 +64,4 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
config.setGroup( "Language" );
- LANG = config.readEntry( "Language" );
- if(LANG.isEmpty()) LANG = "en";
+ //LANG = config.readEntry( "Language", "en" );
+ LANG = "ko";
@@ -448,3 +453,3 @@ QSize Keyboard::sizeHint() const
QFontMetrics fm=fontMetrics();
- int keyHeight = fm.lineSpacing()+2;
+ int keyHeight = fm.lineSpacing();
@@ -770,3 +775,5 @@ Keys::Keys() {
- QString key_map = QPEApplication::qpeDir() + "/i18n/" + l + "/keyboard";
+ QString key_map = QPEApplication::qpeDir() + "/share/multikey/"
+ + /* l // testing korean for now */
+ + "ko.keymap";