FCL/sf/mw/hb: comparison src/hbinput/inputwidgets/hbinputvkbwidget.cpp

equal deleted inserted replaced

-:16d8024aca5e
+:f7ac710697a9
 #include <hbdialog.h>
 #include <hbeffect.h>
 #include <hbstackedwidget.h>
 #include <hbframedrawer.h>
 #include <hbevent.h>
+#include <hbdataform.h>
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinpututils.h>
 #include <hbinputdef.h>
 #include <hbinputvkbhost.h>
-#include <hbinputsettingdialog.h>
+#include <hbinputsettingwidget.h>
 #include <hbinputcommondialogs.h>
 #include <hbinputkeymap.h>
 #include <hbinputkeymapfactory.h>
 #include <hbwidgetfeedback.h>
-#include <hbsmileyengine.h>
 #include <hbinputpredictionfactory.h>
+#include <HbSwipeGesture>
+#include <HbTapGesture>
 #include "hbinputvirtualrocker.h"
 #include "hbinputvkbwidget.h"
 #include "hbinputvkbwidget_p.h"
 #include "hbinputtouchkeypadbutton.h"
 #include "hbinputsettinglist.h"
 mFlickAnimation(false),
 mSettingsListOpen(false),
 mAnimateWhenDialogCloses(false),
 mKeyboardSize(HbQwerty4x10),
 mCloseHandleHeight(0),
-mCloseHandle(NULL),
+mCloseHandle(0),
+mSettingView(0),
+mCurrentView(0),
 mKeyboardDimmed(false)
 {
+mScreenshotTimeLine.setUpdateInterval(16);
 }
 HbInputVkbWidgetPrivate::~HbInputVkbWidgetPrivate()
 {
 mIconDrawer->setFrameGraphicsName(HbInputVkbHandleIcon);
 mReleaseMapper = new QSignalMapper(q);
 mPressMapper = new QSignalMapper(q);
 mActionMapper = new QSignalMapper(q);
+q->grabGesture(Qt::SwipeGesture);
+// eating gestures below the panel (remove when panel starts to do this)
+q->grabGesture(Qt::TapGesture);
+q->grabGesture(Qt::PanGesture);
 }
 // re-implemented by inherited keyboards
 int HbInputVkbWidgetPrivate::keyCode(int buttonId)
 {
 return ret;
 }
 if (mOwner->focusObject()->editorInterface().editor()->inherits("HbAbstractEdit")) {
 if (!mOwner->focusObject()->editorInterface().smileyTheme().isNull()) {
 ret = true;
 }
-}	else {
+}
-HbSmileyEngine smileyEngine;
-if (!smileyEngine.defaultTheme().isNull()) {
+return ret;
-ret = true;
-}
-}
-return ret;
 }
 /// @endcond
 /*!
 Costructs the object.
 #ifdef HB_EFFECTS
 HbEffect::disable(this);
 #endif // HB_EFFECTS
-#if QT_VERSION >= 0x040600
 // Make sure the keypad never steals focus.
 setFlag(QGraphicsItem::ItemIsPanel, true);
 setActive(false);
-#endif
 }
 /*!
 Constructs the object.
 */
 #ifdef HB_EFFECTS
 HbEffect::disable(this);
 #endif // HB_EFFECTS
-#if QT_VERSION >= 0x040600
 // Make sure the keypad never steals focus.
 setFlag(QGraphicsItem::ItemIsPanel, true);
 setActive(false);
-#endif
 }
 /*!
 Destructs the object.
 */
 Q_D(HbInputVkbWidget);
 d->mCurrentHost = host;
 d->mRocker->setVisible(d->mShowRocker);
 d->setRockerPosition();
