diff -r 5456b4e8b3a8 -r 3321d3e205b6 idlehomescreen/inc/xnviewmanager.h --- a/idlehomescreen/inc/xnviewmanager.h Wed Sep 01 12:32:46 2010 +0100 +++ b/idlehomescreen/inc/xnviewmanager.h Tue Sep 14 20:58:58 2010 +0300 @@ -62,6 +62,8 @@ // new functions virtual void NotifyViewActivatedL( const CXnViewData& aViewData ) = 0; + virtual void NotifyViewLoadedL( const CXnViewData& aViewData ) = 0; + virtual void NotifyViewDeactivatedL( const CXnViewData& aViewData ) = 0; virtual void NotifyConfigureWidgetL( @@ -72,9 +74,9 @@ virtual void NotifyWidgetRemovalL( const CXnPluginData& aPluginData ) = 0; - virtual void NotifyViewAdditionL( const CXnPluginData& aPluginData ) = 0; + virtual void NotifyViewAdditionL( const CXnViewData& aViewData ) = 0; - virtual void NotifyViewRemovalL( const CXnPluginData& aPluginData ) = 0; + virtual void NotifyViewRemovalL( const CXnViewData& aViewData ) = 0; virtual void NotifyAllViewsLoadedL() = 0; @@ -173,10 +175,12 @@ const CHsContentInfo& aContentInfo, CXnPluginData& aPluginData ); - void ActivateNextViewL( TInt aEffectId = 0 ); + void ActivateNextViewL(); - void ActivatePreviousViewL( TInt aEffectId = 0 ); + void ActivatePreviousViewL(); + void ActivateViewL( CXnViewData& aViewData, TUid aEffect, TBool aUpdateBg = ETrue ); + TInt AddViewL( const CHsContentInfo& aInfo ); void AddViewL( TInt aEffectId = 0 ); @@ -213,7 +217,9 @@ void HandleErrorNotes( const TInt aError ) const; void PublishersReadyL( CXnViewData& aViewData, TInt aResult ); - + + void NotifyViewLoadedL( const CXnViewData& aViewData ); + void NotifyAllViewsLoadedL(); private: @@ -241,10 +247,11 @@ CXnViewData* ViewData( CXnNode& aNode ) const; +public: CXnViewData& PreviousViewData() const; - CXnViewData& NextViewData() const; - + +private: void UpdateCachesL(); void ReportWidgetAmountL( const CXnViewData& aViewData );