summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/inputmethods.cpp28
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
@@ -18,12 +18,14 @@
**
**********************************************************************/
+#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>
@@ -178,15 +180,18 @@ void InputMethods::loadInputMethods()
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;
}
@@ -207,7 +212,21 @@ void InputMethods::loadInputMethods()
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() )
@@ -249,6 +268,9 @@ void InputMethods::chooseMethod(InputMethod* im)
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() )