+d->mFlickDirection = HbFlickDirectionNone;
 }
 /*!
 Vkb host calls this handler when the keyboard close animation has finished.
 {
 Q_UNUSED(host);
 Q_D(HbInputVkbWidget);
 d->mRocker->setVisible(false);
+d->mFlickDirection = HbFlickDirectionNone;
 }
 /*!
 Vkb host calls this handler when the keyboard minimize animation has finished.
 \sa HbVkbHost
 */
 void HbInputVkbWidget::keyboardMinimized(HbVkbHost *host)
 {
 Q_UNUSED(host);
-}
+Q_D(HbInputVkbWidget);
+d->mFlickDirection = HbFlickDirectionNone;
-/*!
+}
-handles mouse press event.
+/*!
+\deprecated HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent*)
+is deprecated.
 */
 void HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent* event)
 {
-Q_D(HbInputVkbWidget);
 Q_UNUSED(event);
-if (!d->mMouseButtonPressedDown) {
+}
-d->mMouseButtonPressedDown = true;
-d->mMousePressTime.start();
+/*!
-}
+\deprecated HbInputVkbWidget::mappedKeyPress(int)
-}
+is deprecated.
-/*!
-Handles mouse release event.
-*/
-void HbInputVkbWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
-{
-Q_D(HbInputVkbWidget);
-d->mFlickDirection = HbFlickDirectionNone;
-d->mMouseButtonPressedDown = false;
-QPointF mouseDownpoint = event->buttonDownScenePos(Qt::LeftButton);
-if (d->mCurrentHost && d->mCurrentHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened &&
-d->mCurrentHost->activeKeypad() && d->mOwner) {
-HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
-d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
-} else if (d->mMousePressTime.elapsed() < MaxSweepTime || mouseDownpoint.y() <= scenePos().y() + d->mCloseHandleHeight) {
-QPointF delta = event->scenePos() - mouseDownpoint;
-qreal height;
-if (HbInputSettingProxy::instance()->screenOrientation() == Qt::Horizontal) {
-height = geometry().height() * 0.5;
-} else {
-// For ITU-T, 40% of the scene height is considered.
-height = 0.4 * geometry().height();
-}
-// If the user drags the mouse on keypad and the
-// delta is greater than 10% of the height, keypad is closed
-height = HbMouseDragDelta * height;
-if (delta.y() > height) {
-HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
-d->mFlickDirection = HbFlickDirectionDown;
-emit keypadCloseEventDetected(HbVkbCloseMethodButtonDrag);
-}
-if (qAbs(delta.x()) > SweepLength) {
-d->mFlickDirection = delta.x()>0 ? HbFlickDirectionRight : HbFlickDirectionLeft;
-if (d->mFlickAnimation){
-HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
-animKeyboardChange();
-}
-emit flickEvent(d->mFlickDirection);
-}
-}
-}
-/*!
-Handles virtual key press
 */
 void HbInputVkbWidget::mappedKeyPress(int buttonid)
 {
 Q_D(HbInputVkbWidget);
 d->handleStandardButtonPress(buttonid);
 }
 /*!
-Handles virtual key release
+\deprecated HbInputVkbWidget::mappedKeyRelease(int)
+is deprecated.
 */
 void HbInputVkbWidget::mappedKeyRelease(int buttonid)
 {
 Q_D(HbInputVkbWidget);
 d->handleStandardButtonRelease(buttonid);
 d->mKeymap = keymap;
 }
 }
 /*!
-This is called right before the keypad is about to open. This gives inheriting classes opportunity
+\reimp
-to do whatever initialization they need to do at this point.
 */
 void HbInputVkbWidget::aboutToOpen(HbVkbHost *host)
 {
 Q_D(HbInputVkbWidget);
 setLayout(d->mLayout);
 d->mCloseHandle = new QGraphicsWidget();
 d->mCloseHandle->setObjectName("vkbHandle");
-d->mCloseHandleHeight = HbCloseHandleHeight;
+d->mCloseHandleHeight = (int)HbCloseHandleHeight;
 d->mCloseHandle->setMinimumHeight(d->mCloseHandleHeight);
 d->mCloseHandle->setMaximumHeight(d->mCloseHandleHeight);
 d->mLayout->addItem(d->mCloseHandle);
 d->mLayout->addItem(keypadLayout());
 show();
 }
 /*!
-This is called right before the keypad is about to close.
+\reimp
 */
 void HbInputVkbWidget::aboutToClose(HbVkbHost *host)
 {
 Q_D(HbInputVkbWidget);
 d->mSettingsListOpen = true;
 d->captureScreenshot();
 if (!d->mSettingList) {
 d->mSettingList = new HbInputSettingList();
-connect(d->mSettingList, SIGNAL(aboutToClose()), this, SLOT(settingsClosed()));
+connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(showSettingsView()));
-connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(executeSettingsDialog()));
 connect(d->mSettingList, SIGNAL(inputMethodsButtonClicked()), this, SLOT(executeMethodDialog()));
 }
-#if QT_VERSION >= 0x040600
 HbInputFocusObject *focusObject = d->mOwner->focusObject();
 if (focusObject &&
 focusObject->editorInterface().isPredictionAllowed() &&
-!focusObject->editorInterface().isNumericEditor() &&
 predFactory->predictionEngineForLanguage(HbInputSettingProxy::instance()->globalInputLanguage())) {
 d->mSettingList->setPredictionSelectionEnabled(true);
 } else {
 d->mSettingList->setPredictionSelectionEnabled(false);
 }
