summaryrefslogtreecommitdiff
authorhash <hash>2002-08-12 07:55:58 (UTC)
committer hash <hash>2002-08-12 07:55:58 (UTC)
commit1e045c5b7b5278b4a5925ba878cbdbdea9d03e1d (patch) (side-by-side diff)
tree9687a824bde2de00bd1b42c34988acd778660b9a
parent895a6e1cebade986110758c57cafdadd942a63ff (diff)
downloadopie-1e045c5b7b5278b4a5925ba878cbdbdea9d03e1d.zip
opie-1e045c5b7b5278b4a5925ba878cbdbdea9d03e1d.tar.gz
opie-1e045c5b7b5278b4a5925ba878cbdbdea9d03e1d.tar.bz2
uses langauge setting to choose keymap
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index d0cfa51..8f4d562 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -49,34 +49,33 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
QString familyStr = qpeConfig.readEntry( "FontFamily", "fixed" );
setFont( QFont( familyStr, 8 ) );
picks = new KeyboardPicks( this );
picks->setFont( QFont( familyStr, 8 ) );
picks->initialise();
if (usePicks) {
QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
} else picks->hide();
Config config("locale");
config.setGroup( "Language" );
- //LANG = config.readEntry( "Language", "en" );
- LANG = "ko";
+ LANG = config.readEntry( "Language", "en" );
repeatTimer = new QTimer( this );
connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
}
/* Keyboard::resizeEvent {{{1 */
void Keyboard::resizeEvent(QResizeEvent*)
{
int ph = picks->sizeHint().height();
picks->setGeometry( 0, 0, width(), ph );
keyHeight = (height()-(usePicks ? ph : 0))/5;
int nk; // number of keys?
if ( useLargeKeys ) {
nk = 15;
@@ -761,34 +760,33 @@ ushort Keyboard::constoe(const ushort c) {
}
}
}
// Keys::Keys {{{1
Keys::Keys() {
Config config("locale");
config.setGroup( "Language" );
QString l = config.readEntry( "Language" , "en" );
QString key_map = QPEApplication::qpeDir() + "/share/multikey/"
- + /* l // testing korean for now */
- + "ko.keymap";
+ + l + ".keymap";
setKeysFromFile(key_map);
}
Keys::Keys(const char * filename) {
setKeysFromFile(filename);
}
// Keys::setKeysFromFile {{{2
void Keys::setKeysFromFile(const char * filename) {
QFile f(filename);
if (f.open(IO_ReadOnly)) {