| -rw-r--r-- | core/launcher/inputmethods.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp index ac72b02..acd0d59 100644 --- a/core/launcher/inputmethods.cpp +++ b/core/launcher/inputmethods.cpp @@ -201,45 +201,41 @@ void InputMethods::loadInputMethods() #else InputMethod input; input.interface = new HandwritingImpl(); input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); inputMethodList.append( input ); input.interface = new KeyboardImpl(); input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); inputMethodList.append( input ); input.interface = new PickboardImpl(); input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); inputMethodList.append( input ); #endif if ( !inputMethodList.isEmpty() ) { + method = &inputMethodList[0]; Config cfg("qpe"); cfg.setGroup("InputMethod"); QString curMethod = cfg.readEntry("current",""); - if(curMethod.isEmpty()) { - method = &inputMethodList[0]; - } else { int i = 0; QValueList<InputMethod>::Iterator it; for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) { if((*it).interface->name() == curMethod) { method = &inputMethodList[i]; -// qDebug(curMethod); - } } } kbdButton->setPixmap( *method->interface->icon() ); } if ( !inputMethodList.isEmpty() ) kbdButton->show(); else kbdButton->hide(); if ( inputMethodList.count() > 1 ) kbdChoice->show(); else kbdChoice->hide(); } void InputMethods::chooseKbd() { |