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

equal deleted inserted replaced

-:c3690ec91ef8
+:923ff622b8b9
 #include <hbeffect.h>
 #include <hbframedrawer.h>
 #include <hbevent.h>
 #include <hbdataform.h>
 #include <hbinputregioncollector_p.h>
+#include <hbfeedbackmanager.h>
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
 #include <hbinpututils.h>
 #include <hbinputdef.h>
 #include <HbSwipeGesture>
 #include <HbTapGesture>
 #include <HbSelectionDialog>
 #include <HbListWidgetItem>
-#include "hbinputvirtualrocker.h"
 #include "hbinputsettinglist.h"
 #include "hbinputmodeindicator.h"
-#include <hbfeedbackmanager.h>
 #include "hbinputsmileypicker.h"
 #include "hbinputscreenshotwidget.h"
-#define HB_DIGIT_LATIN_START_VALUE          0x0030
+const int HB_DIGIT_LATIN_START_VALUE          = 0x0030;
-#define HB_DIGIT_ARABIC_INDIC_START_VALUE   0x0660
+const int HB_DIGIT_ARABIC_INDIC_START_VALUE   = 0x0660;
-#define HB_DIGIT_EASTERN_ARABIC_START_VALUE 0x06F0
+const int HB_DIGIT_EASTERN_ARABIC_START_VALUE = 0x06F0;
-#define HB_DIGIT_DEVANAGARI_START_VALUE     0x0966
+const int HB_DIGIT_DEVANAGARI_START_VALUE     = 0x0966;
-const qreal HbRockerWidth = 50.0;
+const qreal HbPortraitSmileyPickerHeightInUnits = 43.7;
+const qreal HbPortraitSmileyPickerWidthInUnits = 47.8;
+const qreal HbLandscapeSmileyPickerHeightInUnits = 31.9;
+const qreal HbLandscapeSmileyPickerWidthInUnits = 83.4;
+const qreal HbSmileyPickerMarginInUnits = 0.9;
 /*!
 @proto
 @hbinput
 mKeymap(0),
 mModifiers(0),
 mInputModeIndicator(0),
 mSettingList(0),
 mButtonLayout(0),
-mRocker(0),
 mBackgroundDrawer(0),
 mIconDrawer(0),
 mMainWinConnected(false),
-mShowRocker(false),
 mLayout(0),
 mCurrentHost(0),
 mDrawbackground(true),
 mMouseButtonPressedDown(false),
 mFlickDirection(HbInputVkbWidget::HbFlickDirectionNone),
 mScreenshotWidget(0),
 mScreenshotTimeLine(250),
 mMostRecentlyAccessedButton(0),
 mMostRecentlyClickedLocation(0.0, 0.0),
 mFocusedObject(0),
+mCurrentFocusedObject(0),
 mFlickAnimation(false),
 mSettingsListOpen(false),
 mAnimateWhenDialogCloses(false),
 mKeyboardSize(HbQwerty4x10),
 mCloseHandleHeight(0),
 mCloseHandle(0),
 mSettingView(0),
 mCurrentView(0),
 mKeyboardDimmed(false),
-mImSelectionDialog(0),
+	  mSettingWidget(0)
-mSettingWidget(0)
 {
 mScreenshotTimeLine.setUpdateInterval(16);
 }
 delete mSettingList;
 delete mBackgroundDrawer;
 delete mIconDrawer;
 delete mSmileyPicker;
 delete mScreenshotWidget;
-delete mRocker;
-delete mImSelectionDialog;
 }
 void HbInputVkbWidgetPrivate::initLayout()
 {
 Q_Q(HbInputVkbWidget);
 }
 void HbInputVkbWidgetPrivate::init()
 {
 Q_Q(HbInputVkbWidget);
-q->setFlag(QGraphicsItem::ItemHasNoContents, false);
+QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
+#if QT_VERSION >= 0x040600
-mRocker = new HbInputVirtualRocker();
+itemFlags |= QGraphicsItem::ItemSendsGeometryChanges;
+#endif
+// Make sure the keypad never steals focus.
+itemFlags |= QGraphicsItem::ItemIsPanel;
+q->setFlags(itemFlags);
 HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(q->contentItem());
 QObject::connect(buttonGroup, SIGNAL(aboutToActivateCustomAction(HbAction *)),
 q, SIGNAL(aboutToActivateCustomAction(HbAction *)));
-mRocker->setObjectName("VirtualRocker");
-QSizeF rockerSize(HbRockerWidth, HbRockerWidth);
-mRocker->resize(rockerSize);
-mRocker->setMinimumSize(HbRockerWidth, HbRockerWidth);
-mRocker->setMaximumSize(HbRockerWidth * 20, HbRockerWidth * 20);
-if (q->mainWindow()) {
-q->mainWindow()->scene()->addItem(mRocker);
-}
-QObject::connect(mRocker, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
-q, SLOT(_q_handleRockerChange(int, HbInputVirtualRocker::RockerSelectionMode)));
-mRocker->setVisible(false);
 mBackgroundDrawer = new HbFrameDrawer();
 mBackgroundDrawer->setFrameGraphicsName(backgroundGraphics);
 mBackgroundDrawer->setFrameType(HbFrameDrawer::ThreePiecesVertical);
 mBackgroundDrawer->setFillWholeRect(true);
 placement = HbPopup::BottomRightCorner;
 }
 }
 }
-void HbInputVkbWidgetPrivate::setRockerPosition()
-{
-Q_Q(HbInputVkbWidget);
-mRocker->setPos(q->rockerPosition());
-}
 void HbInputVkbWidgetPrivate::captureScreenshot()
 {
 Q_Q(HbInputVkbWidget);
 if (!mScreenshotWidget) {
 }
 return ret;
 }
-void HbInputVkbWidgetPrivate::showInputMethodSelectionDialog()
+void HbInputVkbWidgetPrivate::_q_activateInputMethod(const HbInputMethodDescriptor &descriptor, const QByteArray &customData)
 {
 Q_Q(HbInputVkbWidget);
-delete mImSelectionDialog;
+if (!descriptor.isEmpty() && mOwner) {
-mImSelectionDialog = new HbSelectionDialog();
+// Set as active input method.
+HbInputSettingProxy::instance()->setPreferredInputMethod(q->mainWindow()->orientation(), descriptor, customData);
-mImSelectionDialog->setObjectName("Input method dialog");
+// Activate immediately.
+mOwner->activateInputMethod(descriptor);
-// Make sure the language dialog never steals focus.
+}
-mImSelectionDialog->setFlag(QGraphicsItem::ItemIsPanel, true);
+}
-mImSelectionDialog->setActive(false);
+void HbInputVkbWidgetPrivate::_q_smileyPickerClosed()
-QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
-QList<HbListWidgetItem *> listItems;
-HbListWidgetItem *item = new HbListWidgetItem();
-QString methodName("Default");
-item->setText(methodName);
-listItems.append(item);
-foreach(const HbInputMethodDescriptor &descriptor, customList) {
-QString displayName = descriptor.displayName();
-if (displayName.length() == 0) {
-displayName = QString("Unknown");
-}
-item = new HbListWidgetItem();
-item->setText(displayName);
-listItems.append(item);
-}
-mImSelectionDialog->setWidgetItems(listItems, true);
-mImSelectionDialog->setSelectionMode(HbAbstractItemView::SingleSelection);
-mImSelectionDialog->setDismissPolicy(HbPopup::NoDismiss);
-mImSelectionDialog->setModal(true);
-q->connect(mImSelectionDialog, SIGNAL(finished(HbAction *)), q, SLOT(_q_inputMethodSelectionDialogFinished(HbAction *)));
-mImSelectionDialog->open();
-}
-void HbInputVkbWidgetPrivate::_q_inputMethodSelectionDialogFinished(HbAction *action)
-{
-Q_UNUSED(action);
-QList<QVariant> selectedItems = mImSelectionDialog->selectedItems();
-if (selectedItems.count()) {
-HbInputMethodDescriptor result;
-int selection = selectedItems.first().toInt();
-if (selection == 0) {
-result.setDefault();
-} else {
-QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
-if (customList.count() <= selection) {
-result = customList[selection-1];
-}
-}
-if (!result.isEmpty() && mOwner) {
-// Set as active custom input method.
-HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, result);
-HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, result);
-// And finally activate immediately.
-mOwner->activateInputMethod(result);
-}
-}
-}
-void HbInputVkbWidgetPrivate::_q_handleRockerChange(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode)
 {
 Q_Q(HbInputVkbWidget);
-if (direction == HbInputVirtualRocker::HbRockerDirectionRelease) {
+q->setKeyboardDimmed(false);
-q->setKeyboardDimmed(false);
-} else if (direction == HbInputVirtualRocker::HbRockerDirectionPress ||
-direction == HbInputVirtualRocker::HbRockerDirectionDoubleClick) {
-q->setKeyboardDimmed(true);
-}
-emit q->rockerDirection(direction, selectionMode);
 }
 QChar HbInputVkbWidgetPrivate::numberCharacterBoundToKey(int key)
 {
 QChar numChr;
 #ifdef HB_EFFECTS
 HbEffect::disable(this);
 #endif // HB_EFFECTS
-// Make sure the keypad never steals focus.
-setFlag(QGraphicsItem::ItemIsPanel, true);
 setActive(false);
+if (!d->mOwner) {
+d->mOwner = HbInputMethod::activeInputMethod();
+}
 }
 /*!
 Constructs the object.
 */
 #ifdef HB_EFFECTS
 HbEffect::disable(this);
 #endif // HB_EFFECTS
