diff -r bd83ceabce89 -r 5a1685599b76 textinput/peninputsplititut/inc/peninputsplititutdatamgr.h --- a/textinput/peninputsplititut/inc/peninputsplititutdatamgr.h Tue Sep 14 21:59:06 2010 +0300 +++ b/textinput/peninputsplititut/inc/peninputsplititutdatamgr.h Wed Sep 15 12:34:44 2010 +0300 @@ -205,21 +205,34 @@ inline void SetSpellMode(TBool aSpellMode); /** - * Set Indicator Data + * Set Spell Indicator Data * - * @since S60 v5.0 * @param aIndicatorData Indicator Data * @return void */ - inline void SetIndicatorData(TFepIndicatorInfo &aIndicatorData); + inline void SetSpellIndicatorData(TFepIndicatorInfo &aIndicatorData); + + /** + * Get Spell Indicator Data + * + * @return TFepIndicatorInfo + */ + inline TFepIndicatorInfo SpellIndicatorData(); /** - * Get Indicator Data + * Set Split Indicator Data * - * @since S60 v5.0 + * @param aIndicatorData Indicator Data + * @return void + */ + inline void SetSplitIndicatorData(TFepIndicatorInfo &aIndicatorData); + + /** + * Get Split Indicator Data + * * @return TFepIndicatorInfo */ - inline TFepIndicatorInfo IndicatorData(); + inline TFepIndicatorInfo SplitIndicatorData(); /** * Set update flag @@ -353,9 +366,23 @@ */ inline TBool IsNumericOnly() const; + /** + * Get the size of the screen + * + * @since S60 v5.0 + * @param none + * @return the size of the screen + */ + TRect screenSize(); + TRect iShiftIconRect; TRect iStarIconRect; + /** + * The star icon rect under number mode + */ + TRect iStarIconRectInNumMode; + private: /** * C++ constructor @@ -563,13 +590,18 @@ TRect iSpellArrowRightRectInner; //TRect iIndiPaneRectWithTextForPrtWest; - TRect iIndiPaneRectWithoutTextForPrtWest; + TRect iSpellIndiPaneRectWithoutTextForPrtWest; //TRect iIndiIconRectWithTextForPrtWest; - TRect iIndiIconRectWithoutTextForPrtWest; - TAknTextLineLayout iIndiTextForPrtWest; + TRect iSpellIconRectWithoutTextForPrtWest; + TAknTextLineLayout iSpellTextForPrtWest; + + TRect iSplitIndiPaneRect; + TRect iSplitIndiIconRect; + TAknTextLineLayout iSplitIndiText; TAknTextLineLayout iSpellBtnTextFormat; - TFepIndicatorInfo iIndicatorData; + TFepIndicatorInfo iSpellIndicatorData; + TFepIndicatorInfo iSplitIndicatorData; }; // --------------------------------------------------------------------------- @@ -636,27 +668,47 @@ } // --------------------------------------------------------------------------- -// CSplitItutDataMgr::SetIndicatorData +// CSplitItutDataMgr::SetSpellIndicatorData // --------------------------------------------------------------------------- // -inline void CSplitItutDataMgr::SetIndicatorData(TFepIndicatorInfo &aIndicatorData) +inline void CSplitItutDataMgr::SetSpellIndicatorData(TFepIndicatorInfo &aIndicatorData) { - iIndicatorData.iIndicatorImgID = aIndicatorData.iIndicatorImgID; - iIndicatorData.iIndicatorMaskID = aIndicatorData.iIndicatorMaskID; - iIndicatorData.iIndicatorTextImgID = aIndicatorData.iIndicatorTextImgID; - iIndicatorData.iIndicatorTextMaskID = aIndicatorData.iIndicatorTextMaskID; + iSpellIndicatorData.iIndicatorImgID = aIndicatorData.iIndicatorImgID; + iSpellIndicatorData.iIndicatorMaskID = aIndicatorData.iIndicatorMaskID; + iSpellIndicatorData.iIndicatorTextImgID = aIndicatorData.iIndicatorTextImgID; + iSpellIndicatorData.iIndicatorTextMaskID = aIndicatorData.iIndicatorTextMaskID; } // --------------------------------------------------------------------------- -// CSplitItutDataMgr::IndicatorData +// CSplitItutDataMgr::SplitIndicatorData +// --------------------------------------------------------------------------- +// +inline TFepIndicatorInfo CSplitItutDataMgr::SplitIndicatorData() + { + return iSplitIndicatorData; + } + +// --------------------------------------------------------------------------- +// CSplitItutDataMgr::SetSplitIndicatorData // --------------------------------------------------------------------------- // -inline TFepIndicatorInfo CSplitItutDataMgr::IndicatorData() +inline void CSplitItutDataMgr::SetSplitIndicatorData(TFepIndicatorInfo &aIndicatorData) { - return iIndicatorData; + iSplitIndicatorData.iIndicatorImgID = aIndicatorData.iIndicatorImgID; + iSplitIndicatorData.iIndicatorMaskID = aIndicatorData.iIndicatorMaskID; + iSplitIndicatorData.iIndicatorTextImgID = aIndicatorData.iIndicatorTextImgID; + iSplitIndicatorData.iIndicatorTextMaskID = aIndicatorData.iIndicatorTextMaskID; + } + +// --------------------------------------------------------------------------- +// CSplitItutDataMgr::SpellIndicatorData +// --------------------------------------------------------------------------- +// +inline TFepIndicatorInfo CSplitItutDataMgr::SpellIndicatorData() + { + return iSpellIndicatorData; } - // --------------------------------------------------------------------------- // CSplitItutDataMgr::IsValidLanguage // ---------------------------------------------------------------------------