MCL/sf/mw/inputmethods: comparison textinput/peninputfingerhwrar/src/peninputfingerhwrarsymboltable.cpp

equal deleted inserted replaced

-:f5a1e66df979
+:a47de9135b21
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
-* Description:  Implementation of char range selector.
+* Description:  Implementation of symbol table.
 *
 */
 // INCLUDE
 #include <s32mem.h>
 #include <barsread.h>
 #include <aknlayoutscalable_apps.cdl.h>
 #include <aknlayoutscalable_avkon.cdl.h>
-#include <AknLayoutDef.h>
+#include <aknlayoutdef.h>
-#include <AknUtils.h>
+#include <aknutils.h>
-#include <AknsUtils.h>
+#include <aknsutils.h>
-#include <AknIconUtils.h>
+#include <akniconutils.h>
 #include <aknfeppeninputenums.h>
-#include <AknFepGlobalEnums.h>
+#include <aknfepglobalenums.h>
 #include <peninputlayout.h>
 #include <peninputrepeatbutton.h>
-#include <peninputmultiimagebutton.h>
-#include <peninputpluginutils.h>
 #include "hbufcarrayar.h"
 #include "peninputfingerhwrarevent.h"
 #include "peninputfingerhwrarcontrolid.h"
 #include "peninputfingerhwrarstoreconstants.h"
 // ---------------------------------------------------------------------------
 //
 void CPeninputArabicFingerHwrSymbolTable::OpenSymbolTable()
 {
 CapturePointer( ETrue );
 iPopupVisible = ETrue;
-iPointerMoveBack = EFalse;
-	Draw();
-UpdateArea(iRect );
 	UiLayout()->LockArea(UiLayout()->Rect(),this);
-}
+NavigatePage(0,EPagePosPageNo);
+	}
 // ---------------------------------------------------------------------------
 // cancel the popup.
 // ---------------------------------------------------------------------------
 //
 void CPeninputArabicFingerHwrSymbolTable::CloseSymbolTable()
 {
 CapturePointer( EFalse );
-iPenDownCtrl = NULL;
 iPopupVisible = EFalse;
 UiLayout()->UnLockArea(UiLayout()->Rect(),this);
 }
 // ---------------------------------------------------------------------------
 CFepUiBaseCtrl* CPeninputArabicFingerHwrSymbolTable::HandlePointerDownEventL(
 const TPoint& aPoint )
 {
 CancelPointerDownL();
 CFepUiBaseCtrl* ctrl = CControlGroup::HandlePointerDownEventL( aPoint );
-iPenDownCtrl = ctrl;
 if(!ctrl)
 	   {
 	   ReportEvent(EHwrEventOutsideEvent);
 	   }
 	else
 {
-	   ctrl->Draw();
 	   ctrl->UpdateArea(ctrl->Rect(),EFalse);
 	   }
 return ctrl;
 }
 {
 CFepUiBaseCtrl* ctrl = CControlGroup::HandlePointerUpEventL( aPoint );
 if(ctrl)
 	   {
-	   ctrl->Draw();
 	   ctrl->UpdateArea(ctrl->Rect(),EFalse);
 	   }
 	return ctrl;
 }
 const TPoint& aPoint )
 {
 	CFepUiBaseCtrl* ctrl = CControlGroup::HandlePointerMoveEventL( aPoint );
 	if(ctrl)
 	    {
-	    ctrl->Draw();
 		ctrl->UpdateArea(ctrl->Rect(),EFalse);
-		iPointerMoveBack = ETrue;
 		}
 	else
 	    {
-	    if(iPointerMoveBack)
+	    CControlGroup::HandlePointerLeave(aPoint);
-	        {
+	    UpdateArea(iRect,EFalse);
-if(iPenDownCtrl)
-{
-iPenDownCtrl->HandlePointerLeave(aPoint);
-}
-iPointerMoveBack = EFalse;
-	        }
 	    }
 return ctrl;
 }
-void CPeninputArabicFingerHwrSymbolTable::HandlePointerLeave(const TPoint& aPoint)
-{
-CControlGroup::HandlePointerLeave(aPoint);
-Draw();
-UpdateArea(Rect(),EFalse);
-}
 // ---------------------------------------------------------------------------
 // C++ constructor.
 // ---------------------------------------------------------------------------
 //
 CPeninputArabicFingerHwrSymbolTable::CPeninputArabicFingerHwrSymbolTable(
 TFontSpec spec;
 iMutiPageKeypad = CMultiPageVirtualKeyboard::NewL(
 TRect(0,0,0,0),
 UiLayout(),
-EHwrCtrlIdSctpad,
+EHwrCtrlIdSymbolTableVkb,
 spec );
 AddControlL( iMutiPageKeypad );
 iMutiPageKeypad->AddEventObserver( UiLayout() );
 }
 void CPeninputArabicFingerHwrSymbolTable::OnActivate()
 {
 CControlGroup::OnActivate();
-	if(IsPopup())
+	/*if(IsPopup())
 	    {
 	    CapturePointer( ETrue );
 	    NavigatePage(0,EPagePosPageNo);
-		}
+		}*/
 	}
 void CPeninputArabicFingerHwrSymbolTable::LoadVkbKeyImageL(TInt aResId, const TSize& aKeySize)
 {
 	TResourceReader reader;
 default:
 break;
 }
-	iMutiPageKeypad->Draw();
 UpdatePageButtonsUi();
-UpdateAllVirtualKeysFeedback( EFingerHwrSymbolRange );
+Draw();
-	iEnterBtn->Draw();
+UpdateAllVirtualKeysFeedback();
-	iSpaceBtn->Draw();
 	UpdateArea(iRect);
 }
 // ---------------------------------------------------------------------------
 // sync sct paging buttons.
 // ---------------------------------------------------------------------------
 //  update feedback state of all virtual keys.
 // ---------------------------------------------------------------------------
 //
-void CPeninputArabicFingerHwrSymbolTable::UpdateAllVirtualKeysFeedback( TInt aType )
+void CPeninputArabicFingerHwrSymbolTable::UpdateAllVirtualKeysFeedback()
 {
-TBool isSctpad = ( aType == EFingerHwrSymbolRange ) ? ETrue : EFalse;
 //update sctpad keys
 TInt keyCount = iMutiPageKeypad->KeyArray().Count();
 TInt pageSize = iMutiPageKeypad->PageSize();
 TInt curPage = iMutiPageKeypad->CurPageIndex();
 for ( TInt i = 0; i < keyCount; i++ )
 {
 CVirtualKey* vk = iMutiPageKeypad->KeyArray()[i];
 TInt page = i / pageSize;
-TBool enable = !vk->Dimmed() &&  isSctpad && ( page == curPage );
+TBool enable = !vk->Dimmed() && ( page == curPage );
 iMutiPageKeypad->EnableKeyFeedback( vk, enable );
 }
 }
 // End Of File

branch	RCL_3
changeset 5	a47de9135b21
parent 3	f5a1e66df979
child 6	6ceef9a83b1a