-// Make sure the keypad never steals focus.
-setFlag(QGraphicsItem::ItemIsPanel, true);
 setActive(false);
 }
 /*!
 Destructs the object.
 void HbInputVkbWidget::keyboardOpened(HbVkbHost *host)
 {
 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.
 void HbInputVkbWidget::keyboardClosed(HbVkbHost *host)
 {
 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.
 }
 return item;
 }
 /*!
+\deprecated HbInputVkbWidget::setRockerVisible(bool)
+is deprecated.
 Sets virtual rocker visibility.
 */
 void HbInputVkbWidget::setRockerVisible(bool visible)
 {
-Q_D(HbInputVkbWidget);
+Q_UNUSED(visible);
-d->mShowRocker = visible;
+}
-}
+/*!
-/*!
+\deprecated HbInputVkbWidget::isRockerVisible() const
+is deprecated.
 Returns true if virtual rocker is allowed to be visible.
 */
 bool HbInputVkbWidget::isRockerVisible() const
 {
-Q_D(const HbInputVkbWidget);
+return false;
-if (d->mShowRocker) {
-return d->mRocker->isVisible();
-} else {
-return false;
-}
 }
 /*!
 Returns active keypad mode. Possible values are EModeAbc, EModeNumeric and EModeSct.
 */
 d->mCurrentHost = host;
 if (d->mOwner && d->mOwner->focusObject()) {
 qreal vkbZValue = d->mOwner->focusObject()->findVkbZValue();
 setZValue(vkbZValue);
-d->mRocker->setZValue(vkbZValue + 0.5);
 }
 show();
 }
 d->mCurrentHost = host;
 if (d->mSmileyPicker && d->mSmileyPicker->isVisible()) {
 d->mSmileyPicker->hide();
 }
