# HG changeset patch # User teknolog # Date 1272141977 -3600 # Node ID 31d05afa1a52d50ccbf76b6a7a470400baa21276 # Parent a2933afe16a72ca2681ba56ad9d427f880d0de6c Added video podcast icons, but they don't work correctly yet. diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_downloaded.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_downloaded.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_downloaded_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_downloaded_new.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_downloading.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_downloading.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_failed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_failed.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_new.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_queued.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_queued.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/data/images/new/Video_suspended.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/new/Video_suspended.svg Sat Apr 24 21:46:17 2010 +0100 @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a2933afe16a7 -r 31d05afa1a52 application/group/icons.mk --- a/application/group/icons.mk Sat Apr 24 20:10:46 2010 +0100 +++ b/application/group/icons.mk Sat Apr 24 21:46:17 2010 +0100 @@ -33,6 +33,14 @@ $(DPATH)\new\Audio_downloaded_new.svg\ $(DPATH)\new\Audio_failed.svg\ $(DPATH)\new\Audio_suspended.svg\ + $(DPATH)\new\Video.svg\ + $(DPATH)\new\Video_new.svg\ + $(DPATH)\new\Video_queued.svg\ + $(DPATH)\new\Video_downloading.svg\ + $(DPATH)\new\Video_downloaded.svg\ + $(DPATH)\new\Video_downloaded_new.svg\ + $(DPATH)\new\Video_failed.svg\ + $(DPATH)\new\Video_suspended.svg\ $(DPATH)\new\Feed.svg FREEZE : do_nothing diff -r a2933afe16a7 -r 31d05afa1a52 application/inc/Podcast.hrh --- a/application/inc/Podcast.hrh Sat Apr 24 20:10:46 2010 +0100 +++ b/application/inc/Podcast.hrh Sat Apr 24 21:46:17 2010 +0100 @@ -81,7 +81,7 @@ enum TShowsIconIndex { - EShowIcon, + EShowIcon = 0, ENewShowIcon, EQuedShowIcon, EDownloadingShowIcon, diff -r a2933afe16a7 -r 31d05afa1a52 application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r a2933afe16a7 -r 31d05afa1a52 application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r a2933afe16a7 -r 31d05afa1a52 application/src/PodcastShowsView.cpp --- a/application/src/PodcastShowsView.cpp Sat Apr 24 20:10:46 2010 +0100 +++ b/application/src/PodcastShowsView.cpp Sat Apr 24 21:46:17 2010 +0100 @@ -69,10 +69,30 @@ EMbmPodcastAudio_failed_mask, EMbmPodcastAudio_suspended, EMbmPodcastAudio_suspended_mask, + EMbmPodcastVideo, + EMbmPodcastVideo_mask, + EMbmPodcastVideo_new, + EMbmPodcastVideo_new_mask, + EMbmPodcastVideo_queued, + EMbmPodcastVideo_queued_mask, + EMbmPodcastVideo_downloading, + EMbmPodcastVideo_downloading_mask, + EMbmPodcastVideo_downloaded, + EMbmPodcastVideo_downloaded_mask, + EMbmPodcastVideo_downloaded_new, + EMbmPodcastVideo_downloaded_new_mask, + EMbmPodcastVideo_failed, + EMbmPodcastVideo_failed_mask, + EMbmPodcastVideo_suspended, + EMbmPodcastVideo_suspended_mask, + EMbmPodcastFeed, + EMbmPodcastFeed_mask, 0, 0 }; +const TInt KVideoIconOffset = 8; + CPodcastShowsView* CPodcastShowsView::NewL(CPodcastModel& aPodcastModel) { CPodcastShowsView* self = CPodcastShowsView::NewLC(aPodcastModel); @@ -120,9 +140,9 @@ TInt pos = 0; while (KShowIconArrayIds[pos] > 0) { - // Load the bitmap for play icon - CFbsBitmap* bitmap= NULL;//iEikonEnv->CreateBitmapL( _L("*"), KIconArrayIds[pos]); - CFbsBitmap* mask= NULL;////iEikonEnv->CreateBitmapL( _L("*"), KIconArrayIds[pos+1] ); + // Load the icon + CFbsBitmap* bitmap= NULL; + CFbsBitmap* mask= NULL; AknIconUtils::CreateIconL(bitmap, mask, iEikonEnv->EikAppUi()->Application()->BitmapStoreName(), @@ -131,7 +151,7 @@ CleanupStack::PushL(bitmap); CleanupStack::PushL(mask); - // Append the play icon to icon array + // Append the icon to icon array icons->AppendL(CGulIcon::NewL(bitmap, mask) ); CleanupStack::Pop(2); // bitmap, mask pos+=2; @@ -372,6 +392,11 @@ aIconIndex = EFailedShowIcon; break; } + + if (aShowInfo->ShowType() == EVideoPodcast) + { + aIconIndex += KVideoIconOffset; + } }