diff -r 99b535de1dda -r a7d8840c0b8c extras/about/src/AboutImage.cpp --- a/extras/about/src/AboutImage.cpp Mon Jun 21 15:42:09 2010 +0300 +++ b/extras/about/src/AboutImage.cpp Thu Jul 15 18:40:36 2010 +0300 @@ -20,6 +20,18 @@ #include #include "AboutImage.h" #include +#include +#include +#include +#include +#include +#include +#include +#include + + +const TInt QtnJavaLogoWidth = 46; +const TInt QtnJavaLogoHeight = 70; // ================= MEMBER FUNCTIONS ========================================== @@ -30,20 +42,32 @@ CAboutImage::~CAboutImage() { delete iBitmap; + delete iBitmapMask; } CAboutImage* CAboutImage::NewLC( const TDesC& aFileName, TInt aBitmapId, TInt aStartLine, - TInt aBaseLineDelta ) + TInt aBaseLineDelta, + TBool aTypeFlag ) { CAboutImage* self = new( ELeave ) CAboutImage(); CleanupStack::PushL( self ); - /*self->iBitmap = new( ELeave ) CFbsBitmap; - self->iBitmap->Load( aFileName, aBitmapId );*/ - + if( aTypeFlag ) + { + // bmp files self->iBitmap = AknIconUtils::CreateIconL(aFileName, aBitmapId ); + } + else + { + // svg files + MAknsSkinInstance* skinInstance = AknsUtils::SkinInstance(); + AknsUtils::CreateIconL( skinInstance, KAknsIIDQgnMenuSmsvoLst, self->iBitmap, self->iBitmapMask, + aFileName, aBitmapId, aBitmapId + 1 ); + AknIconUtils::SetSize( self->iBitmap, TSize( QtnJavaLogoWidth, QtnJavaLogoHeight ) ); + AknIconUtils::SetSize( self->iBitmapMask, TSize( QtnJavaLogoWidth, QtnJavaLogoHeight ) ); + } self->iStartLine = aStartLine; // enough lines so that image and margins fit in them. @@ -111,4 +135,12 @@ return iBitmap; } +// ----------------------------------------------------------------------------- +// CAboutImage::BitmapMask() +// ----------------------------------------------------------------------------- + +const CFbsBitmap* CAboutImage::BitmapMask() const + { + return iBitmapMask; + } // End of File