# HG changeset patch # User Tom Pritchard # Date 1288801924 0 # Node ID 3aa4235c5e9b5edaac3e6fbc4b01c20d25e7a8d6 # Parent fddd8ce1f29d843acde45472c3ddd07c71479682 Remove dependency of MCS on SAT, one step close to removing ETEL: boots but still gives and empty folder. diff -r fddd8ce1f29d -r 3aa4235c5e9b breakdeps/MCSSatHandler/mcssathandler.cpp --- a/breakdeps/MCSSatHandler/mcssathandler.cpp Wed Nov 03 16:17:59 2010 +0000 +++ b/breakdeps/MCSSatHandler/mcssathandler.cpp Wed Nov 03 16:32:04 2010 +0000 @@ -48,8 +48,6 @@ // ----------------------------------------------------------------------------- CMcsSatHandler::~CMcsSatHandler() { - iSatIcon.Close(); - iSatSession.Close(); } // ----------------------------------------------------------------------------- @@ -57,51 +55,7 @@ // ----------------------------------------------------------------------------- EXPORT_C CAknIcon* CMcsSatHandler::LoadIconL() { - TInt iconId( KErrNone ); - User::LeaveIfError( RProperty::Get( KCRUidMenu, KMenuSatUIIconId, iconId ) ); - CAknIcon* icon = CAknIcon::NewL(); - CleanupStack::PushL(icon); - if( iconId != KErrNone ) - { - RIconEf iIconEf; - iSatIcon.GetIconInfoL( TUint8( iconId ), iIconEf ); - CleanupClosePushL( iIconEf ); - CFbsBitmap* bitmap = GetBitmapL( iIconEf ); - if( !bitmap ) - { - CFbsBitmap* mask( NULL ); - CleanupStack::PushL( mask ); - - icon->SetBitmap( bitmap ); - // create and set mask - User::LeaveIfError( mask->Create( bitmap->SizeInPixels(), EGray256 ) ); - - CFbsBitmapDevice* maskDevice = CFbsBitmapDevice::NewL( mask ); - CleanupStack::PushL( maskDevice ); - CFbsBitGc* maskGc; - User::LeaveIfError( maskDevice->CreateContext( maskGc ) ); - CleanupStack::PushL( maskGc ); - maskGc->SetBrushStyle( CGraphicsContext::ESolidBrush ); - maskGc->SetDrawMode( CGraphicsContext::EDrawModePEN ); - maskGc->SetBrushColor( KRgbBlack ); - maskGc->Clear(); - maskGc->SetBrushColor( KRgbWhite ); - maskGc->DrawRect( TRect( TPoint( ), bitmap->SizeInPixels() ) ); - icon->SetMask( mask ); - - CleanupStack::PopAndDestroy( maskGc ); - CleanupStack::PopAndDestroy( maskDevice ); - CleanupStack::Pop( mask ); - } - CleanupStack::PopAndDestroy( &iIconEf ); // iIconEf - CleanupStack::Pop( icon ); - } - else - { - CleanupStack::PopAndDestroy( icon ); - icon = NULL; - } - return icon; + return NULL; } // --------------------------------------------------------------------------- @@ -119,12 +73,7 @@ // EXPORT_C TBool CMcsSatHandler::CheckVisibility() { - TInt visibility( KErrNone ); - TInt err = RProperty::Get( KCRUidMenu, KMenuShowSatUI, visibility ); - if( err == KErrNone && visibility ) - return ETrue; - else - return EFalse; + return EFalse; } @@ -145,55 +94,7 @@ // void CMcsSatHandler::ConstructL() { - iSatSession.ConnectL(); - iSatIcon.OpenL( iSatSession ); } -// --------------------------------------------------------------------------- -// CMenuSATHandler::GetVisibility -// --------------------------------------------------------------------------- -// -CFbsBitmap* CMcsSatHandler::GetBitmapL( const RIconEf& aIconEF ) - { - TInt selectedIconIndex( KErrNotFound ); - TSize selectedIconSize( 0, 0 ); - CFbsBitmap* bitmap( NULL ); - for ( TInt i = 0; i < aIconEF.Count(); ++i ) - { - if( ( aIconEF[i].IconSize().iHeight * aIconEF[i].IconSize().iWidth ) >= - ( selectedIconSize.iHeight * selectedIconSize.iWidth ) ) - if( bitmap ) - { - delete bitmap; - bitmap = NULL; - } - // test and select index of iIcon which is not too big - TRAPD( bitmapErr, bitmap = iSatIcon.GetIconL( aIconEF[ i ] ) ); - if( !bitmapErr && bitmap ) //!iBitmap if iIcon is too big - { - selectedIconSize = aIconEF[i].IconSize(); - selectedIconIndex = i; - } - else if( bitmapErr ) - { - User::Leave( bitmapErr ); - } - } - if( selectedIconIndex != KErrNotFound ) - { - if( bitmap ) - { - delete bitmap; - bitmap = NULL; - } - TRAPD( bitmapErr, bitmap = iSatIcon.GetIconL( aIconEF[ selectedIconIndex ] ) ); - User::LeaveIfError( bitmapErr ); - return bitmap; - } - else - { - return NULL; - } - } // End of File diff -r fddd8ce1f29d -r 3aa4235c5e9b breakdeps/MCSSatHandler/mcssathandler.h --- a/breakdeps/MCSSatHandler/mcssathandler.h Wed Nov 03 16:17:59 2010 +0000 +++ b/breakdeps/MCSSatHandler/mcssathandler.h Wed Nov 03 16:32:04 2010 +0000 @@ -70,18 +70,18 @@ */ void ConstructL(); +#if 0 /** * Gets best icon from aIconEF. */ CFbsBitmap* GetBitmapL( const RIconEf& aIconEF ); private: // data - RSatSession iSatSession; -#ifdef SIM_ATK_SERVICE_API_V1 +//#ifdef SIM_ATK_SERVICE_API_V1 RSatService iSatIcon; -#else +//#else RSatIcon iSatIcon; #endif }; diff -r fddd8ce1f29d -r 3aa4235c5e9b breakdeps/MCSSatHandler/mcssathandler.mmp --- a/breakdeps/MCSSatHandler/mcssathandler.mmp Wed Nov 03 16:17:59 2010 +0000 +++ b/breakdeps/MCSSatHandler/mcssathandler.mmp Wed Nov 03 16:32:04 2010 +0000 @@ -45,7 +45,7 @@ LIBRARY euser.lib LIBRARY aknicon.lib -LIBRARY SatClient.lib +//LIBRARY SatClient.lib LIBRARY fbscli.lib LIBRARY bitgdi.lib diff -r fddd8ce1f29d -r 3aa4235c5e9b syborg_stem/rom_content.csv --- a/syborg_stem/rom_content.csv Wed Nov 03 16:17:59 2010 +0000 +++ b/syborg_stem/rom_content.csv Wed Nov 03 16:32:04 2010 +0000 @@ -4385,7 +4385,7 @@ Sys\Bin\mcspluginhandler.dll,/epoc32/release/armv5/urel/mcspluginhandler.dll,core/mw/mcsplugin.iby,mw/homescreensrv,Out,Auto,Not referenced during boot Sys\Bin\mcspluginsettings.dll,/epoc32/release/armv5/urel/mcspluginsettings.dll,core/mw/mcsplugin.iby,mw/homescreensrv,Out,Auto,Not referenced during boot Sys\Bin\mcsprovider.dll,/epoc32/release/armv5/urel/mcsprovider.dll,core/mw/mcssapi.iby,mw/homescreensrv,,, -sys\bin\mcssathandler.dll,/epoc32/release/armv5/urel/mcssathandler.dll,core/mw/mcs.iby,mw/homescreensrv,,, +sys\bin\mcssathandler.dll,/epoc32/release/armv5/urel/mcssathandler.dll,core/mw/mcs.iby,mw/homescreensrv,etel_stem,TomP,Stub this to not actually talk to SAT sys\bin\mcsservice.dll,/epoc32/release/armv5/urel/mcsservice.dll,core/mw/mcssapi.iby,mw/homescreensrv,,, sys\bin\mdasoundadapter.dll,/epoc32/release/armv5/urel/mdasoundadapter.dll,mdf.iby,os/mm,,, sys\bin\mdccommon.dll,/epoc32/release/armv5/urel/mdccommon.dll,core/mw/mds.iby,mw/mds,Out,Auto,Not referenced during boot diff -r fddd8ce1f29d -r 3aa4235c5e9b syborg_stem/static_dependencies.txt --- a/syborg_stem/static_dependencies.txt Wed Nov 03 16:17:59 2010 +0000 +++ b/syborg_stem/static_dependencies.txt Wed Nov 03 16:32:04 2010 +0000 @@ -3386,6 +3386,7 @@ sys\bin\mcsmenuserver.exe /epoc32/release/armv5/urel/mcsmenuserver.exe sid=200113dd:drtaeabi.dll:euser[100039e5].dll:mcsmenu[200113db].dll sys\bin\mcsmenuutils.dll /epoc32/release/armv5/urel/mcsmenuutils.dll sid=2001cb55:euser[100039e5].dll sys\bin\mcssathandler.dll /epoc32/release/armv5/urel/mcssathandler.dll sid=2001cb7b:AknIcon[1020735a].dll:SatClient[1000a834].dll:bitgdi[10003b18].dll:drtaeabi.dll:euser[100039e5].dll:fbscli[10003a15].dll:scppnwdl.dll +sys\bin\mcssathandler.dll /epoc32/release/armv5/urel/stem_mcssathandler.dll sid=2001cb7b:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll sys\bin\mcsservice.dll /epoc32/release/armv5/urel/mcsservice.dll sid=2001242b:AKNSKINS[10005a26].dll:AknIcon[1020735a].dll:apgrfx[10003a3c].dll:bafl[10003a0f].dll:drtaeabi.dll:efsrv[100039e4].dll:estor[10003b0d].dll:euser[100039e5].dll:fbscli[10003a15].dll:liwServiceHandler[2000b5d3].dll:mcsmenuutils[2001cb55].dll:mcsmenu[200113db].dll:mcssathandler[2001cb7b].dll:scppnwdl.dll sys\bin\mdasoundadapter.dll /epoc32/release/armv5/urel/mdasoundadapter.dll sid=102833d6:audioutils[10286668].dll:dfpaeabi.dll:drtaeabi.dll:drtrvct2_2.dll:euser[100039e5].dll:hal[100039e8].dll:scppnwdl.dll sys\bin\mdccommon.dll /epoc32/release/armv5/urel/mdccommon.dll sid=200009f2:drtaeabi.dll:euser[100039e5].dll:scppnwdl.dll