diff -r 7516d6d86cf5 -r ed14f46c0e55 src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp --- a/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp Mon Oct 04 17:49:30 2010 +0300 +++ b/src/hbplugins/inputmethods/hardwareinput/hbhardwareinputnumeric12keyhandler.cpp Mon Oct 18 18:23:13 2010 +0300 @@ -35,17 +35,17 @@ class HbHardwareInputNumeric12KeyHandlerPrivate: public HbInputNumericHandlerPrivate { - Q_DECLARE_PUBLIC(HbHardwareInputNumeric12KeyHandler) + Q_DECLARE_PUBLIC(HbHardwareInputNumeric12KeyHandler) public: - HbHardwareInputNumeric12KeyHandlerPrivate(); - ~HbHardwareInputNumeric12KeyHandlerPrivate(); + HbHardwareInputNumeric12KeyHandlerPrivate(); + ~HbHardwareInputNumeric12KeyHandlerPrivate(); - bool keyPressed(const QKeyEvent *keyEvent); - void _q_timeout(); + bool keyPressed(const QKeyEvent *keyEvent); + void _q_timeout(); public: - int mLastKey; - bool mButtonDown; + int mLastKey; + bool mButtonDown; }; HbHardwareInputNumeric12KeyHandlerPrivate::HbHardwareInputNumeric12KeyHandlerPrivate(): @@ -60,76 +60,76 @@ bool HbHardwareInputNumeric12KeyHandlerPrivate::keyPressed(const QKeyEvent *keyEvent) { - Q_Q(HbHardwareInputNumeric12KeyHandler); - HbInputFocusObject *focusObject = 0; - focusObject = mInputMethod->focusObject(); - if (!focusObject) { - qDebug("HbInputModeHandler::buttonClicked no focusObject ... failed!!"); - return false; - } + Q_Q(HbHardwareInputNumeric12KeyHandler); + HbInputFocusObject *focusObject = 0; + focusObject = mInputMethod->focusObject(); + if (!focusObject) { + qDebug("HbInputModeHandler::buttonClicked no focusObject ... failed!!"); + return false; + } - int buttonId = keyEvent->key(); + int buttonId = keyEvent->key(); - if (buttonId == Qt::Key_Return) { + if (buttonId == Qt::Key_Return) { - return true; - } else if (buttonId == Qt::Key_Shift) { + return true; + } else if (buttonId == Qt::Key_Shift) { - if (mTimer->isActive() && (mLastKey == buttonId)){ - mTimer->stop(); - HbHardware12key *hostInputMethod = qobject_cast(mInputMethod); - if (hostInputMethod) { - HbInputState newState; - mInputMethod->editorRootState(newState); - mInputMethod->activateState(newState); - } - } else { - mTimer->start(HbLongPressTimerTimeout); - } - mLastKey = buttonId; - mButtonDown = true; - return true; - } else if (buttonId == Qt::Key_Asterisk) { - mInputMethod->switchMode(Qt::Key_Asterisk); - return true; - } + if (mTimer->isActive() && (mLastKey == buttonId)){ + mTimer->stop(); + HbHardware12key *hostInputMethod = qobject_cast(mInputMethod); + if (hostInputMethod) { + HbInputState newState; + mInputMethod->editorRootState(newState); + mInputMethod->activateState(newState); + } + } else { + mTimer->start(HbLongPressTimerTimeout); + } + mLastKey = buttonId; + mButtonDown = true; + return true; + } else if (buttonId == Qt::Key_Asterisk) { + mInputMethod->switchMode(Qt::Key_Asterisk); + return true; + } - // Let's see if we can get the handler for this button in the base class. - if (q->HbInputNumericHandler::filterEvent(keyEvent)) { - return true; - } + // Let's see if we can get the handler for this button in the base class. + if (q->HbInputNumericHandler::filterEvent(keyEvent)) { + return true; + } - q->commitFirstMappedNumber(buttonId); - return true; + q->commitFirstMappedNumber(buttonId); + return true; } void HbHardwareInputNumeric12KeyHandlerPrivate::_q_timeout() { - mTimer->stop(); + mTimer->stop(); - HbInputFocusObject *focusedObject = 0; - focusedObject = mInputMethod->focusObject(); - if (!focusedObject) { - qDebug("HbHardwareInputNumeric12KeyHandler::timeout focusObject == 0"); - return; - } - //switch to Alpha mode when Long key press of Shift key is received - if (mButtonDown && (mLastKey == Qt::Key_Shift )) - { - mButtonDown = false; - // If the editor is not a number only editor, then activate the alphanumeric keypad - if( !focusedObject->editorInterface().isNumericEditor() ){ - mInputMethod->switchMode(mLastKey); - } - } - return; + HbInputFocusObject *focusedObject = 0; + focusedObject = mInputMethod->focusObject(); + if (!focusedObject) { + qDebug("HbHardwareInputNumeric12KeyHandler::timeout focusObject == 0"); + return; + } + //switch to Alpha mode when Long key press of Shift key is received + if (mButtonDown && (mLastKey == Qt::Key_Shift )) + { + mButtonDown = false; + // If the editor is not a number only editor, then activate the alphanumeric keypad + if( !focusedObject->editorInterface().isNumericEditor() ){ + mInputMethod->switchMode(mLastKey); + } + } + return; } HbHardwareInputNumeric12KeyHandler::HbHardwareInputNumeric12KeyHandler(HbInputAbstractMethod* inputMethod) :HbInputNumericHandler( *new HbHardwareInputNumeric12KeyHandlerPrivate, inputMethod) { - Q_D(HbHardwareInputNumeric12KeyHandler); - d->q_ptr = this; + Q_D(HbHardwareInputNumeric12KeyHandler); + d->q_ptr = this; } HbHardwareInputNumeric12KeyHandler::~HbHardwareInputNumeric12KeyHandler() @@ -141,14 +141,14 @@ */ bool HbHardwareInputNumeric12KeyHandler::filterEvent(const QKeyEvent * event) { - Q_D(HbHardwareInputNumeric12KeyHandler); + Q_D(HbHardwareInputNumeric12KeyHandler); - // in numeric mode in itut keypad only KeyPress events are handled. - if ((event->type() == QEvent::KeyPress ) - || (event->type() == QEvent::KeyRelease && event->key() == Qt::Key_Asterisk)) { - return d->keyPressed(event); - } - return false; + // in numeric mode in itut keypad only KeyPress events are handled. + if ((event->type() == QEvent::KeyPress ) + || (event->type() == QEvent::KeyRelease && event->key() == Qt::Key_Asterisk)) { + return d->keyPressed(event); + } + return false; } /*! @@ -156,33 +156,33 @@ */ bool HbHardwareInputNumeric12KeyHandler::actionHandler(HbInputModeAction action) { - bool ret = false; - switch (action) { - //In case of the numeric editor the character is already committed. - //Need to remove the committed character. + bool ret = false; + switch (action) { + //In case of the numeric editor the character is already committed. + //Need to remove the committed character. case HbInputModeHandler::HbInputModeActionDeleteAndCommit:{ - HbInputFocusObject *focusObject = 0; - Q_D(HbHardwareInputNumeric12KeyHandler); - focusObject = d->mInputMethod->focusObject(); - if (!focusObject) { - return false; - } - d->mTimer->stop(); - QString empty; - QList list; - QInputMethodEvent event(QString(), list); - event.setCommitString(empty, -1, 1); - focusObject->sendEvent(event); - ret = true; - } + HbInputFocusObject *focusObject = 0; + Q_D(HbHardwareInputNumeric12KeyHandler); + focusObject = d->mInputMethod->focusObject(); + if (!focusObject) { + return false; + } + d->mTimer->stop(); + QString empty; + QList list; + QInputMethodEvent event(QString(), list); + event.setCommitString(empty, -1, 1); + focusObject->sendEvent(event); + ret = true; + } default: { - ret = false; - } - } - if(!ret) { - ret = HbInputNumericHandler::actionHandler(action); - } - return ret; + ret = false; + } + } + if(!ret) { + ret = HbInputNumericHandler::actionHandler(action); + } + return ret; } // EOF