--- a/src/hbcore/inputfw/hbinputdef.h	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbcore/inputfw/hbinputdef.h	Wed Aug 18 10:05:37 2010 +0300
@@ -64,20 +64,25 @@
 bit HbTouchInputMask set.
 */
 enum HbKeyboardTypeFlag {
-    HbKeyboardNone                          = 0x00000000,
+    HbKeyboardNone          				= 0x00000000,
 
-    HbKeyboard12Key                         = 0x00000001,       /**< Deprecated, use HbKeyboardHardwarePortrait instead. */
+    HbKeyboard12Key         				= 0x00000001,       /**< Deprecated, use HbKeyboardHardwarePortrait instead. */
     HbKeyboardHardwarePortrait                          = HbKeyboard12Key,  /**< Hardware keyboard for portrait orientation. */
-    HbKeyboardQwerty                        = 0x00000001 | HbQwertyKeyboardMask,  /**< Deprecated, use HbKeyboardHardwareLandcape instead */
+    HbKeyboardQwerty        				= 0x00000001 | HbQwertyKeyboardMask,  /**< Deprecated, use HbKeyboardHardwareLandcape instead */
     HbKeyboardHardwareLandcape                          = HbKeyboardQwerty, /**< Hardware keyboard for landscape mode. */
-    HbKeyboardVirtual12Key                  = 0x00000001 | HbTouchInputMask,    /**< Deprecated, use HbKeyboardTouchPortrait instead. */
+    HbKeyboardVirtual12Key  				= 0x00000001 | HbTouchInputMask,    /**< Deprecated, use HbKeyboardTouchPortrait instead. */
     HbKeyboardTouchPortrait                             = HbKeyboardVirtual12Key,           /**< Touch keyboard for portrait mode. */
-    HbKeyboardVirtualQwerty                 = 0x00000002 | HbTouchInputMask | HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
+    HbKeyboardVirtualQwerty 				= 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
     HbKeyboardTouchLandscape                            = HbKeyboardVirtualQwerty, /**< Touch keyboard for landscape mode. */
-    HbKeyboardSctPortrait                   = 0x00000003 | HbTouchInputMask,                       /**< Special character selection keypad for portrait view */
-    HbKeyboardSctLandscape                  = 0x00000004 | HbTouchInputMask | HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
-    HbKeyboardHwr                           = 0x00000005 | HbTouchInputMask | HbHwrKeyboardMask,   /**< Hand writing recognition keypad */
-    HbKeyboardVirtual12KeyLabels            = 0x00000006 | HbTouchInputMask                        /**< Key labels for virtual 12 key keyboard */
+    HbKeyboardSctPortrait   				= 0x00000003 | HbTouchInputMask,                       /**< Special character selection keypad for portrait view */
+    HbKeyboardSctLandscape  				= 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
+    HbKeyboardHwr           				= 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask,    /**< Hand writing recognition keypad */
+    HbKeyboardVirtual12KeyLabels			= 0x00000006 | HbTouchInputMask,                       /**< Key labels for virtual 12 key keyboard */
+
+    HbKeyboardVirtual12KeyEmail	            = 0x00000008 | HbTouchInputMask,                       /**< Touchscreen version of conventional phone keypad in URL editor*/
+    HbKeyboardVirtual12KeyUrl      	        = 0x00000009 | HbTouchInputMask,                       /**< Touchscreen version of qwerty keyboard in Email editor */
+    HbKeyboardSctEmail	                    = 0x0000000A | HbTouchInputMask,                       /**< Url Special character selection keypad for portrait view */
+    HbKeyboardSctUrl      	                = 0x0000000B | HbTouchInputMask                        /**< Email Special character selection keypad for portrait view */
 };
 
 Q_DECLARE_FLAGS(HbKeyboardType, HbKeyboardTypeFlag)
@@ -266,6 +271,26 @@
     HbTypingCorrectionLevelHigh
 };
 
+/*!
+Writing speed of hwr.
+*/
+enum HbHwrWritingSpeed {
+    HbHwrSpeedVerySlow,
+    HbHwrSpeedSlow,
+    HbHwrSpeedNormal,
+    HbHwrSpeedFast,
+    HbHwrSpeedVeryFast
+};
+
+/*!
+Dedicated input mode of cangjie.
+*/
+enum HbCangjieDetailMode {
+    HbCangjieEasy,
+    HbCangjieNormal,
+    HbCangjieAdvanced
+};
+
 const int HbInputMinKeypressTimeout = 400;
 const int HbInputMaxKeypressTimeout = 3000;