--- a/textinput/peninputsplititut/src/peninputsplititutwindow.cpp Wed Sep 15 12:34:44 2010 +0300
+++ b/textinput/peninputsplititut/src/peninputsplititutwindow.cpp Wed Oct 13 14:55:58 2010 +0300
@@ -43,6 +43,7 @@
#include "peninputcommonbgctrl.h"
_LIT(KBmpFileName, "z:\\resource\\apps\\peninputsplititut.mbm");
+_LIT(KEmptyString, "");
const TInt KImageMajorSkinId = EAknsMajorGeneric;
const TUint KDefaultSpellTextColor = 0;
@@ -261,13 +262,6 @@
iStandardItutKp->SetTextLineLayout(
TItutDataConverter::AnyToTextLine(iDataMgr->RequestData(EKeypadRightTextLine3)),
EPosRight3);
-
- TRect* iconRect = static_cast<TRect*>( iDataMgr->RequestData( EStarIconRect ));
- // Set the star icon rect
- iStandardItutKp->SetStarIconRect( *iconRect );
- iconRect = static_cast<TRect*>( iDataMgr->RequestData( EShiftIconRect ));
- // Set the shift icon rect
- iStandardItutKp->SetShiftIconRect( *iconRect );
TResourceReader reader;
CCoeEnv::Static()->CreateResourceReaderLC(reader, aResId);
@@ -791,7 +785,7 @@
KAknsIIDQsnFrInputPreviewSideR );
iICF->SetMsgBubbleCtrlSize(TSize(iBubbleSize.iW,iBubbleSize.iH));
- iICF->MsgBubbleCtrl()->SetTextL( KNullDesC );
+ iICF->MsgBubbleCtrl()->SetTextL( KEmptyString );
iICF->SetTextMargin( iDataMgr->iIcfTextLeftMargin,
iDataMgr->iIcfTextRightMargin,
@@ -800,28 +794,9 @@
iICF->SetLineSpace( iDataMgr->iIcfTextLineSpaceMargin );
- SetSpellIndiBubble();
+ SetIndiBubble();
iICF->Hide( ETrue );
}
-
-// ---------------------------------------------------------------------------
-// CSplitItutWindow::CreateSplitIndiBubbleL
-// ---------------------------------------------------------------------------
-//
-void CSplitItutWindow::CreateSplitIndiBubbleL()
- {
- // char count bubble
- TRect bubbleRect = TItutDataConverter::AnyToRect(iDataMgr->RequestData(ESplitIndiPaneRect));
- iSplitIndiBubble = CBubbleCtrl::NewL(bubbleRect,iLayoutOwner,ECtrlIdSplitIndiBubble);
- iSplitIndiBubble->SetTextFormat(TItutDataConverter::AnyToTextLine(iDataMgr->RequestData(ESplitIndiTextLine)));
- iSplitIndiBubble->SetTextColorIndex( EAknsCIQsnTextColorsCG67 );
- iSplitIndiBubble->SetBitmapParam(NULL,
- NULL,
- KAknsIIDQsnFrInputPreviewSideL,
- KAknsIIDQsnFrInputPreviewMiddle,
- KAknsIIDQsnFrInputPreviewSideR);
- AddControlL(iSplitIndiBubble);
- }
// ---------------------------------------------------------------------------
@@ -834,7 +809,6 @@
CreateAllButtonL();
CreateItutKeypadL();
CreateICFL();
- CreateSplitIndiBubbleL();
}
// ---------------------------------------------------------------------------
@@ -974,7 +948,6 @@
{
// resize all controls
SetCtrlRect(iStandardItutKp, EKeypadRect);
- SetCtrlRect(iSplitIndiBubble, ESplitIndiPaneRect);
iStandardItutKp->SetTextLineLayout(
TItutDataConverter::AnyToTextLine(iDataMgr->RequestData(EKeypadLeftTextLine)),
@@ -989,13 +962,6 @@
TItutDataConverter::AnyToTextLine(iDataMgr->RequestData(EKeypadRightTextLine3)),
EPosRight3);
- TRect* iconRect = static_cast<TRect*>( iDataMgr->RequestData( EStarIconRect ));
- // Set the star icon rect
- iStandardItutKp->SetStarIconRect( *iconRect );
- iconRect = static_cast<TRect*>( iDataMgr->RequestData( EShiftIconRect ));
- // Set the shift icon rect
- iStandardItutKp->SetShiftIconRect( *iconRect );
-
RPointerArray<CVirtualKey>& keys =
const_cast<RPointerArray<CVirtualKey>&>(iStandardItutKp->KeyArray());
RArray<TRect>& cellRects =
@@ -1490,44 +1456,9 @@
}
-void CSplitItutWindow::UpdateSplitIndiBubbleL( TUint8* aData )
+void CSplitItutWindow::UpdateIndiBubbleL( TUint8* aData )
{
- RDesReadStream readStream;
- TFepIndicatorInfo indicatorData;
-
- TPtr8 countPtr( aData, 4*sizeof(TInt), 4*sizeof(TInt) );
- readStream.Open(countPtr);
- CleanupClosePushL(readStream);
-
- indicatorData.iIndicatorImgID = readStream.ReadInt32L();
- indicatorData.iIndicatorMaskID = readStream.ReadInt32L();
- indicatorData.iIndicatorTextImgID = readStream.ReadInt32L();
- indicatorData.iIndicatorTextMaskID = readStream.ReadInt32L();
-
- CleanupStack::PopAndDestroy(&readStream);
-
- if ( indicatorData.iIndicatorImgID != 0 &&
- indicatorData.iIndicatorMaskID != 0 &&
- indicatorData.iIndicatorTextImgID != 0 &&
- indicatorData.iIndicatorTextMaskID != 0)
- {
- iDataMgr->SetSplitIndicatorData(indicatorData);
- iImDimensionSet = ETrue;
-
- SetBubbleImageL(*iSplitIndiBubble, TItutDataConverter::AnyToRect(
- iDataMgr->RequestData(ESplitIndiIconRect)),
- indicatorData.iIndicatorImgID,
- indicatorData.iIndicatorMaskID,
- indicatorData.iIndicatorTextImgID,
- indicatorData.iIndicatorTextMaskID);
- iSplitIndiBubble->Hide(EFalse);
- }
-
- }
-
-void CSplitItutWindow::UpdateSpellIndiBubbleL( TUint8* aData )
- {
- // if icf is hidden, not call updateindibubblel
+ // if icf is hidden, not call updateindibubblel
if( iICF->Hiden() )
{
return;
@@ -1551,16 +1482,13 @@
indicatorData.iIndicatorTextImgID != 0 &&
indicatorData.iIndicatorTextMaskID != 0)
{
- iDataMgr->SetSpellIndicatorData( indicatorData );
+ iDataMgr->SetIndicatorData( indicatorData );
iImDimensionSet = ETrue;
- SetBubbleImageL(*iICF->MsgBubbleCtrl(),
- TItutDataConverter::AnyToRect(
- iDataMgr->RequestData( ESpellIndiIconWithoutTextRect )),
- indicatorData.iIndicatorImgID,
- indicatorData.iIndicatorMaskID,
- indicatorData.iIndicatorTextImgID,
- indicatorData.iIndicatorTextMaskID );
+ SetIndiBubbleImageL( indicatorData.iIndicatorImgID,
+ indicatorData.iIndicatorMaskID,
+ indicatorData.iIndicatorTextImgID,
+ indicatorData.iIndicatorTextMaskID );
TBuf<KTextLength> text;
iICF->MsgBubbleCtrl()->GetText( text );
@@ -1674,12 +1602,10 @@
}
// ---------------------------------------------------------------------------
-// CSplitItutWindow::SetBubbleImageL
+// CSplitItutWindow::SetIndiBubbleImageL
// ---------------------------------------------------------------------------
//
-void CSplitItutWindow::SetBubbleImageL( CBubbleCtrl& aBubble,
- const TRect& aRect,
- const TInt aImgID1,
+void CSplitItutWindow::SetIndiBubbleImageL( const TInt aImgID1,
const TInt aMaskID1,
const TInt aImgID2,
const TInt aMaskID2 )
@@ -1724,7 +1650,10 @@
AknIconUtils::GetContentDimensions( bmp2, iIndicatorTextSize );
- TRect boundRect = aRect;
+ TRect boundRect;
+ boundRect = TItutDataConverter::AnyToRect(
+ iDataMgr->RequestData( EIndiIconWithoutTextRect ));
+
TRect imgrect, textrect;
CalIndicatorRect( boundRect, imgrect, textrect, EIndiAlignCenter );
@@ -1736,11 +1665,11 @@
CFbsBitmap* bmp3 = AknPenImageUtils::CombineTwoImagesL(bmp1, bmp2, EColor256);
CFbsBitmap* mask3 = AknPenImageUtils::CombineTwoImagesL(mask1, mask2, EGray256);
- aBubble.SetBitmapParam( bmp3, mask3,
- KAknsIIDQsnFrInputPreviewSideL,
- KAknsIIDQsnFrInputPreviewMiddle,
- KAknsIIDQsnFrInputPreviewSideR );
-
+ iICF->MsgBubbleCtrl()->SetBitmapParam( bmp3, mask3,
+ KAknsIIDQsnFrInputPreviewSideL,
+ KAknsIIDQsnFrInputPreviewMiddle,
+ KAknsIIDQsnFrInputPreviewSideR );
+
CleanupStack::PopAndDestroy( mask2 );
CleanupStack::PopAndDestroy( bmp2 );
CleanupStack::PopAndDestroy( mask1 );
@@ -1748,43 +1677,17 @@
}
// ---------------------------------------------------------------------------
-// CSplitItutWindow::SetSplitIndiBubble
+// CSplitItutWindow::SetIndiBubble
// ---------------------------------------------------------------------------
//
-void CSplitItutWindow::SetSplitIndiBubble()
+void CSplitItutWindow::SetIndiBubble()
{
- if (iSplitIndiBubble)
- {
- TAknTextLineLayout textLine = TItutDataConverter::AnyToTextLine(
- iDataMgr->RequestData(ESplitIndiTextLine));
- TRect bubbleRect = TItutDataConverter::AnyToRect(
- iDataMgr->RequestData(ESplitIndiPaneRect));
- TRect iconRect = TItutDataConverter::AnyToRect(
- iDataMgr->RequestData(ESplitIndiIconRect));
- TSize offset;
- offset.iHeight = iconRect.iTl.iY - bubbleRect.iTl.iY;
- offset.iWidth = iconRect.iTl.iX - bubbleRect.iTl.iX;
- TSize size(iconRect.Width(), iconRect.Height());
-
- iSplitIndiBubble->SetRect(bubbleRect);
- iSplitIndiBubble->SetIconOffsetAndSize(offset, size);
- iSplitIndiBubble->SetTextFormat(textLine);
- iSplitIndiBubble->SetTextColorIndex(EAknsCIQsnTextColorsCG67);
- }
- }
-
-// ---------------------------------------------------------------------------
-// CSplitItutWindow::SetSpellIndiBubble
-// ---------------------------------------------------------------------------
-//
-void CSplitItutWindow::SetSpellIndiBubble()
- {
- if (iICF)
+ if ( iICF )
{
TRect bubbleRect = TItutDataConverter::AnyToRect(
- iDataMgr->RequestData( ESpellIndiPaneWithoutTextRect ));
+ iDataMgr->RequestData( EIndiPaneWithoutTextRect ));
TRect iconRect = TItutDataConverter::AnyToRect(
- iDataMgr->RequestData( ESpellIndiIconWithoutTextRect ));
+ iDataMgr->RequestData( EIndiIconWithoutTextRect ));
TSize offset;
offset.iHeight = iconRect.iTl.iY - bubbleRect.iTl.iY;