--- a/textinput/peninputfingerhwrar/inc/peninputfingerhwrarnumsymboltable.h Thu Jul 15 19:01:13 2010 +0300
+++ b/textinput/peninputfingerhwrar/inc/peninputfingerhwrarnumsymboltable.h Thu Aug 19 10:15:25 2010 +0300
@@ -100,8 +100,7 @@
* sizechanged
*
*/
- void SizeChanged(const TRect aVirtualKeypadRect, const RArray<TRect> aBtnRects,
- const TInt aKeypadRow, const TInt aKeypadCol, TBool aIsLandscape = ETrue);
+ void SizeChanged(const TRect& aVirtualKeypadRect);
/**
* Load VKB image
@@ -122,12 +121,6 @@
inline CVirtualKeyboard* KeyPad(){return iNumKeypad;}
/**
- * Navigate page
- *
- */
- void UpdateNumSymbolTable(TInt aNumSctType = ENumSCTLatin);
-
- /**
* Construct from resource
* This funciton will be called when the resource has changed for example skin was changed
*/
@@ -140,7 +133,7 @@
* @param aNumMapping a string contains numbers and related char. max length is 16.
* @return none
*/
- void SetNumericMapping( const TDesC& aNumMapping );
+ void UpdateTableSymbol( const TDesC& aNumMapping );
/*
* set arabic number mode.
@@ -149,6 +142,14 @@
* @return none.
*/
void SetNativeNumMode(const TBool aIsNativeNumMode);
+
+ /**
+ * Update the virtual keys rect.
+ * @since s60 5.2.
+ * @param aCellRects keypad cell rects.
+ * @return None.
+ */
+ void UpdateAllVirtualKeysRect(const RArray<TRect> & aCellRects);
protected: //virtuals from CControlGroup (CFepUiBaseCtrl)
/**
@@ -207,20 +208,6 @@
*/
void CreateVirtualKeypadL();
- /**
- * create a new virtual key
- *
- */
- CVirtualKey* CreateVkbKeyL(TResourceReader& aReader, const TRect aKeyRect);
-
- /**
- * update the virtal key
- *
- */
- void UpdateVkbKeyL( CVirtualKey* aVirtualKey, TResourceReader& aReader,
- const TRect aKeyRect );
- void OnActivate();
-
/**
* Update the virtual key feedback
*
@@ -231,7 +218,14 @@
* Draw group control
*/
void Draw();
-
+
+private:
+ /**
+ * Refresh the symbol table
+ *
+ */
+ void RefreshNumSymbolTable();
+
/**
* Load background from resource
*
@@ -242,6 +236,13 @@
* map latin number to arabic number.
*/
TInt16 MapLatinNumAccordingToNumMode(TInt16 aUnicode);
+
+ /**
+ * Generate the char talbe according to the aNumMapping
+ *
+ */
+ HBufC* GenerateCharTable(const TDesC& aNumMapping);
+
private:
/**
* multipage viritual keyboard
@@ -254,12 +255,6 @@
*/
TBool iPopupVisible;
- /**
- * store the layout mode
- */
- TBool iIsLandscape;
-
- TInt iCurrentNumSCTType;
/*
* Default number mode.
*/