MCL/sf/app/homescreen: comparison idlehomescreen/xmluirendering/uiengine/src/xneditor.cpp

equal deleted inserted replaced

-:1b758917cafc
+:d721605b30d0
 {
 ECanBeAdded = 0x01,
 ECanBeRemoved
 };
-const TInt KNotifyWidgetUpdateDelay( 1000000 ); //1sec
+const TInt KNotifyWidgetListChangedDelay( 1000000 ); //1sec
+const TInt KNotifyViewListChangedDelay( 1000000 );   //1sec
 // ====================== LOCAL FUNTION PROTOTYPES ============================
 static void DeletePluginInfos( TAny* aObject );
 static void DeleteItemMaps( TAny* aObject );
 static void DeleteContentInfo( TAny* aObject );
 {
 iCpsWrapper = CCpsWrapper::NewL( *this );
 iHspsWrapper = CHspsWrapper::NewL( aUid, this );
 iRepository= CRepository::NewL( TUid::Uid( KCRUidActiveIdleLV ) );
 iOomSysHandler = CXnOomSysHandler::NewL();
-iNotifyWidgetUpdate = CPeriodic::New( CActive::EPriorityIdle );
+iNotifyWidgetListChanged = CPeriodic::New( CActive::EPriorityIdle );
+iNotifyViewListChanged = CPeriodic::New( CActive::EPriorityIdle );
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::~CXnEditor
 // ---------------------------------------------------------------------------
 //
 CXnEditor::~CXnEditor()
 {
-if ( iNotifyWidgetUpdate->IsActive() )
+if ( iNotifyWidgetListChanged->IsActive() )
 {
-iNotifyWidgetUpdate->Cancel();
+iNotifyWidgetListChanged->Cancel();
 }
-delete iNotifyWidgetUpdate;
+delete iNotifyWidgetListChanged;
+if ( iNotifyViewListChanged->IsActive() )
+{
+iNotifyViewListChanged->Cancel();
+}
+delete iNotifyViewListChanged;
 iViewManager.RemoveObserver( *this );
 if( iPluginConfigurations.Count() )
 {
 iPluginConfigurations.ResetAndDestroy();
 }
 {
 	OomSysHandler().HandlePotentialOomL();
 	return;
 }
-TBuf8<KOpaQDataLen> oPaqDataStr;
+TBuf8<KOpaQDataLen> oPaqDataStr = KNullDesC8();
 MHsContentControlUi* ui( NULL );
 if ( IdFromCrep ( oPaqDataStr ) == KErrNone )
 {
 ui = iViewManager.AppUiAdapter().HsContentController( oPaqDataStr );
 XnPropertyNames::style::common::KDisplay,
 XnPropertyNames::style::common::display::KBlock );
 node->SetDirtyL( XnDirtyLevel::ELayoutAndRenderSiblings );
-WidgetListChanged();
+NotifyWidgetListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyWidgetRemovalL
 // ---------------------------------------------------------------------------
 // No more widgets in the active view
 iWidgetsVisibilityState = EFalse;
 }
 }
