FCL/sf/app/utils: comparison extras/about/src/AboutContainer.cpp

equal deleted inserted replaced

-:2e7bab7ab409
+:9d6a662e71d9
 /*
 * Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0""
 * which accompanies this distribution, and is available
 #include "about_test.hrh"
 #include "AboutResourceLoader.h"
 #include "AboutResource.h"
 #include <layoutmetadata.cdl.h>
 #include <about.rsg>
+#include <about_oss_text.rsg>
 #include <about_oss_part_text.rsg>
 #include <about_oss_other_text.rsg>
 #include <eiksbfrm.h>
 #include <eikscrlb.h>
 #include <eikrted.h>
 // CONSTANTS
 const TInt KAboutOSSIndex = 14; // For adding blank break between OSS Text and real Text
 _LIT( KAboutPanicCategory, "About" );
 // Resource files for about application loading real data because this rsc file must be loaded by yourself
+_LIT( KRSCDirAndFileFirst, "Z:\\resource\\apps\\about_oss_text.rsc" );
 _LIT( KRSCDirAndFile, "Z:\\resource\\apps\\about_oss_part_text.rsc" );
 _LIT( KRSCDirAndFileAdd, "Z:\\resource\\apps\\about_oss_other_text.rsc" );
 enum TAboutPanic
 void CAboutContainer::ConstructL( const TRect& aRect )
 {
 CreateWindowL();
 iScrollBarDragged = EFalse;
 iBreakFlag = EFalse;
-iSkinContext = NULL;
+	iSkinContext = NULL;
-iText = NULL;
+	iText = NULL;
-iImages = NULL;
+	iImages = NULL;
-iScreenStarts = NULL;
+	iScreenStarts = NULL;
-iSBFrame = NULL;
+	iSBFrame = NULL;
-iHandleFlag = ETrue;
 iLoader = CAboutResourceLoader::NewL( iEikonEnv, this );
-CalculateL( aRect );
+CalculateL(aRect);
 ActivateL();
 }
 // -----------------------------------------------------------------------------
 // CAboutContainer::~CAboutContainer()
 // -----------------------------------------------------------------------------
 CAboutContainer::~CAboutContainer()
 {
-delete iSkinContext;
+	delete iSkinContext;
 delete iSBFrame;
 delete iScreenStarts;
 delete iIcon;
 if ( iText )
 {
 iText->ResetAndDestroy();
 delete iText;
 }
 if ( iImages )
 {
 iImages->ResetAndDestroy();
 delete iImages;
 }
 // -----------------------------------------------------------------------------
 // CAboutContainer::SizeChanged()
 // -----------------------------------------------------------------------------
 void CAboutContainer::SizeChanged()
 {
-TRect parentRect( Rect() );
+TRect parentRect(Rect());
-if (iSkinContext)
+	if (iSkinContext)
 {
-iSkinContext->SetRect( parentRect );
+iSkinContext->SetRect(parentRect);
 }
-}
+	}
 // -----------------------------------------------------------------------------
 // CAboutContainer::Draw()
 // -----------------------------------------------------------------------------
 void CAboutContainer::Draw( const TRect& aRect ) const
 {
 CWindowGc& gc = SystemGc();
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
+	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	if ( iSkinContext )
+	if (iSkinContext)
 		{
 		//Draw the skin background
 		AknsDrawUtils::Background(
-			skin, iSkinContext, this, gc, aRect );
+			skin, iSkinContext, this, gc, aRect);
 		}
 	else
 		{//  clear the area
 		gc.SetBrushColor( iEikonEnv->ControlColor( EColorWindowBackground, *this ) );
 		gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
 // The value of firstLine can not be the same.
 if ( !iScrollBarDragged )
 {
 if ( ( iScreenStarts ) && (iScreenStarts->Count() >= iCurrentScreen ) )
 {
-firstLine = ( ( *iScreenStarts )[ iCurrentScreen ] );
+	    firstLine = ( ( *iScreenStarts )[ iCurrentScreen ] );
 }
 }
 else
 {
 if ( iCurrentScreen <= ( ( *iScreenStarts )[ iScreenStarts->Count() - 1 ] ) )
 topLeft = TPoint( position.iX, position.iY-iBaseLineDelta );
 			TRgb color;
 			TInt error = AknsUtils::GetCachedColor( skin,
 							color, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG6 );
-			if( error == KErrNone )
+			if(error == KErrNone)
 				{
-				gc.SetPenColor( color );
+				gc.SetPenColor(color);
 				}
 gc.DrawText( *text,
 TRect( topLeft, rectSize ),
 iBaseLineDelta,
 iTextAlign );
 position.iY += ( image->StartLine() - firstLine ) * iBaseLineDelta;
 position.iY -= iBaseLineDelta - iFont->DescentInPixels();
 // Now iY is the top line of rectangle where the picture is
 // centered in.
-position.iY += ( ( image->Lines()+1 ) * iBaseLineDelta -
+position.iY += ( (image->Lines()+1) * iBaseLineDelta -
 iFont->HeightInPixels() -
 image->HeightInPixels() ) / 2;
 // If text is right-aligned, also align images to the right.
 				break;
 				}
 			default:
 				break;
 			}
-if( !line->Length() )
+if(!line->Length())
 {
 iText->AppendL( NULL );
-CleanupStack::PopAndDestroy( line );  // line
+CleanupStack::PopAndDestroy(line);  // line
 }
 else
 {
 if( iBreakFlag && ( numLines - 1 ) == i )
 	{
 if ( aText[ aText.Length() - 1 ] == '\n' )
 {
 iText->AppendL( NULL );
 		}
-CleanupStack::PopAndDestroy( wrappedArray ); // wrappedArray
+CleanupStack::PopAndDestroy(wrappedArray); // wrappedArray
 delete dataToDestroy;
 // update screen scrolling info array
 TInt lastLine( iText->Count() - 1 );
 {
 iText->AppendL( NULL );
 }
 iImages->AppendL( image );
-CleanupStack::Pop( image ); // image
+CleanupStack::Pop(image); // image
 // update screen scrolling info array
 TInt lastLineOfImage( iText->Count() - 1 );
 TInt screenStart( (*iScreenStarts)[ iScreenStarts->Count() - 1 ] );
 		// Decide which type of scrollbar is to be shown
 CAknAppUi* appUi = iAvkonAppUi;
 		if (AknLayoutUtils::DefaultScrollBarType(appUi) == CEikScrollBarFrame::EDoubleSpan)
 		{
 			// For EDoubleSpan type scrollbar
 			iSBFrame->CreateDoubleSpanScrollBarsL(ETrue, EFalse); // non-window owning scrollbar
 			iSBFrame->SetTypeOfVScrollBar(CEikScrollBarFrame::EDoubleSpan);
 		}
 		else
 		{
 			// For EArrowHead type scrollbar
 }
 // -----------------------------------------------------------------------------
 // CAboutContainer::CalculateL()
 // -----------------------------------------------------------------------------
-void CAboutContainer::CalculateL( const TRect& aRect )
+void CAboutContainer::CalculateL(const TRect& aRect)
 {
 TRect rect( 0, 0, 0, 0 );
 iCurrentScreen = 0;
 if ( iSkinContext )
 }
 // -----------------------------------------------------------------------------
 // CAboutContainer::HandleResourceChange()
 // -----------------------------------------------------------------------------
-void CAboutContainer::HandleResourceChange( TInt aType )
+void CAboutContainer::HandleResourceChange(TInt aType)
 {
-switch ( aType )
-{
+switch ( aType )
-case KEikDynamicLayoutVariantSwitch :
+{
-{
+case KEikDynamicLayoutVariantSwitch :
+{
 TRAP_IGNORE( CalculateL( iAvkonAppUi->ClientRect() ) );
 DrawNow();
 }
 break;
 case KEikMessageUnfadeWindows :
 case KAknsMessageSkinChange :
 {
 // window owning scrollbar
 TRAP_IGNORE( iSBFrame->CreateDoubleSpanScrollBarsL( ETrue, EFalse ) );
-iSBFrame->SetTypeOfVScrollBar( CEikScrollBarFrame::EDoubleSpan );
+iSBFrame->SetTypeOfVScrollBar(CEikScrollBarFrame::EDoubleSpan);
 TRAP_IGNORE( iSBFrame->SetScrollBarVisibilityL(
 CEikScrollBarFrame::EOff,CEikScrollBarFrame::EOn ) );
-TRAP_IGNORE( UpdateScrollIndicatorL() );
+	   TRAP_IGNORE(UpdateScrollIndicatorL());
 }
-default:
-{
+default:
-CCoeControl::HandleResourceChange( aType );
+{
-}
+CCoeControl::HandleResourceChange(aType);
-break;
+}
-}
+	   break;
 }
+}
 // ---------------------------------------------------------
 // CAboutContainer::MopSupplyObject()
 // Pass skin information if need.
 // ---------------------------------------------------------
-TTypeUid::Ptr CAboutContainer::MopSupplyObject( TTypeUid aId )
+TTypeUid::Ptr CAboutContainer::MopSupplyObject(TTypeUid aId)
 {
-if ( aId.iUid == MAknsControlContext::ETypeId && iSkinContext )
+if (aId.iUid == MAknsControlContext::ETypeId && iSkinContext)
 {
-return MAknsControlContext::SupplyMopObject( aId, iSkinContext );
+return MAknsControlContext::SupplyMopObject(aId, iSkinContext);
 }
-return CCoeControl::MopSupplyObject( aId );
+return CCoeControl::MopSupplyObject(aId);
 }
 // ---------------------------------------------------------
 // CAboutContainer::HandleScrollEventL()
 // Capture Touch Events on the Scroll Bar
 // ---------------------------------------------------------
 void CAboutContainer::HandleScrollEventL( CEikScrollBar* aScrollBar,
 TEikScrollEvent aEventType )
 {
 //Only on page up/down,scroll up/down and drag events
-if( ( aEventType == EEikScrollPageDown ) || ( aEventType == EEikScrollPageUp ) ||
+if((aEventType == EEikScrollPageDown) || (aEventType == EEikScrollPageUp) ||
-( aEventType == EEikScrollThumbDragVert ) || ( aEventType == EEikScrollUp ) ||
+(aEventType == EEikScrollThumbDragVert) || (aEventType == EEikScrollUp) ||
 ( aEventType == EEikScrollDown ) )
 {
 //Get the current position from the scroll bar
 iCurrentScreen = aScrollBar->ThumbPosition();
 // Panic if error occurred.
 if ( aError != KErrNone )
 {
 User::Panic( KAboutPanicCategory, aError );
 }
 // Display loaded texts
 RPointerArray<CAboutResource>* items = iLoader->LoadedResourceItems();
 if ( items )
 {
 for ( TInt i = 0; i < items->Count(); i++ )
 CAboutResource* item = ( *items )[i];
 if ( item->ResourceType() == EAboutTextItem )
 {
 if ( R_ABOUT_MAIN_TEXT == iLoader->CurrentResourceId() )
 {
-// Only one data record for each
+SetTextL( *item->ResourceItem(), item->ResourceIndex() );
-if ( iHandleFlag )
+if ( iLoader->ItemCount() == item->ResourceIndex() + 1 )
 {
-// Store the count of the current resource
+iFinalCount = iLoader->ItemCount() + 1;
-iCurrentCount = iLoader->ItemCount();
-iHandleFlag = EFalse;
 }
-SetTextL( *item->ResourceItem(), item->ResourceIndex() );
-// Set the flag to ETrue
-if ( iCurrentCount == item->ResourceIndex() )
-{
-iHandleFlag = ETrue;
-}
-}
-else if ( R_ABOUT_OSS_TEXT == iLoader->CurrentResourceId() )
-{
-iFinalCount = iCurrentCount + item->ResourceIndex() + 1;
-SetTextL( *item->ResourceItem(), iFinalCount );
 }
 else
 {
-// Only one data record for each
-if ( iHandleFlag )
-{
-iCurrentCount = iLoader->ItemCount();
-iHandleFlag = EFalse;
-}
-iFinalCount = iCurrentCount + item->ResourceIndex() + 1;
 SetTextL( *item->ResourceItem(), iFinalCount );
+iFinalCount++;
 }
 }
 else if( item->ResourceType() == EAboutImageItem )
 {
 SetImageL( *item->ResourceItem(), item->BitmapId() );
 // Load other resources including R_ABOUT_OSS_TEXT and R_ABOUT_OSS_TEXT_ADD
 TInt resourceId( aResourceId );
 if( R_ABOUT_MAIN_TEXT == resourceId )
 {
+// Load the R_ABOUT_OSS_TEXT_FIRST
+// Set the resource which you want to load next
+resourceId = R_ABOUT_OSS_TEXT_FIRST;
+// Set the resource's path
+iResourcePath.Copy( KRSCDirAndFileFirst );
+}
+else if ( R_ABOUT_OSS_TEXT_FIRST == resourceId )
+{
 // Load the R_ABOUT_OSS_TEXT
-// Set the resource which you want to load next
 resourceId = R_ABOUT_OSS_TEXT;
-// Set the resource's path
 iResourcePath.Copy( KRSCDirAndFile );
 }
 else
 {
 // Load the R_ABOUT_OSS_TEXT_ADD

branch	RCL_3
changeset 29	9d6a662e71d9
parent 25	bec11adf88f9