diff -r 10852b179f64 -r ea98413ce11f locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp --- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp Wed Sep 15 12:40:28 2010 +0300 +++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp Wed Oct 13 15:01:35 2010 +0300 @@ -292,33 +292,42 @@ ChangeMSKL(); break; } - + // Handle all the internal view specific commands here + case ELocSuplChange: + case ELocSuplMSKChange: + { + // Launch the SUPL Settings usage configurator. + // The error code is ignored since the necessary UI + // notification would be convveyed by the Engine + TRAP_IGNORE( iEngine.LaunchSuplUsageConfiguratorL() ); + break; + } case ELocSuplOpen: case ELocSuplMSKOpen: { TInt index = SelectedItemIndex(); switch( index ) { - case 0: - { - // Launch the Supl Server List. - // The error code is ignored since the necessary UI - // notification would be convveyed by the Engine - iViewLaunched = 0; - TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLServerUiViewId ) ); - break; - } - case 1: - { - TInt sessionCount = iContainer->ActiveSessionCount(); - if (sessionCount) - { - iViewLaunched = 1; - // Launch the Supl sessions view. - TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSessionUiViewId ) ); - } - break; - } + case 1: + { + // Launch the Supl Server List. + // The error code is ignored since the necessary UI + // notification would be convveyed by the Engine + iViewLaunched = 1; + TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLServerUiViewId ) ); + break; + } + case 2: + { + TInt sessionCount = iContainer->ActiveSessionCount(); + if( sessionCount ) + { + iViewLaunched = 2; + // Launch the Supl sessions view. + TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSessionUiViewId ) ); + } + break; + } default: break; } @@ -435,27 +444,37 @@ { case 0: { - aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse ); + //aMenuPane->SetItemDimmed( ELocSuplChange, EFalse ); + //aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue ); aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue ); aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue ); break; } case 1: { + //aMenuPane->SetItemDimmed( ELocSuplChange, ETrue ); + //aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse ); + aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue ); + aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue ); + break; + } + case 2: + { + aMenuPane->SetItemDimmed( ELocSuplChange, ETrue ); TInt sessionCount = iContainer->ActiveSessionCount(); switch( sessionCount ) { case 0: { - aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue ); + //aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue ); aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue ); aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue ); break; } case 1: { - aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse ); + //aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse ); aMenuPane->SetItemDimmed( ELocSuplClearSession, EFalse ); aMenuPane->SetItemSpecific(ELocSuplClearSession, ETrue); aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue ); @@ -463,7 +482,7 @@ } default: { - aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse ); + //aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse ); aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue ); aMenuPane->SetItemDimmed( ELocSuplClearSessions, EFalse ); aMenuPane->SetItemSpecific(ELocSuplClearSessions, ETrue);