diff -r 67369d1b217f -r 6b8f3b30d0ec meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrpriorityfield.cpp --- a/meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrpriorityfield.cpp Tue May 25 12:23:16 2010 +0300 +++ b/meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrpriorityfield.cpp Wed Jun 09 09:22:57 2010 +0300 @@ -58,8 +58,8 @@ FUNC_LOG; iArray.ResetAndDestroy(); iArray.Close(); - - delete iIcon; + + delete iIcon; } // --------------------------------------------------------------------------- @@ -82,7 +82,7 @@ // void CESMRPriorityField::ConstructL() { - FUNC_LOG; + FUNC_LOG; iLabel = CMRLabel::NewL(); iLabel->SetParent( this ); CESMRField::ConstructL( iLabel ); // ownership transfered @@ -98,7 +98,7 @@ void CESMRPriorityField::InitializeL() { FUNC_LOG; - NMRColorManager::SetColor( *iLabel, + NMRColorManager::SetColor( *iLabel, NMRColorManager::EMRMainAreaTextColor ); } @@ -144,7 +144,7 @@ } } // reader - CleanupStack::PopAndDestroy(); // codescanner::cleanup + CleanupStack::PopAndDestroy(); // codescanner::cleanup } // --------------------------------------------------------------------------- @@ -172,7 +172,7 @@ void CESMRPriorityField::SetOutlineFocusL( TBool aFocus ) { FUNC_LOG; - CESMRField::SetOutlineFocusL ( aFocus ); + CESMRField::SetOutlineFocusL ( aFocus ); iLabel->SetFocus( aFocus ); //Focus gained @@ -193,24 +193,25 @@ TAknLayoutRect rowLayoutRect = NMRLayoutManager::GetFieldRowLayoutRect( rect, 1 ); rect = rowLayoutRect.Rect(); - + TAknWindowComponentLayout iconLayout = - NMRLayoutManager::GetWindowComponentLayout( + NMRLayoutManager::GetWindowComponentLayout( NMRLayoutManager::EMRLayoutTextEditorIcon ); AknLayoutUtils::LayoutImage( iIcon, rect, iconLayout ); - + TAknLayoutRect bgLayoutRect = - NMRLayoutManager::GetLayoutRect( + NMRLayoutManager::GetLayoutRect( rect, NMRLayoutManager::EMRLayoutTextEditorBg ); TRect bgRect( bgLayoutRect.Rect() ); // Move focus rect so that it's relative to field's position. bgRect.Move( -Position() ); SetFocusRect( bgRect ); - - TAknLayoutText labelLayout = - NMRLayoutManager::GetLayoutText( - rect, NMRLayoutManager::EMRTextLayoutTextEditor ); - iLabel->SetRect( labelLayout.TextRect() ); + + TAknTextComponentLayout editorLayout = + NMRLayoutManager::GetTextComponentLayout( + NMRLayoutManager::EMRTextLayoutTextEditor ); + + AknLayoutUtils::LayoutLabel( iLabel, rect, editorLayout ); } // --------------------------------------------------------------------------- @@ -265,7 +266,7 @@ aCommand == EAknCmdOpen ) { HandleTactileFeedbackL(); - + ExecutePriorityQueryL(); isUsed = ETrue; } @@ -381,7 +382,7 @@ CESMRPriority* priority = iArray[ aIndex ]; iLabel->SetTextL ( priority->Text ( ) ); - NMRBitmapManager::TMRBitmapId bitmapId( + NMRBitmapManager::TMRBitmapId bitmapId( NMRBitmapManager::EMRBitmapPriorityNormal ); switch ( priority->Id() ) @@ -408,7 +409,7 @@ ASSERT(EFalse); break; } - + delete iIcon; iIcon = NULL; iIcon = CMRImage::NewL( bitmapId );