diff -r 474929a40a0f -r 87476091b3f5 homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Wed Jul 14 15:53:30 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/src/hsallcollectionsstate.cpp Fri Jul 23 13:47:57 2010 +0300 @@ -14,6 +14,7 @@ * Description: Menu All Collections state. * */ +#include #include #include #include @@ -24,12 +25,12 @@ #include +#include "hsmenumodewrapper.h" #include "hsmenueventfactory.h" #include "hsmenumodewrapper.h" #include "hsmenuitemmodel.h" #include "hsallcollectionsstate.h" #include "hsaddappstocollectionstate.h" -//#include "hsmenumodetransition.h" #include "hsmainwindow.h" /*! @@ -107,6 +108,11 @@ void HsAllCollectionsState::setContextMenuOptions(HbAbstractViewItem *item, EntryFlags flags) { Q_UNUSED(item) + + HbAction *openAction = mContextMenu->addAction(hbTrId( + "txt_common_menu_open")); + openAction->setData(OpenContextAction); + // create context menu HbAction *addShortcutAction = mContextMenu->addAction(hbTrId( "txt_applib_menu_add_to_home_screen")); @@ -200,7 +206,7 @@ */ void HsAllCollectionsState::contextMenuAction(HbAction *action) { - HsContextAction command = + HsContextAction command = static_cast(action->data().toInt()); const int itemId = mContextModelIndex.data(CaItemModel::IdRole).toInt(); @@ -209,7 +215,9 @@ case AddToHomeScreenContextAction: machine()->postEvent( HsMenuEventFactory::createAddToHomeScreenEvent( - itemId, mMenuMode->getHsMenuMode(), mMenuMode->getHsToken())); + itemId, + mMenuMode->getHsMenuMode(), + mMenuMode->getHsToken())); break; case RenameContextAction: machine()->postEvent( @@ -218,12 +226,15 @@ case DeleteContextAction: machine()->postEvent( HsMenuEventFactory::createDeleteCollectionEvent(itemId)); - break; + break; + case OpenContextAction: + openCollection(mContextModelIndex); + break; default: break; } - - mMenuView->setSearchPanelVisible(false); + + mMenuView->hideSearchPanel(); } /*!