# HG changeset patch # User Sebastian Brannstrom # Date 1289864840 0 # Node ID 697e27864f3a85ba4c8e14a3bd89032887d7d9dd # Parent a0eb6aaed0528903eb0b4d186e74d6a144cb7e2b# Parent 075b3a49cb55c1cccc0cc02c5cfb42032c4d0431 Merge newlist branch diff -r a0eb6aaed052 -r 697e27864f3a application/data/Podcast.rss --- a/application/data/Podcast.rss Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/Podcast.rss Mon Nov 15 23:47:20 2010 +0000 @@ -82,8 +82,8 @@ layout = EGeneralLayout; singular_label = STRING_r_about_text_s60; imagefile = APPICON; - imageid = EMbmPodcastPodcatcher_64px; - imagemask = EMbmPodcastPodcatcher_64px_mask; + imageid = EMbmPodcastAppicon; + imagemask = EMbmPodcastAppicon_mask; }; } }; @@ -95,16 +95,22 @@ type = ENaviDecoratorControlTabGroup; control = TAB_GROUP { - tab_width = EAknTabWidthWithTwoTabs; + tab_width = EAknTabWidthWithThreeTabs; active = 0; tabs = { - TAB - { - id = EPodcastTabFeeds; - + TAB + { + id = EPodcastTabFeeds; bmpfile = APPICON; bmpid = EMbmPodcastTab_feeds; bmpmask = EMbmPodcastTab_feeds_mask; + }, + TAB + { + id = EPodcastTabNew; + bmpfile = APPICON; + bmpid = EMbmPodcastTab_new; + bmpmask = EMbmPodcastTab_new_mask; }, TAB { diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastClient_common.rls --- a/application/data/PodcastClient_common.rls Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastClient_common.rls Mon Nov 15 23:47:20 2010 +0000 @@ -23,4 +23,4 @@ rls_string STRING_r_caption "Podcatcher" rls_string STRING_r_short_caption "Podcatcher" -rls_string STRING_r_about_text_s60 "Podcatcher 1.00(%d)\nŠ 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund, EmbedDev AB" +rls_string STRING_r_about_text_s60 "Podcatcher 1.10(%d)\nŠ 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund, EmbedDev AB" diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastClient_english.rls --- a/application/data/PodcastClient_english.rls Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastClient_english.rls Mon Nov 15 23:47:20 2010 +0000 @@ -19,7 +19,8 @@ // Menu items rls_string STRING_r_settings_cmd "Settings" -rls_string STRING_r_view_mark_all_played_cmd "Mark all old" +rls_string STRING_r_view_mark_all_played_cmd "Mark all shows old" +rls_string STRING_r_view_mark_all_played_cmd_short "Mark all old" rls_string STRING_r_exit_cmd "Exit" rls_string STRING_r_view_help "Help" rls_string STRING_r_view_about_cmd "About" @@ -51,8 +52,8 @@ // Settings view rls_string STRING_r_podcast_settings_title "Settings" rls_string STRING_r_podcast_setting_showdir "Podcast folder" -rls_string STRING_r_podcast_setting_autoupdate "Automatic update" -rls_string STRING_r_podcast_setting_autodownload "Automatic download" +rls_string STRING_r_podcast_setting_autoupdate "Update feeds" +rls_string STRING_r_podcast_setting_autodownload "Download shows" rls_string STRING_r_podcast_setting_connection "Connection" rls_string STRING_r_podcast_setting_default "Use default" rls_string STRING_r_podcast_setting_alwaysask "Always ask" @@ -60,15 +61,15 @@ rls_string STRING_r_podcast_setting_iaplist "Access points" rls_string STRING_r_podcast_select_folder "Select folder" //enable and disable automatic connections -rls_string STRING_r_on "On" -rls_string STRING_r_off "Off" +rls_string STRING_r_on "Automatically" +rls_string STRING_r_off "Manually" rls_string STRING_r_podcast_setting_reset_db "Reset database" rls_string STRING_r_podcast_setting_reset_db_query "Reset database? All data will be lost!" // Choicelist for autodownload -rls_string STRING_podcast_autoupdate_option1 "Off" +rls_string STRING_podcast_autoupdate_option1 "Manually" rls_string STRING_podcast_autoupdate_option2 "Every hour" rls_string STRING_podcast_autoupdate_option3 "Four times a day" rls_string STRING_podcast_autoupdate_option4 "Twice a day" @@ -109,7 +110,7 @@ rls_string STRING_r_view_delete_feed_cmd_short "Remove" rls_string STRING_r_update_feed_cmd "Update feed" rls_string STRING_r_update_feed_short_cmd "Update" -rls_string STRING_r_update_all_feeds_cmd "Update all" +rls_string STRING_r_update_all_feeds_cmd "Update all feeds" rls_string STRING_r_update_all_feeds_short_cmd "Update" rls_string STRING_r_podcast_feeds_is_updating "Updating..." @@ -128,10 +129,12 @@ // Show view +rls_string STRING_r_view_mark_as_played_cmd "Mark show old" rls_string STRING_r_view_mark_as_played_cmd_short "Mark old" -rls_string STRING_r_view_mark_as_unplayed_cmd_short "Mark new" -rls_string STRING_r_view_download_show_cmd "Get" -rls_string STRING_r_view_delete_show_cmd "Delete" +rls_string STRING_r_view_mark_as_unplayed_cmd "Mark show new" +rls_string STRING_r_view_mark_as_unplayed_cmd_short "Mark new" +rls_string STRING_r_view_download_show_cmd "Download show" +rls_string STRING_r_view_delete_show_cmd "Delete show" rls_string STRING_r_view_show_info_cmd "Info" rls_string STRING_r_error_playback_failed "Could not play show" @@ -140,8 +143,8 @@ rls_string STRING_r_view_resume_short_dls_cmd "Resume" rls_string STRING_r_view_stop_downloads_cmd "Suspend downloading" rls_string STRING_r_view_resume_downloads_cmd "Resume downloading" -rls_string STRING_r_view_remove_all_downloads_cmd_short "Remove all" -rls_string STRING_r_view_remove_all_downloads_cmd "Remove all" +rls_string STRING_r_view_remove_all_downloads_cmd_short "Remove" +rls_string STRING_r_view_remove_all_downloads_cmd "Remove all downloads" rls_string STRING_r_clear_query "Remove all downloads?" rls_string STRING_r_view_remove_download_short_cmd "Remove" rls_string STRING_r_view_move_up_short_cmd "Move up" @@ -158,3 +161,13 @@ rls_string STRING_r_add_url "Enter address" rls_string STRING_r_add_search "Search for feed" rls_string STRING_r_search_feed_prompt "Enter search terms:" +rls_string STRING_r_new_shows "New shows" +rls_string STRING_r_download_queue "Download queue" +rls_string STRING_r_mark_all_old_query "Mark all shows old?" +rls_string STRING_r_download_all_query "Add all shows to download queue?" +rls_string STRING_r_podcast_setting_autodelete "Delete old shows" +rls_string STRING_podcast_autodelete_option1 "Manually" +rls_string STRING_podcast_autodelete_option2 "1 day after playing" +rls_string STRING_podcast_autodelete_option3 "7 days after playing" +rls_string STRING_podcast_autodelete_option4 "30 days after playing" +rls_string STRING_r_download_all_shows "Download all shows" diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastFeedView.ra --- a/application/data/PodcastFeedView.ra Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastFeedView.ra Mon Nov 15 23:47:20 2010 +0000 @@ -111,8 +111,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastReload_all; - bmpmask = EMbmPodcastReload_all_mask; + bmpid = EMbmPodcastUpdate_all; + bmpmask = EMbmPodcastUpdate_all_mask; //txt = STRING_r_update_feed_short_cmd; helptxt = STRING_r_update_all_feeds_cmd; } @@ -130,8 +130,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastCancel; - bmpmask = EMbmPodcastCancel_mask; + bmpid = EMbmPodcastUpdate_cancel; + bmpmask = EMbmPodcastUpdate_cancel_mask; //txt = STRING_r_cancel_update_all_feeds_short_cmd; helptxt = STRING_r_cancel_update_all_feeds_cmd; } @@ -150,8 +150,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastAdd_pod; - bmpmask = EMbmPodcastAdd_pod_mask; + bmpid = EMbmPodcastAdd_feed; + bmpmask = EMbmPodcastAdd_feed_mask; //txt = STRING_r_view_add_feed_cmd_short; helptxt = STRING_r_view_add_feed_cmd; } diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastQueueView.ra --- a/application/data/PodcastQueueView.ra Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastQueueView.ra Mon Nov 15 23:47:20 2010 +0000 @@ -70,8 +70,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastDwn_pause; - bmpmask = EMbmPodcastDwn_pause_mask; + bmpid = EMbmPodcastDownload_pause; + bmpmask = EMbmPodcastDownload_pause_mask; //txt = STRING_r_suspend_download_cmd; helptxt = STRING_r_view_stop_downloads_cmd; } @@ -89,8 +89,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastDwn_start; - bmpmask = EMbmPodcastDwn_start_mask; + bmpid = EMbmPodcastDownload_play; + bmpmask = EMbmPodcastDownload_play_mask; //txt = STRING_r_view_resume_short_dls_cmd; helptxt = STRING_r_view_resume_downloads_cmd; } @@ -108,8 +108,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastRemove; - bmpmask = EMbmPodcastRemove_mask; + bmpid = EMbmPodcastDelete; + bmpmask = EMbmPodcastDelete_mask; //txt = STRING_r_view_remove_download_short_cmd; helptxt = STRING_r_view_remove_download_cmd; } @@ -127,8 +127,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastRemove_all; - bmpmask = EMbmPodcastRemove_all_mask; + bmpid = EMbmPodcastDelete_all; + bmpmask = EMbmPodcastDelete_all_mask; //txt = STRING_r_view_remove_all_downloads_cmd_short; helptxt = STRING_r_view_remove_all_downloads_cmd; } @@ -149,6 +149,21 @@ // }, STYLUS_POPUP_MENU_ITEM { + txt = STRING_r_view_show_info_cmd; + command = EPodcastShowInfo; + }, + STYLUS_POPUP_MENU_ITEM + { + txt = STRING_r_view_mark_as_unplayed_cmd_short; + command = EPodcastMarkAsUnplayed; + }, + STYLUS_POPUP_MENU_ITEM + { + txt = STRING_r_view_mark_as_played_cmd_short; + command = EPodcastMarkAsPlayed; + }, + STYLUS_POPUP_MENU_ITEM + { txt = STRING_r_view_move_up_short_cmd; command = EPodcastMoveDownloadUp; }, diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastSearchView.ra --- a/application/data/PodcastSearchView.ra Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastSearchView.ra Mon Nov 15 23:47:20 2010 +0000 @@ -108,8 +108,8 @@ flags= EAknWaitNoteFlags; singular_label = STRING_r_searching; imagefile = APPICON; - imageid = EMbmPodcastPodcatcher_64px; - imagemask = EMbmPodcastPodcatcher_64px_mask; + imageid = EMbmPodcastAppicon; + imagemask = EMbmPodcastAppicon_mask; animation = R_QGN_GRAF_WAIT_BAR_ANIM; }; } diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastSettingsView.ra --- a/application/data/PodcastSettingsView.ra Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastSettingsView.ra Mon Nov 15 23:47:20 2010 +0000 @@ -28,11 +28,6 @@ { items = { - /*MENU_ITEM - { - command = EPodcastResetDb; - txt = STRING_r_podcast_setting_reset_db; - },*/ MENU_ITEM { command = EPodcastHelp; @@ -41,7 +36,6 @@ }; } - RESOURCE AVKON_VIEW r_podcast_settingsview { menubar = r_podcast_settingsview_menubar; @@ -75,6 +69,13 @@ }, AVKON_SETTING_ITEM { + identifier = EPodcastSettingAutoDelete; + setting_page_resource = r_podcast_autodelete_page_resource; + associated_resource = r_podcast_autodelete_texts; + name = STRING_r_podcast_setting_autodelete; + }, + AVKON_SETTING_ITEM + { identifier = EPodcastSettingConnection; setting_page_resource = r_podcast_connection_page_resource; associated_resource = r_podcast_connection_texts; @@ -173,6 +174,44 @@ }; } +RESOURCE AVKON_SETTING_PAGE r_podcast_autodelete_page_resource +{ + label= STRING_r_podcast_setting_autodelete; + type = EAknCtPopupSettingList; + editor_resource_id = r_setting_autodelete_popup_list_entry; +} + +RESOURCE POPUP_SETTING_LIST r_setting_autodelete_popup_list_entry +{ +} + +RESOURCE AVKON_POPUP_SETTING_TEXTS r_podcast_autodelete_texts +{ + flags = 0; + setting_texts_resource = r_podcast_autodelete_closed; + popped_up_texts_resource = r_podcast_autodelete_opened; +} + +RESOURCE ARRAY r_podcast_autodelete_closed +{ + items = + { + AVKON_ENUMERATED_TEXT { value=0; text=STRING_podcast_autodelete_option1; }, + AVKON_ENUMERATED_TEXT { value=1; text=STRING_podcast_autodelete_option2; }, + AVKON_ENUMERATED_TEXT { value=2; text=STRING_podcast_autodelete_option3; } + }; +} + +RESOURCE ARRAY r_podcast_autodelete_opened +{ + items = + { + LBUF { txt=STRING_podcast_autodelete_option1; }, + LBUF { txt=STRING_podcast_autodelete_option2; }, + LBUF { txt=STRING_podcast_autodelete_option3; } + }; +} + RESOURCE AVKON_SETTING_PAGE r_podcast_autoupdate_page_resource { label= STRING_r_podcast_setting_autoupdate; diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastShowsView.ra --- a/application/data/PodcastShowsView.ra Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastShowsView.ra Mon Nov 15 23:47:20 2010 +0000 @@ -38,15 +38,9 @@ MENU_ITEM { command = EPodcastMarkAllPlayed; - txt = STRING_r_view_mark_all_played_cmd; + txt = STRING_r_view_mark_all_played_cmd_short; }, -// MENU_ITEM -// { -// command = EPodcastFilterShows; -// txt = STRING_r_view_filter_shows_cmd; -// cascade = r_filtershows_menu; -// }, - MENU_ITEM + MENU_ITEM { command = EPodcastAbout; txt = STRING_r_view_about_cmd; @@ -64,32 +58,6 @@ }; } -RESOURCE MENU_PANE r_filtershows_menu - { - items = { - MENU_ITEM - { - command = EPodcastFilterShowsAll; - txt = STRING_r_view_filter_all_shows_cmd; - }, -/* MENU_ITEM - { - command = EPodcastFilterShowsNew; - txt = STRING_r_view_filter_new_shows_cmd; - }, - MENU_ITEM - { - command = EPodcastFilterShowsDownloaded; - txt = STRING_r_view_filter_downloaded_shows_cmd; - },*/ - MENU_ITEM - { - command = EPodcastFilterShowsNewAndDownloaded; - txt = STRING_r_view_filter_downloaded_new_shows_cmd; - } - }; - } - RESOURCE AVKON_TOOLBAR r_showsview_toolbar { flags = KAknToolbarFixed; @@ -98,6 +66,25 @@ TBAR_CTRL { type = EAknCtButton; + id = EPodcastUpdateAllFeeds; + control = AVKON_BUTTON + { + states = + { + AVKON_BUTTON_STATE + { + bmpfile = APPICON; + bmpid = EMbmPodcastUpdate_all; + bmpmask = EMbmPodcastUpdate_all_mask; + //txt = STRING_r_update_feed_short_cmd; + helptxt = STRING_r_update_all_feeds_cmd; + } + }; + }; + }, + TBAR_CTRL + { + type = EAknCtButton; id = EPodcastUpdateFeed; control = AVKON_BUTTON { @@ -106,8 +93,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastReload; - bmpmask = EMbmPodcastReload_mask; + bmpid = EMbmPodcastUpdate; + bmpmask = EMbmPodcastUpdate_mask; //txt = STRING_r_update_feed_short_cmd; helptxt = STRING_r_update_feed_cmd; } @@ -125,8 +112,8 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastCancel; - bmpmask = EMbmPodcastCancel_mask; + bmpid = EMbmPodcastUpdate_cancel; + bmpmask = EMbmPodcastUpdate_cancel_mask; //txt = STRING_r_cancel_update_all_feeds_short_cmd; helptxt = STRING_r_cancel_update_all_feeds_cmd; } @@ -175,6 +162,44 @@ }; }, TBAR_CTRL + { + type = EAknCtButton; + id = EPodcastDownloadAll; + control = AVKON_BUTTON + { + states = + { + AVKON_BUTTON_STATE + { + bmpfile = APPICON; + bmpid = EMbmPodcastDownload_all; + bmpmask = EMbmPodcastDownload_all_mask; + //txt = STRING_r_cancel_update_all_feeds_short_cmd; + helptxt = STRING_r_download_all_shows; + } + }; + }; + }, + TBAR_CTRL + { + type = EAknCtButton; + id = EPodcastMarkAllPlayed; + control = AVKON_BUTTON + { + states = + { + AVKON_BUTTON_STATE + { + bmpfile = APPICON; + bmpid = EMbmPodcastMark_old_all; + bmpmask = EMbmPodcastMark_old_all_mask; + //txt = STRING_r_cancel_update_all_feeds_short_cmd; + helptxt = STRING_r_view_mark_all_played_cmd; + } + }; + }; + }, + TBAR_CTRL { type = EAknCtButton; id = EPodcastMarkAsPlayed; @@ -185,10 +210,10 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastMarkold; - bmpmask = EMbmPodcastMarkold_mask; + bmpid = EMbmPodcastMark_old; + bmpmask = EMbmPodcastMark_old_mask; //txt = STRING_r_view_mark_as_played_cmd_short; - helptxt = STRING_r_view_mark_as_played_cmd_short; + helptxt = STRING_r_view_mark_as_played_cmd; } }; }; @@ -204,10 +229,10 @@ AVKON_BUTTON_STATE { bmpfile = APPICON; - bmpid = EMbmPodcastMarknew; - bmpmask = EMbmPodcastMarknew_mask; + bmpid = EMbmPodcastMark_new; + bmpmask = EMbmPodcastMark_new_mask; //txt = STRING_r_view_mark_as_unplayed_cmd_short; - helptxt = STRING_r_view_mark_as_unplayed_cmd_short; + helptxt = STRING_r_view_mark_as_unplayed_cmd; } }; }; @@ -223,7 +248,18 @@ { txt = STRING_r_view_show_info_cmd; command = EPodcastShowInfo; + }, + STYLUS_POPUP_MENU_ITEM + { + txt = STRING_r_view_mark_as_unplayed_cmd_short; + command = EPodcastMarkAsUnplayed; + }, + STYLUS_POPUP_MENU_ITEM + { + txt = STRING_r_view_mark_as_played_cmd_short; + command = EPodcastMarkAsPlayed; } + }; } diff -r a0eb6aaed052 -r 697e27864f3a application/data/PodcastStrings.ra --- a/application/data/PodcastStrings.ra Sat Nov 13 12:34:20 2010 +0000 +++ b/application/data/PodcastStrings.ra Mon Nov 15 23:47:20 2010 +0000 @@ -78,3 +78,7 @@ RESOURCE TBUF r_about_text {buf = STRING_r_about_text_s60;} RESOURCE TBUF r_error_playback_failed {buf = STRING_r_error_playback_failed; } RESOURCE TBUF r_podcast_searchfeed_prompt {buf = STRING_r_search_feed_prompt;} +RESOURCE TBUF r_new_shows {buf = STRING_r_new_shows;} +RESOURCE TBUF r_download_queue {buf = STRING_r_download_queue;} +RESOURCE TBUF r_download_all_query {buf = STRING_r_download_all_query;} +RESOURCE TBUF r_mark_all_old_query {buf = STRING_r_mark_all_old_query;} diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/appicon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/appicon.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,466 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5813 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_active.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_active.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,3208 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_active_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_active_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5834 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_failed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_failed.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_failed_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_failed_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5829 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5827 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_queued.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_queued.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5819 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_queued_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_queued_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5834 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_suspended.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_suspended.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5820 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_dl_suspended_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_dl_suspended_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5834 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/audio_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/audio_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,5814 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/feed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/feed.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_active.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_active.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_active_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_active_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_failed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_failed.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1314 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_failed_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_failed_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_queued.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_queued.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_queued_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_queued_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_suspended.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_suspended.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_dl_suspended_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_dl_suspended_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/shows/video_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/shows/video_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,1314 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/tabs/tab_feeds.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/tabs/tab_feeds.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,114 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/tabs/tab_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/tabs/tab_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,12 @@ + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/tabs/tab_queue.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/tabs/tab_queue.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,29 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/tabs/tab_queue1.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/tabs/tab_queue1.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,35 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/tabs/tab_queue2.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/tabs/tab_queue2.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,41 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/tabs/tab_queue3.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/tabs/tab_queue3.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,46 @@ + + + +image/svg+xml + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/add_feed.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/add_feed.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/delete.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/delete.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,14 @@ + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/delete_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/delete_all.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/download.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/download.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,11 @@ + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/download_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/download_all.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/download_pause.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/download_pause.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/download_play.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/download_play.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,13 @@ + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/mark_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/mark_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,12 @@ + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/mark_new_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/mark_new_all.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/mark_old.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/mark_old.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,16 @@ + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/mark_old_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/mark_old_all.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,50 @@ + + + +image/svg+xml + + + + + + + + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/settings.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/settings.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,17 @@ + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/update.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/update.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,16 @@ + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/update_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/update_all.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/icons/toolbar/update_cancel.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/toolbar/update_cancel.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/images/tab_new.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/tab_new.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,12 @@ + + + + + + diff -r a0eb6aaed052 -r 697e27864f3a application/data/images/toolbars/markold_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/markold_all.svg Mon Nov 15 23:47:20 2010 +0000 @@ -0,0 +1,41 @@ + + + +image/svg+xml + + \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/group/icons.mk --- a/application/group/icons.mk Sat Nov 13 12:34:20 2010 +0000 +++ b/application/group/icons.mk Mon Nov 15 23:47:20 2010 +0000 @@ -7,8 +7,7 @@ TARGETDIR=$(ZDIR)\resource\apps ICONTARGETFILENAME=$(TARGETDIR)\Podcast.mif HEADERFILE=$(EPOCROOT)epoc32\include\Podcast.mbg -DPATH=..\data\images -TPATH=..\data\images\toolbars +DPATH=..\data\icons do_nothing : @rem do_nothing @@ -25,43 +24,54 @@ RESOURCE : mifconv $(ICONTARGETFILENAME) /h$(HEADERFILE) /c16,1\ - $(DPATH)\podcatcher_64px.svg\ - $(DPATH)\Audio.svg\ - $(DPATH)\Audio_new.svg\ - $(DPATH)\Audio_queued.svg\ - $(DPATH)\Audio_downloading.svg\ - $(DPATH)\Audio_downloaded.svg\ - $(DPATH)\Audio_downloaded_new.svg\ - $(DPATH)\Audio_failed.svg\ - $(DPATH)\Audio_suspended.svg\ - $(DPATH)\Video.svg\ - $(DPATH)\Video_new.svg\ - $(DPATH)\Video_queued.svg\ - $(DPATH)\Video_downloading.svg\ - $(DPATH)\Video_downloaded.svg\ - $(DPATH)\Video_downloaded_new.svg\ - $(DPATH)\Video_failed.svg\ - $(DPATH)\Video_suspended.svg\ - $(DPATH)\Feed.svg\ - $(TPATH)\add_pod.svg\ - $(TPATH)\delete.svg\ - $(TPATH)\dwn_pause.svg\ - $(TPATH)\dwn_start.svg\ - $(TPATH)\reload.svg\ - $(TPATH)\reload_all.svg\ - $(TPATH)\settings.svg\ - $(TPATH)\cancel.svg\ - $(TPATH)\remove.svg\ - $(TPATH)\remove_all.svg\ - $(TPATH)\download.svg\ - $(TPATH)\markold.svg\ - $(TPATH)\marknew.svg\ - $(DPATH)\tab_feeds.svg\ - $(DPATH)\tab_queue.svg\ - $(DPATH)\tab_queue1.svg\ - $(DPATH)\tab_queue2.svg\ - $(DPATH)\tab_queue3.svg\ - + $(DPATH)\appicon.svg\ + $(DPATH)\shows\audio.svg\ + $(DPATH)\shows\audio_dl.svg\ + $(DPATH)\shows\audio_dl_active.svg\ + $(DPATH)\shows\audio_dl_active_new.svg\ + $(DPATH)\shows\audio_dl_failed.svg\ + $(DPATH)\shows\audio_dl_failed_new.svg\ + $(DPATH)\shows\audio_dl_new.svg\ + $(DPATH)\shows\audio_dl_queued.svg\ + $(DPATH)\shows\audio_dl_queued_new.svg\ + $(DPATH)\shows\audio_dl_suspended.svg\ + $(DPATH)\shows\audio_dl_suspended_new.svg\ + $(DPATH)\shows\audio_new.svg\ + $(DPATH)\shows\video.svg\ + $(DPATH)\shows\video_dl.svg\ + $(DPATH)\shows\video_dl_active.svg\ + $(DPATH)\shows\video_dl_active_new.svg\ + $(DPATH)\shows\video_dl_failed.svg\ + $(DPATH)\shows\video_dl_failed_new.svg\ + $(DPATH)\shows\video_dl_new.svg\ + $(DPATH)\shows\video_dl_queued.svg\ + $(DPATH)\shows\video_dl_queued_new.svg\ + $(DPATH)\shows\video_dl_suspended.svg\ + $(DPATH)\shows\video_dl_suspended_new.svg\ + $(DPATH)\shows\video_new.svg\ + $(DPATH)\shows\feed.svg\ + $(DPATH)\tabs\tab_feeds.svg\ + $(DPATH)\tabs\tab_new.svg\ + $(DPATH)\tabs\tab_queue.svg\ + $(DPATH)\tabs\tab_queue1.svg\ + $(DPATH)\tabs\tab_queue2.svg\ + $(DPATH)\tabs\tab_queue3.svg\ + $(DPATH)\toolbar\add_feed.svg\ + $(DPATH)\toolbar\delete.svg\ + $(DPATH)\toolbar\delete_all.svg\ + $(DPATH)\toolbar\download_all.svg\ + $(DPATH)\toolbar\download_pause.svg\ + $(DPATH)\toolbar\download_play.svg\ + $(DPATH)\toolbar\mark_new.svg\ + $(DPATH)\toolbar\mark_new_all.svg\ + $(DPATH)\toolbar\mark_old.svg\ + $(DPATH)\toolbar\mark_old_all.svg\ + $(DPATH)\toolbar\settings.svg\ + $(DPATH)\toolbar\update.svg\ + $(DPATH)\toolbar\update_all.svg\ + $(DPATH)\toolbar\update_cancel.svg\ + $(DPATH)\toolbar\download.svg + FREEZE : do_nothing SAVESPACE : do_nothing diff -r a0eb6aaed052 -r 697e27864f3a application/inc/Podcast.hrh --- a/application/inc/Podcast.hrh Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/Podcast.hrh Mon Nov 15 23:47:20 2010 +0000 @@ -53,6 +53,7 @@ EPodcastMarkAsPlayed, EPodcastMarkAsUnplayed, EPodcastShowInfo, + EPodcastDownloadAll, // Common commands EPodcastBack, EPodcastSettings, @@ -63,14 +64,9 @@ EPodcastSearch, EPodcastAddSearchResult, EPodcastResetDb, - EPodcastFilterShows, - EPodcastFilterShowsAll, - EPodcastFilterShowsNew, - EPodcastFilterShowsDownloaded, - EPodcastFilterShowsNewAndDownloaded, - // Tabs EPodcastTabFeeds, - EPodcastTabQueue + EPodcastTabQueue, + EPodcastTabNew }; enum TPodcastControl @@ -79,6 +75,7 @@ EPodcastSettingShowDir, EPodcastSettingAutoDownload, EPodcastSettingAutoUpdate, + EPodcastSettingAutoDelete, EPodcastSettingMaxsimdls, EPodcastSettingConnection, EPodcastSettingIAPList, @@ -92,13 +89,17 @@ enum TShowsIconIndex { EShowIcon = 0, - ENewShowIcon, + EShowIconNew, EQuedShowIcon, + EQuedShowIconNew, EDownloadingShowIcon, + EDownloadingShowIconNew, EDownloadedShowIcon, - EDownloadedNewShowIcon, + EDownloadedShowIconNew, EFailedShowIcon, - ESuspendedShowIcon + EFailedShowIconNew, + ESuspendedShowIcon, + ESuspendedShowIconNew }; enum TConnectionSetting { diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastAppui.h --- a/application/inc/PodcastAppui.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastAppui.h Mon Nov 15 23:47:20 2010 +0000 @@ -41,8 +41,11 @@ const TUid KUidPodcastSearchViewID = {0x00000004}; const TUid KUidPodcastSettingsViewID = {0x00000005}; +const TUid KUidShowNewShows = {0x00000001}; + const TInt KTabIdFeeds = 0; -const TInt KTabIdQueue = 1; +const TInt KTabIdNew = 1; +const TInt KTabIdQueue = 2; const TInt KTimeoutPrio = CActive::EPriorityStandard; @@ -121,6 +124,7 @@ void NaviSetTextL(TInt aResourceId); void NaviShowTabGroupL(); void GetErrorTextL(TDes &aErrorMessage, TInt aErrorCode); + void SetTabsDimmed(TBool aDimmed); private: // From MEikMenuObserver diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastFeedView.h --- a/application/inc/PodcastFeedView.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastFeedView.h Mon Nov 15 23:47:20 2010 +0000 @@ -31,7 +31,7 @@ EOpmlSearching }; -class CPodcastFeedView : public CPodcastListView, public MEikListBoxObserver, +class CPodcastFeedView : public CPodcastListView, public MFeedEngineObserver, public MImageHandlerCallback { public: diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastListView.h --- a/application/inc/PodcastListView.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastListView.h Mon Nov 15 23:47:20 2010 +0000 @@ -77,7 +77,6 @@ TBool iLongTapDetected; CEikColumnListBox * iListbox; TBool iLandscape; - }; diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastQueueView.h --- a/application/inc/PodcastQueueView.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastQueueView.h Mon Nov 15 23:47:20 2010 +0000 @@ -80,7 +80,7 @@ void DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane); virtual void HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation); - + void UpdateViewTitleL(); private: TBool iDontUpdateList; }; diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastSearchView.h --- a/application/inc/PodcastSearchView.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastSearchView.h Mon Nov 15 23:47:20 2010 +0000 @@ -25,7 +25,7 @@ #include "PodcastListView.h" #include "Podcast.hrh" -class CPodcastSearchView : public CPodcastListView, public MEikListBoxObserver, +class CPodcastSearchView : public CPodcastListView, public MFeedEngineObserver { public: diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastSettingsView.h --- a/application/inc/PodcastSettingsView.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastSettingsView.h Mon Nov 15 23:47:20 2010 +0000 @@ -74,7 +74,6 @@ CPodcastModel& iPodcastModel; /** Previous activated view */ TVwsViewId iPreviousView; - TInt iAutoDownloadValue; CAknNavigationDecorator* iNaviDecorator; CAknNavigationControlContainer* iNaviPane; CPodcastSettingItemList * iListbox; diff -r a0eb6aaed052 -r 697e27864f3a application/inc/PodcastShowsView.h --- a/application/inc/PodcastShowsView.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/PodcastShowsView.h Mon Nov 15 23:47:20 2010 +0000 @@ -30,7 +30,7 @@ #include "Podcast.hrh" #include "PodcastListView.h" -class CPodcastShowsView : public CPodcastListView, public MEikListBoxObserver, +class CPodcastShowsView : public CPodcastListView, public MFeedEngineObserver, public MShowEngineObserver { public: @@ -109,13 +109,15 @@ void HandleDeleteShow(); void UpdateViewTitleL(); void GetShowErrorText(TDes &aErrorMessage, TInt aErrorCode); - + void HandleDownloadAllL(); + protected: CPodcastModel& iPodcastModel; TBool iProgressAdded; TInt iLastImageHandlerError; TBool iSetTitlebarImage; + TBool iShowNewShows; }; #endif // PODCASTSHOWSVIEWH diff -r a0eb6aaed052 -r 697e27864f3a application/inc/buildno.h --- a/application/inc/buildno.h Sat Nov 13 12:34:20 2010 +0000 +++ b/application/inc/buildno.h Mon Nov 15 23:47:20 2010 +0000 @@ -1,2 +1,2 @@ // Build number generated by increment_buildno.py, do not edit manually -#define BUILD_NO 32 \ No newline at end of file +#define BUILD_NO 1 \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/sis/buildno.txt --- a/application/sis/buildno.txt Sat Nov 13 12:34:20 2010 +0000 +++ b/application/sis/buildno.txt Mon Nov 15 23:47:20 2010 +0000 @@ -1,1 +1,1 @@ -32 \ No newline at end of file +1 \ No newline at end of file diff -r a0eb6aaed052 -r 697e27864f3a application/sis/increment_buildno.py --- a/application/sis/increment_buildno.py Sat Nov 13 12:34:20 2010 +0000 +++ b/application/sis/increment_buildno.py Mon Nov 15 23:47:20 2010 +0000 @@ -40,7 +40,7 @@ def update_header(header_file, buildno): print 'Writing %s' % header_file - buildno_str = '// Build number generated by increment_buildno.py, do not edit manually\r\n#define BUILD_NO %d' % buildno + buildno_str = '// Build number generated by increment_buildno.py, do not edit manually\r\n#define BUILD_NO %d\r\n' % buildno f = open(header_file, 'w') f.write(buildno_str) diff -r a0eb6aaed052 -r 697e27864f3a application/sis/podcatcher_udeb.pkg --- a/application/sis/podcatcher_udeb.pkg Sat Nov 13 12:34:20 2010 +0000 +++ b/application/sis/podcatcher_udeb.pkg Mon Nov 15 23:47:20 2010 +0000 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 32, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 10, 1, TYPE=SA ;Supports Symbian^1 [0x1028315F], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r a0eb6aaed052 -r 697e27864f3a application/sis/podcatcher_udeb_template.pkg --- a/application/sis/podcatcher_udeb_template.pkg Sat Nov 13 12:34:20 2010 +0000 +++ b/application/sis/podcatcher_udeb_template.pkg Mon Nov 15 23:47:20 2010 +0000 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, BUILDNO, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 10, BUILDNO, TYPE=SA ;Supports Symbian^1 [0x1028315F], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r a0eb6aaed052 -r 697e27864f3a application/sis/podcatcher_urel.pkg --- a/application/sis/podcatcher_urel.pkg Sat Nov 13 12:34:20 2010 +0000 +++ b/application/sis/podcatcher_urel.pkg Mon Nov 15 23:47:20 2010 +0000 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, 32, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 10, 1, TYPE=SA ;Supports Symbian^1 [0x1028315F], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r a0eb6aaed052 -r 697e27864f3a application/sis/podcatcher_urel_template.pkg --- a/application/sis/podcatcher_urel_template.pkg Sat Nov 13 12:34:20 2010 +0000 +++ b/application/sis/podcatcher_urel_template.pkg Mon Nov 15 23:47:20 2010 +0000 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 00, BUILDNO, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 10, BUILDNO, TYPE=SA ;Supports Symbian^1 [0x1028315F], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r a0eb6aaed052 -r 697e27864f3a application/src/PodcastAppui.cpp --- a/application/src/PodcastAppui.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/application/src/PodcastAppui.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -142,11 +142,13 @@ const TUid KUidFastSwap = { 0x10207218 }; if (activeAppUid == KUidFastSwap) { + DP("Exit called by task manager"); // closed by task manager Exit(); } else { + DP("Red button pressed, going into background"); // red button pressed TApaTask task(iEikonEnv->WsSession()); task.SetWgId(iEikonEnv->RootWin().Identifier()); @@ -207,10 +209,16 @@ { iTabGroup = STATIC_CAST(CAknTabGroup*, iNaviPane->ResourceDecorator()->DecoratedControl()); iTabGroup->SetObserver(this); + iNaviStyle = ENaviTabGroup; UpdateQueueTabL(iPodcastModel->ShowEngine().GetNumDownloadingShows()); } +void CPodcastAppUi::SetTabsDimmed(TBool aDimmed) + { + iTabGroup->SetDimmed(aDimmed); + } + void CPodcastAppUi::TabChangedL (TInt aIndex) { DP("CPodcastListView::TabChangedL "); @@ -224,12 +232,18 @@ if (iFeedView->ViewingShows()) { newview = KUidPodcastShowsViewID; + messageUid = TUid::Uid(2); } else { newview = KUidPodcastFeedViewID; } } + else if (aIndex == KTabIdNew) + { + newview = KUidPodcastShowsViewID; + messageUid = KUidShowNewShows; + } else if (aIndex == KTabIdQueue) { newview = KUidPodcastQueueViewID; diff -r a0eb6aaed052 -r 697e27864f3a application/src/PodcastFeedView.cpp --- a/application/src/PodcastFeedView.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/application/src/PodcastFeedView.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -119,12 +119,14 @@ CPodcastFeedView::~CPodcastFeedView() { + DP("CPodcastFeedView::~CPodcastFeedView BEGIN"); iPodcastModel.FeedEngine().RemoveObserver(this); delete iFeedsFormat; delete iNeverUpdated; delete iStylusPopupMenu; delete iUpdater; iFeedIdForIconArray.Close(); + DP("CPodcastFeedView::~CPodcastFeedView END"); } void CPodcastFeedView::UpdateItemL(TInt aIndex) @@ -180,6 +182,7 @@ DP("CPodcastFeedView::DoActivateL BEGIN"); CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); + iPodcastModel.ShowEngine().ExpireOldShows(); if (aPrevViewId.iViewUid == KUidPodcastShowsViewID) { // back key from shows view @@ -636,7 +639,7 @@ void CPodcastFeedView::ShowItem(TUint aUid) { TInt listIndex = -1; - for (TUint i=0;iScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto ); iListboxLandscape->SetSize(aRect.Size()); iListboxLandscape->MakeVisible(EFalse); - + iListboxLandscape->ItemDrawer()->ColumnData()->EnableMarqueeL(ETrue); + iListboxPortrait = new (ELeave) CAknDoubleLargeStyleListBox; iListboxPortrait->ConstructL(this, aListboxFlags); iListboxPortrait->SetMopParent( this ); @@ -82,6 +83,7 @@ iListboxPortrait->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto ); iListboxPortrait->SetSize(aRect.Size()); iListboxPortrait->MakeVisible(EFalse); + iListboxPortrait->ItemDrawer()->ColumnData()->EnableMarqueeL(ETrue); if (aRect.Width() > aRect.Height()) { @@ -154,6 +156,7 @@ iListbox->ScrollToMakeItemVisible(iListbox->CurrentItemIndex()); } } + void CPodcastListContainer::SizeChanged() { DP2("CPodcastListContainer::SizeChanged() BEGIN, width=%d, height=%d",Size().iWidth, Size().iHeight); @@ -169,9 +172,16 @@ iListboxPortrait->UpdateScrollBarsL(); iListboxPortrait->MakeVisible(EFalse); + iListboxLandscape->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto ); iListboxLandscape->MakeVisible(ETrue); iListboxLandscape->SetFocus(ETrue, EDrawNow); + + TInt index = iListboxPortrait->CurrentItemIndex(); + + if (IsVisible()) + iListboxLandscape->SetCurrentItemIndex(index); + iListbox = iListboxLandscape; } else @@ -183,9 +193,15 @@ iListboxPortrait->ScrollBarFrame()->SetScrollBarVisibilityL(CEikScrollBarFrame::EAuto, CEikScrollBarFrame::EAuto ); iListboxPortrait->MakeVisible(ETrue); iListboxPortrait->SetFocus(ETrue, EDrawNow); + + TInt index = iListboxLandscape->CurrentItemIndex(); + + if (IsVisible()) + iListboxPortrait->SetCurrentItemIndex(index); + iListbox = (CEikColumnListBox*) iListboxPortrait; } - + iListbox->SetSize(Size()); ActivateL(); DrawNow(); @@ -227,10 +243,12 @@ CPodcastListContainer::~CPodcastListContainer() { + DP("CPodcastListContainer::~CPodcastListContainer BEGIN"); iListboxLandscape->ItemDrawer()->ColumnData()->SetIconArray(NULL); delete iListboxPortrait; delete iListboxLandscape; delete iBgContext; + DP("CPodcastListContainer::~CPodcastListContainer END"); } void CPodcastListContainer::SetEmptyText(const TDesC &aText) @@ -304,8 +322,6 @@ void CPodcastListView::HandleViewRectChange() { - TBool wasVisible = iListContainer->IsVisible(); - if ( iListContainer ) { iListContainer->SetRect( ClientRect() ); diff -r a0eb6aaed052 -r 697e27864f3a application/src/PodcastQueueView.cpp --- a/application/src/PodcastQueueView.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/application/src/PodcastQueueView.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include #define KMaxMessageLength 200 @@ -105,11 +106,13 @@ CPodcastQueueView::~CPodcastQueueView() { + DP("CPodcastQueueView::~CPodcastQueueView BEGIN"); iPodcastModel.ShowEngine().RemoveObserver(this); iPodcastModel.FeedEngine().RemoveObserver(this); if(iStylusPopupMenu) delete iStylusPopupMenu, iStylusPopupMenu = NULL; + DP("CPodcastQueueView::~CPodcastQueueView END"); } @@ -125,7 +128,7 @@ CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); iPreviousView = aPrevViewId; - + UpdateViewTitleL(); UpdateFeedUpdateStateL(); UpdateToolbar(); DP("CPodcastQueueView::DoActivateL END"); @@ -336,7 +339,7 @@ } break; default: - CPodcastListView::HandleCommandL(aCommand); + CPodcastShowsView::HandleCommandL(aCommand); break; } iListContainer->SetLongTapDetectedL(EFalse); // in case we got here by long tapping @@ -384,16 +387,32 @@ if(iStylusPopupMenu && aPenEventLocation.iY < lbHeight) { TBool dimDown = (iListContainer->Listbox()->CurrentItemIndex() >= iPodcastModel.ActiveShowList().Count() - 1 ? - ETrue : EFalse); + (TBool)ETrue : (TBool)EFalse); TBool dimUp = (iListContainer->Listbox()->CurrentItemIndex() <= 0 ? - ETrue : EFalse); + (TBool)ETrue : (TBool)EFalse); iStylusPopupMenu->SetItemDimmed(EPodcastMoveDownloadDown, dimDown); iStylusPopupMenu->SetItemDimmed(EPodcastMoveDownloadUp, dimUp); - + + TInt index = iListContainer->Listbox()->CurrentItemIndex(); + CShowInfo *info = iPodcastModel.ActiveShowList()[index]; + + iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, info->PlayState() != ENeverPlayed); + iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, info->PlayState() == ENeverPlayed); + iStylusPopupMenu->ShowMenu(); iStylusPopupMenu->SetPosition(aPenEventLocation); } DP("CPodcastQueueView::HandleLongTapEventL END"); } + +void CPodcastQueueView::UpdateViewTitleL() + { + CAknTitlePane* titlePane = static_cast + ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); + + HBufC *title = iEikonEnv->AllocReadResourceLC(R_DOWNLOAD_QUEUE); + titlePane->SetTextL(*title); + CleanupStack::PopAndDestroy(title); + } diff -r a0eb6aaed052 -r 697e27864f3a application/src/PodcastSearchView.cpp --- a/application/src/PodcastSearchView.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/application/src/PodcastSearchView.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -93,6 +93,7 @@ CPodcastSearchView::~CPodcastSearchView() { + DP("CPodcastSearchView::~CPodcastSearchView BEGIN"); iPodcastModel.FeedEngine().RemoveObserver(this); if(iLongTapDetector) @@ -101,6 +102,7 @@ if(iStylusPopupMenu) delete iStylusPopupMenu, iStylusPopupMenu = NULL; + DP("CPodcastSearchView::~CPodcastSearchView END"); } TUid CPodcastSearchView::Id() const @@ -123,6 +125,7 @@ titlePane->SetTextL(*text , ETrue ); CleanupStack::PopAndDestroy(text); UpdateListboxItemsL(); + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(ETrue); } void CPodcastSearchView::DoDeactivate() @@ -133,6 +136,7 @@ ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); titlePane->SetTextToDefaultL(); + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(EFalse); } diff -r a0eb6aaed052 -r 697e27864f3a application/src/PodcastSettingsView.cpp --- a/application/src/PodcastSettingsView.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/application/src/PodcastSettingsView.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -24,6 +24,7 @@ #include #include #include "SettingsEngine.h" +#include #include #include @@ -256,6 +257,9 @@ DP1("Download automatically: %d", iAutoDownload); se.SetDownloadAutomatically(iAutoDownload); + + DP1("Delete automatically: %d", iAutoDownload); + se.SetDeleteAutomatically((TAutoDeleteSetting)iAutoDelete); se.SaveSettingsL(); DP("StoreSettings END"); } @@ -375,6 +379,7 @@ } iAutoDownload = se.DownloadAutomatically(); + iAutoDelete = se.DeleteAutomatically(); switch(aSettingId) { @@ -401,6 +406,11 @@ iSettingAutoDownload = new (ELeave) CAknBinaryPopupSettingItem (aSettingId, iAutoDownload); return iSettingAutoDownload; break; + case EPodcastSettingAutoDelete: + DP("EPodcastSettingAutoDelete"); + iSettingAutoDelete = new (ELeave) CAknEnumeratedTextPopupSettingItem (aSettingId, iAutoDelete); + return iSettingAutoDelete; + break; default: return CAknSettingItemList::CreateSettingItemL(aSettingId); break; @@ -417,6 +427,9 @@ TInt iAutoDownload; CAknSettingItem *iSettingAutoDownload; + TInt iAutoDelete; + CAknSettingItem *iSettingAutoDelete; + TInt iConnection; TInt iIap; @@ -487,10 +500,13 @@ DP("Creating navipane"); iNaviPane =( CAknNavigationControlContainer * ) StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) ); - HBufC *titleBuffer = iEikonEnv->AllocReadResourceL(R_SETTINGS_TITLE); - iNaviDecorator = iNaviPane->CreateNavigationLabelL(*titleBuffer); - delete titleBuffer; - + CAknTitlePane* titlePane = static_cast + ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); + + HBufC *titleBuffer = iEikonEnv->AllocReadResourceLC(R_SETTINGS_TITLE); + titlePane->SetTextL(*titleBuffer); + CleanupStack::PopAndDestroy(titleBuffer); + DP("Updating listbox"); AppUi()->AddToStackL(*this, iListbox); iListbox->UpdateSettingVisibility(); @@ -503,6 +519,7 @@ iNaviPane->PushL(*iNaviDecorator); } + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(ETrue); DP("CPodcastSettingsView::DoActivateL END"); } @@ -522,6 +539,8 @@ delete iNaviDecorator; iNaviDecorator = NULL; } + + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(EFalse); DP("CPodcastSettingsView::DoDeactivate END"); } diff -r a0eb6aaed052 -r 697e27864f3a application/src/PodcastShowsView.cpp --- a/application/src/PodcastShowsView.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/application/src/PodcastShowsView.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -44,45 +44,85 @@ const TUint KShowIconArrayIds[] = { - EMbmPodcastAudio, - EMbmPodcastAudio_mask, - EMbmPodcastAudio_new, - EMbmPodcastAudio_new_mask, - EMbmPodcastAudio_queued, - EMbmPodcastAudio_queued_mask, - EMbmPodcastAudio_downloading, - EMbmPodcastAudio_downloading_mask, - EMbmPodcastAudio_downloaded, - EMbmPodcastAudio_downloaded_mask, - EMbmPodcastAudio_downloaded_new, - EMbmPodcastAudio_downloaded_new_mask, - EMbmPodcastAudio_failed, - 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 + // EShowIcon = 0, + EMbmPodcastAudio, + EMbmPodcastAudio_mask, + // EShowIconNew, + EMbmPodcastAudio_new, + EMbmPodcastAudio_new_mask, + // EQuedShowIcon, + EMbmPodcastAudio_dl_queued, + EMbmPodcastAudio_dl_queued_mask, + // EQuedShowIconNew, + EMbmPodcastAudio_dl_queued_new, + EMbmPodcastAudio_dl_queued_new_mask, + // EDownloadingShowIcon, + EMbmPodcastAudio_dl_active, + EMbmPodcastAudio_dl_active_mask, + // EDownloadingShowIconNew, + EMbmPodcastAudio_dl_active_new, + EMbmPodcastAudio_dl_active_new_mask, + // EDownloadedShowIcon, + EMbmPodcastAudio_dl, + EMbmPodcastAudio_dl_mask, + // EDownloadedShowIconNew, + EMbmPodcastAudio_dl_new, + EMbmPodcastAudio_dl_new_mask, + // EFailedShowIcon, + EMbmPodcastAudio_dl_failed, + EMbmPodcastAudio_dl_failed_mask, + // EFailedShowIconNew, + EMbmPodcastAudio_dl_failed_new, + EMbmPodcastAudio_dl_failed_new_mask, + // ESuspendedShowIcon, + EMbmPodcastAudio_dl_suspended, + EMbmPodcastAudio_dl_suspended_mask, + // ESuspendedShowIconNew + EMbmPodcastAudio_dl_suspended_new, + EMbmPodcastAudio_dl_suspended_new_mask, + // EShowIcon = 0, + EMbmPodcastVideo, + EMbmPodcastVideo_mask, + // EShowIconNew, + EMbmPodcastVideo_new, + EMbmPodcastVideo_new_mask, + // EQuedShowIcon, + EMbmPodcastVideo_dl_queued, + EMbmPodcastVideo_dl_queued_mask, + // EQuedShowIconNew, + EMbmPodcastVideo_dl_queued_new, + EMbmPodcastVideo_dl_queued_new_mask, + // EDownloadingShowIcon, + EMbmPodcastVideo_dl_active, + EMbmPodcastVideo_dl_active_mask, + // EDownloadingShowIconNew, + EMbmPodcastVideo_dl_active_new, + EMbmPodcastVideo_dl_active_new_mask, + // EDownloadedShowIcon, + EMbmPodcastVideo_dl, + EMbmPodcastVideo_dl_mask, + // EDownloadedShowIconNew, + EMbmPodcastVideo_dl_new, + EMbmPodcastVideo_dl_new_mask, + // EFailedShowIcon, + EMbmPodcastVideo_dl_failed, + EMbmPodcastVideo_dl_failed_mask, + // EFailedShowIconNew, + EMbmPodcastVideo_dl_failed_new, + EMbmPodcastVideo_dl_failed_new_mask, + // ESuspendedShowIcon, + EMbmPodcastVideo_dl_suspended, + EMbmPodcastVideo_dl_suspended_mask, + // ESuspendedShowIconNew + EMbmPodcastVideo_dl_suspended_new, + EMbmPodcastVideo_dl_suspended_new_mask, + EMbmPodcastFeed, + EMbmPodcastFeed_mask, + 0, + 0 }; -const TInt KVideoIconOffset = 8; +const TInt KVideoIconOffset = 12; CPodcastShowsView* CPodcastShowsView::NewL(CPodcastModel& aPodcastModel) { @@ -196,11 +236,14 @@ CPodcastShowsView::~CPodcastShowsView() { + DP("CPodcastShowsView::~CPodcastShowsView BEGIN"); iPodcastModel.ShowEngine().RemoveObserver(this); iPodcastModel.FeedEngine().RemoveObserver(this); if(iStylusPopupMenu) delete iStylusPopupMenu, iStylusPopupMenu = NULL; + + DP("CPodcastShowsView::~CPodcastShowsView END"); } @@ -217,6 +260,21 @@ iPreviousView = TVwsViewId(KUidPodcast, KUidPodcastFeedViewID); + iShowNewShows = (aCustomMessageId.iUid == 1); + + if (iShowNewShows) + { + CEikButtonGroupContainer* cba = CEikButtonGroupContainer::Current(); + cba->SetCommandSetL(R_PODCAST_CBA); + cba->DrawDeferred(); + } + else + { + CEikButtonGroupContainer* cba = CEikButtonGroupContainer::Current(); + cba->SetCommandSetL(R_AVKON_SOFTKEYS_OPTIONS_BACK); + cba->DrawDeferred(); + } + UpdateViewTitleL(); UpdateFeedUpdateStateL(); DP("CPodcastShowsView::DoActivateL END"); @@ -359,31 +417,26 @@ void CPodcastShowsView::GetShowIcons(CShowInfo* aShowInfo, TInt& aIconIndex) { TBool dlStop = iPodcastModel.SettingsEngine().DownloadSuspended(); - + TBool isNew = aShowInfo->PlayState() == ENeverPlayed; switch (aShowInfo->DownloadState()) { case EDownloaded: - if (aShowInfo->PlayState() == ENeverPlayed) { - aIconIndex = EDownloadedNewShowIcon; - } else { - aIconIndex = EDownloadedShowIcon; - } + aIconIndex = isNew ? EDownloadedShowIconNew : EDownloadedShowIcon; break; case ENotDownloaded: - if (aShowInfo->PlayState() == ENeverPlayed) { - aIconIndex = ENewShowIcon; - } else { - aIconIndex = EShowIcon; - } + aIconIndex = isNew ? EShowIconNew : EShowIcon; break; case EQueued: - aIconIndex = dlStop ? ESuspendedShowIcon : EQuedShowIcon; + aIconIndex = dlStop ? (isNew ? ESuspendedShowIconNew : ESuspendedShowIcon) : + (isNew ? EQuedShowIconNew : EQuedShowIcon); break; case EDownloading: - aIconIndex = dlStop ? ESuspendedShowIcon : EDownloadingShowIcon; + aIconIndex = dlStop ? (isNew ? ESuspendedShowIconNew : ESuspendedShowIcon) : + (isNew ? EDownloadingShowIconNew : EDownloadingShowIcon); break; case EFailedDownload: - aIconIndex = EFailedShowIcon; + aIconIndex = dlStop ? (isNew ? ESuspendedShowIconNew : ESuspendedShowIcon) : + (isNew ? EFailedShowIconNew : EFailedShowIconNew); break; } @@ -391,6 +444,8 @@ { aIconIndex += KVideoIconOffset; } + + //DP3("dlStop=%d, isNew=%d, aIconIndex=%d", dlStop, isNew, aIconIndex); } @@ -423,8 +478,9 @@ { if (aShowInfo.ShowSize() > 0) { + TInt showSize = aShowInfo.ShowSize() >= aSizeDownloaded ? aShowInfo.ShowSize() : aSizeDownloaded; infoSize.Format(KSizeDownloadingOf(), ((float) aSizeDownloaded / (float) KSizeMb), - ((float)aShowInfo.ShowSize() / (float)KSizeMb)); + ((float) showSize / (float)KSizeMb)); } else { @@ -509,8 +565,15 @@ TListItemProperties itemProps; TInt len = 0; - iPodcastModel.GetShowsByFeedL(iPodcastModel.ActiveFeedInfo()->Uid()); - + if (iShowNewShows) + { + iPodcastModel.GetNewShowsL(); + } + else + { + iPodcastModel.GetShowsByFeedL(iPodcastModel.ActiveFeedInfo()->Uid()); + } + RShowInfoArray &fItems = iPodcastModel.ActiveShowList(); len = fItems.Count(); @@ -599,6 +662,9 @@ case EPodcastDeleteShow: HandleDeleteShowL(); break; + case EPodcastDownloadAll: + HandleDownloadAllL(); + break; case EPodcastDownloadShow: { TInt index = iListContainer->Listbox()->CurrentItemIndex(); @@ -627,6 +693,11 @@ } } break; + case EPodcastUpdateAllFeeds: + { + iPodcastModel.FeedEngine().UpdateAllFeedsL(); + UpdateToolbar(); + }break; case EPodcastCancelUpdateAllFeeds: iPodcastModel.FeedEngine().CancelUpdateAllFeeds(); break; @@ -634,22 +705,6 @@ { DisplayShowInfoDialogL(); }break; - case EPodcastFilterShowsAll: - iPodcastModel.ShowEngine().SetShowFilter(EAllShows); - UpdateListboxItemsL(); - break; - case EPodcastFilterShowsDownloaded: - iPodcastModel.ShowEngine().SetShowFilter(EDownloadedShows); - UpdateListboxItemsL(); - break; - case EPodcastFilterShowsNew: - iPodcastModel.ShowEngine().SetShowFilter(ENewShows); - UpdateListboxItemsL(); - break; - case EPodcastFilterShowsNewAndDownloaded: - iPodcastModel.ShowEngine().SetShowFilter(ENewAndDownloadedShows); - UpdateListboxItemsL(); - break; default: CPodcastListView::HandleCommandL(aCommand); break; @@ -661,7 +716,7 @@ void CPodcastShowsView::DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane) { - if(aResourceId == R_PODCAST_SHOWSVIEW_MENU) + if(aResourceId == R_PODCAST_SHOWSVIEW_MENU && !iShowNewShows) { TBool showMarkAllPlayed = EFalse; for (int i=0;iUid(); - aMenuPane->SetItemDimmed(EPodcastMarkAllPlayed, updatingState || !showMarkAllPlayed); - - + aMenuPane->SetItemDimmed(EPodcastMarkAllPlayed, updatingState || !showMarkAllPlayed); } } @@ -699,6 +752,27 @@ } } +void CPodcastShowsView::HandleDownloadAllL() + { + + TBuf msg; + iEikonEnv->ReadResourceL(msg, R_DOWNLOAD_ALL_QUERY); + if (!ShowQueryMessageL(msg)) + { + return; + } + + for (int i=0;iDownloadState() == ENotDownloaded) + { + TRAP_IGNORE(iPodcastModel.ShowEngine().AddDownloadL(*info)); + } + } + } + void CPodcastShowsView::UpdateToolbar(TBool aVisible) { CAknToolbar* toolbar = Toolbar(); @@ -711,63 +785,102 @@ TBool updatingState = iPodcastModel.FeedEngine().ClientState() != EIdle && iPodcastModel.ActiveFeedInfo() && iPodcastModel.FeedEngine().ActiveClientUid() == iPodcastModel.ActiveFeedInfo()->Uid(); - toolbar->HideItem(EPodcastUpdateFeed, updatingState, ETrue ); + if (iShowNewShows) + { + updatingState = iPodcastModel.FeedEngine().ClientState(); + toolbar->HideItem(EPodcastUpdateFeed, ETrue, ETrue ); + toolbar->HideItem(EPodcastUpdateAllFeeds, updatingState, ETrue ); + } + else + { + toolbar->HideItem(EPodcastUpdateFeed, updatingState, ETrue ); + toolbar->HideItem(EPodcastUpdateAllFeeds, ETrue, ETrue ); + } + toolbar->HideItem(EPodcastCancelUpdateAllFeeds, !updatingState, ETrue ); - RShowInfoArray &fItems = iPodcastModel.ActiveShowList(); - TInt itemCnt = fItems.Count(); - - TBool hideDownloadShowCmd = EFalse; - TBool dimDownloadShowCmd = EFalse; - TBool hideSetPlayed = EFalse; - - if(iListContainer->Listbox() != NULL) - { - TInt index = iListContainer->Listbox()->CurrentItemIndex(); + toolbar->HideItem(EPodcastDownloadAll, !iShowNewShows, ETrue); + toolbar->HideItem(EPodcastMarkAllPlayed, !iShowNewShows, ETrue ); + + if (iShowNewShows) + { + toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue ); + toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue ); + toolbar->HideItem(EPodcastDeleteShow, ETrue, ETrue); + toolbar->HideItem(EPodcastMarkAsPlayed, ETrue, ETrue ); + toolbar->HideItem(EPodcastMarkAsUnplayed, ETrue, ETrue ); - if(index>= 0 && index < itemCnt) - { - switch(fItems[index]->DownloadState()) + TBool showDownloadAll = EFalse; + TInt count = iPodcastModel.ActiveShowList().Count(); + for (int i=0;iDownloadState() == ENotDownloaded) { - case ENotDownloaded: - case EFailedDownload: - hideDownloadShowCmd = EFalse; - dimDownloadShowCmd = EFalse; - break; - case EQueued: - case EDownloading: - hideDownloadShowCmd = EFalse; - dimDownloadShowCmd = ETrue; - break; - case EDownloaded: - hideDownloadShowCmd = ETrue; - break; + showDownloadAll = ETrue; } - - if(fItems[index]->PlayState() == EPlayed) { - hideSetPlayed = ETrue; } + + toolbar->SetItemDimmed(EPodcastMarkAllPlayed, !count, ETrue); + toolbar->SetItemDimmed(EPodcastDownloadAll, !showDownloadAll, ETrue); } - } + else + { + RShowInfoArray &fItems = iPodcastModel.ActiveShowList(); + TInt itemCnt = fItems.Count(); + + TBool hideDownloadShowCmd = EFalse; + TBool dimDownloadShowCmd = EFalse; + TBool hideSetPlayed = EFalse; - if (hideDownloadShowCmd) { - toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue ); - toolbar->HideItem(EPodcastDeleteShow, EFalse, ETrue); - toolbar->SetItemDimmed(EPodcastDeleteShow, updatingState, ETrue); - } else { - toolbar->HideItem(EPodcastDownloadShow, EFalse, ETrue ); - toolbar->HideItem(EPodcastDeleteShow, ETrue, ETrue); - toolbar->SetItemDimmed(EPodcastDownloadShow, updatingState || dimDownloadShowCmd, ETrue); - } - - if (hideSetPlayed) { - toolbar->HideItem(EPodcastMarkAsPlayed, ETrue, ETrue ); - toolbar->HideItem(EPodcastMarkAsUnplayed, EFalse, ETrue ); - toolbar->SetItemDimmed(EPodcastMarkAsUnplayed, updatingState, ETrue); - } else { - toolbar->HideItem(EPodcastMarkAsPlayed, EFalse, ETrue ); - toolbar->HideItem(EPodcastMarkAsUnplayed, ETrue, ETrue ); - toolbar->SetItemDimmed(EPodcastMarkAsPlayed, updatingState, ETrue); - } + if(iListContainer->Listbox() != NULL) + { + TInt index = iListContainer->Listbox()->CurrentItemIndex(); + + if(index>= 0 && index < itemCnt) + { + switch(fItems[index]->DownloadState()) + { + case ENotDownloaded: + case EFailedDownload: + hideDownloadShowCmd = EFalse; + dimDownloadShowCmd = EFalse; + break; + case EQueued: + case EDownloading: + hideDownloadShowCmd = EFalse; + dimDownloadShowCmd = ETrue; + break; + case EDownloaded: + hideDownloadShowCmd = ETrue; + break; + } + + if(fItems[index]->PlayState() == EPlayed) { + hideSetPlayed = ETrue; + } + } + } + + if (hideDownloadShowCmd) { + toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue ); + toolbar->HideItem(EPodcastDeleteShow, EFalse, ETrue); + toolbar->SetItemDimmed(EPodcastDeleteShow, updatingState , ETrue); + } else { + toolbar->HideItem(EPodcastDownloadShow, EFalse, ETrue ); + toolbar->HideItem(EPodcastDeleteShow, ETrue, ETrue); + toolbar->SetItemDimmed(EPodcastDownloadShow, updatingState || dimDownloadShowCmd || !itemCnt, ETrue); + } + + if (hideSetPlayed) { + toolbar->HideItem(EPodcastMarkAsPlayed, ETrue, ETrue ); + toolbar->HideItem(EPodcastMarkAsUnplayed, EFalse, ETrue ); + toolbar->SetItemDimmed(EPodcastMarkAsUnplayed, updatingState, ETrue); + } else { + toolbar->HideItem(EPodcastMarkAsPlayed, EFalse, ETrue ); + toolbar->HideItem(EPodcastMarkAsUnplayed, ETrue, ETrue ); + toolbar->SetItemDimmed(EPodcastMarkAsPlayed, updatingState|| !itemCnt, ETrue); + } + } } } @@ -791,8 +904,8 @@ TBool hideDeleteShowCmd = info->DownloadState() != EDownloaded; TBool hideMarkOld = info->PlayState() == EPlayed; - iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, hideMarkOld); - iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, !hideMarkOld); + iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, hideMarkOld || !iShowNewShows); + iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, !hideMarkOld || !iShowNewShows); iStylusPopupMenu->SetItemDimmed(EPodcastDownloadShow, hideDownloadShowCmd); iStylusPopupMenu->SetItemDimmed(EPodcastDeleteShow, hideDeleteShowCmd); @@ -813,9 +926,30 @@ { CShowInfo *info = iPodcastModel.ActiveShowList()[index]; info->SetPlayState(aPlayed ? EPlayed : ENeverPlayed); - iPodcastModel.ShowEngine().UpdateShowL(*info); - UpdateShowItemDataL(iPodcastModel.ActiveShowList()[index], index, 0); - iListContainer->Listbox()->DrawItem(index); + if (aPlayed) + { + // PostPlayHandling calls UpdateShow, which is slow, so we don't need to do it again + iPodcastModel.ShowEngine().PostPlayHandling(info); + } + else + { + iPodcastModel.ShowEngine().UpdateShowL(*info); + } + + if (iShowNewShows) + { + UpdateListboxItemsL(); + + if (index > 0) + { + iListContainer->Listbox()->SetCurrentItemIndex(index - 1); + } + } + else + { + UpdateShowItemDataL(iPodcastModel.ActiveShowList()[index], index, 0); + iListContainer->Listbox()->DrawItem(index); + } } } @@ -864,7 +998,7 @@ CAknTitlePane* titlePane = static_cast ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); - TBool updatingState = iPodcastModel.FeedEngine().ClientState() != EIdle && + TBool updatingState = iPodcastModel.FeedEngine().ClientState() != EIdle && iPodcastModel.ActiveFeedInfo() && iPodcastModel.FeedEngine().ActiveClientUid() == iPodcastModel.ActiveFeedInfo()->Uid(); if (updatingState) { @@ -873,7 +1007,13 @@ SetEmptyTextL(R_PODCAST_EMPTY_LIST); } - if(iPodcastModel.ActiveFeedInfo()) + if(iShowNewShows) + { + HBufC *title = iEikonEnv->AllocReadResourceLC(R_NEW_SHOWS); + titlePane->SetTextL(*title); + CleanupStack::PopAndDestroy(title); + } + else if(iPodcastModel.ActiveFeedInfo()) { if (iPodcastModel.ActiveFeedInfo()->Title() != KNullDesC) { diff -r a0eb6aaed052 -r 697e27864f3a engine/inc/PodcastModel.h --- a/engine/inc/PodcastModel.h Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/inc/PodcastModel.h Mon Nov 15 23:47:20 2010 +0000 @@ -91,6 +91,7 @@ IMPORT_C void GetShowsDownloadingL(); IMPORT_C void GetShowsByFeedL(TUint aFeedUid); + IMPORT_C void GetNewShowsL(); IMPORT_C void MarkSelectionPlayedL(); TInt FindActiveShowByUid(TUint aUid); diff -r a0eb6aaed052 -r 697e27864f3a engine/inc/SettingsEngine.h --- a/engine/inc/SettingsEngine.h Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/inc/SettingsEngine.h Mon Nov 15 23:47:20 2010 +0000 @@ -48,6 +48,14 @@ EAutoUpdatePeriod4=1440 }; +enum TAutoDeleteSetting + { + EAutoDeleteOff, + EAutoDeleteAfter1Day, + EAutoDeleteAfter7Days, + EAutoDeleteAfter3Days + }; + class CSettingsEngine : public CBase { public: @@ -87,6 +95,9 @@ IMPORT_C void SaveSettingsL(); + IMPORT_C TAutoDeleteSetting DeleteAutomatically(); + IMPORT_C void SetDeleteAutomatically(TAutoDeleteSetting aAutoDeleteOn); + private: CSettingsEngine(CPodcastModel& aPodcastModel); void ConstructL(); @@ -104,7 +115,8 @@ TInt iMaxListItems; TTime iUpdateFeedTime; TBool iDownloadSuspended; - + TAutoDeleteSetting iDeleteAutomatically; + // Other member variables CPodcastModel &iPodcastModel; // reference to the model }; diff -r a0eb6aaed052 -r 697e27864f3a engine/inc/ShowEngine.h --- a/engine/inc/ShowEngine.h Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/inc/ShowEngine.h Mon Nov 15 23:47:20 2010 +0000 @@ -34,14 +34,6 @@ TUint iIndex; TUint iUid; }; - -typedef enum TShowFilter - { - EAllShows, - ENewShows, - EDownloadedShows, - ENewAndDownloadedShows - }; class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver { @@ -86,10 +78,11 @@ IMPORT_C void CheckForDeletedShows(TUint aFeedUid); IMPORT_C CMetaDataReader& MetaDataReader(); - IMPORT_C void SetShowFilter(TShowFilter aFilter); IMPORT_C void MoveDownloadUpL(TUint aUid); IMPORT_C void MoveDownloadDownL(TUint aUid); + IMPORT_C void PostPlayHandling(CShowInfo *aShow); + IMPORT_C void ExpireOldShows(); private: // from HttpClientObserver, dont have to be public void Connected(CHttpClient* aClient); @@ -140,6 +133,7 @@ void DBAddDownloadL(TUint aUid); CShowInfo* DBGetNextDownloadL(); void DBSwapDownloadsL(TDownload aFirstDL, TDownload aSecondDL); + void DBGetOldShowsL(RShowInfoArray& aShowArray); private: CHttpClient* iShowClient; @@ -160,7 +154,6 @@ sqlite3& iDB; TBuf iSqlBuffer; - TShowFilter iShowFilter; }; #endif /*SHOWENGINE_H_*/ diff -r a0eb6aaed052 -r 697e27864f3a engine/inc/ShowInfo.h --- a/engine/inc/ShowInfo.h Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/inc/ShowInfo.h Mon Nov 15 23:47:20 2010 +0000 @@ -98,6 +98,11 @@ IMPORT_C void SetLastError(TInt aLastError); IMPORT_C TInt LastError() const; + + IMPORT_C const TTime DeleteDate() const; + IMPORT_C void SetDeleteDate(TTime aDeleteDate); + + private: CShowInfo(); void ConstructL(); @@ -119,6 +124,7 @@ TBool iDelete; TShowType iShowType; TInt iLastError; + TTime iDeleteDate; }; typedef RPointerArray RShowInfoArray; diff -r a0eb6aaed052 -r 697e27864f3a engine/src/ConnectionEngine.cpp --- a/engine/src/ConnectionEngine.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/src/ConnectionEngine.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -309,11 +309,9 @@ { DP1("CConnectionEngine::ReportConnectionL, aError=%d", aError); TInt noObservers = iObserverArray.Count(); - DP1(" noObservers=%d", noObservers); while(noObservers) { noObservers--; - DP(" calling callback"); iObserverArray[noObservers]->ConnectCompleteL(aError); } } diff -r a0eb6aaed052 -r 697e27864f3a engine/src/FeedEngine.cpp --- a/engine/src/FeedEngine.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/src/FeedEngine.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -749,6 +749,17 @@ CleanupStack::PopAndDestroy(); // st } + rc = sqlite3_prepare_v2(&iDB,"alter table shows add column deletedate int" , -1, &st, (const char**) NULL); + DP1(" rc=%d", rc); + + if( rc==SQLITE_OK ) + { + Cleanup_sqlite3_finalize_PushL(st); + rc = sqlite3_step(st); + DP1(" rc=%d", rc); + CleanupStack::PopAndDestroy(); // st + } + DP("DBEnsureFileSizeFieldExists END"); } diff -r a0eb6aaed052 -r 697e27864f3a engine/src/PodcastModel.cpp --- a/engine/src/PodcastModel.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/src/PodcastModel.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -239,8 +239,7 @@ if (err == KErrNone) { - aPodcast->SetPlayState(EPlayed); - iShowEngine->UpdateShowL(*aPodcast); + iShowEngine->PostPlayHandling(aPodcast); } else { @@ -351,15 +350,6 @@ // open DB TBuf8 filename8; filename8.Copy(dbFileName); - -#ifdef COPY_DB - DP("Copying DB to c:\\data"); - TFileName copyName; - copyName.Copy(_L("C:\\data\\")); - copyName.Append(KDBFileName); - BaflUtils::CopyFile(iFsSession, dbFileName, copyName); -#endif - int rc = sqlite3_open((const char*) filename8.PtrZ(), &iDB); if(rc != SQLITE_OK){ User::Leave(KErrCorrupt); @@ -477,6 +467,12 @@ iShowEngine->GetShowsByFeedL(iActiveShowList, aFeedUid); } +EXPORT_C void CPodcastModel::GetNewShowsL() + { + iActiveShowList.ResetAndDestroy(); + iShowEngine->GetNewShowsL(iActiveShowList); + } + EXPORT_C void CPodcastModel::MarkSelectionPlayedL() { for (int i=0;iSetFileNameL(file); + + aShowArray.Append(showInfo); + CleanupStack::Pop(showInfo); + rc = sqlite3_step(st); + } + CleanupStack::PopAndDestroy();//st + } + else + { + User::Leave(KErrCorrupt); + } + DP("CShowEngine::DBGetOldShowsL END"); + } + CShowInfo* CShowEngine::DBGetNextDownloadL() { DP("CShowEngine::DBGetNextDownload"); CShowInfo *showInfo = NULL; - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, shows.uid, showsize, trackno, pubdate, showtype, lasterror from downloads, shows where downloads.uid=shows.uid"); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, shows.uid, showsize, trackno, pubdate, showtype, lasterror, deletedate from downloads, shows where downloads.uid=shows.uid"); iSqlBuffer.Format(KSqlStatement); #ifdef DONT_SORT_SQL @@ -560,25 +604,8 @@ void CShowEngine::DBGetShowsByFeedL(RShowInfoArray& aShowArray, TUint aFeedUid) { DP1("CShowEngine::DBGetShowsByFeed BEGIN, feedUid=%u", aFeedUid); - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror from shows where feeduid=%u"); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror, deletedate from shows where feeduid=%u"); iSqlBuffer.Format(KSqlStatement, aFeedUid); - - if (iShowFilter == ENewShows) - { - _LIT(KSqlStatementNewShows, " and playstate = 0"); // ENeverPlayed - iSqlBuffer.Append(KSqlStatementNewShows); - } - else if (iShowFilter == EDownloadedShows) - { - _LIT(KSqlStatementDownloadedShows, " and downloadstate = 4"); // EDownloaded - iSqlBuffer.Append(KSqlStatementDownloadedShows); - } - else if (iShowFilter == ENewAndDownloadedShows) - { - _LIT(KSqlStatementDownloadedAndNewShows, " and (downloadstate = 4 or playstate = 0)"); // EDownloaded or ENeverPlayed - iSqlBuffer.Append(KSqlStatementDownloadedAndNewShows); - - } #ifndef DONT_SORT_SQL _LIT(KSqlOrderByDate, " order by pubdate desc"); @@ -650,7 +677,7 @@ void CShowEngine::DBGetDownloadedShowsL(RShowInfoArray& aShowArray) { DP("CShowEngine::DBGetDownloadedShows"); - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror from shows where downloadstate=%u"); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror, deletedate from shows where downloadstate=%u"); iSqlBuffer.Format(KSqlStatement, EDownloaded); #ifndef DONT_SORT_SQL @@ -686,7 +713,8 @@ void CShowEngine::DBGetNewShowsL(RShowInfoArray& aShowArray) { DP("CShowEngine::DBGetNewShows"); - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror from shows where playstate=%u"); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror from shows where playstate=%u order by pubdate desc"); + iSqlBuffer.Format(KSqlStatement, ENeverPlayed); sqlite3_stmt *st; @@ -809,6 +837,10 @@ TInt lasterror = sqlite3_column_int(st, 14); showInfo->SetLastError(lasterror); + + sqlite3_int64 deletedate = sqlite3_column_int64(st, 15); + TTime timedeletedate(deletedate); + showInfo->SetDeleteDate(timedeletedate); } void CShowEngine::DBAddShowL(const CShowInfo& aItem) @@ -825,13 +857,13 @@ descPtr.Copy(aItem.Description()); PodcastUtils::SQLEncode(descPtr); - _LIT(KSqlStatement, "insert into shows (url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype) values (\"%S\",\"%S\", \"%S\", \"%S\", \"%Lu\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%Lu\", \"%d\")"); + _LIT(KSqlStatement, "insert into shows (url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, deletedate) values (\"%S\",\"%S\", \"%S\", \"%S\", \"%Lu\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%Lu\", \"%d\", \"%Lu\")"); iSqlBuffer.Format(KSqlStatement, &aItem.Url(), &titlePtr, &descPtr, &aItem.FileName(), aItem.Position().Int64(), aItem.PlayTime(), aItem.PlayState(), aItem.DownloadState(), aItem.FeedUid(), aItem.Uid(), aItem.ShowSize(), aItem.TrackNo(), - aItem.PubDate().Int64(), aItem.ShowType()); + aItem.PubDate().Int64(), aItem.ShowType(), aItem.DeleteDate().Int64()); CleanupStack::PopAndDestroy(descBuf); CleanupStack::PopAndDestroy(titleBuf); @@ -898,12 +930,12 @@ descPtr.Copy(aItem.Description()); PodcastUtils::SQLEncode(descPtr); - _LIT(KSqlStatement, "update shows set url=\"%S\", title=\"%S\", description=\"%S\", filename=\"%S\", position=\"%Lu\", playtime=\"%u\", playstate=\"%u\", downloadstate=\"%u\", feeduid=\"%u\", showsize=\"%u\", trackno=\"%u\",pubdate=\"%Lu\", showtype=\"%d\", lasterror=\"%d\" where uid=\"%u\""); + _LIT(KSqlStatement, "update shows set url=\"%S\", title=\"%S\", description=\"%S\", filename=\"%S\", position=\"%Lu\", playtime=\"%u\", playstate=\"%u\", downloadstate=\"%u\", feeduid=\"%u\", showsize=\"%u\", trackno=\"%u\",pubdate=\"%Lu\", showtype=\"%d\", lasterror=\"%d\", deletedate=\"%Lu\" where uid=\"%u\""); iSqlBuffer.Format(KSqlStatement, &aItem.Url(), &titlePtr, &descPtr, &aItem.FileName(), aItem.Position().Int64(), aItem.PlayTime(), aItem.PlayState(), aItem.DownloadState(), aItem.FeedUid(), aItem.ShowSize(), aItem.TrackNo(), aItem.PubDate().Int64(), - aItem.ShowType(), aItem.LastError(), aItem.Uid()); + aItem.ShowType(), aItem.LastError(), aItem.DeleteDate().Int64(), aItem.Uid()); CleanupStack::PopAndDestroy(descBuf); CleanupStack::PopAndDestroy(titleBuf); @@ -1440,6 +1472,24 @@ iDownloadErrors = KMaxDownloadErrors; } +EXPORT_C void CShowEngine::ExpireOldShows() + { + DP("CShowEngine::ExpireOldShows BEGIN"); + RShowInfoArray oldShowsArray; + + TRAPD(err, DBGetOldShowsL(oldShowsArray)); + + if (err == KErrNone) + { + for (int i=0;iFileName()); + BaflUtils::DeleteFile(iPodcastModel.FsSession(), oldShowsArray[i]->FileName()); + } + } + DP("CShowEngine::ExpireOldShows END"); + } + EXPORT_C void CShowEngine::CheckForDeletedShows(TUint aFeedUid) { RShowInfoArray shows; @@ -1469,11 +1519,6 @@ } } -EXPORT_C void CShowEngine::SetShowFilter(TShowFilter aFilter) - { - iShowFilter = aFilter; - } - EXPORT_C void CShowEngine::MoveDownloadUpL(TUint aUid) { DP("CShowEngine::MoveDownLoadUpL"); @@ -1599,3 +1644,38 @@ User::Leave(KErrCorrupt); } } + +EXPORT_C void CShowEngine::PostPlayHandling(CShowInfo *aShow) + { + DP("CShowEngine::PostPlayHandling BEGIN"); + if (!aShow) + return; + + aShow->SetPlayState(EPlayed); + + TAutoDeleteSetting deleteSetting = iPodcastModel.SettingsEngine().DeleteAutomatically(); + TTimeIntervalDays daysAhead; + + switch (deleteSetting) + { + case EAutoDeleteOff: + break; + case EAutoDeleteAfter1Day: + daysAhead = 1; + break; + case EAutoDeleteAfter7Days: + daysAhead = 7; + break; + case EAutoDeleteAfter3Days: + daysAhead = 30; + break; + } + + TTime deleteDate; + deleteDate.HomeTime(); + deleteDate += daysAhead; + aShow->SetDeleteDate(deleteDate); + + UpdateShowL(*aShow); + DP("CShowEngine::PostPlayHandling END"); + } diff -r a0eb6aaed052 -r 697e27864f3a engine/src/ShowInfo.cpp --- a/engine/src/ShowInfo.cpp Sat Nov 13 12:34:20 2010 +0000 +++ b/engine/src/ShowInfo.cpp Mon Nov 15 23:47:20 2010 +0000 @@ -255,3 +255,13 @@ { return iLastError; } + +EXPORT_C const TTime CShowInfo::DeleteDate() const + { + return iDeleteDate; + } + +EXPORT_C void CShowInfo::SetDeleteDate(TTime aDeleteDate) + { + iDeleteDate = aDeleteDate; + }