--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Wed Aug 18 10:05:37 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Thu Sep 02 20:44:51 2010 +0300
@@ -31,7 +31,6 @@
#include <hbabstractedit.h>
#include <hbtextedit.h>
#include <hblineedit.h>
-#include <hbinputvirtualrocker.h>
#include <hbabstractslidercontrol.h>
#include <hbprogressslider.h>
#include <hbscrollbar.h>
@@ -105,7 +104,7 @@
case Hb::ItemType_MenuItem:
case Hb::ItemType_AbstractItemView:
-
+
case Hb::ItemType_ListView:
case Hb::ItemType_ListViewItem:
@@ -712,49 +711,7 @@
}
}
}
- else if (const HbInputVirtualRocker *trackPoint = qobject_cast<const HbInputVirtualRocker *>(widget)) {
- QGraphicsItem* graphicsItem = trackPoint->mainWindow()->scene()->focusItem();
-
- if (graphicsItem->isWidget() && (static_cast<QGraphicsWidget*>(graphicsItem)->inherits("QGraphicsWebView"))) {
- QVariant v;
- v = graphicsItem->scene()->inputMethodQuery( Qt::ImCursorPosition );
- if ( v.isValid() && v.canConvert<int>()) {
- int index;
- index = v.toInt();
- QVariant varSurrText;
- varSurrText = graphicsItem->scene()->inputMethodQuery( Qt::ImSurroundingText );
- if ( varSurrText.isValid() ) {
- QString text = varSurrText.toString();
- // Index (current cursor position) can be equal to the
- // length of the string (for e.g. when the cursor is at the end)
- // So we make sure we bring index within the bounds of the string
- if (!text.isEmpty() && index <= text.count()) {
- dist = abs(index - previousCursorPosition);
-
- if (previousCursorPosition < index || index == text.count()) {
- index--;
- }
- QChar character = text.at(index);
- emptyline = character.category() == QChar::Separator_Paragraph;
-
- if (emptyline) {
- effect = HbFeedback::EmptyLineSelection;
- }
- else if (dist > 1) {
- effect = HbFeedback::LineSelection;
- }
- else if (character.isSpace()) {
- effect = HbFeedback::BlankSelection;
- }
- else {
- effect = HbFeedback::TextSelection;
- }
- }
- }
- }
- }
- }
return effect;
}
@@ -847,8 +804,8 @@
default:
break;
}
- }
- }
+ }
+ }
else if (const HbAbstractItemView* itemView = qobject_cast<const HbAbstractItemView*>(widget)) {
if (itemView->selectionMode() == HbAbstractItemView::MultiSelection && (modifiers & Hb::ModifierScrolling)) {
effect = HbFeedback::MultipleCheckbox;
@@ -1038,7 +995,7 @@
modalities = HbFeedback::Tactile;
break;
- case Hb::InstantMultitouchActivated:
+ case Hb::InstantAdvancedGestureActivated:
modalities = HbFeedback::Tactile | HbFeedback::Audio;
break;