| -rw-r--r-- | core/launcher/inputmethods.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp index 003dc77..da98e07 100644 --- a/core/launcher/inputmethods.cpp +++ b/core/launcher/inputmethods.cpp @@ -13,22 +13,24 @@ ** ** 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. ** **********************************************************************/ +#define QTOPIA_INTERNAL_LANGLIST #include "inputmethods.h" #include <qpe/config.h> #include <qpe/qpeapplication.h> #include <qpe/inputmethodinterface.h> #include <qpe/qlibrary.h> +#include <qpe/global.h> #include <qpopupmenu.h> #include <qpushbutton.h> #include <qtoolbutton.h> #include <qwidget.h> #include <qlayout.h> #include <qtimer.h> #include <qdir.h> @@ -173,25 +175,28 @@ void InputMethods::loadInputMethods() QLibrary *lib = new QLibrary( path + "/" + *it ); if ( lib->queryInterface( IID_InputMethod, (QUnknownInterface**)&iface ) == QS_OK ) { InputMethod input; input.library = lib; input.interface = iface; input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); inputMethodList.append( input ); - QString lang = getenv( "LANG" ); - QTranslator * trans = new QTranslator(qApp); + QString type = (*it).left( (*it).find(".") ); + QStringList langs = Global::languageList(); + for (QStringList::ConstIterator lit = langs.begin(); lit!=langs.end(); ++lit) { + QString lang = *lit; + QTranslator * trans = new QTranslator(qApp); QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm"; - qDebug("tr for inputmethod: %s", tfn.latin1() ); if ( trans->load( tfn )) qApp->installTranslator( trans ); else delete trans; + } } else { delete lib; } } #else InputMethod input; input.interface = new HandwritingImpl(); input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); @@ -202,17 +207,31 @@ void InputMethods::loadInputMethods() 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() ) { + 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(); @@ -244,16 +263,19 @@ void InputMethods::chooseKbd() } void InputMethods::chooseMethod(InputMethod* im) { if ( im != method ) { if ( method && method->widget->isVisible() ) method->widget->hide(); method = im; + Config cfg("qpe"); + cfg.setGroup("InputMethod"); + cfg.writeEntry("current", method->interface->name()); kbdButton->setPixmap( *method->interface->icon() ); } if ( !kbdButton->isOn() ) kbdButton->setOn( TRUE ); else showKbd( TRUE ); } |