-#endif
 d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
 qreal x = d->mSettingsButton->scenePos().x() + d->mSettingsButton->rect().width();
 qreal y = d->mSettingsButton->scenePos().y();
 d->mSettingList->setPreferredPos(QPointF(x, y), HbPopup::BottomRightCorner);
-d->mSettingList->showSettingList();
+d->mSettingList->updateSettingList();
+d->mSettingList->open(this, SLOT(settingsClosed()));
+}
+/*!
+Slot which is called when settings list is closed.
+*/
+void HbInputVkbWidget::settingsClosed()
+{
+Q_D(HbInputVkbWidget);
+d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
 d->mSettingsListOpen = false;
 if ( d->mAnimateWhenDialogCloses ) {
 animKeyboardChange();
 d->mAnimateWhenDialogCloses = false;
 } else if(d->mScreenshotTimeLine.state() != QTimeLine::Running) {
 keypadLanguageChangeFinished();
 }
 }
 /*!
-Slot to connect aboutToClose of settings list to update keyboard graphics.
-*/
-void HbInputVkbWidget::settingsClosed()
-{
-Q_D(HbInputVkbWidget);
-d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-}
-/*!
 Closes settings list
 */
 void HbInputVkbWidget::closeSettingList()
 {
 Q_D(HbInputVkbWidget);
 d->mSettingList->close();
 d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
 }
 /*!
-Toggles prediction status.
+\deprecated HbInputVkbWidget::togglePredictionStatus()
+is deprecated.
 */
 void HbInputVkbWidget::togglePredictionStatus()
 {
 closeSettingList();
-bool predictionStatus = HbInputSettingProxy::instance()->predictiveInputStatus();
+HbInputSettingProxy::instance()->togglePrediction();
-HbInputSettingProxy::instance()->setPredictiveInputStatus(!predictionStatus);
 update();
 }
 /*!
-Executes settingsDialog
+\deprecated HbInputVkbWidget::executeSettingsDialog()
+is deprecated. Use showSettingsView instead.
 */
 void HbInputVkbWidget::executeSettingsDialog()
 {
+}
+/*!
+Shows settings view
+*/
+void HbInputVkbWidget::showSettingsView()
+{
 Q_D(HbInputVkbWidget);
 closeSettingList();
-HbInputSettingDialog::HbSettingItems items = HbInputSettingDialog::HbSettingItemAll;
-if (d->mOwner->focusObject()->editorInterface().isNumericEditor()) {
+d->mSettingView = new HbView(this);
-items &=  (~HbInputSettingDialog::HbSettingItemPrediction);
+d->mSettingView->setTitle(tr("Input Settings"));
-}
+mainWindow()->addView(d->mSettingView);
-HbInputSettingDialog* settings = new HbInputSettingDialog(items);
-d->mSettingsListOpen = true;
+HbAction *backAction = new HbAction(Hb::BackNaviAction, d->mSettingView);
-settings->exec();
+backAction->setText(tr("Back"));
-delete settings;
+connect(backAction, SIGNAL(triggered(bool)), this, SLOT(closeSettingsView()));
-d->mSettingsListOpen = false;
+d->mSettingView->setNavigationAction(backAction);
-if ( d->mAnimateWhenDialogCloses ) {
-animKeyboardChange();
+HbDataForm *dataForm = new HbDataForm();
-d->mAnimateWhenDialogCloses = false;
+d->mSettingView->setWidget(dataForm);
-} else {
+HbInputSettingWidget *settingWidget = new HbInputSettingWidget(dataForm, d->mSettingView);
-keypadLanguageChangeFinished();
+settingWidget->initializeWidget();
-}
+d->mCurrentView = mainWindow()->currentView();
+mainWindow()->setCurrentView(d->mSettingView);
+}
+/*!
+Closes settings view and returns to previous view
+*/
+void HbInputVkbWidget::closeSettingsView()
+{
+Q_D(HbInputVkbWidget);
+mainWindow()->setCurrentView(d->mCurrentView);
+mainWindow()->removeView(d->mSettingView);
+delete d->mSettingView;
+d->mSettingView = 0;
 }
 /*!
 Executes input method selection dialog
 */
 d->mOwner->activateInputMethod(method);
 }
 }
 /*!
-Virtual function, each derived keypads should calculate and provide the
+\deprecated HbInputVkbWidget::keypadLayout()
-layout information through this functions. This layout information is used
+is deprecated.
-by HbInputVkbWidget for layouting different components of vkb.
 */
 QGraphicsLayout *HbInputVkbWidget::keypadLayout()
 {
 Q_D(HbInputVkbWidget);
 return d->mButtonLayout;
 }
 /*!
-Returns the keypad in QWidget form.
+\reimp
 */
 QWidget* HbInputVkbWidget::asWidget()
 {
 return HbInputUtils::createWrapperWidget(this);
 }
 /*!
-Returns the keypad in QGraphicsWidget form.
+\reimp
 */
 QGraphicsWidget* HbInputVkbWidget::asGraphicsWidget()
 {
 return this;
 }
 /*!
-Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+\reimp
 */
 QSizeF HbInputVkbWidget::preferredKeyboardSize()
 {
 Q_D(HbInputVkbWidget);
 return QSizeF(0.0, 0.0);
 }
 /*!
-This method is called every time vkb host draws an opening animation frame.
+\reimp
 */
 void HbInputVkbWidget::keyboardAnimationFrame(HbVkbAnimationType type, qreal x)
 {
 Q_UNUSED(type);
 Q_UNUSED(x);
 {
 Q_D(HbInputVkbWidget);
 QSizeF ret = preferredKeyboardSize();
 if (ret.height() >  d->mCloseHandleHeight) {
 ret.setHeight(ret.height() - d->mCloseHandleHeight);
-	}
+}
 return ret;
 }
 /*!
 void HbInputVkbWidget::setBackgroundDrawing(bool backgroundEnabled)
 {
 Q_D(HbInputVkbWidget);
 d->mDrawbackground = backgroundEnabled;
 }
 /*!
 Returns all possible keys those the user could have intended to press
 for the last registered touch along with their corresponding probability.
 One issue of thecurrent API implementation is that it does not always
 d->normalizeProbabilities(probableKeys);
 return probableKeys;
 }
 /*!
-Sets up the common buttons in the tool cluster (settings and application buttons).
+\deprecated HbInputVkbWidget::setupToolCluster()
+is deprecated.
 */
 void HbInputVkbWidget::setupToolCluster()
 {
 Q_D(HbInputVkbWidget);
 if(!d->mOwner || !d->mOwner->focusObject()) {
 d->mApplicationButton->disconnect(SIGNAL(pressed()));
 d->mApplicationButton->disconnect(SIGNAL(released()));
 d->mApplicationButton->setText(QString());
 d->mApplicationButton->setIcon(HbIcon());
 d->mApplicationButton->setToolTip(QString());
-			d->mApplicationButtonAction = 0;
+d->mApplicationButtonAction = 0;
 } else {
 d->mApplicationButton = new HbTouchKeypadButton(this, QString());
 d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
 d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
 }
-d->mApplicationButtonAction = NULL;
+d->mApplicationButtonAction = 0;
 }
 }
 /*!
-shape function actually refines the bounding rect. This function is used for collision detection
+Refines the bounding rect. This function is used for collision detection
 and hit test.
 */
 QPainterPath HbInputVkbWidget::shape() const
 {
 QRectF rect = boundingRect();
 QPainterPath path;
 path.addRect(rect);
 return path;
 }
