summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/inputmethods.cpp6
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
@@ -205,37 +205,33 @@ void InputMethods::loadInputMethods()
205 input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); 205 input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
206 inputMethodList.append( input ); 206 inputMethodList.append( input );
207 input.interface = new KeyboardImpl(); 207 input.interface = new KeyboardImpl();
208 input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); 208 input.widget = input.interface->inputMethod( 0, inputWidgetStyle );
209 input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); 209 input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
210 inputMethodList.append( input ); 210 inputMethodList.append( input );
211 input.interface = new PickboardImpl(); 211 input.interface = new PickboardImpl();
212 input.widget = input.interface->inputMethod( 0, inputWidgetStyle ); 212 input.widget = input.interface->inputMethod( 0, inputWidgetStyle );
213 input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) ); 213 input.interface->onKeyPress( this, SLOT(sendKey(ushort,ushort,ushort,bool,bool)) );
214 inputMethodList.append( input ); 214 inputMethodList.append( input );
215#endif 215#endif
216 if ( !inputMethodList.isEmpty() ) { 216 if ( !inputMethodList.isEmpty() ) {
217 method = &inputMethodList[0];
217 Config cfg("qpe"); 218 Config cfg("qpe");
218 cfg.setGroup("InputMethod"); 219 cfg.setGroup("InputMethod");
219 QString curMethod = cfg.readEntry("current",""); 220 QString curMethod = cfg.readEntry("current","");
220 if(curMethod.isEmpty()) {
221 method = &inputMethodList[0];
222 } else {
223 int i = 0; 221 int i = 0;
224 QValueList<InputMethod>::Iterator it; 222 QValueList<InputMethod>::Iterator it;
225 for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) { 223 for ( it = inputMethodList.begin(); it != inputMethodList.end(); ++it, i++ ) {
226 if((*it).interface->name() == curMethod) { 224 if((*it).interface->name() == curMethod) {
227 method = &inputMethodList[i]; 225 method = &inputMethodList[i];
228// qDebug(curMethod);
229 }
230 } 226 }
231 } 227 }
232 kbdButton->setPixmap( *method->interface->icon() ); 228 kbdButton->setPixmap( *method->interface->icon() );
233 } 229 }
234 if ( !inputMethodList.isEmpty() ) 230 if ( !inputMethodList.isEmpty() )
235 kbdButton->show(); 231 kbdButton->show();
236 else 232 else
237 kbdButton->hide(); 233 kbdButton->hide();
238 if ( inputMethodList.count() > 1 ) 234 if ( inputMethodList.count() > 1 )
239 kbdChoice->show(); 235 kbdChoice->show();
240 else 236 else
241 kbdChoice->hide(); 237 kbdChoice->hide();