MCL/sf/app/videoplayer: comparison mediasettings/mediasettingsapp/src/MPSettingsAppUi.cpp

equal deleted inserted replaced

-:7d91903f795f
+:ce5ada96ab30
 *
 * Description:   Application UI class required by AVKON application architecture.*
 */
-// Version : %version: 9 %
+// Version : %version: 11 %
 // INCLUDE FILES
 #include    <MediaSettings.rsg>
 #include    "mediasettings.hrh"
 #include    "MPSettingsAppUi.h"
 #include    "MPSettingsMainView.h"
 #include    "MPSettingsVideoView.h"
 #include    "MPSettingsStreamingView.h"
-#include    "MPSettingsProxyView.h"
-#include    "MPSettingsNetworkView.h"
 #include    "MPSettingsConstants.h"
 #include    "MPSettingsPluginView.h"
 #include    "MPSettingsAdvancedBwView.h"
 #include    "MPSettingsDocument.h"
 #include    "mpsettingsmodel.h"
 #include    "MPSettingsModelForROP.h"
 #include    "mpxlog.h"
-#include    "feedsettingsview.h"
+#include    <centralrepository.h>
+#include    "MediaPlayerPrivateCRKeys.h"
+#include    "MediaPlayerVariant.hrh"
 // CONSTANTS
-const TInt KMPSettViewIdArrayGranularity = 3;
+const TInt KMPSettViewIdArrayGranularity = 2;
 // ================= MEMBER FUNCTIONS =======================
 //
 // -----------------------------------------------------------------------------
 // CMPSettingsAppUi::CMPSettingsAppUi
 // C++ default constructor can NOT contain any code, that
 // might leave.
 // -----------------------------------------------------------------------------
 //
-CMPSettingsAppUi::CMPSettingsAppUi() : iConstructAsGsPlugin(EFalse)
+CMPSettingsAppUi::CMPSettingsAppUi()
 {
 MPX_DEBUG1(_L("#MS# CMPSettingsAppUi::CMPSettingsAppUi()"));
 }
 // ----------------------------------------------------------
 BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible );
 // Sets up TLS, must be done before FeatureManager is used.
 FeatureManager::InitializeLibL();
-CMPSettingsDocument* doc = static_cast<CMPSettingsDocument*>(static_cast<CEikAppUi*>
+iVideoViewAvailable =  VideoContrastIsSupportedL();
-(CEikonEnv::Static()->AppUi())->Document());
+CMPSettingsDocument* doc = static_cast<CMPSettingsDocument*>( Document() );
 iModel = doc->SettingsModel();
 iRopModel = static_cast<CMPSettingsModelForROP*>(iModel);
 // Fetch pointer to the default navi pane control
 CEikStatusPane* sp = StatusPane();
 (sp->ControlL(TUid::Uid(EEikStatusPaneUidNavi)));
 // Construct navipane tabs
 iDecoratedTabGroup = iNaviPane->CreateTabGroupL(this);
-// Construct tabs
+// Construct tabs if we have multiple views
-AddTabSettingsGroupL();
+if ( iVideoViewAvailable )
+{
+AddTabSettingsGroupL();
+}
 // Create vector which contains view id's for all setting folders.
 iViewIds = new(ELeave) CArrayFixFlat<TUid>(KMPSettViewIdArrayGranularity);
-iViewIds->AppendL(KMPSettVideoViewId);
+if ( iVideoViewAvailable )
-iViewIds->AppendL(KMPSettStreamingViewId);
+{
-iViewIds->AppendL(KMPSettFeedsViewId);
+iViewIds->AppendL( KMPSettVideoViewId );
+}
-// * Create application views *
+iViewIds->AppendL( KMPSettStreamingViewId );
+// Create application views
 CAknView* view;
+view = CMPSettingsMainView::NewLC( iViewIds, iRopModel, EFalse );
-view = CMPSettingsMainView::NewLC(iViewIds,iRopModel,iConstructAsGsPlugin);
 AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
+CleanupStack::Pop(); // view
 // iMainView is not owned, i.e. it is not deleted in the destructor ->
 // main view cannot be directly creted to iMainView, as it's against the coding
 // conventions to place class' pointers to cleanup stack => static_cast.
 iMainView = static_cast<CMPSettingsMainView*>(view);
-view = CMPSettingsVideoView::NewLC(iRopModel);
+if ( iVideoViewAvailable )
+{
+view = CMPSettingsVideoView::NewLC(iRopModel);
+AddViewL(view);      // transfer ownership to CAknViewAppUi
+CleanupStack::Pop(); // view
+}
+CMPSettingsStreamingView* streamingView = CMPSettingsStreamingView::NewLC(iRopModel);
+view = streamingView;
 AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
+CleanupStack::Pop(); // view
-view = CMPSettingsStreamingView::NewLC(iRopModel);
+view = CMPSettingsAdvancedBwView::NewLC( iRopModel, EFalse );
 AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
