MCL/sf/mw/classicui: comparison uifw/AvKon/src/aknnotecontrol.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 #include <eikdialg.h>
 #include <eikdialogext.h>
 #include <touchfeedback.h>
 #include <AknTasHook.h> // for testability hooks
-#include "akntrace.h"
 const TInt KRate = 95;    // 95% similar rate
 const TInt KFullColor = 255;
 // ---------------------------------------------
 // CONSTRUCTION - DESTRUCTION
 *
 *
 */
 EXPORT_C CAknNoteControl::~CAknNoteControl()
 {
-_AKNTRACE_FUNC_ENTER;
 AKNTASHOOK_REMOVE();
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
 feedback->RemoveFeedbackForControl( this );
 }
 delete iAttributes;
 delete iLineWidths;
-_AKNTRACE_FUNC_EXIT;
 }
 void CAknNoteControl::ConstructFromResourceL(TResourceReader &aRes)
 {
 // -----------------------------------------
 //  CCOECONTROL METHODS
 // -----------------------------------------
 void CAknNoteControl::Draw(const TRect& /*aRect*/) const
 {
-_AKNTRACE_FUNC_ENTER;
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 MAknsControlContext* cc = iAttributes->iBgContext;
 #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS
 }
 if (iImageHasShadow)
 {
 iShadowRect.DrawRect( gc );
 }
-_AKNTRACE_FUNC_EXIT;
 }
 EXPORT_C void CAknNoteControl::HandlePointerEventL(const TPointerEvent& aPointerEvent)
 {
 CAknControl::HandlePointerEventL(aPointerEvent);
 * Do not call this method when you need to do layout for reasons
 * different than the size or position of the control changing.
 * Call Layout instead.
 */
 void CAknNoteControl::SizeChanged()
 {
-_AKNTRACE_FUNC_ENTER;
 DoLayout();
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Code shared between SizeChanged() and Layout().
 *
 */
 void CAknNoteControl::DoLayout()
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("iNoteLayout = %d", iNoteLayout);
 TextControl()->SetRect(LayoutRect());
 switch(iNoteLayout)
 {
 case EGeneralLayout:
 GeneralNoteLayout();
 ETouchFeedbackVibra );
 feedback->SetFeedbackArea( this, 0, Rect(), spec );
 delete spec;
 }
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 *
 * This is used by a dialog to layout the control correctly.
 *
 */
 void CAknNoteControl::WindowLayout( TAknWindowLineLayout& aLayout ) const
 {
-_AKNTRACE_FUNC_ENTER;
-_AKNTRACE("iNoteLayout = %d", iNoteLayout);
 TIndex laf(NumberOfLines());
 AknLayoutUtils::TAknCbaLocation cbaLocation( AknLayoutUtils::CbaLocation() );
 TInt variety( 0 );
 switch(iNoteLayout)
 aLayout = AknLayoutScalable_Avkon::popup_note_window( variety +
 laf.PopupNoteWindow() );
 break;
 }
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Return the note height
 *
 for (TInt i=0; i < nLines; i++)
 {
 AknLayoutUtils::LayoutLabel(TextControl()->Line(i),LayoutRect(),
 AKN_LAYOUT_TEXT_Note_with_an_image_pop_up_window_texts_Line_1(
-lafIndex.NWIPWindowTextsLine1Left(i),lafIndex.NWIPWindowTextsLine1Right(i),
+lafIndex.NWIPWindowTextsLine1L(i),lafIndex.NWIPWindowTextsLine1R(i),
 lafIndex.NWIPWindowTextsLine1B(i),lafIndex.NWIPWindowTextsLine1W(i)));
 if (!error)
 {
 // Ignore error
 TIndex lafIndex(KINMaxNumLines,Icon()!=NULL,imageSize);
 for (TInt i=0; i < KINMaxNumLines; i++)
 {
 TAknTextLineLayout lay = AKN_LAYOUT_TEXT_Note_with_an_image_pop_up_window_texts_Line_1(
-lafIndex.NWIPWindowTextsLine1Left(i),lafIndex.NWIPWindowTextsLine1Right(i),
+lafIndex.NWIPWindowTextsLine1L(i),lafIndex.NWIPWindowTextsLine1R(i),
 lafIndex.NWIPWindowTextsLine1B(i),lafIndex.NWIPWindowTextsLine1W(i));
 text.LayoutText(LayoutRect(), lay);
 TInt width = text.TextRect().Width();
 iLineWidths->AppendL(width,1);
 * @see CAknTextControl
 */
 EXPORT_C void CAknNoteControl::ResetText()
 {
 // This can not Leave so no need to use TRAP
-TRAP_IGNORE(Attributes()->SetTextL(KNullDesC));
+Attributes()->SetTextL(KNullDesC);
 Layout();
 }
 /**
 * Set whole text for the note control.
 * The dialog will not be resized.
 *
 */
 EXPORT_C void CAknNoteControl::SetTextL(const TDesC& aText, TInt aLineNum)
 {
-_AKNTRACE_FUNC_ENTER;
 TAknLayoutText textRect;
-_AKNTRACE(_L("SetTextL = %S"), &aText);
 if ( iNoteLayout == ENotificationWithGraphicsLayout || iNoteLayout == ETextualNotificationLayout )
 {
 textRect.LayoutText(LayoutRect(), AKN_LAYOUT_TEXT_Notification_pop_up_window_texts__text__Line_1(1));
 }
 else
 const CFont *font = textRect.Font();
 Attributes()->SetTextL(aText, aLineNum, font, iLineWidths);
 Layout();
-_AKNTRACE_FUNC_EXIT;
 }
 /**
 * Set the number inside the note text. The text must have been
 * previously set via resource or via SetTextL and must have a
 * Return Left index into table "Note With Image Popup Window Texts Line 1"
 * Index depends on number of text lines, whether or not there is a
 * number type indication (NTI). See table in *.lay and
 * LAF specs for working out indexes.
 */
-TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1Left(TInt aLineNum) const
+TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1L(TInt aLineNum) const
 {
 SelfTest();
-static const TInt  KNWIPWindowTextsLine1IndexLeft[2][3] =
+static const TInt  KNWIPWindowTextsLine1IndexL[2][3] =
 {
 {0, 0, 0}, //NO NTI
 {0, 0, 2}  //NTI
 };
-return KNWIPWindowTextsLine1IndexLeft[HasNtiIndex()][aLineNum];
+return KNWIPWindowTextsLine1IndexL[HasNtiIndex()][aLineNum];
 }
 /**
 * Return Right index into table "Note With Image Popup Window Texts Line 1"
 * Index depends on number of text lines and image size.
 * Table has 3 dimensions:-
 * - Dimension 1 is the line number
 * - Dimension 2 is the image width
 * - Dimension 3 is the image height
 */
-TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1Right(TInt aLineNum) const
+TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1R(TInt aLineNum) const
 {
 SelfTest();
-static const TInt  KNWIPWindowTextsLine1IndexRight[3][5][5] =
+static const TInt  KNWIPWindowTextsLine1IndexR[3][5][5] =
 {
 {{0, 0, 0, 0, 0}, {0, 3, 3, 3, 3}, {0, 5, 5, 5, 5}, {0, 7, 7, 7, 7}, {0, 9, 9, 9, 9} }, //FIRST LINE
 {{0, 0, 0, 0, 0}, {0, 3, 3, 3, 3}, {0, 5, 5, 5, 5}, {0, 7, 7, 7, 7}, {0, 9, 9, 9, 9} }, //SECOND LINE
 {{0, 0, 0, 0, 0}, {0, 0, 0, 3, 3}, {0, 0, 0, 5, 5}, {0, 0, 0, 7, 7}, {0, 0, 0, 9, 9} }  //THIRD LINE
 };
-return KNWIPWindowTextsLine1IndexRight[aLineNum][ImageWidthIndex()][ImageHeightIndex()];
+return KNWIPWindowTextsLine1IndexR[aLineNum][ImageWidthIndex()][ImageHeightIndex()];
 }
 /**
 * Return Bottom index into table "Note With Image Popup Window Texts Line 1"

branch	RCL_3
changeset 19	aecbbf00d063
parent 18	fcdfafb36fe7
child 20	d48ab3b357f1