--- a/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Fri Mar 19 09:35:13 2010 +0200
+++ b/tactilefeedback/tactilefeedbackresolver/plugins/tactilehapticsplugin/src/tactilehapticsplayer.cpp Fri Apr 16 15:15:56 2010 +0300
@@ -46,30 +46,38 @@
_LIT8( KTFSensitive, "TFSensitive");
_LIT8( KTFBasicButton, "TFBasicButton");
_LIT8( KTFSensitiveButton, "TFSensitiveButton");
-_LIT8( KTFList, "TFList");
-_LIT8( KTFSensitiveList, "TFSensitiveList");
-_LIT8( KTFBoundaryList, "TFBoundaryList");
-_LIT8( KTFSlider, "TFSlider");
-_LIT8( KTFEdit, "TFEdit");
+_LIT8( KTFBasicItem, "TFList"); // Mapped to IVT file version 9.2
+_LIT8( KTFSensitiveItem, "TFSensitiveList"); // Mapped to IVT file version 9.2
+_LIT8( KTFBounceEffect, "TFBoundaryList"); // Mapped to IVT file version 9.2
+_LIT8( KTFBasicSlider, "TFSlider"); // Mapped to IVT file version 9.2
+_LIT8( KTFEditor, "TFEdit"); // Mapped to IVT file version 9.2
_LIT8( KTFLineSelection, "TFLineSelection");
_LIT8( KTFBlankSelection, "TFBlankSelection");
_LIT8( KTFTextSelection, "TFTextSelection");
_LIT8( KTFEmptyLineSelection, "TFEmptyLineSelection");
-_LIT8( KTFTab, "TFTab");
_LIT8( KTFPopUp, "TFPopUp");
-_LIT8( KTFIncreasingPopUp, "TFIncreasingPopUp");
-_LIT8( KTFDecreasingPopUp, "TFDecreasingPopUp");
-_LIT8( KTFFlick, "TFFlick");
+_LIT8( KTFPopupOpen, "TFIncreasingPopUp"); // Mapped to IVT file version 9.2
+_LIT8( KTFPopupClose, "TFDecreasingPopUp"); // Mapped to IVT file version 9.2
+_LIT8( KTFItemScroll, "TFFlick"); // Mapped to IVT file version 9.2
_LIT8( KTFCheckbox, "TFCheckbox");
-_LIT8( KTFSensitiveInput, "TFSensitiveInput");
-_LIT8( KTFCharacterInputButton, "TFCharacterInputButton");
-_LIT8( KTFMultiTouchRecognized, "TFMultiTouchRecognized");
+_LIT8( KTFBasicKeypad, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFSensitiveKeypad, "TFSensitiveInput"); // Mapped to IVT file version 9.2
+_LIT8( KTFMultitouchActivate, "TFMultiTouchRecognized"); // Mapped to IVT file version 9.2
+_LIT8( KTFFlicked, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFItemDrop, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFItemMoveOver, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFItemPick, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFMultipleCheckbox, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFRotateStep, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFSensitiveSlider, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFStopFlick, "TFBasic"); // To be released in IVT file version 10.1
// Continuous feedback's names
_LIT8( KTFContinuousSmooth, "TFContinuousSmooth");
_LIT8( KTFContinuousSlider, "TFContinuousSlider");
_LIT8( KTFContinuousInput, "TFContinuousInput");
-_LIT8( KTFContinuousFlick, "TFContinuousFlick");
+_LIT8( KTFContinuousPopup, "TFBasic"); // To be released in IVT file version 10.1
+_LIT8( KTFContinuousPinch, "TFBasic"); // To be released in IVT file version 10.1
// ---------------------------------------------------------------------------
// Constructor.
// ---------------------------------------------------------------------------
@@ -211,20 +219,23 @@
case ETouchFeedbackSensitiveButton:
name = KTFSensitiveButton;
break;
- case ETouchFeedbackList:
- name = KTFList;
+ case ETouchFeedbackBasicItem:
+ name = KTFBasicItem;
break;
- case ETouchFeedbackSensitiveList:
- name = KTFSensitiveList;
+ case ETouchFeedbackSensitiveItem:
+ name = KTFSensitiveItem;
+ break;
+ case ETouchFeedbackBasicSlider:
+ name = KTFBasicSlider;
break;
- case ETouchFeedbackBoundaryList:
- name = KTFBoundaryList;
+ case ETouchFeedbackSensitiveSlider:
+ name = KTFSensitiveSlider;
break;
- case ETouchFeedbackSlider:
- name = KTFSlider;
+ case ETouchFeedbackBounceEffect:
+ name = KTFBounceEffect;
break;
- case ETouchFeedbackEdit:
- name = KTFEdit;
+ case ETouchFeedbackEditor:
+ name = KTFEditor;
break;
case ETouchFeedbackLineSelection:
name = KTFLineSelection;
@@ -238,32 +249,50 @@
case ETouchFeedbackEmptyLineSelection:
name = KTFEmptyLineSelection;
break;
- case ETouchFeedbackTab:
- name = KTFTab;
- break;
case ETouchFeedbackPopUp:
name = KTFPopUp;
break;
- case ETouchFeedbackIncreasingPopUp:
- name = KTFIncreasingPopUp;
+ case ETouchFeedbackPopupOpen:
+ name = KTFPopupOpen;
break;
- case ETouchFeedbackDecreasingPopUp:
- name = KTFDecreasingPopUp;
+ case ETouchFeedbackPopupClose:
+ name = KTFPopupClose;
break;
- case ETouchFeedbackFlick:
- name = KTFFlick;
+ case ETouchFeedbackItemScroll:
+ name = KTFItemScroll;
break;
case ETouchFeedbackCheckbox:
name = KTFCheckbox;
break;
- case ETouchFeedbackSensitiveInput:
- name = KTFSensitiveInput;
+ case ETouchFeedbackBasicKeypad:
+ name = KTFBasicKeypad;
+ break;
+ case ETouchFeedbackSensitiveKeypad:
+ name = KTFSensitiveKeypad;
+ break;
+ case ETouchFeedbackMultitouchActivate:
+ name = KTFMultitouchActivate;
+ break;
+ case ETouchFeedbackFlicked:
+ name = KTFFlicked;
+ break;
+ case ETouchFeedbackItemDrop:
+ name = KTFItemDrop;
break;
- case ETouchFeedbackCharacterInputButton:
- name = KTFCharacterInputButton;
+ case ETouchFeedbackItemMoveOver:
+ name = KTFItemMoveOver;
+ break;
+ case ETouchFeedbackItemPick:
+ name = KTFItemPick;
break;
- case ETouchFeedbackMultiTouchRecognized:
- name = KTFMultiTouchRecognized;
+ case ETouchFeedbackMultipleCheckbox:
+ name = KTFMultipleCheckbox;
+ break;
+ case ETouchFeedbackRotateStep:
+ name = KTFRotateStep;
+ break;
+ case ETouchFeedbackStopFlick:
+ name = KTFStopFlick;
break;
default:
User::Leave( KErrArgument );
@@ -340,8 +369,11 @@
case ETouchContinuousInput:
name = KTFContinuousInput;
break;
- case ETouchContinuousFlick:
- name = KTFContinuousFlick;
+ case ETouchContinuousPopup:
+ name = KTFContinuousPopup;
+ break;
+ case ETouchContinuousPinch:
+ name = KTFContinuousPinch;
break;
default:
ret = KErrArgument;