+/*!
+\reimp
+*/
 QSizeF HbInputVkbWidget::minimizedKeyboardSize()
 {
 Q_D(HbInputVkbWidget);
 return QSizeF(0.0, d->mCloseHandleHeight);
 }
+/*!
+Shows smiley picker widget.
+*/
 void HbInputVkbWidget::showSmileyPicker(int rows, int columns)
 {
 Q_D(HbInputVkbWidget);
 if (!d->mOwner || !d->mOwner->focusObject()) {
 return;
 }
-// check whether the smiley recognition is enabled 	in the currently focused editor.
+// check whether the smiley recognition is enabled  in the currently focused editor.
 if (!d->isSmileysEnabled()) {
 return;
 }
 HbInputFocusObject *focusObject = d->mOwner->focusObject();
 if (!d->mSmileyPicker || d->mFocusedObject != focusObject) {
 d->mFocusedObject = focusObject;
 if (d->mSmileyPicker) {
 delete d->mSmileyPicker;
 }
 // get the smiley list from editor interface smiley theme.
 QStringList smileys = focusObject->editorInterface().smileyTheme().smileys();
-// if the smiley list is empty and the editor is not a Hb editor,
-// then get the default smiley list from smiley engine.
-if (smileys.isEmpty() && !focusObject->editorInterface().editor()->inherits("HbAbstractEdit")) {
-HbSmileyEngine smileyEngine;
-smileys = smileyEngine.defaultTheme().smileys();
-}
 if (!smileys.isEmpty()) {
 d->mSmileyPicker = new HbInputSmileyPicker(rows, columns, 0, smileys);
 d->mSmileyPicker->setObjectName("vkbwidget_smiley_picker");
 connect(d->mSmileyPicker, SIGNAL(selected(QString)), this, SIGNAL(smileySelected(QString)));
 }
 }
 if (d->mSmileyPicker) {
 d->mSmileyPicker->setGeometry(QRectF(0, pos().y(), geometry().width(),
 geometry().height()));
 d->mSmileyPicker->show();
 }
 }
