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

equal deleted inserted replaced

-:f7ac710697a9
+:06ff229162e9
 #include <hbinputdialog.h>
 #include <hbaction.h>
 #include <hbmainwindow.h>
 #include <hbinstance.h>
 #include <hbeffect.h>
+#include <hbinputbutton.h>
 #include "virtual12key.h"
 #include "hbinputprediction12keyhandler.h"
 #include "hbinputpredictionhandler_p.h"
 	bool isCancel = false;
 	bool isExternalClose = false;
 	// action is null when input query is closed externally , for example by calling
 	// HbDialog::close() function.
 	if (action) {
-		isOk = (action->text() == primaryAction()->text())? true : false;
+		isOk = (action->text() == actions().at(0)->text())? true : false;
-		isCancel = (action->text() == secondaryAction()->text())? true:false;
+		isCancel = (action->text() == actions().at(1)->text())? true:false;
 	} else {
 		isExternalClose = true;
 	}
 	//Need to disable effects as asynchronous hide will commit the word otherwise.
 updateEditor();
 mCanContinuePrediction = true;
 }
 }
-void HbInputPrediction12KeyHandlerPrivate::_q_timeout()
+bool HbInputPrediction12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
 {
-qDebug("HbInputPrediction12KeyHandlerPrivate::_q_timeout()");
 Q_Q(HbInputPrediction12KeyHandler);
+mLongPressHappened = false;
-// let's stop the timer first.
+HbInputFocusObject *focusObject = 0;
-mTimer->stop();
+focusObject = mInputMethod->focusObject();
+if (!focusObject) {
-//Long key press number key is applicable to all keys
+return false;
-if (mButtonDown) {
+}
-if (mLastKey == Qt::Key_Asterisk) {
-			//Remove the "?" mark if present
+int buttonId = keyEvent->key();
-chopQMarkAndUpdateEditor();
-mInputMethod->switchMode(mLastKey);
+if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
-} else if (mLastKey == Qt::Key_Shift) {
+if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) {
-mInputMethod->switchMode(Qt::Key_Shift);
+if (!mCanContinuePrediction) {
+mInputMethod->switchMode(buttonId);
+} else {
+//Remove the "?" mark if present
+chopQMarkAndUpdateEditor();
+mInputMethod->selectSpecialCharacterTableMode();
+}
 mLongPressHappened = true;
-} else if (mLastKey == Qt::Key_Control) {
+} else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
+mInputMethod->switchMode(HbInputButton::ButtonKeyCodeShift);
+mLongPressHappened = true;
+} else if (buttonId == HbInputButton::ButtonKeyCodeSymbol) {
 //Remove the "?" mark if present
 chopQMarkAndUpdateEditor();
 mInputMethod->selectSpecialCharacterTableMode();
+mLongPressHappened = true;
 } else {
 //With a long key press of a key, numbers are supposed to be entered.
 //When the existing input (along with the short key press input of the
 //existing key) results in tail (i.e. autocompletion), we need to accept
 //the short key press as well as the tail. In case of ? delete the questionmark and add the number value.
 //mTailShowing = false;
 // Delete "?" entered
 if (!mCanContinuePrediction) {
 deleteOneCharacter();
-}
+mLongPressHappened = true;
-			if (mLastKey != Qt::Key_Delete) {
+}
-				q->commitFirstMappedNumber(mLastKey);
+			if (buttonId != HbInputButton::ButtonKeyCodeDelete) {
+				q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
+mLongPressHappened = true;
 			}
-mLongPressHappened = true;
+}
-}
-}
+if (mLongPressHappened) {
-}
+mLastKey = 0;
+return true;
-bool HbInputPrediction12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
+}
-{
+}
-mLongPressHappened = false;
-HbInputFocusObject *focusObject = 0;
+if (buttonId == HbInputButton::ButtonKeyCodeShift) {
-focusObject = mInputMethod->focusObject();
+// if we get a second consequtive shift key press,
-if (!focusObject) {
+// we want to handle it in buttonRelease
-return false;
-}
-int buttonId = keyEvent->key();
-if (buttonId == Qt::Key_Control) {
-mLastKey = buttonId;
-mButtonDown = true;
-mTimer->start(HbLongPressTimerTimeout);
-return true;
-} else if (buttonId == Qt::Key_Shift) {
-// if we get a second consequtive shift key press,
-// we want to handle it in buttonRelease
 if (mTimer->isActive() && (mLastKey == buttonId)){
 mShiftKeyDoubleTap = true;
 }
-if (!mTimer->isActive()) {
-mTimer->start(HbLongPressTimerTimeout);
-}
-mLastKey = buttonId;
-mButtonDown = true;
-return true;
 }
 mLastKey = buttonId;
 mButtonDown = true;
-// custom button should not start timer.
-if ((buttonId & CUSTOM_INPUT_MASK) != CUSTOM_INPUT_MASK) {
-mTimer->start(HbLongPressTimerTimeout);
-}
 return false;
 }
 /*!
 Handles the key release events from the VKB. Launches the SCT with key release event of
 }
 // since button is released we can set buttonDown back to false.
 mButtonDown = false;
 int buttonId = keyEvent->key();
-// it was a long press on sct swith button. so just return form here.
-if (!mTimer->isActive() && buttonId == Qt::Key_Control) {
-return true;
-}
 // Sym key is handled in this class it self, so not passing it to
 // the base mode handlers.
-if ( buttonId == Qt::Key_Control) {
+if (buttonId == HbInputButton::ButtonKeyCodeSymbol ||
+buttonId == HbInputButton::ButtonKeyCodeAlphabet) {
 //Remove the "?" mark if present
 chopQMarkAndUpdateEditor();
 mInputMethod->switchMode(buttonId);
 return true;
 }
 		- Should launch Candidate List if we can continue with prediction i.e. "?" is not displayed
 		- Should launch Spell Query Dialog if we cannot continue with prediction
 	- Behavior of Short Press of Asterisk Key when not in inline editing state
 		- Should launch SCT
 	*/
