FCL/sf/mw/hb: comparison src/hbplugins/inputmethods/touchinput/virtual12key.cpp

equal deleted inserted replaced

-:923ff622b8b9
+:4633027730f5
 HbVirtual12Key::HbVirtual12Key()
 : mCurrentKeypad(0),
 mItutKeypad(0),
 mSctKeypad(0),
 mKeymap(0),
-mOrientationAboutToChange(false),
 mCandidatePopup(0),
 mCurrentlyFocused(0),
 mVkbHost(0),
 mKeyboardChangeAlreadyInprogress(false)
 {
 state of the input method.
 */
 void HbVirtual12Key::reset()
 {
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionReset);
-mOrientationAboutToChange = false;
+// close candidate popup if visible
+closeCandidatePopup();
 }
 Hb12KeyTouchKeyboard *HbVirtual12Key::construct12Keyboard()
 {
 Hb12KeyTouchKeyboard *tempKeypad = new Hb12KeyTouchKeyboard(this, mKeymap);
 connect(tempKeypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
 this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
 //FLICKDISABLED connect(tempKeypad, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
 connect(tempKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
 connect(tempKeypad, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
+connect(tempKeypad, SIGNAL(settingsListClosed()), this, SLOT(restorePreviousState()));
 tempKeypad->setRockerVisible(true);
 return tempKeypad;
 }
 /*!
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
 if (mCurrentlyFocused != focusObject()) {
 mCurrentlyFocused = focusObject();
 // Focus changed from one editor to another.
-if (mCandidatePopup) {
+closeCandidatePopup();
-mCandidatePopup->hide();
-}
 }
 openKeypad(mItutKeypad);
 if (focusObject() && mVkbHost) {
 if (focusObject()) {
 disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
 mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
 connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
 mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
+disconnect(focusObject(), SIGNAL(orientationChanged()), this, SLOT(orientationChanged()));
+connect(focusObject(), SIGNAL(orientationChanged()), this, SLOT(orientationChanged()));
 }
 HbInputAbstractMethod::focusReceived();
 }
 /*!
 // do any closing related things.
 // Then make sure that keypad closes.
 closeKeypad();
 mVkbHost = 0;
 }
+HbInputAbstractMethod::focusLost();
 }
 /*!
 Closes the keypad if it is open.
 */
 {
 if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
 mVkbHost->closeKeypad(!stateChangeInProgress());
 // set mCurrentKeypad to null.
 mCurrentKeypad = 0;
-if (mCandidatePopup) {
+closeCandidatePopup();
-mCandidatePopup->hide();
-}
 }
 }
 /*!
 Opens the virtual keypad for input.
 // when their is a keypad that needs to be closed before opening the new keypad, we don't
 // want to animate the opening of new keypad.
 disableAnimation = true;
 }
 }
 // Close candidate popup if open
-if (mCandidatePopup) {
+closeCandidatePopup();
-mCandidatePopup->hide();
-}
 QObject::disconnect(mCurrentKeypad,SIGNAL(aboutToActivateCustomAction(HbAction*)),
 this,SLOT(aboutToActivateCustomAction(HbAction*)));
 QObject::connect(keypadToOpen,SIGNAL(aboutToActivateCustomAction(HbAction*)),
 this,SLOT(aboutToActivateCustomAction(HbAction*)));
 }
 if (focusObject()) {
 connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
 mVkbHost, SLOT(ensureCursorVisibility()));
 }
+}
+if(mActiveModeHandler) {
+mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetKeypad);
 }
 }
 /*!
 vkb widget is about to call a custom action that is mapped to one of the keypad buttons.
 }
 }
 void HbVirtual12Key::autocompletionStateChanged(HbKeyboardSettingFlags keyboardType, bool newState)
 {
-if (keyboardType & HbKeyboardSetting12key) {
+if ( isActiveMethod() && (keyboardType & HbKeyboardSetting12key) ) {
 mPredictionModeHandler->setAutocompletionStatus(newState);
 }
 }
 /*!
 Call back indicating that the keypad is closed.
 */
 void HbVirtual12Key::keypadClosed()
 {
-mOrientationAboutToChange = false;
 }
 /*!
 Call back indicating that the keypad is opened.
 */
 if (isActiveMethod()) {
 if (mVkbHost) {
 if (mVkbHost->keypadStatus() == HbVkbHost::HbVkbStatusOpened) {
 // We need to commit the inline word when we minimize the keypad
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
-if (mCandidatePopup) {
+// close candiatelist popup if visisble.
-mCandidatePopup->hide();
+closeCandidatePopup();
-}
 // Close input.
 QInputContext* ic = qApp->inputContext();
 if (ic) {
 QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
 HbInputModeHandler *previousModeHandler = mActiveModeHandler;
 	if (newState.inputMode() == HbInputModeDefault && usePrediction()) {
 mActiveModeHandler = mPredictionModeHandler;
 // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
+		/* The below line should be added in orientationChanged Slot, however currently it is not working correctly
+		 hence this fix is temporarily added here */
+mPredictionModeHandler->setAutocompletionStatus(HbInputSettingProxy::instance()->isAutocompletionEnabled(HbKeyboardSetting12key));
 } else if (newState.inputMode() == HbInputModeDefault) {
 mActiveModeHandler = mBasicModeHandler;
 // Auto completer setup needs following line.
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
 } else if (newState.inputMode() == HbInputModeNumeric) {
 /*!
 this slot is called by the mode handlers when there is sym key or long  press of Asterisk key.
 */
 void HbVirtual12Key::switchMode(int keyCode)
 {
-if (keyCode == HbInputButton::ButtonKeyCodeAsterisk ||
+if (keyCode == HbInputButton::ButtonKeyCodeAsterisk && mCandidatePopup && mCandidatePopup->isVisible() && mCandidatePopup->isModal()) {
-keyCode == HbInputButton::ButtonKeyCodeSymbol ||
+return;
-keyCode == HbInputButton::ButtonKeyCodeAlphabet) {
+} else if (keyCode == HbInputButton::ButtonKeyCodeAsterisk || keyCode == HbInputButton::ButtonKeyCodeSymbol || keyCode == HbInputButton::ButtonKeyCodeAlphabet) {
-if (mCandidatePopup && mCandidatePopup->isVisible()) {
-return;
-}
 if (mCurrentKeypad == mSctKeypad){
 // if sct is active keypad, then launch itu-t keypad
 switchToAlphaMode();
 } else {
 // launch special character keypad
 //Open the keypad
 openKeypad(mItutKeypad,openAlphaInMinimizedMode);
 }
 /*!
-The call back from framework to indicate that the orientation is about to change. This closes the keypad
+The call back from framework to indicate that the orientation is changed.
-if it is already open.
+*/
-*/
+void HbVirtual12Key::orientationChanged()
-void HbVirtual12Key::orientationAboutToChange()
+{
-{
+//Close the spell Query if it is visible
-HbInputMethod::orientationAboutToChange();
+//During the change of orientation focus is locked by the framework and hence the spell query
-if (isActiveMethod()) {
+//cannot be closed. Closing spell query should result in change of focus back to the previous editor
-mOrientationAboutToChange = true;
+//which is not possible if focus is locked.
 mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCloseSpellQuery);
-// We need to commit the inline word before orientation change.
-mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
-closeKeypad();
-}
 }
 /*!
 Launches the candidate list.
 */
 void HbVirtual12Key::launchCandidatePopup(const QStringList& candidates)
 {
 if (!mCandidatePopup) {
 mCandidatePopup = new HbCandidateList(this);
+connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(restorePreviousState()));
 connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString)));
 QObject::connect(mCandidatePopup,SIGNAL(launchSpellQueryDialog()),mPredictionModeHandler,SLOT(launchSpellQueryDialog()));
 }
 mCandidatePopup->populateList(candidates,true);
 mCandidatePopup->setModal(true);
 QSizeF candListSize = mCandidatePopup->size();
 mItutKeypad->showSmileyPicker();
 }
 }
 /*!
-Slot used by mode handlers to close the candidate popup.
+Closes the candidate popup if visible.
 */
 void HbVirtual12Key::closeCandidatePopup()
 {
 if (mCandidatePopup && mCandidatePopup->isVisible()) {
 mCandidatePopup->hide();
 */
 void HbVirtual12Key::launchAutoCompletionPopup(const QStringList& candidates)
 {
 if (!mCandidatePopup) {
 mCandidatePopup = new HbCandidateList(this);
+connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(restorePreviousState()));
 connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString)));
 QObject::connect(mCandidatePopup,SIGNAL(launchSpellQueryDialog()),mPredictionModeHandler,SLOT(launchSpellQueryDialog()));
 }
 if (candidates.count() > 0) {
 if (mCandidatePopup->setSizeAndPositionForAutoCompletion(mVkbHost)) {
 mCandidatePopup->setDismissPolicy(HbPopup::TapInside);
 mCandidatePopup->setBackgroundFaded(false);
 mCandidatePopup->show();
 }
-} else if (mCandidatePopup->isVisible()) {
+} else {
-mCandidatePopup->hide();
+closeCandidatePopup();
 }
 }
 /*!
 Returns true if prediction is on, prediction engine is available and predictions is allowed in current editor.
 }
 return false;
 }
+void HbVirtual12Key::restorePreviousState()
+{
+mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionRestorePreviousState);
+}
 // End of file

changeset 21	4633027730f5
parent 7	923ff622b8b9
child 23	e6ad4ef83b23