# HG changeset patch # User Sebastian Brannstrom # Date 1288011531 -3600 # Node ID 0d5e69a7cda9abc87e3ffedd8e6c67bf2d652363 # Parent 91d73b84416ca2397f4c8b484796c855b0fd0afd Added Mark all played button in show view diff -r 91d73b84416c -r 0d5e69a7cda9 application/data/PodcastShowsView.ra --- a/application/data/PodcastShowsView.ra Mon Oct 25 10:19:55 2010 +0100 +++ b/application/data/PodcastShowsView.ra Mon Oct 25 13:58:51 2010 +0100 @@ -35,11 +35,6 @@ { items = { - MENU_ITEM - { - command = EPodcastMarkAllPlayed; - txt = STRING_r_view_mark_all_played_cmd; - }, MENU_ITEM { command = EPodcastAbout; @@ -131,6 +126,25 @@ }; }; }, + TBAR_CTRL + { + type = EAknCtButton; + id = EPodcastMarkAllPlayed; + control = AVKON_BUTTON + { + states = + { + AVKON_BUTTON_STATE + { + bmpfile = APPICON; + bmpid = EMbmPodcastMarkold_all; + bmpmask = EMbmPodcastMarkold_all_mask; + //txt = STRING_r_cancel_update_all_feeds_short_cmd; + helptxt = STRING_r_view_mark_all_played_cmd; + } + }; + }; + }, // we keep the download toolbar button in S^3, but always disable it // because there are drawing issues with only one item in the toolbar TBAR_CTRL diff -r 91d73b84416c -r 0d5e69a7cda9 application/group/bld.inf --- a/application/group/bld.inf Mon Oct 25 10:19:55 2010 +0100 +++ b/application/group/bld.inf Mon Oct 25 13:58:51 2010 +0100 @@ -65,6 +65,7 @@ -c16,1 download.svg\ -c16,1 markold.svg\ -c16,1 marknew.svg\ + -c16,1 markold_all.svg\ -c16,1 tab_feeds.svg\ -c16,1 tab_queue.svg\ -c16,1 tab_queue1.svg\ diff -r 91d73b84416c -r 0d5e69a7cda9 application/inc/buildno.h --- a/application/inc/buildno.h Mon Oct 25 10:19:55 2010 +0100 +++ b/application/inc/buildno.h Mon Oct 25 13:58:51 2010 +0100 @@ -1,2 +1,2 @@ // Build number generated by increment_buildno.py, do not edit manually -#define BUILD_NO 7 \ No newline at end of file +#define BUILD_NO 8 \ No newline at end of file diff -r 91d73b84416c -r 0d5e69a7cda9 application/sis/buildno.txt --- a/application/sis/buildno.txt Mon Oct 25 10:19:55 2010 +0100 +++ b/application/sis/buildno.txt Mon Oct 25 13:58:51 2010 +0100 @@ -1,1 +1,1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff -r 91d73b84416c -r 0d5e69a7cda9 application/sis/podcatcher_udeb.pkg --- a/application/sis/podcatcher_udeb.pkg Mon Oct 25 10:19:55 2010 +0100 +++ b/application/sis/podcatcher_udeb.pkg Mon Oct 25 13:58:51 2010 +0100 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 7, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 8, TYPE=SA ;Supports Symbian^3 [0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r 91d73b84416c -r 0d5e69a7cda9 application/sis/podcatcher_urel.pkg --- a/application/sis/podcatcher_urel.pkg Mon Oct 25 10:19:55 2010 +0100 +++ b/application/sis/podcatcher_urel.pkg Mon Oct 25 13:58:51 2010 +0100 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, 7, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 0, 90, 8, TYPE=SA ;Supports Symbian^3 [0x20022E6D], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r 91d73b84416c -r 0d5e69a7cda9 application/src/PodcastShowsView.cpp --- a/application/src/PodcastShowsView.cpp Mon Oct 25 10:19:55 2010 +0100 +++ b/application/src/PodcastShowsView.cpp Mon Oct 25 13:58:51 2010 +0100 @@ -632,6 +632,18 @@ TInt index = iListContainer->Listbox()->CurrentItemIndex(); + TBool showMarkAllPlayed = EFalse; + for (int i=0;iPlayState() == ENeverPlayed) + { + showMarkAllPlayed = ETrue; + break; + } + + } + if (index >= 0 && index < iPodcastModel.ActiveShowList().Count()) { CShowInfo* info = iPodcastModel.ActiveShowList()[index]; @@ -645,6 +657,7 @@ aMenuPane->SetItemDimmed(EPodcastDownloadShow, hideDownloadShowCmd); aMenuPane->SetItemDimmed(EPodcastDeleteShow, hideDeleteShowCmd); + aMenuPane->SetItemDimmed(EPodcastMarkAllPlayed, !showMarkAllPlayed); } } } @@ -684,6 +697,19 @@ // one or two buttons defined in the resource, so we have download // there but always hidden toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue ); + + TBool showMarkAllPlayed = EFalse; + for (int i=0;iPlayState() == ENeverPlayed) + { + showMarkAllPlayed = ETrue; + break; + } + + } + toolbar->SetItemDimmed(EPodcastMarkAllPlayed, !showMarkAllPlayed, ETrue); } }