-else if (buttonId == Qt::Key_Asterisk ) {
+else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk ) {
 		if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
 //Remove the "?" mark
 (*mCandidates)[mBestGuessLocation].chop(1);
 updateEditor();
 q->processCustomWord((*mCandidates)[mBestGuessLocation]);
 		}
 		else
 			mInputMethod->starKeySelected();
 return true;
 }
-else if (buttonId == Qt::Key_Return) {
+else if (buttonId == HbInputButton::ButtonKeyCodeEnter) {
 mInputMethod->closeKeypad();
 return true;
 }
-if (buttonId == Qt::Key_Shift) {
+if (buttonId == HbInputButton::ButtonKeyCodeShift) {
 // single tap of shift key toggles prediction status in case insensitive languages
 if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage()) {
 HbInputSettingProxy::instance()->togglePrediction();
 } else {
 if (mShiftKeyDoubleTap) {
 mInputMethod->activateState(rootState);
 }
 } else {
 updateTextCase();
 if( !mTimer->isActive()){
-mTimer->start();
+mTimer->start(HbMultiTapTimerTimeout);
 }
 }
 }
+return true;
+}
+if (buttonId != HbInputButton::ButtonKeyCodeDelete &&
+mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
+q->sctCharacterSelected(QChar(buttonId));
 return true;
 }
 // text input happens on button release
 if (q->HbInputPredictionHandler::filterEvent(keyEvent)) {
 //any meaningful word for the input sequence.
 if(!d->mCanContinuePrediction) {
 int eventKey = event->key();
 switch(eventKey) {
 case Qt::Key_0:
-case Qt::Key_Space: {
+case HbInputButton::ButtonKeyCodeSpace: {
 if(d->mCandidates->size() && focusObject) {
 //Remove the "?" mark
 (*d->mCandidates)[d->mBestGuessLocation].chop(1);
 d->updateEditor();
 d->mCanContinuePrediction = true;
 }
 }
 break;
-case Qt::Key_Shift: {
+case HbInputButton::ButtonKeyCodeShift: {
 if(event->type() == QEvent::KeyRelease && d->mShiftKeyDoubleTap) {
 //Remove the "?" mark
 deleteOneCharacter();
 }
 }
 //For the following set of keys, it does not matter.
 case Qt::Key_Backspace:
-case Qt::Key_Delete:
+case HbInputButton::ButtonKeyCodeDelete:
-case Qt::Key_Return:
+case HbInputButton::ButtonKeyCodeEnter:
-case Qt::Key_Enter:
+		case HbInputButton::ButtonKeyCodeAsterisk:
-		case Qt::Key_Asterisk:
+case HbInputButton::ButtonKeyCodeControl:
-case Qt::Key_Control:
 break;
 /* Behavior for other keys i.e. from key1 to key9 -
 To start the long press timer as we need to handle long press functionality i.e Enter corresponding number mapped to a key */
 case Qt::Key_1:
 case Qt::Key_2:
 if (event->type() == QEvent::KeyRelease) {
 d->mButtonDown = false;
 } else {
 d->mButtonDown = true;
 d->mLastKey = event->key();
-// start Long Press timer as corresponding number mapped to a key should be allowed to enter
-d->mTimer->start(HbLongPressTimerTimeout);
 }
 return true;
 }
 //The default behavior for any other key press is just to consume the key event and
 //not to do anything.

changeset 2	06ff229162e9
parent 1	f7ac710697a9
child 3	11d3954df52a