--- a/videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp Tue May 11 16:15:40 2010 +0300
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp Tue May 25 12:44:54 2010 +0300
@@ -15,7 +15,7 @@
*/
-// Version : %version: 42 %
+// Version : %version: 45 %
// INCLUDE FILES
#include <bldvariant.hrh>
@@ -236,7 +236,10 @@
//
void CVcxHgMyVideosMainView::HandleStatusPaneSizeChange()
{
- UpdateLayout();
+ if ( iContainer ) // If view is active
+ {
+ UpdateLayout();
+ }
}
// -----------------------------------------------------------------------------
@@ -382,22 +385,6 @@
}
}
break;
- case EVcxHgMyVideosCmdResumeDownload:
- {
- if ( iModel->AppState() == CVcxHgMyVideosModel::EVcxMyVideosAppStateVideoIdle )
- {
- VideoListL()->ResumeDownloadL();
- }
- }
- break;
- case EVcxHgMyVideosCmdCancelDownload:
- {
- if ( iModel->AppState() == CVcxHgMyVideosModel::EVcxMyVideosAppStateVideoIdle )
- {
- VideoListL()->CancelDownloadL();
- }
- }
- break;
case EVcxHgMyVideosCmdVideoDetails:
{
VideoListL()->VideoModel().ShowVideoDetailsDialogL();
@@ -544,9 +531,7 @@
{
TKeyResponse response( EKeyWasNotConsumed );
- // Clear key performs either 'Delete' or 'Cancel Download'. As Cancel Download
- // cannot be performed if there are selections, selections always cause Delete.
- // When there is no selections, video's status dictates the operation.
+ // Clear key performs 'Delete'.
if ( aKeyEvent.iScanCode == EStdKeyBackspace && aType == EEventKey )
{
if ( iModel->AppState() == CVcxHgMyVideosModel::EVcxMyVideosAppStateVideoIdle )
@@ -558,16 +543,10 @@
TInt count = markedVideos.Count();
CleanupStack::PopAndDestroy( &markedVideos );
- if ( ( count > 0 ) ||
- ( VideoListL()->VideoModel().VideoDownloadState( VideoListL()->Highlight() )
- == EVcxMyVideosDlStateNone ) )
+ if ( count > 0 )
{
HandleCommandL( EVcxHgMyVideosCmdDelete );
}
- else
- {
- HandleCommandL( EVcxHgMyVideosCmdCancelDownload );
- }
response = EKeyWasConsumed;
}
@@ -617,8 +596,6 @@
{
aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdDelete, ETrue );
aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdDeleteMarked, ETrue );
- aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdResumeDownload, ETrue );
- aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdCancelDownload, ETrue );
aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdSortSubMenu, ETrue );
aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdVideoDetails, ETrue );
aMenuPane->SetItemDimmed( EVcxHgMyVideosCmdStopShowViaHomenet, ETrue );
@@ -886,4 +863,3 @@
CleanupStack::PopAndDestroy( param );
}
-