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

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
 #include "virtualqwerty.h"
 #include <hbapplication.h>
+#include <hbaction.h>
+#include <hbview.h>
+#include <hbmainwindow.h>
 #include <QLocale>
 #include <hbinputexactwordpopup.h>
 #include <hbinputkeymapfactory.h>
 #include <hbinputkeymap.h>
 #include <hbinputcandidatelist.h>
 #include <hbinputsettingproxy.h>
 #include <hbinpututils.h>
 #include <hbinputvirtualrocker.h>
-#include <hbinputsctlandscape.h>
+#include <hbinputsctkeyboard.h>
-#include <hbinputqwertytouchkeyboard.h>
 #include <hbinputeditorinterface.h>
 #include <hbinputdef.h>
 #include <hbinputvkbhost.h>
 #include <hbinputcommondialogs.h>
+#include <hbinputpredictionfactory.h>
-#include <hbmainwindow.h>
 #include "hbinputbasicqwertyhandler.h"
 #include "hbinputpredictionqwertyhandler.h"
 #include "hbinputnumericqwertyhandler.h"
-#include <hbaction.h>
+#include "hbinputqwerty10x4touchkeyboard.h"
-#include <hbview.h>
+#include "hbinputqwerty11x4touchkeyboard.h"
-#include <hbinputpredictionfactory.h>
+#include "hbinputqwertynumerictouchkeyboard.h"
+const int HbVirtualQwerty4x10MaxKeysCount = 32;
 HbVirtualQwerty::HbVirtualQwerty() : mCurrentKeypad(0),
 mQwertyAlphaKeypad(0),
+mQwerty10x4Keypad(0),
+mQwerty11x4Keypad(0),
 mQwertyNumericKeypad(0),
 mSctKeypad(0),
 mKeymap(0),
 mExactWordPopup(0),
 mCandidatePopup(0),
 mOrientationAboutToChange(false),
-mSctMode(HbInputVkbWidget::HbSctViewSpecialCharacter),
 mShiftKeyState(0),
 mVkbHost(0)
 {
 initializeModeHandlers();
 }
 mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
 mNumericModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionInit);
 // autocompleter connection
 connect(this, SIGNAL(autoCompletionPopupClosed(QString, int)), mBasicModeHandler, SLOT(autoCompletionPopupClosed(QString, int)));
+connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)), this, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)));
 }
 // ---------------------------------------------------------------------------
 // HbVirtualQwerty::~HbVirtualQwerty
 //
 delete mCandidatePopup;
 mCandidatePopup = 0;
 delete mQwertyAlphaKeypad;
 mQwertyAlphaKeypad = 0;
+delete mQwerty10x4Keypad;
+delete mQwerty11x4Keypad;
 delete mQwertyNumericKeypad;
 mQwertyNumericKeypad = 0;
 delete mSctKeypad;
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionReset);
 }
 void HbVirtualQwerty::focusReceived()
 {
+/* Update the text case */
+updateState();
 // set input mode to default ABC
 HbInputLanguage language = inputState().language();
 if ((!focusObject()->editorInterface().isNumericEditor() && inputState().inputMode() == HbInputModeNumeric) || !language.isCaseSensitiveLanguage()) {
 HbInputState state = inputState();
 // For Case insensitive languages, the default case should be lowercase.
 HbKeypadMode currentInputType = EModeAbc;
 if (focusObject()->editorInterface().isNumericEditor()) {
 currentInputType = EModeNumeric;
 }
-HbInputVkbWidget * keypadToOpen = 0;
+HbInputVkbWidget* keypadToOpen = 0;
 if (currentInputType == EModeAbc) {
-if(!mQwertyAlphaKeypad) {
+mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
-mQwertyAlphaKeypad = constructKeypad(EModeAbc);
-connect(mQwertyAlphaKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
-//FLICKDISABLED connect(mQwertyAlphaKeypad, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
-}
 keypadToOpen = mQwertyAlphaKeypad;
 } else if(currentInputType == EModeNumeric) {
 if(!mQwertyNumericKeypad) {
-mQwertyNumericKeypad = constructKeypad(EModeNumeric);
+mQwertyNumericKeypad = static_cast<HbQwertyNumericKeyboard*>(constructKeyboard(EModeNumeric));
 mQwertyNumericKeypad->setBackgroundDrawing(true);
 }
 keypadToOpen = mQwertyNumericKeypad;
 }
 }
 // inform active mode handler about the focusrecieve event.
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
-// We need to check if this focusRecieved call is due to a orientation
+openKeypad(keypadToOpen);
-// switch. If yes we should get the keypad status prior to the orientation
-// switch and open the keypad in that state only.
-// For example we have minimized the keypad in Qwerty mode and change the
-// orientation to portrait then in Itu-T mode also keypad should be in minimized state.
-HbVkbHost *host = focusObject()->editorInterface().vkbHost();
-if (orientationContextSwitchInProgress()) {
-if (host) {
-// We can get the keypad status prior to the orientation switch from vkbHost it self.
-HbVkbHost::HbVkbStatus vkbStatus = host->keypadStatusBeforeOrientationChange();
-if (vkbStatus != HbVkbHost::HbVkbStatusClosed) {
-openKeypad(keypadToOpen,vkbStatus == HbVkbHost::HbVkbStatusMinimized);
-}
-}
-} else {
-openKeypad(keypadToOpen);
-}
 if (mVkbHost) {
 connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
 }
 }  */
 connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
 }
 }