+/*!
+\deprecated HbInputVkbWidget::flickDirection()
+is deprecated.
+*/
 HbInputVkbWidget::HbFlickDirection HbInputVkbWidget::flickDirection()
 {
 Q_D(HbInputVkbWidget);
 return d->mFlickDirection;
 }
 /*!
-Intended for internal use only
+\deprecated HbInputVkbWidget::refreshApplicationButton()
+is deprecated.
 */
 void HbInputVkbWidget::refreshApplicationButton()
 {
 Q_D(HbInputVkbWidget);
 d->mApplicationButton->disconnect(SIGNAL(clicked()));
 d->mApplicationButton->setFade(true);
 }
 }
-void HbInputVkbWidget::keypadLanguageChangeAnimationUpdate(qreal aValue)
+void HbInputVkbWidget::keypadLanguageChangeAnimationUpdate(qreal value)
 {
 Q_D(HbInputVkbWidget);
 int direction = 1;
 if (flickDirection() == HbFlickDirectionLeft) {
 direction = -1;
 }
 QRectF rect = boundingRect();
 QPointF position = pos();
-position.setX(direction * (-rect.width() + rect.width() * aValue));
+position.setX(direction * (-rect.width() + rect.width() * value));
 if (d->mScreenshotWidget) {
 d->mScreenshotWidget->setPos(position.x() + direction * rect.width(), position.y());
 setPos(position);
 }
 }
 void HbInputVkbWidget::keypadLanguageChangeFinished()
 {
 Q_D(HbInputVkbWidget);
 delete d->mScreenshotWidget;
-d->mScreenshotWidget = NULL;
+d->mScreenshotWidget = 0;
+d->mFlickDirection = HbFlickDirectionNone;
 }
 void HbInputVkbWidget::animKeyboardChange()
 {
 Q_D(HbInputVkbWidget);
 d->mScreenshotTimeLine.start();
 }
 }
 }
+/*!
+\reimp
+*/
 QSizeF HbInputVkbWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
 Q_UNUSED(constraint);
 Q_D(const HbInputVkbWidget);
 }
 return sh;
 }
 /*!
 \reimp
 */
 void HbInputVkbWidget::changeEvent(QEvent *event)
 {
 Q_D(HbInputVkbWidget);
 if (event->type() == HbEvent::ThemeChanged) {
 d->mIconDrawer->themeChanged();
 }
 HbWidget::changeEvent(event);
 }
+/*!
+\reimp
+*/
+void HbInputVkbWidget::gestureEvent(QGestureEvent *event)
+{
+Q_D(HbInputVkbWidget);
+if(HbSwipeGesture *gesture = qobject_cast<HbSwipeGesture *>(event->gesture(Qt::SwipeGesture))) {
+if (gesture->state() == Qt::GestureFinished) {
+HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
+// vertical swipes
+if (gesture->sceneSwipeAngle() > 250 && gesture->sceneSwipeAngle() < 290 &&
+gesture->sceneVerticalDirection() == QSwipeGesture::Down) {
+d->mFlickDirection = HbFlickDirectionDown;
+emit keypadCloseEventDetected(HbVkbCloseMethodCloseGesture);
+} else if (gesture->sceneSwipeAngle() > 70 && gesture->sceneSwipeAngle() < 110 &&
+gesture->sceneVerticalDirection() == QSwipeGesture::Up) {
+d->mFlickDirection = HbFlickDirectionUp;
+d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
+} else {
+d->mFlickDirection = (HbInputVkbWidget::HbFlickDirection)gesture->sceneHorizontalDirection();
+// horizontal swipes
+if (d->mFlickAnimation){
+animKeyboardChange();
+}
+emit flickEvent(d->mFlickDirection);
+}
+}
+} else if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+if (gesture->state() == Qt::GestureFinished) {
+// if keypad is minimized, open it
+if ( d->mCurrentHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized ) {
+d->mCurrentHost->openKeypad(this, d->mOwner);
+}
+}
+}
+}
 // End of file

changeset 1	f7ac710697a9
parent 0	16d8024aca5e
child 2	06ff229162e9