-WidgetListChanged();
+NotifyWidgetListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyViewAdditionL
 // ---------------------------------------------------------------------------
 //
 void CXnEditor::NotifyViewAdditionL( const CXnPluginData& /*aPluginData*/ )
 {
-ViewListChanged();
+NotifyViewListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyViewRemovalL
 // ---------------------------------------------------------------------------
 //
 void CXnEditor::NotifyViewRemovalL( const CXnPluginData& /*aPluginData*/ )
 {
-ViewListChanged();
+NotifyViewListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyWidgetUnregisteredL
 // ---------------------------------------------------------------------------
 //
 void CXnEditor::NotifyWidgetUnregisteredL( const TDesC& aPublisher )
 {
 ResetPluginsAndPublishers();
 RemoveUnRegisteredWidgetL( aPublisher );
-WidgetListChanged();
+NotifyWidgetListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyWidgetRegisteredL
 // ---------------------------------------------------------------------------
 //
 void CXnEditor::NotifyWidgetRegisteredL()
 {
 ResetPluginsAndPublishers();
-WidgetListChanged();
+NotifyWidgetListChanged();
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::NotifyWidgetUpdatedL
 // ---------------------------------------------------------------------------
 //
 void CXnEditor::NotifyWidgetUpdatedL()
 {
-if ( iNotifyWidgetUpdate->IsActive() )
+NotifyWidgetListChanged();
-{
+}
-iNotifyWidgetUpdate->Cancel();
-}
+// ---------------------------------------------------------------------------
-// start waiting for widget updates (wait time is 1sec).
+// CXnEditor::NotifyAllViewsLoadedL
-	// if no new updates, notify views about changes. otherwise
+// ---------------------------------------------------------------------------
-	// start waiting for new updates again.
+//
-iNotifyWidgetUpdate->Start(
+void CXnEditor::NotifyAllViewsLoadedL()
-KNotifyWidgetUpdateDelay,
+{
-KNotifyWidgetUpdateDelay,
+NotifyViewListChanged();
+NotifyWidgetListChanged();
+}
+// -----------------------------------------------------------------------------
+// CXnEditor::NotifyContainerActivatedL
+// -----------------------------------------------------------------------------
+//
+void CXnEditor::NotifyContainerActivatedL( const CXnViewData& /* aViewData */ )
+{
+if ( iViewManager.ActiveAppData().AllViewsLoaded() )
+{
+NotifyWidgetListChanged();
+}
+}
+// ---------------------------------------------------------------------------
+// CXnEditor::NotifyWidgetListChanged
+// ---------------------------------------------------------------------------
+//
+void CXnEditor::NotifyWidgetListChanged()
+{
+if ( iNotifyWidgetListChanged->IsActive() )
+{
+iNotifyWidgetListChanged->Cancel();
+}
+// start waiting for widget list changes (wait time is 1sec).
+// if no new changes, notify observers about changes. otherwise
+// start waiting for new updates again.
+iNotifyWidgetListChanged->Start(
+KNotifyWidgetListChangedDelay,
+KNotifyWidgetListChangedDelay,
 TCallBack( WidgetListChangedCallBack, this ) );
 }
 // ---------------------------------------------------------------------------
 // CXnEditor::WidgetListChangedCallBack
 // ---------------------------------------------------------------------------
 //
 TInt CXnEditor::WidgetListChangedCallBack( TAny* aSelf )
 {
 CXnEditor* editor = static_cast<CXnEditor*>( aSelf );
-if ( editor && editor->iNotifyWidgetUpdate->IsActive() )
+if ( editor && editor->iNotifyWidgetListChanged->IsActive() )
 {
 // prevent multiple events
-editor->iNotifyWidgetUpdate->Cancel();
+editor->iNotifyWidgetListChanged->Cancel();
 editor->WidgetListChanged();
+}
+return KErrNone;
+}
+// ---------------------------------------------------------------------------
+// CXnEditor::NotifyViewListChanged
+// ---------------------------------------------------------------------------
+//
+void CXnEditor::NotifyViewListChanged()
+{
+if ( iNotifyViewListChanged->IsActive() )
+{
+iNotifyViewListChanged->Cancel();
+}
+// start waiting for widget list changes (wait time is 1sec).
+// if no new changes, notify observer about changes. otherwise
+// start waiting for new changes again.
+iNotifyViewListChanged->Start(
+KNotifyViewListChangedDelay,
+KNotifyViewListChangedDelay,
+TCallBack( ViewListChangedCallBack, this ) );
+}
+// ---------------------------------------------------------------------------
+// CXnEditor::ViewListChangedCallBack
+// ---------------------------------------------------------------------------
+//
+TInt CXnEditor::ViewListChangedCallBack( TAny* aSelf )
+{
+CXnEditor* editor = static_cast<CXnEditor*>( aSelf );
+if ( editor && editor->iNotifyViewListChanged->IsActive() )
+{
+// prevent multiple events
+editor->iNotifyViewListChanged->Cancel();
+editor->ViewListChanged();
 }
 return KErrNone;
 }
 // ---------------------------------------------------------------------------
 info->SetNameL( aPluginName );
 info->SetUidL( aPluginUid );
 info->SetPluginIdL( aPluginId );
 RemoveUnInstalledWidgetL( *info );
-WidgetListChanged();
+NotifyWidgetListChanged();
 CleanupStack::PopAndDestroy( info );
 }
 else if ( aEvent == KEventRootConfActivated )
 {
 }
 else if ( aEvent == KEventPluginInstalled )
 {
 ResetPluginsAndPublishers();
-WidgetListChanged();
+NotifyWidgetListChanged();
 }
 else if ( aEvent == KEventPluginUpdated )
 {
 ResetPluginsAndPublishers();
 info->SetUidL( aPluginUid );
 info->SetPluginIdL( aPluginId );
 ReplaceWidgetL( *info );
 CleanupStack::PopAndDestroy( info );
 }
-WidgetListChanged();
+NotifyWidgetListChanged();
 }
 return KErrNone;
 }
 // CXnEditor::WidgetListChanged
 // -----------------------------------------------------------------------------
 //
 void CXnEditor::WidgetListChanged()
 {
-TBuf8<KOpaQDataLen> oPaqDataStr;
+TBuf8<KOpaQDataLen> oPaqDataStr = KNullDesC8();
 MHsContentControlUi* ui( NULL );
 if ( IdFromCrep ( oPaqDataStr ) == KErrNone )
 {
 ui = iViewManager.AppUiAdapter().HsContentController( oPaqDataStr );
 // CXnEditor::ViewListChanged
 // -----------------------------------------------------------------------------
 //
 void CXnEditor::ViewListChanged()
 {
-TBuf8<KOpaQDataLen> oPaqDataStr;
+TBuf8<KOpaQDataLen> oPaqDataStr = KNullDesC8();
 MHsContentControlUi* ui( NULL );
 if ( IdFromCrep ( oPaqDataStr ) == KErrNone )
 {
 ui = iViewManager.AppUiAdapter().HsContentController( oPaqDataStr );
 TInt ret( KErrNone );
 const TDesC8& type( aInfo.Type() );
 if ( ( type != KKeyWidget && type != KKeyTemplate ) ||
-aInfo.Uid() == KNullDesC8 )
+aInfo.Uid() == KNullDesC8  || !aInfo.CanBeAdded() )
 {
 // malformed content info
 return KErrArgument;
 }
+CXnPluginData* plugin( NULL );
+if( iTargetPlugin )
+{
+plugin = DeterminePlugin( iViewManager, iTargetPlugin );
+}
+else
+{
+plugin = DeterminePlugin( iViewManager );
+}
+iTargetPlugin = NULL;
 // the widget can not be added. Return proper error code
-if ( IsCurrentViewFull() )
+if ( IsCurrentViewFull() || !plugin )
 {
 return KHsErrorViewFull;
 }
-else if ( !aInfo.CanBeAdded() )
-{
-return KHsErrorMaxInstanceCountExceeded;
-}
-CXnPluginData* plugin( NULL );
-if( iTargetPlugin )
-{
-plugin = DeterminePlugin( iViewManager, iTargetPlugin );
-}
 else
 {
-plugin = DeterminePlugin( iViewManager );
+TInt result;
-}
+if ( aInfo.Type() != KKeyTemplate() )
+{
-iTargetPlugin = NULL;
+result = NonTemplateWidgetCanBeAddedRemovedL( aInfo );
+}
-if ( !plugin )
+else
 {
-return KErrGeneral;
+result = TemplateWidgetCanBeAddedRemovedL( aInfo );
+}
+if ( !( result & ECanBeAdded ) )
+{
+return KHsErrorMaxInstanceCountExceeded;
+}
 }
 ret = iViewManager.LoadWidgetToPluginL( aInfo, *plugin );
 if( ret == KErrNone )

branch	RCL_3
changeset 28	d721605b30d0
parent 25	137ebc85284b
child 31	89165693e770