-HbQwertyKeyboard* HbVirtualQwerty::constructKeypad(HbKeypadMode currentInputType)
+HbInputVkbWidget* HbVirtualQwerty::constructKeyboard(HbKeypadMode currentInputType)
 {
-HbQwertyKeyboard* keypad =  new HbQwertyKeyboard(this, mKeymap, 0, currentInputType);
+HbInputVkbWidget *keyboard = 0;
-connect(keypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)),
+if (currentInputType == EModeAbc) {
+const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
+if (keyboardMap && keyboardMap->keys.count() > HbVirtualQwerty4x10MaxKeysCount) {
+if (mQwerty11x4Keypad) {
+return mQwerty11x4Keypad;
+}
+mQwerty11x4Keypad = new HbQwerty11x4Keyboard(this, mKeymap);
+keyboard = mQwerty11x4Keypad;
+} else {
+if (mQwerty10x4Keypad) {
+return mQwerty10x4Keypad;
+}
+mQwerty10x4Keypad = new HbQwerty10x4Keyboard(this, mKeymap);
+keyboard = mQwerty10x4Keypad;
+}
+connect(keyboard, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
+//FLICKDISABLED connect(keyboard, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
+} else {
+keyboard = new HbQwertyNumericKeyboard(this, mKeymap);
+}
+connect(keyboard, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)),
 this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