-d->mRocker->setVisible(false);
 if (d->mSettingList) {
 d->mSettingList->close();
 }
 }
 /*!
-Enables or disabled all buttons in the keyboard that have not been disabled directly.
+Enables or disables all buttons in the keyboard that have not been disabled directly.
 */
 void HbInputVkbWidget::setKeyboardDimmed(bool dimmed)
 {
 HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(contentItem());
 if (buttonGroup) {
 d->captureScreenshot();
 if (!d->mSettingList) {
 d->mSettingList = new HbInputSettingList();
 connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(showSettingsView()));
-connect(d->mSettingList, SIGNAL(inputMethodsButtonClicked()), this, SLOT(executeMethodDialog()));
+connect(d->mSettingList, SIGNAL(inputMethodSelected(const HbInputMethodDescriptor &, const QByteArray &)),
+this, SLOT(_q_activateInputMethod(const HbInputMethodDescriptor &, const QByteArray &)));
 }
 HbInputFocusObject *focusObject = d->mOwner->focusObject();
 if (focusObject) {
 if (focusObject->editorInterface().inputConstraints() & HbEditorConstraintLatinAlphabetOnly) {
 */
 void HbInputVkbWidget::showSettingsView()
 {
 Q_D(HbInputVkbWidget);
-//HbVkbHostBridge::instance()->minimizeKeypad(true);
 /*
 Added for vanilla input
 When settings dialog is launched, keypad is not closed.
 */
 HbInputFocusObject *focusObject = 0;
 }
 HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
 if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
 vkbHost->closeKeypad();
 }
+d->mCurrentFocusedObject = focusObject->object();
 closeSettingList();
-hide();
 if(!d->mSettingView) {
 d->mSettingView = new HbView(this);
 HbAction *backAction = new HbAction(Hb::BackNaviAction, d->mSettingView);
 backAction->setText(tr("Back"));
 connect(backAction, SIGNAL(triggered(bool)), this, SLOT(closeSettingsView()));
 d->mSettingWidget->initializeWidget();
 HbInputRegionCollector::instance()->attach(d->mSettingView);
 d->mSettingView->setTitle(tr("Input Settings"));
 mainWindow()->addView(d->mSettingView);
 d->mCurrentView = mainWindow()->currentView();
-mainWindow()->clearFocus();
 mainWindow()->setCurrentView(d->mSettingView);
 }
 /*!
 Closes settings view and returns to previous view
 {
 Q_D(HbInputVkbWidget);
 mainWindow()->setCurrentView(d->mCurrentView);
 mainWindow()->removeView(d->mSettingView);
+if (d->mSettingView->scene()) {
+d->mSettingView->scene()->removeItem(d->mSettingView);
+}
 HbInputRegionCollector::instance()->detach(d->mSettingView);
 d->mSettingWidget->resetWidget();
-/***** To be removed, Added for vanilla input.
+if (d->mCurrentFocusedObject) {
-HbInputFocusObject *focusObject = 0;
+HbInputFocusObject *focusObject = new HbInputFocusObject(d->mCurrentFocusedObject);
-if (!d->mOwner || !(focusObject = d->mOwner->focusObject())) {
+d->mOwner->setFocusObject(focusObject);
-return;
+d->mCurrentFocusedObject = 0;
 }
-HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
+}
-if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened) {
-vkbHost->openKeypad();
+/*!
-}
+\deprecated HbInputVkbWidget::executeMethodDialog()
-*****/
+is deprecated.
-}
-/*!
 Executes input method selection dialog
 */
 void HbInputVkbWidget::executeMethodDialog()
 {
-Q_D(HbInputVkbWidget);
-closeSettingList();
-d->showInputMethodSelectionDialog();
 }
 /*!
 \reimp
 */
 */
 void HbInputVkbWidget::keyboardAnimationFrame(HbVkbAnimationType type, qreal x)
 {
 Q_UNUSED(type);
 Q_UNUSED(x);
-Q_D(HbInputVkbWidget);
-d->setRockerPosition();
 }
 /*!
 Returns the size of the keypad button area.
 */
 return ret;
 }
 /*!
-Returns the virtual rocker position. The default psition is in the middle
+\deprecated HbInputVkbWidget::rockerPosition()
+is deprecated.
+Returns the virtual rocker position. The default position is in the middle
 of keypad button area.
 */
 QPointF HbInputVkbWidget::rockerPosition()
 {
-Q_D(const HbInputVkbWidget);
+return QPointF();
-QPointF result;
-if (d->mRocker) {
-QSizeF padArea = keypadButtonAreaSize();
-result = QPointF(scenePos().x() + (padArea.width() * 0.5) - (d->mRocker->size().width() * 0.5),
-scenePos().y() + (padArea.height() * 0.5) - (d->mRocker->size().height() * 0.5));
-result.setY(result.y() + d->mCloseHandleHeight);
-}
-return result;
 }
 /*!
 Sets the status of the background drawing. This method can be used to
 optimize vkb widget drawing. If it is known that the widget will cover whole
 d->mDrawbackground = backgroundEnabled;
 }
 /*!
-Returns all possible keys those the user could have intended to press
+Returns all possible keys that the user could have intended to press
 for the last registered touch along with their corresponding probability.
 */
 QList<HbKeyPressProbability> HbInputVkbWidget::probableKeypresses()
 {
 QList<HbKeyPressProbability> probabilities;
 connect(d->mSmileyPicker, SIGNAL(selected(QString)), this, SIGNAL(smileySelected(QString)));
 }
 }
 if (d->mSmileyPicker) {
-d->mSmileyPicker->setGeometry(QRectF(0, pos().y(), geometry().width(),
+qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
-geometry().height()));
+QSizeF screenSize = HbDeviceProfile::profile(mainWindow()).logicalSize();
-d->mSmileyPicker->show();
+qreal width = HbPortraitSmileyPickerWidthInUnits * unitValue;
+qreal height = HbPortraitSmileyPickerHeightInUnits * unitValue;
+if (mainWindow()->orientation() == Qt::Horizontal) {
+width = HbLandscapeSmileyPickerWidthInUnits * unitValue;
+height = HbLandscapeSmileyPickerHeightInUnits * unitValue;
+}
+d->mSmileyPicker->setPreferredSize(QSizeF(width, height));
+d->mSmileyPicker->setPos((screenSize.width() - width) * 0.5,
+screenSize.height() - height - HbSmileyPickerMarginInUnits * unitValue);
+d->mSmileyPicker->open(this, SLOT(_q_smileyPickerClosed()));
+setKeyboardDimmed(true);
 HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(contentItem());
 if (buttonGroup) {
 buttonGroup->cancelButtonPress();
 }
 */
 void HbInputVkbWidget::sendKeyReleaseEvent(const QKeyEvent &event)
 {
 Q_D(HbInputVkbWidget);
+if (d->mOwner && event.key() > 0) {
+d->mOwner->filterEvent(&event);
+}
 if (event.key() == HbInputButton::ButtonKeyCodeSettings) {
 showSettingList();
-} else if (d->mOwner && event.key() > 0) {
+}
-d->mOwner->filterEvent(&event);
-}
 }
 /*!
 Sends key event to owning input method.
 */

changeset 7	923ff622b8b9
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55