equal
deleted
inserted
replaced
303 } |
303 } |
304 |
304 |
305 // Close candidate popup if open |
305 // Close candidate popup if open |
306 closeCandidatePopup(); |
306 closeCandidatePopup(); |
307 |
307 |
308 QObject::disconnect(mCurrentKeypad,SIGNAL(aboutToActivateCustomAction(HbAction*)), |
308 if (mCurrentKeypad) { |
309 this,SLOT(aboutToActivateCustomAction(HbAction*))); |
309 QObject::disconnect(mCurrentKeypad,SIGNAL(aboutToActivateCustomAction(HbAction*)), |
|
310 this,SLOT(aboutToActivateCustomAction(HbAction*))); |
|
311 } |
310 QObject::connect(keypadToOpen,SIGNAL(aboutToActivateCustomAction(HbAction*)), |
312 QObject::connect(keypadToOpen,SIGNAL(aboutToActivateCustomAction(HbAction*)), |
311 this,SLOT(aboutToActivateCustomAction(HbAction*))); |
313 this,SLOT(aboutToActivateCustomAction(HbAction*))); |
312 |
314 |
313 // assign new keypad to be opened to varable mCurrentKeypad |
315 // assign new keypad to be opened to varable mCurrentKeypad |
314 mCurrentKeypad = keypadToOpen; |
316 mCurrentKeypad = keypadToOpen; |
471 } else { |
473 } else { |
472 mItutKeypad->setMode(EModeAbc, HbModifierNone); |
474 mItutKeypad->setMode(EModeAbc, HbModifierNone); |
473 } |
475 } |
474 } |
476 } |
475 } |
477 } |
476 |
478 // need to make sure that the prediction mode handler has the input state's language set |
|
479 // it is the global input language by default |
|
480 |
|
481 if(mPredictionModeHandler && newState.language().language() != HbInputSettingProxy::instance()->globalInputLanguage().language()) { |
|
482 HbInputLanguage inputStateLang = newState.language(); |
|
483 mPredictionModeHandler->setLanguage(inputStateLang); |
|
484 } |
477 HbInputModeHandler *previousModeHandler = mActiveModeHandler; |
485 HbInputModeHandler *previousModeHandler = mActiveModeHandler; |
478 if (newState.inputMode() == HbInputModeDefault && usePrediction()) { |
486 if (newState.inputMode() == HbInputModeDefault && usePrediction()) { |
479 mActiveModeHandler = mPredictionModeHandler; |
487 mActiveModeHandler = mPredictionModeHandler; |
480 // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad |
488 // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad |
481 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved); |
489 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved); |