-connect(keypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
+connect(keyboard, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
 this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
-connect(keypad, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
+connect(keyboard, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
-keypad->setRockerVisible(true);
+keyboard->setRockerVisible(true);
-return keypad;
+return keyboard;
 }
 void HbVirtualQwerty::mouseHandler(int x, QMouseEvent* event)
 {
 mActiveModeHandler->mouseHandler(x, event);
 if (mCurrentKeypad){
 mCurrentKeypad->keypadLanguageChangeAnimationUpdate(0);
 }
 // load the new key keymappings for newLanguage to all keypads and all mode handlers
 loadKeymap(aNewLanguage);
+if (mCurrentKeypad && mCurrentKeypad != mQwertyAlphaKeypad
+&& mCurrentKeypad != mQwertyNumericKeypad) {
+mCurrentKeypad->animKeyboardChange();
+openKeypad(mQwertyAlphaKeypad);
+}
 mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionPrimaryLanguageChanged);
 if (mCurrentKeypad){
 mCurrentKeypad->animKeyboardChange();
 }
 return;  // Just to be sure...
 }
 if (newState.inputMode() == HbInputModeNumeric && mQwertyNumericKeypad) {
 mQwertyNumericKeypad->setMode(EModeNumeric, HbModifierNone);
-} else if(mQwertyAlphaKeypad) {
+} else if (mQwertyAlphaKeypad) {
 if (newState.textCase() == HbTextCaseUpper || newState.textCase() == HbTextCaseAutomatic) {
 mQwertyAlphaKeypad->setMode(EModeAbc, HbModifierShiftPressed);
 } else {
 mQwertyAlphaKeypad->setMode(EModeAbc, HbModifierNone);
 }
 HbInputModeHandler *previousModeHandler = mActiveModeHandler;
 if (newState.inputMode() == HbInputModeNumeric) {
 mActiveModeHandler = mNumericModeHandler;
 }  else if (newState.inputMode() == HbInputModeDefault && usePrediction()) {
 mActiveModeHandler = mPredictionModeHandler;
-if (mQwertyAlphaKeypad) {
-mQwertyAlphaKeypad->disconnect(SIGNAL(charFromPreviewSelected(QString)));
-connect(mQwertyAlphaKeypad, SIGNAL(charFromPreviewSelected(QString)), mActiveModeHandler, SLOT(charFromPreviewSelected(QString)));
-}
 } else if (newState.inputMode() == HbInputModeDefault) {
 mActiveModeHandler = mBasicModeHandler;
 // Auto completer setup needs following line.
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
-if (mQwertyAlphaKeypad) {
-mQwertyAlphaKeypad->disconnect(SIGNAL(charFromPreviewSelected(QString)));
-connect(mQwertyAlphaKeypad, SIGNAL(charFromPreviewSelected(QString)), mActiveModeHandler, SLOT(charFromPreviewSelected(QString)));
-}
 }
 if (focusObject()) {
 disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), previousModeHandler, SLOT(cursorPositionChanged(int, int)));
 connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
 mKeymap =  keymap;
 if (mQwertyNumericKeypad) {
 mQwertyNumericKeypad->setKeymap(mKeymap);
 }
-if (mQwertyAlphaKeypad) {
+mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
 mQwertyAlphaKeypad->setKeymap(mKeymap);
-}
 if (mSctKeypad) {
 mSctKeypad->setKeymap(mKeymap);
 }
 // inform mode handlers about the language change.
-if(mBasicModeHandler) {
+if (mBasicModeHandler) {
 mBasicModeHandler->setKeymap(mKeymap);
 }
-if(mPredictionModeHandler) {
+if (mPredictionModeHandler) {
 mPredictionModeHandler->setKeymap(mKeymap);
 }
-if(mNumericModeHandler) {
+if (mNumericModeHandler) {
 mNumericModeHandler->setKeymap(mKeymap);
 }
 }
 }
 }
 void HbVirtualQwerty::switchSpecialCharacterTable()
 {
 if (mCurrentKeypad != mSctKeypad) {
-mSctMode = HbInputVkbWidget::HbSctViewSpecialCharacter;
 displaySpecialCharacterTable(this);
 } else {
 // we always go back to alpha qwerty mode after coming back from sct
-openKeypad(mQwertyAlphaKeypad);
+openKeypad(constructKeyboard(EModeAbc));
 }
 }
 void HbVirtualQwerty::secondaryInputLanguageChanged(const HbInputLanguage &newLanguage)
 {
 int HbVirtualQwerty::displaySpecialCharacterTable(QObject* aReceiver)
 {
 Q_UNUSED(aReceiver);
 if (!mSctKeypad) {
-mSctKeypad = new HbInputSctLandscape(this, mKeymap);
+mSctKeypad = new HbSctKeyboard(this, mKeymap);
-connect(mSctKeypad, SIGNAL(sctCharacterSelected(QString)), this, SLOT(sctCharacterSelected(QString)));
 connect(mSctKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
 connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
 connect(mSctKeypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
 this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
 mSctKeypad->setRockerVisible(true);
 }
+mSctKeypad->setMode(EModeAbc, HbModifierNone);
-// set up sct!
-mSctKeypad->setSct(mSctMode);
 //open the keypad
 openKeypad(mSctKeypad);
 return 0;
 }
-/*!
-Call-back implementation to indicate that a character was selected from the SCT. With this, the character is committed to the
-editor and editor is again made to focus.
-*/
-void HbVirtualQwerty::sctCharacterSelected(QString character)
-{
-mActiveModeHandler->sctCharacterSelected(character);
-/* Update the text case */
-updateState();
-}
 void HbVirtualQwerty::smileySelected(QString smiley)
 {
 mActiveModeHandler->smileySelected(smiley);
 }
 void HbVirtualQwerty::selectSpecialCharacterTableMode()
 {
-if (mQwertyAlphaKeypad) {
+mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
 mQwertyAlphaKeypad->showSmileyPicker(4, 10);
-}
 }
 /*!
 Slot used by mode handlers to close the autocompletion popup.
 */
 void HbVirtualQwerty::launchAutoCompletionPopup(const QStringList& candidates)
 {
 if (!mCandidatePopup) {
 mCandidatePopup = new HbCandidateList(this);
 connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(candidatePopupCancelled()));
+connect(mCandidatePopup, SIGNAL(candidateSelected(int,const QString&)), this, SLOT(candidatePopupClosed(int, const QString&)));
 }
 if (candidates.count() > 0) {
 mCandidatePopup->populateList(candidates);
 mCandidatePopup->setModal(false);
 mCandidatePopup->show();
 }
 } else if (mCandidatePopup->isVisible()) {
 mCandidatePopup->hide();
 }
+}
+HbKeyboardType HbVirtualQwerty::currentKeyboardType() const
+{
+HbKeyboardType type = HbKeyboardNone;
+if (mCurrentKeypad) {
+type = mCurrentKeypad->keyboardType();
+}
+return type;
 }
 /*!
 Launches the candidate list.
 */
 //before launching candidate popup, close exact word popup if visible.
 closeExactWordPopup();
 if (!mCandidatePopup) {
 mCandidatePopup = new HbCandidateList(this);
 connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(candidatePopupCancelled()));
+connect(mCandidatePopup, SIGNAL(candidateSelected(int,const QString&)), this, SLOT(candidatePopupClosed(int, const QString&)));
 }
 mCandidatePopup->populateList(candidates);
 mCandidatePopup->setModal(true);
 QSizeF candListSize = mCandidatePopup->size();
 }
 /*!
 Commits the candidate upon closing of the candidate list.
 */
-void HbVirtualQwerty::candidatePopupClosed(int closingKey)
+void HbVirtualQwerty::candidatePopupClosed(int closingKey, const QString& candidate)
 {
-if (mCandidatePopup) {
+if (candidate.size() > 0) {
-QString currentCandidate = mCandidatePopup->currentCandidate();
+if ((focusObject()->editorInterface().inputConstraints() & HbEditorConstraintAutoCompletingField)) {
-if (currentCandidate.size() > 0) {
+emit autoCompletionPopupClosed(candidate, closingKey);
-if ((focusObject()->editorInterface().constraints() & HbEditorConstraintAutoCompletingField)) {
+} else {
-emit autoCompletionPopupClosed(currentCandidate, closingKey);
+mPredictionModeHandler->candidatePopupClosed(candidate, closingKey);
-} else {
-mPredictionModeHandler->candidatePopupClosed(currentCandidate, closingKey);
-}
 }
 }
 }
 /*!
 mOrientationAboutToChange = true;
 // We need to commit the inline word before orientation change.
 mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
 closeKeypad();
 }
-}
-/*!
-This function is called during a long key press
-for a long time.
-*/
-void HbVirtualQwerty::launchCharacterPreviewPane(int key)
-{
-// In alpha keyboard, when the keypad is closed by
-// dragging it, long key press event is generated.
-// Character preview must not be shown in this case.
-if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened) {
-return;
-}
-// get the characters bound to the key.
-QStringList spellList;
-mActiveModeHandler->getAndFilterCharactersBoundToKey(spellList, static_cast<Qt::Key>(key));
-bool previewAvailable = false;
-if (spellList.size()) {
-// preview pane should show the correct case.
-int currentTextCase = focusObject()->editorInterface().textCase();
-for(int i = 0; i < spellList.size(); i++) {
-if (currentTextCase == HbTextCaseLower) {
-spellList[i] = spellList.at(i).toLower();
-} else {
-spellList[i] = spellList.at(i).toUpper();
-}
-}
-previewAvailable = mQwertyAlphaKeypad->previewCharacters(spellList);
-}
-mActiveModeHandler->characterPreviewAvailable(previewAvailable);
 }
 /*!
 Slot used by virtual rocker to move cursor.
 */
 }
 break;
 default:
 break;
 }
-}
-/*!
-\deprecated HbVirtualQwerty::predictiveInputStatusChanged(int newStatus)
-is deprecated. Use predictiveInputStateChanged instead.
-*/
-void HbVirtualQwerty::predictiveInputStatusChanged(int newStatus)
-{
-predictiveInputStateChanged(HbKeyboardSettingQwerty, newStatus);
 }
 /*!
 The framework calls this method when the predictive input status changes.
 */

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 5	627c4a0fd0e7