diff -r 23b5d6a29cce -r 4785f57bf3d4 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Fri May 14 15:43:04 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsapplibrarystate.cpp Thu May 27 12:46:08 2010 +0300 @@ -119,10 +119,11 @@ HSMENUTEST_FUNC_ENTRY("HsAppLibraryState::construct"); setObjectName("homescreen.nokia.com/state/applibrarystate"); - mAllAppsState = new HsAllAppsState(mMenuViewBuilder, mMenuMode, this); + mAllAppsState = new HsAllAppsState(mMenuViewBuilder, mMenuMode, mMainWindow, this); connect(this, SIGNAL(entered()),mAllAppsState, SLOT(scrollToBeginning())); - mAllCollectionsState = new HsAllCollectionsState(mMenuViewBuilder, mMenuMode, this); + mAllCollectionsState = new HsAllCollectionsState(mMenuViewBuilder, mMenuMode, + mMainWindow, this); connect(this, SIGNAL(entered()), mAllCollectionsState, SLOT(scrollToBeginning())); @@ -138,14 +139,15 @@ mCollectionState = new HsCollectionState(mMenuViewBuilder, mMenuMode, + mMainWindow, this); connect(mCollectionState, SIGNAL(entered()),SLOT(clearToolbarLatch())); HsMenuEventTransition *eventTransition = new HsMenuEventTransition(HsMenuEvent::OpenCollection, - mAllCollectionsState, mCollectionState); - mAllCollectionsState->addTransition(eventTransition); + this, mCollectionState); + this->addTransition(eventTransition); HsMenuEventTransition *collectionDeletedTransition = new HsMenuEventTransition(HsMenuEvent::CollectionDeleted, @@ -159,7 +161,7 @@ mCollectionState->addTransition(collectionToAppLibTransition); mInstalledAppsState = new HsInstalledAppsState( - mMenuViewBuilder, this); + mMenuViewBuilder, mMainWindow, this); HsMenuEventTransition *installedToAppLibTransition = new HsMenuEventTransition(HsMenuEvent::OpenApplicationLibrary, @@ -294,6 +296,7 @@ if (checkedAction != NULL) { checkedAction->setChecked(false); } + emit collectionEntered(); HSMENUTEST_FUNC_EXIT("HsAppLibraryState::clearToolbarLatch"); }