+CleanupStack::Pop(); // view
-view = CVcxNsSettingsView::NewLC();
-AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
-view = CMPSettingsProxyView::NewLC(iRopModel,iConstructAsGsPlugin);
-AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
-view = CMPSettingsNetworkView::NewLC(iRopModel,iConstructAsGsPlugin);
-AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
-view = CMPSettingsAdvancedBwView::NewLC(iRopModel,iConstructAsGsPlugin);
-AddViewL(view);      // transfer ownership to CAknViewAppUi
-CleanupStack::Pop();    // view
 // Construct plug-in views (if any exists)
 CMPSettingsPluginView::ListImplementationsL(iImplInfoArray);
 TInt count = iImplInfoArray.Count();
 // Sort UID array to rising order
 TKeyArrayFix sortKey(0, ECmpTUint);
 User::LeaveIfError(iViewIds->Sort(sortKey));
 }
-SetDefaultViewL(*iMainView);
+if ( iVideoViewAvailable && iMainView )
+{
+SetDefaultViewL(*iMainView);
+}
+else if ( streamingView )
+{
+SetDefaultViewL(*streamingView);
+}
 }
 // ----------------------------------------------------
 // CMPSettingsAppUi::~CMPSettingsAppUi
 // Destructor
 // ----------------------------------------------------
 //
 CMPSettingsAppUi::~CMPSettingsAppUi()
 {
 MPX_DEBUG1(_L("#MS# CMPSettingsAppUi::~CMPSettingsAppUi()"));
-if (iDecoratedTabGroup)
-{
+delete iDecoratedTabGroup;
-delete iDecoratedTabGroup;
-}
 if (iDoorObserver)
 {
 iDoorObserver->NotifyExit(MApaEmbeddedDocObserver::EEmpty);
 }
-if (iViewIds)
+delete iViewIds;
-{
-delete iViewIds;
-}
 iImplInfoArray.ResetAndDestroy();
 FeatureManager::UnInitializeLib();
 }
 {
 AddTabSettingsGroupL();
 }
 }
 // ----------------------------------------------------
 // CMPSettingsAppUi::TabChangedL
 // MAknTabObserver callback for handling tab changed event.
 // ----------------------------------------------------
 //
 // ----------------------------------------------------
 //
 void CMPSettingsAppUi::UpdateTabIndex()
 {
 MPX_DEBUG1(_L("#MS# CMPSettingsAppUi::UpdateTabIndex()"));
-iTabGroup->SetActiveTabByIndex(iMainView->ActiveFolder());
+if ( iTabGroup )
+{
+iTabGroup->SetActiveTabByIndex( iMainView->ActiveFolder() );
+}
 }
 // ------------------------------------------------------------------------------
 // CMPSettingsAppUi::DynInitMenuPaneL
 //  This function is called by the AVKON framework just before it displays
 }
 return iTabGroup->OfferKeyEventL(aKeyEvent, aType);
 }
 // ----------------------------------------------------
 // CMPSettingsAppUi::AddTabSettingsGroupL()
 // (Re)create tab group with skin support
 // ----------------------------------------------------
 //
 }
 iTabGroup = static_cast<CAknTabGroup*>
 (iDecoratedTabGroup->DecoratedControl());
-iTabGroup->SetTabFixedWidthL(KTabWidthWithThreeTabs);
+iTabGroup->SetTabFixedWidthL(KTabWidthWithTwoTabs);
 HBufC* mbmpath = StringLoader::LoadLC(R_MPSETT_ICON_MBM_FILE);
 // This is done to ensure upgraded file is used first.
 // If no upgraded file is found, default file in Z: drive will be used.
 AddTabSettingsL(KAknsIIDQgnPropSetMpStreamTab3,
 fileName,
 EMbmMediasettingsQgn_prop_set_mp_stream_tab2,
 EMbmMediasettingsQgn_prop_set_mp_stream_tab2_mask,
 EMPViewStreamTab);
-AddTabSettingsL(KAknsIIDQgnPropSetMpStreamTab3,
-fileName,
-EMbmMediasettingsQgn_prop_set_mp_video_tab3,
-EMbmMediasettingsQgn_prop_set_mp_video_tab3_mask,
-EMPViewFeedsTab);
 CleanupStack::PopAndDestroy();  // mbmpath
 // return to previous view & update correct tab index
 if (iPushed)
 iTabGroup->AddTabL(aTabId, bitmap, mask);
 CleanupStack::Pop(2); // bitmap, mask
 }
+// ----------------------------------------------------
+// CMPSettingsAppUi::ActivateLocalViewL
+// ----------------------------------------------------
+//
+void CMPSettingsAppUi::ActivateLocalViewL( TUid aViewId )
+{
+if ( !iVideoViewAvailable &&
+aViewId == KMPSettMainViewId )
+{
+HandleCommandL( EEikCmdExit );
+}
+else
+{
+CAknViewAppUi::ActivateLocalViewL( aViewId );
+}
+}
+// ----------------------------------------------------
+// CMPSettingsAppUi::VideoContrastIsSupportedL
+// ----------------------------------------------------
+//
+TBool CMPSettingsAppUi::VideoContrastIsSupportedL()
+{
+TInt flags = 0;
+CRepository* repository = CRepository::NewL( KCRUidMediaPlayerFeatures );
+repository->Get( KMPLocalVariation, flags );
+delete repository;
+return ( flags & KMediaPlayerVideoContrast );
+}
 // End of File

branch	RCL_3
changeset 8	ce5ada96ab30
parent 1	6711b85517b7
child 11	8970fbd719ec