diff -r ff572dfe6d86 -r 9674c1a575e9 idlehomescreen/widgetmanager/src/wmmaincontainerview.cpp --- a/idlehomescreen/widgetmanager/src/wmmaincontainerview.cpp Fri Mar 12 15:41:49 2010 +0200 +++ b/idlehomescreen/widgetmanager/src/wmmaincontainerview.cpp Mon Mar 15 12:39:47 2010 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include #include "wmplugin.h" #include "widgetmanager.hrh" @@ -141,8 +142,14 @@ break; case EWmMainContainerViewBackMenuItemCommand: // flow through case EAknSoftkeyBack: - iWmPlugin.CloseView(); + { + if ( iWmMainContainer && + !iWmMainContainer->IsLoadingWidgets() ) + { + iWmPlugin.CloseView(); + } break; + } case EWmMainContainerViewWiddetDetailsMenuItemCommand: HandleDetailsMenuItemSelectedL(); break; @@ -176,6 +183,12 @@ R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT ); StatusPane()->ApplyCurrentSettingsL(); + // disable transparancy + if ( StatusPane()->IsTransparent() ) + { + StatusPane()->EnableTransparent( EFalse ); + } + // title in status pane SetTitleL(); @@ -185,7 +198,12 @@ CEikButtonGroupContainer* bgc( Cba() ); CEikCba* cba = static_cast< CEikCba* >( bgc->ButtonGroup() ); if ( cba ) - { + { + TInt cbaResourceId = ( AknLayoutUtils::MSKEnabled() ? + R_AVKON_SOFTKEYS_OPTIONS_BACK__SELECT : + R_AVKON_SOFTKEYS_OPTIONS_BACK ); + + cba->SetCommandSetL( cbaResourceId ); bgc->SetBoundingRect( TRect() ); cba->DrawNow(); }