diff -r 67eb01668b0e -r baf439b22ddd videocollection/hgmyvideos/src/vcxhgmyvideosvideolistimpl.cpp --- a/videocollection/hgmyvideos/src/vcxhgmyvideosvideolistimpl.cpp Wed Jun 09 09:44:23 2010 +0300 +++ b/videocollection/hgmyvideos/src/vcxhgmyvideosvideolistimpl.cpp Mon Jun 21 15:43:03 2010 +0300 @@ -729,7 +729,7 @@ // Send item if ( highlight >= 0 || videosMarked ) { - AddSendItemToMenuPaneL( aMenuPane, videosMarked ); + AddSendItemToMenuPaneL( aMenuPane ); } #ifdef RD_VIDEO_AS_RINGING_TONE @@ -743,9 +743,6 @@ // Hide Assign (use as) menu item aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdAiwAssign, ETrue ); } -#else - // Context sensitive Mark - aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdMarkContext, IsMarking() ); #endif // Marking submenu @@ -787,7 +784,7 @@ } CleanupStack::PopAndDestroy( &operationTargets ); } -#endif +#endif } // ----------------------------------------------------------------------------- @@ -1059,9 +1056,8 @@ // CVcxHgMyVideosVideoListImpl::AddSendItemToMenuPaneL() // --------------------------------------------------------------------------- // -void CVcxHgMyVideosVideoListImpl::AddSendItemToMenuPaneL( - CEikMenuPane* aMenuPane, - TBool aAddToOptions ) +void CVcxHgMyVideosVideoListImpl::AddSendItemToMenuPaneL( + CEikMenuPane* aMenuPane ) { IPTVLOGSTRING_LOW_LEVEL( "CVcxHgMyVideosVideoListImpl::AddSendItemToMenuPaneL() enter" ); // Get total size of the videos that we're about to send @@ -1101,17 +1097,6 @@ // The Send item also needs to be flagged as a list query. CEikMenuPaneItem::SData& itemData = aMenuPane->ItemData( EVcxHgMyVideosCmdSend ); itemData.iFlags |= EEikMenuItemSpecificListQuery; - - // Add Send to Options menu - if ( aAddToOptions ) - { - SendUiL()->AddSendMenuItemL( - *aMenuPane, - sendItemIndex, - EVcxHgMyVideosCmdSendMarked, - capabilities ); - aMenuPane->SetItemSpecific( EVcxHgMyVideosCmdSendMarked, EFalse ); - } } CleanupStack::PopAndDestroy( &operationTargets ); IPTVLOGSTRING_LOW_LEVEL( "CVcxHgMyVideosVideoListImpl::AddSendItemToMenuPaneL() return" ); @@ -1149,9 +1134,6 @@ aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdCopy, !showCopy ); aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdMove, !showMove ); aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdDelete, !showDelete ); - aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdCopyMarked, !showCopy || !aItemsMarked ); - aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdMoveMarked, !showMove || !aItemsMarked ); - aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdDeleteMarked, !showDelete || !aItemsMarked ); CleanupStack::PopAndDestroy( &operationTargets ); }