diff -r f5a1e66df979 -r a47de9135b21 textinput/peninputgenericitut/inc/peninputgenericitutdatamgr.h --- a/textinput/peninputgenericitut/inc/peninputgenericitutdatamgr.h Fri Feb 19 23:09:27 2010 +0200 +++ b/textinput/peninputgenericitut/inc/peninputgenericitutdatamgr.h Fri Mar 12 15:44:07 2010 +0200 @@ -74,6 +74,7 @@ void SetCase(TInt aCase); TAny* RequestData(TInt aDataType); + TAny* RequestDataForPortraitWest(TInt aDataType); inline CPtiEngine* PtiEngine(); @@ -100,6 +101,9 @@ inline void SetLatinOnly( TBool aLatinOnly ); + inline TBool IsPortraitWest(); + + TBool IsChineseGlobalLanguage(); void SetUpdate(TBool aNeedUpdate); TBool IsUpdate() const; // when user press navi-next button on dropdownlist, there is need to @@ -164,6 +168,14 @@ TInt iIcfTextHeightCn; TRect iShiftIconRect; + TInt iIcfTextLeftMarginForPrtWest; + TInt iIcfTextRightMarginForPrtWest; + TInt iIcfTextTopMarginForPrtWest; + TInt iIcfTextBottomMarginForPrtWest; + TInt iIcfTextLineSpaceMarginForPrtWest; + TInt iIcfTextHeightForPrtWest; + TRect iShiftIconRectForPrtWest; + TInt iSpellIcfTextHeightForPrtWest; private: CGenericItutDataMgr(MItutLayoutContext* aLayoutContext, CPtiEngine* aPtiEngine ); @@ -188,6 +200,7 @@ TInt HindiKeypadResourceId(); TInt KoreanKeypadResourceId(); + void ReadLafInfoForPrtWest(); private: // data member RPointerArray iSubscriberList; @@ -324,6 +337,24 @@ TAknTextLineLayout iBtnTextFormat1; TFepIndicatorInfo iIndicatorData; + TRect iSpellQueryPaneRectForPrtWest; + TRect iOKRectForPrtWest; + TRect iCancelRectForPrtWest; + TAknTextLineLayout iBtnOKTextForPrtWest; + TAknTextLineLayout iBtnCancelTextForPrtWest; + TRect iSpellICFRectForPrtWest; + TRect iSpellICFBtnRectForPrtWest; + TRect iSpellICFBtnInnerRectForPrtWest; + TAknTextLineLayout iSpellText1ForPrtWest; + TAknTextLineLayout iSpellText2ForPrtWest; + TAknTextLineLayout iSpellText3ForPrtWest; + TRect iSpellIndiPaneWithoutTextForPrtWest; + TRect iSpellIndiIconWithoutTextForPrtWest; + CFont* iSpellIcfFontForPrtWest; + TRect iSpellArrowLeftRectForPrtWest; + TRect iSpellArrowLeftInnerRectForPrtWest; + TRect iSpellArrowRightRectForPrtWest; + TRect iSpellArrowRightInnerRectForPrtWest; RPointerArray iMenuItemList; TBool iNeedUpdate; @@ -337,6 +368,37 @@ TBool iPlusCharFlagChanged; TBool iNumberOnly; + TRect iLayoutRectForPrtWest; + TPoint iLayoutOffsetForPrtWest; + RArray iKeypadCellRectsForPrtWest; + TRect iKeypadRectForPrtWest; + TAknTextLineLayout iVkAlphaText1ForPrtWest; + TAknTextLineLayout iVkAlphaText2ForPrtWest; + TAknTextLineLayout iVkAlphaText3ForPrtWest; + TAknTextLineLayout iVkNumTextForPrtWest; + TRect iCloseRectForPrtWest; + TRect iCloseInnerRectForPrtWest; + TRect iArrowLeftRectForPrtWest; + TRect iArrowLeftInnerRectForPrtWest; + TRect iOptionsRectForPrtWest; + TRect iOptionInnerRectForPrtWest; + TRect iArrowRightRectForPrtWest; + TRect iArrowRightInnerRectForPrtWest; + TRect iBackspaceRectForPrtWest; + TRect iBackspaceInnerRectForPrtWest; + TRect iPreviewWndRectForPrtWest; + TRect iPreviewWndInnerRectForPrtWest; + TAknTextLineLayout iPreviewWndTextForPrtWest; + CFont* iBubbleFontForPrtWest; + TRect iIcfRectForPrtWest; + CFont* iIcfFontForPrtWest; + TInt iIcfTextAlignmentForPrtWest; + + TRect iIndiPaneRectWithTextForPrtWest; + TRect iIndiPaneRectWithoutTextForPrtWest; + TRect iIndiIconRectWithTextForPrtWest; + TRect iIndiIconRectWithoutTextForPrtWest; + TAknTextLineLayout iIndiTextForPrtWest; }; inline CPtiEngine* CGenericItutDataMgr::PtiEngine() @@ -393,6 +455,10 @@ iLatinOnly = aLatinOnly; } +inline TBool CGenericItutDataMgr::IsPortraitWest() + { + return !iLandScape && !IsChinese(); + } inline TBool CGenericItutDataMgr::IsValidLanguage(TInt aLanguage) { return (aLanguage != ELangTest && aLanguage != ELangNone);