# HG changeset patch # User Sebastian Brannstrom # Date 1290440501 0 # Node ID d7abecc9d18997e715150cdbacc00379159759ef # Parent 702ba9ffe210ce864a7bce088c2497ea22b38e5d Catch up with 5th ed; New SIS version 1.10 (1) diff -r 702ba9ffe210 -r d7abecc9d189 .cproject --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.cproject Mon Nov 22 15:41:41 2010 +0000 @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 702ba9ffe210 -r d7abecc9d189 .project --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.project Mon Nov 22 15:41:41 2010 +0000 @@ -0,0 +1,19 @@ + + + podcatcher_3rd + + + + + + com.nokia.carbide.cdt.builder.carbideCPPBuilder + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + com.nokia.carbide.cdt.builder.carbideCPPBuilderNature + + diff -r 702ba9ffe210 -r d7abecc9d189 .settings/org.eclipse.core.resources.prefs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.settings/org.eclipse.core.resources.prefs Mon Nov 22 15:41:41 2010 +0000 @@ -0,0 +1,3 @@ +#Fri Nov 12 22:43:48 CET 2010 +eclipse.preferences.version=1 +encoding//application/data/PodcastClient_spanish.rls=UTF-8 diff -r 702ba9ffe210 -r d7abecc9d189 application/data/Podcast.rss --- a/application/data/Podcast.rss Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/Podcast.rss Mon Nov 22 15:41:41 2010 +0000 @@ -68,8 +68,8 @@ layout = EGeneralLayout; singular_label = STRING_r_about_text_s60; imagefile = APPICON; - imageid = EMbmPodcastPodcatcher_64px; - imagemask = EMbmPodcastPodcatcher_64px_mask; + imageid = EMbmPodcastAppicon; + imagemask = EMbmPodcastAppicon_mask; }; } }; diff -r 702ba9ffe210 -r d7abecc9d189 application/data/PodcastClient_common.rls --- a/application/data/PodcastClient_common.rls Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastClient_common.rls Mon Nov 22 15:41:41 2010 +0000 @@ -23,4 +23,5 @@ 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_title "About Podcatcher" +rls_string STRING_r_about_body "Version 1.10 (%d) for S60 3rd ed.\n� 2007-2010 Sebastian Brannstrom, Lars Persson, Anders Fridlund" diff -r 702ba9ffe210 -r d7abecc9d189 application/data/PodcastClient_english.rls --- a/application/data/PodcastClient_english.rls Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastClient_english.rls Mon Nov 22 15:41:41 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" @@ -36,6 +37,7 @@ rls_string STRING_r_tabgroup_feeds "Feeds" rls_string STRING_r_tabgroup_queue "Queue" rls_string STRING_r_tabgroup_queue_counter "(%d) Queue" +rls_string STRING_r_tabgroup_new "New" // Question dialogs rls_string STRING_r_add_feed_prompt "Enter feed address:" @@ -51,23 +53,24 @@ // 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" rls_string STRING_r_podcast_setting_useiap "Select access point" rls_string STRING_r_podcast_setting_iaplist "Access points" rls_string STRING_r_podcast_select_folder "Select folder" -rls_string STRING_r_on "On" -rls_string STRING_r_off "Off" +//enable and disable automatic connections +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" @@ -108,7 +111,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..." @@ -127,10 +130,14 @@ // 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_download_show_cmd_short "Download" +rls_string STRING_r_view_delete_show_cmd "Delete show" +rls_string STRING_r_view_delete_show_cmd_short "Delete" rls_string STRING_r_view_show_info_cmd "Info (#)" rls_string STRING_r_error_playback_failed "Could not play show" @@ -139,24 +146,35 @@ 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_remove_download_cmd "Remove download" - rls_string STRING_r_view_move_up_short_cmd "Move up" rls_string STRING_r_view_move_down_short_cmd "Move down" +rls_string STRING_r_view_remove_download_cmd "Remove download" rls_string STRING_r_error_notfound "Error: Not found on server" rls_string STRING_r_error_invalid_address "Error: Connection failed" rls_string STRING_r_error_general "Error: General error %d" rls_string STRING_r_error_http "Error: HTTP error %d" rls_string STRING_r_error_disk_full "Error: Disk full" + rls_string STRING_r_add_url_or_search "Add feed" -rls_string STRING_r_add_url "Enter URL" +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_view_feed_feed_menu "Manage feeds" +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 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" +rls_string STRING_r_view_feed_feed_menu "Feed" rls_string STRING_r_view_shows_show_menu "Show" -rls_string STRING_r_view_queue_show_menu "Queue" +rls_string STRING_r_view_queue_show_menu "Show" + diff -r 702ba9ffe210 -r d7abecc9d189 application/data/PodcastClient_spanish.rls --- a/application/data/PodcastClient_spanish.rls Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastClient_spanish.rls Mon Nov 22 15:41:41 2010 +0000 @@ -131,9 +131,13 @@ // Show view rls_string STRING_r_view_mark_as_played_cmd_short "Marcar leido (*)" +rls_string STRING_r_view_mark_as_played_cmd "Marcar leido" rls_string STRING_r_view_mark_as_unplayed_cmd_short "Marcar nuevo (*)" +rls_string STRING_r_view_mark_as_unplayed_cmd "Marcar nuevo" rls_string STRING_r_view_download_show_cmd "Descargar" +rls_string STRING_r_view_download_show_cmd_short "Descargar" rls_string STRING_r_view_delete_show_cmd "Borrar" +rls_string STRING_r_view_delete_show_cmd_short "Borrar" rls_string STRING_r_view_show_info_cmd "Información (#)" rls_string STRING_r_error_playback_failed "No se pudo reproducir el capítulo" @@ -146,21 +150,27 @@ rls_string STRING_r_view_remove_all_downloads_cmd "Borrar la cola de descarga" rls_string STRING_r_clear_query "¿Quiere borrar la cola?" rls_string STRING_r_view_remove_download_short_cmd "Borrar" -rls_string STRING_r_view_remove_download_cmd "Borrar descarga" - rls_string STRING_r_view_move_up_short_cmd "Move up" rls_string STRING_r_view_move_down_short_cmd "Move down" +rls_string STRING_r_view_remove_download_cmd "Borrar descarga" rls_string STRING_r_error_notfound "Error: Servidor no fue hallado" rls_string STRING_r_error_invalid_address "Error: La conexión fallo" rls_string STRING_r_error_general "Error: Error general %d" rls_string STRING_r_error_http "Error: error HTTP %d" rls_string STRING_r_error_disk_full "Error: No espacio en el disco" + rls_string STRING_r_add_url_or_search "Add feed" -rls_string STRING_r_add_url "Enter URL" +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_view_feed_feed_menu "Administrar fuentes" -rls_string STRING_r_view_shows_show_menu "Show" -rls_string STRING_r_view_queue_show_menu "Queue" - +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 702ba9ffe210 -r d7abecc9d189 application/data/PodcastFeedView.ra --- a/application/data/PodcastFeedView.ra Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastFeedView.ra Mon Nov 22 15:41:41 2010 +0000 @@ -115,6 +115,11 @@ items = { MENU_ITEM { + txt = STRING_r_view_show_info_cmd; + command = EPodcastShowInfo; + }, + MENU_ITEM + { command = EPodcastAddFeed; txt = STRING_r_view_add_feed_cmd; }, diff -r 702ba9ffe210 -r d7abecc9d189 application/data/PodcastQueueView.ra --- a/application/data/PodcastQueueView.ra Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastQueueView.ra Mon Nov 22 15:41:41 2010 +0000 @@ -73,6 +73,21 @@ items = { MENU_ITEM { + txt = STRING_r_view_show_info_cmd; + command = EPodcastShowInfo; + }, + MENU_ITEM + { + txt = STRING_r_view_mark_as_unplayed_cmd_short; + command = EPodcastMarkAsUnplayed; + }, + MENU_ITEM + { + txt = STRING_r_view_mark_as_played_cmd_short; + command = EPodcastMarkAsPlayed; + }, + MENU_ITEM + { txt = STRING_r_view_remove_download_short_cmd; command = EPodcastRemoveDownload; }, diff -r 702ba9ffe210 -r d7abecc9d189 application/data/PodcastSearchView.ra --- a/application/data/PodcastSearchView.ra Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastSearchView.ra Mon Nov 22 15:41:41 2010 +0000 @@ -48,6 +48,7 @@ }; } + RESOURCE CBA r_podcast_search_cba { buttons = @@ -58,6 +59,7 @@ {id=EAknSoftkeyCancel; txt = STRING_r_cba_cancel;} }; } + RESOURCE DIALOG r_podcast_search_dlg { buttons = r_podcast_search_cba; @@ -101,8 +103,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 702ba9ffe210 -r d7abecc9d189 application/data/PodcastSettingsView.ra --- a/application/data/PodcastSettingsView.ra Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastSettingsView.ra Mon Nov 22 15:41:41 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; @@ -73,6 +67,13 @@ associated_resource = r_on_off_texts; name = STRING_r_podcast_setting_autodownload; }, + 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; @@ -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 702ba9ffe210 -r d7abecc9d189 application/data/PodcastShowsView.ra --- a/application/data/PodcastShowsView.ra Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastShowsView.ra Mon Nov 22 15:41:41 2010 +0000 @@ -36,6 +36,11 @@ { MENU_ITEM { + command = EPodcastUpdateAllFeeds; + txt = STRING_r_update_all_feeds_cmd; + }, + MENU_ITEM + { command = EPodcastUpdateFeed; txt = STRING_r_update_feed_cmd; }, @@ -53,7 +58,12 @@ MENU_ITEM { command = EPodcastMarkAllPlayed; - txt = STRING_r_view_mark_all_played_cmd; + txt = STRING_r_view_mark_all_played_cmd_short; + }, + MENU_ITEM + { + command = EPodcastDownloadAll; + txt = STRING_r_download_all_shows; }, MENU_ITEM { @@ -73,6 +83,11 @@ items = { MENU_ITEM { + txt = STRING_r_view_show_info_cmd; + command = EPodcastShowInfo; + }, + MENU_ITEM + { command = EPodcastMarkAsPlayed; txt = STRING_r_view_mark_as_played_cmd_short; }, @@ -83,18 +98,17 @@ }, MENU_ITEM { - command = EPodcastDeleteShow; - txt = STRING_r_view_delete_show_cmd; + command = EPodcastDownloadShow; + txt = STRING_r_view_download_show_cmd; }, MENU_ITEM { - txt = STRING_r_view_show_info_cmd; - command = EPodcastShowInfo; + command = EPodcastDeleteShow; + txt = STRING_r_view_delete_show_cmd; } }; } - RESOURCE DIALOG r_show_info_note { flags = EAknDialogGenericQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow; diff -r 702ba9ffe210 -r d7abecc9d189 application/data/PodcastStrings.ra --- a/application/data/PodcastStrings.ra Sat Nov 13 15:05:16 2010 +0000 +++ b/application/data/PodcastStrings.ra Mon Nov 22 15:41:41 2010 +0000 @@ -31,7 +31,6 @@ RESOURCE TBUF r_podcast_empty_list { buf = STRING_r_podcast_empty_list; } RESOURCE TBUF r_podcast_empty_list_updating { buf = STRING_r_podcast_empty_list_updating; } RESOURCE TBUF r_podcast_empty_search { buf = STRING_r_podcast_empty_search; } -RESOURCE TBUF r_podcast_feeds_update_error {buf = STRING_r_podcast_feeds_update_error;} RESOURCE TBUF r_podcast_feeds_never_updated {buf = STRING_r_podcast_shows_never_updated;} RESOURCE TBUF r_podcast_feeds_is_updating {buf = STRING_r_podcast_feeds_is_updating;} RESOURCE TBUF r_podcast_feeds_no_feeds {buf = STRING_r_podcast_no_feeds;} @@ -46,6 +45,7 @@ RESOURCE TBUF r_podcast_addfeed_title_prompt {buf = STRING_r_add_feed_title_prompt;} RESOURCE TBUF r_tabgroup_feeds {buf = STRING_r_tabgroup_feeds;} RESOURCE TBUF r_tabgroup_queue {buf = STRING_r_tabgroup_queue;} +RESOURCE TBUF r_tabgroup_new {buf = STRING_r_tabgroup_new;} RESOURCE TBUF r_tabgroup_queue_counter {buf = STRING_r_tabgroup_queue_counter;} RESOURCE TBUF r_podcast_no_search_results {buf = STRING_r_podcast_empty_list;} RESOURCE TBUF r_add_feed_query {buf=STRING_add_feed_query;} @@ -75,7 +75,11 @@ RESOURCE TBUF r_reset_db_query {buf = STRING_r_podcast_setting_reset_db_query;} RESOURCE TBUF r_error_disk_full {buf = STRING_r_error_disk_full; } -RESOURCE TBUF r_about_text {buf = STRING_r_about_text_s60;} +RESOURCE TBUF r_about_title {buf = STRING_r_about_title;} +RESOURCE TBUF r_about_body {buf = STRING_r_about_body;} 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 702ba9ffe210 -r d7abecc9d189 application/data/icons/appicon.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/icons/appicon.svg Mon Nov 22 15:41:41 2010 +0000 @@ -0,0 +1,34 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,468 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,481 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,489 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,500 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,482 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,496 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,495 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,486 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,500 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,486 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,500 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,482 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,19 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,93 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,107 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,200 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,127 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,108 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,122 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,121 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,113 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,127 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,113 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,127 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 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 22 15:41:41 2010 +0000 @@ -0,0 +1,108 @@ + + + + diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio.svg --- a/application/data/images/Audio.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_downloaded.svg --- a/application/data/images/Audio_downloaded.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_downloaded_new.svg --- a/application/data/images/Audio_downloaded_new.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_downloading.svg --- a/application/data/images/Audio_downloading.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ - - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_failed.svg --- a/application/data/images/Audio_failed.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_new.svg --- a/application/data/images/Audio_new.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_queued.svg --- a/application/data/images/Audio_queued.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ - - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Audio_suspended.svg --- a/application/data/images/Audio_suspended.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ - - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Feed.svg --- a/application/data/images/Feed.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Podcatcher_64px.svg --- a/application/data/images/Podcatcher_64px.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video.svg --- a/application/data/images/Video.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,127 +0,0 @@ - - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_downloaded.svg --- a/application/data/images/Video_downloaded.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_downloaded_new.svg --- a/application/data/images/Video_downloaded_new.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,230 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_downloading.svg --- a/application/data/images/Video_downloading.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_failed.svg --- a/application/data/images/Video_failed.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,182 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_new.svg --- a/application/data/images/Video_new.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,193 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_queued.svg --- a/application/data/images/Video_queued.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,149 +0,0 @@ - - - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/Video_suspended.svg --- a/application/data/images/Video_suspended.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,167 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Blue_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Blue_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Broken_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Broken_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1568 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Download_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Download_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1627 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Green_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Green_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/New_showstate_left.svg --- a/application/data/images/originals/SVG_Left_overlays/New_showstate_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1594 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Not_downloaded_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Not_downloaded_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1570 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Queue_downloaded_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Queue_downloaded_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1596 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Left_overlays/Red_left.svg --- a/application/data/images/originals/SVG_Left_overlays/Red_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Blue_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Blue_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Broken_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Broken_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1569 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Download_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Download_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1626 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Green_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Green_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/New_showstate_right.svg --- a/application/data/images/originals/SVG_Right_overlays/New_showstate_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1594 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Not_downloaded_left.svg --- a/application/data/images/originals/SVG_Right_overlays/Not_downloaded_left.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1570 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Not_downloaded_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Not_downloaded_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1570 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Queue_downloaded_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Queue_downloaded_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1598 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_Right_overlays/Red_right.svg --- a/application/data/images/originals/SVG_Right_overlays/Red_right.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Audio.svg --- a/application/data/images/originals/SVG_files/Audio.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1662 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Audio_blue.svg --- a/application/data/images/originals/SVG_files/Audio_blue.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1662 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Audio_green.svg --- a/application/data/images/originals/SVG_files/Audio_green.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1662 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Audio_pink.svg --- a/application/data/images/originals/SVG_files/Audio_pink.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1662 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Feed.svg --- a/application/data/images/originals/SVG_files/Feed.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1574 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Podcatcher_48px.svg --- a/application/data/images/originals/SVG_files/Podcatcher_48px.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2719 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Podcatcher_64px.svg --- a/application/data/images/originals/SVG_files/Podcatcher_64px.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2732 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/originals/SVG_files/Video.svg --- a/application/data/images/originals/SVG_files/Video.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1802 +0,0 @@ - - - - - - - - - - -]> - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tab_feeds.svg --- a/application/data/images/toolbars/podcast_tab_feeds.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tab_queue.svg --- a/application/data/images/toolbars/podcast_tab_queue.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tab_search.svg --- a/application/data/images/toolbars/podcast_tab_search.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_addfeed.svg --- a/application/data/images/toolbars/podcast_tb_addfeed.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_cancel.svg --- a/application/data/images/toolbars/podcast_tb_cancel.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_clear.svg --- a/application/data/images/toolbars/podcast_tb_clear.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_delete.svg --- a/application/data/images/toolbars/podcast_tb_delete.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_download.svg --- a/application/data/images/toolbars/podcast_tb_download.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_marknew.svg --- a/application/data/images/toolbars/podcast_tb_marknew.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_markold.svg --- a/application/data/images/toolbars/podcast_tb_markold.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_remove.svg --- a/application/data/images/toolbars/podcast_tb_remove.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_resume.svg --- a/application/data/images/toolbars/podcast_tb_resume.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_search.svg --- a/application/data/images/toolbars/podcast_tb_search.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_settings.svg --- a/application/data/images/toolbars/podcast_tb_settings.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_suspend.svg --- a/application/data/images/toolbars/podcast_tb_suspend.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_update.svg --- a/application/data/images/toolbars/podcast_tb_update.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/data/images/toolbars/podcast_tb_updateall.svg --- a/application/data/images/toolbars/podcast_tb_updateall.svg Sat Nov 13 15:05:16 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - diff -r 702ba9ffe210 -r d7abecc9d189 application/group/Podcast.mmp --- a/application/group/Podcast.mmp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/group/Podcast.mmp Mon Nov 22 15:41:41 2010 +0000 @@ -89,7 +89,7 @@ LIBRARY eikcdlg.lib LIBRARY efsrv.lib LIBRARY aknicon.lib -LIBRARY gdi.lib +LIBRARY gdi.lib LIBRARY eikctl.lib LIBRARY charconv.lib LIBRARY flogger.lib @@ -109,5 +109,4 @@ LIBRARY estlib.lib //LIBRARY libc.lib LIBRARY centralrepository.lib -LIBRARY sysutil.lib - +LIBRARY sysutil.lib diff -r 702ba9ffe210 -r d7abecc9d189 application/group/icons.mk --- a/application/group/icons.mk Sat Nov 13 15:05:16 2010 +0000 +++ b/application/group/icons.mk Mon Nov 22 15:41:41 2010 +0000 @@ -7,7 +7,7 @@ TARGETDIR=$(ZDIR)\resource\apps ICONTARGETFILENAME=$(TARGETDIR)\Podcast.mif HEADERFILE=$(EPOCROOT)epoc32\include\Podcast.mbg -DPATH=..\data\images +DPATH=..\data\icons do_nothing : @rem do_nothing @@ -24,25 +24,33 @@ 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 - + $(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 + FREEZE : do_nothing SAVESPACE : do_nothing diff -r 702ba9ffe210 -r d7abecc9d189 application/inc/Podcast.hrh --- a/application/inc/Podcast.hrh Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/Podcast.hrh Mon Nov 22 15:41:41 2010 +0000 @@ -40,6 +40,8 @@ EPodcastImportExportFeeds, EPodcastImportFeeds, EPodcastExportFeeds, + EPodcastFeedFeedMenu, + EPodcastFeedHelpMenu, // Show commands EPodcastDownloadShow, EPodcastDeleteShow, @@ -53,6 +55,9 @@ EPodcastMarkAsPlayed, EPodcastMarkAsUnplayed, EPodcastShowInfo, + EPodcastDownloadAll, + EPodcastShowsShowMenu, + EPodcastQueueShowMenu, // Common commands EPodcastBack, EPodcastSettings, @@ -63,15 +68,9 @@ EPodcastSearch, EPodcastAddSearchResult, EPodcastResetDb, - EPodcastFilterShows, - EPodcastFilterShowsAll, - EPodcastFilterShowsNew, - EPodcastFilterShowsDownloaded, - EPodcastFilterShowsNewAndDownloaded, - EPodcastFeedFeedMenu, - EPodcastShowsShowMenu, - EPodcastQueueShowMenu, - EPodcastFeedHelpMenu + EPodcastTabFeeds, + EPodcastTabQueue, + EPodcastTabNew }; enum TPodcastControl @@ -80,6 +79,7 @@ EPodcastSettingShowDir, EPodcastSettingAutoDownload, EPodcastSettingAutoUpdate, + EPodcastSettingAutoDelete, EPodcastSettingMaxsimdls, EPodcastSettingConnection, EPodcastSettingIAPList, @@ -92,13 +92,17 @@ enum TShowsIconIndex { EShowIcon = 0, - ENewShowIcon, + EShowIconNew, EQuedShowIcon, + EQuedShowIconNew, EDownloadingShowIcon, + EDownloadingShowIconNew, EDownloadedShowIcon, - EDownloadedNewShowIcon, + EDownloadedShowIconNew, EFailedShowIcon, - ESuspendedShowIcon + EFailedShowIconNew, + ESuspendedShowIcon, + ESuspendedShowIconNew }; enum TConnectionSetting { diff -r 702ba9ffe210 -r d7abecc9d189 application/inc/PodcastAppui.h --- a/application/inc/PodcastAppui.h Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/PodcastAppui.h Mon Nov 22 15:41:41 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 702ba9ffe210 -r d7abecc9d189 application/inc/PodcastFeedView.h --- a/application/inc/PodcastFeedView.h Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/PodcastFeedView.h Mon Nov 22 15:41:41 2010 +0000 @@ -31,7 +31,7 @@ EOpmlSearching }; -class CPodcastFeedView : public CPodcastListView, public MEikListBoxObserver, +class CPodcastFeedView : public CPodcastListView, public MFeedEngineObserver, public MImageHandlerCallback { public: diff -r 702ba9ffe210 -r d7abecc9d189 application/inc/PodcastQueueView.h --- a/application/inc/PodcastQueueView.h Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/PodcastQueueView.h Mon Nov 22 15:41:41 2010 +0000 @@ -75,7 +75,7 @@ void HandleCommandL(TInt aCommand); TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType); void DynInitMenuPaneL(TInt aResourceId,CEikMenuPane* aMenuPane); - + void UpdateViewTitleL(); private: TBool iDontUpdateList; }; diff -r 702ba9ffe210 -r d7abecc9d189 application/inc/PodcastSearchView.h --- a/application/inc/PodcastSearchView.h Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/PodcastSearchView.h Mon Nov 22 15:41:41 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 702ba9ffe210 -r d7abecc9d189 application/inc/PodcastSettingsView.h --- a/application/inc/PodcastSettingsView.h Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/PodcastSettingsView.h Mon Nov 22 15:41:41 2010 +0000 @@ -74,7 +74,6 @@ CPodcastModel& iPodcastModel; /** Previous activated view */ TVwsViewId iPreviousView; - TInt iAutoDownloadValue; CAknNavigationDecorator* iNaviDecorator; CAknNavigationControlContainer* iNaviPane; CPodcastSettingItemList * iListbox; diff -r 702ba9ffe210 -r d7abecc9d189 application/inc/PodcastShowsView.h --- a/application/inc/PodcastShowsView.h Sat Nov 13 15:05:16 2010 +0000 +++ b/application/inc/PodcastShowsView.h Mon Nov 22 15:41:41 2010 +0000 @@ -28,7 +28,7 @@ #include "Podcast.hrh" #include "PodcastListView.h" -class CPodcastShowsView : public CPodcastListView, public MEikListBoxObserver, +class CPodcastShowsView : public CPodcastListView, public MFeedEngineObserver, public MShowEngineObserver { public: @@ -104,13 +104,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 702ba9ffe210 -r d7abecc9d189 application/sis/podcatcher_udeb.pkg --- a/application/sis/podcatcher_udeb.pkg Sat Nov 13 15:05:16 2010 +0000 +++ b/application/sis/podcatcher_udeb.pkg Mon Nov 22 15:41:41 2010 +0000 @@ -1,7 +1,7 @@ &EN,SP :"Symbian Foundation" %{"Podcatcher","Podcatcher"} -#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 0, 1, TYPE=SA +#{"Podcatcher","Podcatcher"},(0xA0009D00), 1, 10, 1, TYPE=SA ;Supports S60 3rd edition [0x101F7961], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r 702ba9ffe210 -r d7abecc9d189 application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r 702ba9ffe210 -r d7abecc9d189 application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r 702ba9ffe210 -r d7abecc9d189 application/sis/podcatcher_udeb_template.pkg --- a/application/sis/podcatcher_udeb_template.pkg Sat Nov 13 15:05:16 2010 +0000 +++ b/application/sis/podcatcher_udeb_template.pkg Mon Nov 22 15:41:41 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 S60 3rd edition [0x101F7961], 0, 0, 0, {"Series60ProductID","Series60ProductID"} diff -r 702ba9ffe210 -r d7abecc9d189 application/sis/podcatcher_urel.pkg --- a/application/sis/podcatcher_urel.pkg Sat Nov 13 15:05:16 2010 +0000 +++ b/application/sis/podcatcher_urel.pkg Mon Nov 22 15:41:41 2010 +0000 @@ -1,7 +1,7 @@ &EN :"Symbian Foundation" %{"Podcatcher"} -#{"Podcatcher"},(0xA0009D00), 1, 00, 1, TYPE=SA +#{"Podcatcher"},(0xA0009D00), 1, 10, 1, TYPE=SA ;Supports S60 3rd edition [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff -r 702ba9ffe210 -r d7abecc9d189 application/sis/podcatcher_urel_template.pkg --- a/application/sis/podcatcher_urel_template.pkg Sat Nov 13 15:05:16 2010 +0000 +++ b/application/sis/podcatcher_urel_template.pkg Mon Nov 22 15:41:41 2010 +0000 @@ -1,7 +1,7 @@ &EN :"Symbian Foundation" %{"Podcatcher"} -#{"Podcatcher"},(0xA0009D00), 1, 00, BUILDNO, TYPE=SA +#{"Podcatcher"},(0xA0009D00), 1, 10, BUILDNO, TYPE=SA ;Supports S60 3rd edition [0x101F7961], 0, 0, 0, {"Series60ProductID"} diff -r 702ba9ffe210 -r d7abecc9d189 application/src/PodcastAppui.cpp --- a/application/src/PodcastAppui.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastAppui.cpp Mon Nov 22 15:41:41 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()); @@ -216,11 +218,15 @@ HBufC *label1 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_FEEDS); iTabGroup->AddTabL(KTabIdFeeds,*label1); - + + HBufC *label2 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_NEW); + iTabGroup->AddTabL(KTabIdNew,*label2); + HBufC *label3 = iEikonEnv->AllocReadResourceLC(R_TABGROUP_QUEUE); iTabGroup->AddTabL(KTabIdQueue,*label3); CleanupStack::PopAndDestroy(label3); + CleanupStack::PopAndDestroy(label2); CleanupStack::PopAndDestroy(label1); iTabGroup->SetActiveTabByIndex(0); @@ -232,6 +238,11 @@ UpdateQueueTabL(iPodcastModel->ShowEngine().GetNumDownloadingShows()); } +void CPodcastAppUi::SetTabsDimmed(TBool aDimmed) + { + iTabGroup->SetDimmed(aDimmed); + } + void CPodcastAppUi::TabChangedL (TInt aIndex) { DP("CPodcastListView::TabChangedL "); @@ -245,12 +256,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 702ba9ffe210 -r d7abecc9d189 application/src/PodcastFeedView.cpp --- a/application/src/PodcastFeedView.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastFeedView.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -113,11 +113,13 @@ CPodcastFeedView::~CPodcastFeedView() { + DP("CPodcastFeedView::~CPodcastFeedView BEGIN"); iPodcastModel.FeedEngine().RemoveObserver(this); delete iFeedsFormat; delete iNeverUpdated; delete iUpdater; iFeedIdForIconArray.Close(); + DP("CPodcastFeedView::~CPodcastFeedView END"); } void CPodcastFeedView::UpdateItemL(TInt aIndex) @@ -132,7 +134,7 @@ iItemIdArray[aIndex] = sortedItems[aIndex]->Uid(); // Prepare data to update the listbox item with - FormatFeedInfoListBoxItemL(*sortedItems[aIndex], EFalse); + FormatFeedInfoListBoxItemL(*sortedItems[aIndex], sortedItems[aIndex]->Uid() == iFeedUpdating); // If nothing has changed, we are done here if (iListboxFormatbuffer == iItemArray->MdcaPoint(aIndex)) @@ -170,6 +172,7 @@ DP("CPodcastFeedView::DoActivateL BEGIN"); CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); + iPodcastModel.ShowEngine().ExpireOldShows(); if (aPrevViewId.iViewUid == KUidPodcastShowsViewID) { // back key from shows view @@ -322,7 +325,7 @@ void CPodcastFeedView::FormatFeedInfoListBoxItemL(CFeedInfo& aFeedInfo, TBool aIsUpdating) { - DP("CPodcastFeedView::FormatFeedInfoListBoxItemL BEGIN"); +// DP("CPodcastFeedView::FormatFeedInfoListBoxItemL BEGIN"); TBuf updatedDate; TBuf unplayedShows; TUint unplayedCount = 0; @@ -374,7 +377,7 @@ } iconIndex = iFeedIdForIconArray.Find(aFeedInfo.Uid()); - DP1(" iconIndex = %d", iconIndex); +// DP1(" iconIndex = %d", iconIndex); if(iconIndex == KErrNotFound && aFeedInfo.FeedIcon() != NULL && aFeedInfo.ImageFileName().Length() > 0 && aFeedInfo.FeedIcon()->SizeInPixels().iHeight > 0 && aFeedInfo.FeedIcon()->SizeInPixels().iWidth > 0) @@ -402,7 +405,7 @@ } iListboxFormatbuffer.Format(KFeedFormat(), iconIndex, &(aFeedInfo.Title()), &updatedDate, &unplayedShows); - DP("CPodcastFeedView::FormatFeedInfoListBoxItemL END"); +// DP("CPodcastFeedView::FormatFeedInfoListBoxItemL END"); } void CPodcastFeedView::ImageOperationCompleteL(TInt aError, TUint aHandle, CPodcastModel& /*aPodcastModel*/) @@ -512,6 +515,9 @@ case EPodcastEditFeed: HandleEditFeedL(); break; + case EPodcastShowInfo: + DisplayFeedInfoDialogL(); + break; case EPodcastDeleteFeedHardware: case EPodcastDeleteFeed: HandleRemoveFeedL(); @@ -531,9 +537,6 @@ iPodcastModel.FeedEngine().CancelUpdateAllFeeds(); } }break; - case EPodcastShowInfo: - DisplayFeedInfoDialogL(); - break; default: CPodcastListView::HandleCommandL(aCommand); break; @@ -593,7 +596,7 @@ void CPodcastFeedView::ShowItem(TUint aUid) { TInt listIndex = -1; - for (TUint i=0;i 0 && !iPodcastModel.SettingsEngine().DownloadSuspended()) + { + TBuf<256> msg; + iEikonEnv->ReadResourceL(msg, R_EXIT_SHOWS_DOWNLOADING); + + if (!ShowQueryMessageL(msg)) + { + return; + } + } + + AppUi()->Exit(); + } + void CPodcastFeedView::OpmlParsingComplete(TInt aError, TUint aNumFeedsImported) { TRAP_IGNORE(OpmlParsingCompleteL(aError, aNumFeedsImported)); @@ -996,29 +1022,6 @@ } } -void CPodcastFeedView::CheckConfirmExit() - { - DP("CPodcastFeedView::CheckConfirmExit"); - RShowInfoArray showsDownloading; - iPodcastModel.ShowEngine().GetShowsDownloadingL(showsDownloading); - TUint count = showsDownloading.Count(); - showsDownloading.ResetAndDestroy(); - showsDownloading.Close(); - - if (count > 0 && !iPodcastModel.SettingsEngine().DownloadSuspended()) - { - TBuf<256> msg; - iEikonEnv->ReadResourceL(msg, R_EXIT_SHOWS_DOWNLOADING); - - if (!ShowQueryMessageL(msg)) - { - return; - } - } - - AppUi()->Exit(); - } - TKeyResponse CPodcastFeedView::OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType) { if (aType == EEventKey) @@ -1028,6 +1031,10 @@ case EKeyDelete: HandleCommandL(EPodcastDeleteFeedHardware); break; + case 106: + case '#': + HandleCommandL(EPodcastShowInfo); + break; default: break; } diff -r 702ba9ffe210 -r d7abecc9d189 application/src/PodcastListView.cpp --- a/application/src/PodcastListView.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastListView.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -31,7 +31,7 @@ #include #include #include - +#include #include "buildno.h" const TInt KDefaultGran = 5; @@ -232,8 +232,8 @@ } void CPodcastListView::HandleViewRectChange() -{ - if ( iListContainer ) +{ + if ( iListContainer ) { iListContainer->SetRect( ClientRect() ); } @@ -332,13 +332,22 @@ void CPodcastListView::RunAboutDialogL() { - CAknNoteDialog* dlg = new(ELeave) CAknNoteDialog(); - HBufC *aboutTextTemplate = iEikonEnv->AllocReadResourceLC(R_ABOUT_TEXT); + HBufC *aboutTextTitle = iEikonEnv->AllocReadResourceLC(R_ABOUT_TITLE); + + HBufC *aboutTextTemplate = iEikonEnv->AllocReadResourceLC(R_ABOUT_BODY); TBuf<255> aboutText; aboutText.Format(*aboutTextTemplate, BUILD_NO); - dlg->SetTextL(aboutText); CleanupStack::PopAndDestroy(aboutTextTemplate); - dlg->ExecuteLD(R_DLG_ABOUT); + + HBufC *aboutTextBody = aboutText.AllocLC(); + + CAknMessageQueryDialog* note = new ( ELeave ) CAknMessageQueryDialog(aboutTextBody, aboutTextTitle ); + + note->PrepareLC( R_SHOW_INFO_NOTE ); // Adds to CleanupStack + note->RunLD(); + + CleanupStack::Pop(aboutTextBody); + CleanupStack::Pop(aboutTextTitle); } void CPodcastListView::SetEmptyTextL(TInt aResourceId) diff -r 702ba9ffe210 -r d7abecc9d189 application/src/PodcastQueueView.cpp --- a/application/src/PodcastQueueView.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastQueueView.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include #define KMaxMessageLength 200 @@ -92,11 +93,12 @@ } } } - return CPodcastListView::OfferKeyEventL(aKeyEvent, aType); + return CPodcastShowsView::OfferKeyEventL(aKeyEvent, aType); } CPodcastQueueView::~CPodcastQueueView() { + DP("CPodcastQueueView::~CPodcastQueueView BEGIN"); iPodcastModel.ShowEngine().RemoveObserver(this); iPodcastModel.FeedEngine().RemoveObserver(this); } @@ -114,7 +116,7 @@ CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage); iPreviousView = aPrevViewId; - + UpdateViewTitleL(); UpdateFeedUpdateStateL(); DP("CPodcastQueueView::DoActivateL END"); } @@ -320,7 +322,7 @@ } break; default: - CPodcastListView::HandleCommandL(aCommand); + CPodcastShowsView::HandleCommandL(aCommand); break; } } @@ -336,6 +338,12 @@ aMenuPane->SetItemDimmed(EPodcastMoveDownloadDown, dimDown); aMenuPane->SetItemDimmed(EPodcastMoveDownloadUp, dimUp); + + TInt index = iListContainer->Listbox()->CurrentItemIndex(); + CShowInfo *info = iPodcastModel.ActiveShowList()[index]; + + aMenuPane->SetItemDimmed(EPodcastMarkAsPlayed, info->PlayState() != ENeverPlayed); + aMenuPane->SetItemDimmed(EPodcastMarkAsUnplayed, info->PlayState() == ENeverPlayed); } else if (aResourceId == R_PODCAST_QUEUEVIEW_MENU) { @@ -345,3 +353,14 @@ aMenuPane->SetItemDimmed(EPodcastResumeDownloads, !iPodcastModel.SettingsEngine().DownloadSuspended()); } } + + +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 702ba9ffe210 -r d7abecc9d189 application/src/PodcastSearchView.cpp --- a/application/src/PodcastSearchView.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastSearchView.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -91,7 +91,9 @@ CPodcastSearchView::~CPodcastSearchView() { + DP("CPodcastSearchView::~CPodcastSearchView BEGIN"); iPodcastModel.FeedEngine().RemoveObserver(this); + DP("CPodcastSearchView::~CPodcastSearchView END"); } TUid CPodcastSearchView::Id() const @@ -114,6 +116,7 @@ titlePane->SetTextL(*text , ETrue ); CleanupStack::PopAndDestroy(text); UpdateListboxItemsL(); + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(ETrue); } void CPodcastSearchView::DoDeactivate() @@ -124,6 +127,7 @@ ( StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); titlePane->SetTextToDefaultL(); + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(EFalse); } diff -r 702ba9ffe210 -r d7abecc9d189 application/src/PodcastSettingsView.cpp --- a/application/src/PodcastSettingsView.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastSettingsView.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -28,7 +28,7 @@ #include #include #include - +#include class CIapSetting: public CAknEnumeratedTextPopupSettingItem { @@ -231,6 +231,9 @@ DP1("Download automatically: %d", iAutoDownload); se.SetDownloadAutomatically(iAutoDownload); + + DP1("Delete automatically: %d", iAutoDownload); + se.SetDeleteAutomatically((TAutoDeleteSetting)iAutoDelete); se.SaveSettingsL(); DP("StoreSettings END"); } @@ -262,6 +265,7 @@ void EditItemL (TInt aIndex, TBool aCalledFromMenu) { + DP("EditItemL BEGIN"); if (aIndex == 0) { CAknMemorySelectionDialog* memDlg = CAknMemorySelectionDialog::NewL(ECFDDialogTypeNormal, ETrue); @@ -303,7 +307,7 @@ else { CAknSettingItemList::EditItemL(aIndex,aCalledFromMenu); } - StoreSettingsL(); + StoreSettingsL(); UpdateSettingVisibility(); DP("EditItemL END"); } @@ -358,6 +362,7 @@ // } iAutoDownload = se.DownloadAutomatically(); + iAutoDelete = se.DeleteAutomatically(); switch(aSettingId) { @@ -384,6 +389,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; @@ -400,6 +410,9 @@ TInt iAutoDownload; CAknSettingItem *iSettingAutoDownload; + TInt iAutoDelete; + CAknSettingItem *iSettingAutoDelete; + // TInt iConnection; TInt iIap; @@ -470,10 +483,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(); @@ -486,6 +502,7 @@ iNaviPane->PushL(*iNaviDecorator); } + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(ETrue); DP("CPodcastSettingsView::DoActivateL END"); } @@ -505,6 +522,8 @@ delete iNaviDecorator; iNaviDecorator = NULL; } + + ((CPodcastAppUi*)AppUi())->SetTabsDimmed(EFalse); DP("CPodcastSettingsView::DoDeactivate END"); } diff -r 702ba9ffe210 -r d7abecc9d189 application/src/PodcastShowsView.cpp --- a/application/src/PodcastShowsView.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/application/src/PodcastShowsView.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -43,45 +43,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) { @@ -171,9 +211,7 @@ break; case 106: case '#': - if (activeShow->DownloadState() == ENotDownloaded) { - HandleCommandL(EPodcastDownloadShow); - } + HandleCommandL(EPodcastShowInfo); break; case EKeyBackspace: case EKeyDelete: @@ -189,9 +227,11 @@ CPodcastShowsView::~CPodcastShowsView() { + DP("CPodcastShowsView::~CPodcastShowsView BEGIN"); iPodcastModel.ShowEngine().RemoveObserver(this); iPodcastModel.FeedEngine().RemoveObserver(this); + DP("CPodcastShowsView::~CPodcastShowsView END"); } @@ -208,6 +248,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"); @@ -348,31 +403,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; } @@ -380,6 +430,8 @@ { aIconIndex += KVideoIconOffset; } + + //DP3("dlStop=%d, isNew=%d, aIconIndex=%d", dlStop, isNew, aIconIndex); } @@ -411,8 +463,9 @@ { if (aShowInfo.ShowSize() > 0) { + TUint showSize = aShowInfo.ShowSize() >= (TUint) aSizeDownloaded ? aShowInfo.ShowSize() : (TUint) aSizeDownloaded; infoSize.Format(KSizeDownloadingOf(), ((float) aSizeDownloaded / (float) KSizeMb), - ((float)aShowInfo.ShowSize() / (float)KSizeMb)); + ((float) showSize / (float)KSizeMb)); } else { @@ -492,8 +545,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(); @@ -572,12 +632,23 @@ HandleSetShowPlayedL(EFalse); break; case EPodcastMarkAllPlayed: + { + TBuf msg; + iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY); + if (!ShowQueryMessageL(msg)) + { + break; + } iPodcastModel.MarkSelectionPlayedL(); UpdateListboxItemsL(); + } break; case EPodcastDeleteShow: HandleDeleteShowL(); break; + case EPodcastDownloadAll: + HandleDownloadAllL(); + break; case EPodcastDownloadShow: { TInt index = iListContainer->Listbox()->CurrentItemIndex(); @@ -596,16 +667,20 @@ { TRAPD(error, iPodcastModel.FeedEngine().UpdateFeedL(iPodcastModel.ActiveFeedInfo()->Uid())); - if (error != KErrNone) - { - HBufC* str = - iEikonEnv->AllocReadResourceLC(R_PODCAST_FEEDS_UPDATE_ERROR); - User::InfoPrint(*str); - CleanupStack::PopAndDestroy(str); - } +// if (error != KErrNone) +// { +// HBufC* str = +// iEikonEnv->AllocReadResourceLC(R_PODCAST_FEEDS_UPDATE_ERROR); +// User::InfoPrint(*str); +// CleanupStack::PopAndDestroy(str); +// } } } break; + case EPodcastUpdateAllFeeds: + { + iPodcastModel.FeedEngine().UpdateAllFeedsL(); + }break; case EPodcastCancelUpdateAllFeeds: iPodcastModel.FeedEngine().CancelUpdateAllFeeds(); break; @@ -613,22 +688,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; @@ -642,10 +701,35 @@ if(aResourceId == R_PODCAST_SHOWSVIEW_MENU) { - aMenuPane->SetItemDimmed(EPodcastMarkAllPlayed, updatingState || iPodcastModel.ActiveShowList().Count() == 0); + + TBool hideDownloadAll = ETrue; + TBool hideMarkAllPlayed = ETrue; + + for (int i=0;iPlayState() == ENeverPlayed) + { + hideMarkAllPlayed = EFalse; + } + if (info->DownloadState() == ENotDownloaded) + { + hideDownloadAll = EFalse; + } + } + + if (!iShowNewShows) { + hideDownloadAll = ETrue; + } + + aMenuPane->SetItemDimmed(EPodcastMarkAllPlayed, hideMarkAllPlayed); + aMenuPane->SetItemDimmed(EPodcastDownloadAll, hideDownloadAll); + aMenuPane->SetItemDimmed(EPodcastUpdateFeed, updatingState); aMenuPane->SetItemDimmed(EPodcastCancelUpdateAllFeeds, !updatingState); aMenuPane->SetItemDimmed(EPodcastShowsShowMenu, updatingState || iPodcastModel.ActiveShowList().Count() == 0); + aMenuPane->SetItemDimmed(EPodcastUpdateAllFeeds, !iShowNewShows); + aMenuPane->SetItemDimmed(EPodcastUpdateFeed, iShowNewShows); } else if (aResourceId == R_SHOWS_SHOW_MENU) { @@ -654,11 +738,13 @@ { CShowInfo *info = iPodcastModel.ActiveShowList()[index]; TBool hideDeleteShowCmd = info->DownloadState() != EDownloaded; + TBool hideDownloadShowCmd = info->DownloadState() != ENotDownloaded; TBool hideMarkOld = info->PlayState() == EPlayed; aMenuPane->SetItemDimmed(EPodcastMarkAsPlayed, hideMarkOld); aMenuPane->SetItemDimmed(EPodcastMarkAsUnplayed, !hideMarkOld); aMenuPane->SetItemDimmed(EPodcastDeleteShow, hideDeleteShowCmd); + aMenuPane->SetItemDimmed(EPodcastDownloadShow, hideDownloadShowCmd); } } } @@ -680,6 +766,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::HandleSetShowPlayedL(TBool aPlayed) { @@ -689,9 +796,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 && info->DownloadState() == EDownloaded) + { + // 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); + } } } @@ -715,9 +843,21 @@ info->SetDownloadState(ENotDownloaded); info->SetPlayState(EPlayed); iPodcastModel.ShowEngine().UpdateShowL(*info); - - UpdateShowItemDataL(iPodcastModel.ActiveShowList()[index], index, 0); - iListContainer->Listbox()->DrawItem(index); + + if (iShowNewShows) + { + UpdateListboxItemsL(); + + if (index > 0) + { + iListContainer->Listbox()->SetCurrentItemIndex(index - 1); + } + } + else + { + UpdateShowItemDataL(iPodcastModel.ActiveShowList()[index], index, 0); + iListContainer->Listbox()->DrawItem(index); + } } } } @@ -739,7 +879,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) { @@ -748,7 +888,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 702ba9ffe210 -r d7abecc9d189 engine/inc/FeedEngine.h --- a/engine/inc/FeedEngine.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/FeedEngine.h Mon Nov 22 15:41:41 2010 +0000 @@ -97,6 +97,7 @@ IMPORT_C void OpmlParsingCompleteL(TInt aError, TUint aNumFeedsAdded); void NotifyFeedUpdateComplete(TInt aFeedUid, TInt aError); + void ParserShowUpdatedL(CShowInfo& aShow); protected: @@ -154,10 +155,6 @@ // observers that will receive callbacks, not owning RArray iObservers; - // new feeds only add one show to download list when auto downloading - TBool newFeed; - TUint showsAdded; - // offline mode detection CRepository* iRepository; diff -r 702ba9ffe210 -r d7abecc9d189 engine/inc/FeedParser.h --- a/engine/inc/FeedParser.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/FeedParser.h Mon Nov 22 15:41:41 2010 +0000 @@ -62,6 +62,13 @@ ELatin1 }; +enum TFeedDirection + { + EFeedUnknown, + EFeedAddsAtTop, + EFeedAddsAtBottom + }; + const int KBufferLength = 1024; class CFeedParser : public CBase, public Xml::MContentHandler @@ -87,13 +94,15 @@ void OnError(TInt aErrorCode); TAny* GetExtendedInterface(const TInt32 aUid); CFeedInfo& ActiveFeed(); + private: MFeedParserObserver& iCallbacks; TFeedState iFeedState; CShowInfo* iActiveShow; CFeedInfo *iActiveFeed; - + CShowInfo *iNewestShow; + TBuf iBuffer; TUint iUid; TUint iMaxItems; @@ -102,6 +111,9 @@ TEncoding iEncoding; RFs& iRfs; TInt iFileSize; + TFeedDirection iFeedDirection; + TTime iPreviousPubDate; + TBool iNewFeed; }; #endif diff -r 702ba9ffe210 -r d7abecc9d189 engine/inc/FeedParserObserver.h --- a/engine/inc/FeedParserObserver.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/FeedParserObserver.h Mon Nov 22 15:41:41 2010 +0000 @@ -27,6 +27,7 @@ public: virtual void NewShowL(CShowInfo& item) = 0; virtual void ParsingCompleteL(CFeedInfo *item) = 0; + virtual void ParserShowUpdatedL(CShowInfo& item) = 0; }; #endif diff -r 702ba9ffe210 -r d7abecc9d189 engine/inc/PodcastModel.h --- a/engine/inc/PodcastModel.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/PodcastModel.h Mon Nov 22 15:41:41 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 702ba9ffe210 -r d7abecc9d189 engine/inc/SettingsEngine.h --- a/engine/inc/SettingsEngine.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/SettingsEngine.h Mon Nov 22 15:41:41 2010 +0000 @@ -48,6 +48,13 @@ EAutoUpdatePeriod4=1440 }; +enum TAutoDeleteSetting + { + EAutoDeleteOff, + EAutoDeleteAfter1Day, + EAutoDeleteAfter7Days + }; + class CSettingsEngine : public CBase { public: @@ -87,6 +94,9 @@ IMPORT_C void SaveSettingsL(); + IMPORT_C TAutoDeleteSetting DeleteAutomatically(); + IMPORT_C void SetDeleteAutomatically(TAutoDeleteSetting aAutoDeleteOn); + private: CSettingsEngine(CPodcastModel& aPodcastModel); void ConstructL(); @@ -104,7 +114,8 @@ TInt iMaxListItems; TTime iUpdateFeedTime; TBool iDownloadSuspended; - + TAutoDeleteSetting iDeleteAutomatically; + // Other member variables CPodcastModel &iPodcastModel; // reference to the model }; diff -r 702ba9ffe210 -r d7abecc9d189 engine/inc/ShowEngine.h --- a/engine/inc/ShowEngine.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/ShowEngine.h Mon Nov 22 15:41:41 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 702ba9ffe210 -r d7abecc9d189 engine/inc/ShowInfo.h --- a/engine/inc/ShowInfo.h Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/inc/ShowInfo.h Mon Nov 22 15:41:41 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 702ba9ffe210 -r d7abecc9d189 engine/src/FeedEngine.cpp --- a/engine/src/FeedEngine.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/FeedEngine.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -261,15 +261,7 @@ } iActiveFeed = GetFeedInfoByUid(aFeedUid); - iCancelRequested = EFalse; - - if (iActiveFeed->LastUpdated() == 0) - { - newFeed = ETrue; - } - - showsAdded = 0; iActiveFeed->SetLastError(KErrNone); DBUpdateFeedL(*iActiveFeed); @@ -312,14 +304,6 @@ aItem.SetDescriptionL(*description); CleanupStack::PopAndDestroy(description); - if (newFeed) { - // for new feeds, set all shows played - aItem.SetPlayState(EPlayed); - // except the first one - if (showsAdded == 0) { - aItem.SetPlayState(ENeverPlayed); - } - } TRAPD(err, iPodcastModel.ShowEngine().AddShowL(aItem)); @@ -329,7 +313,6 @@ iPodcastModel.ShowEngine().AddDownloadL(aItem); } - showsAdded++; DP("CFeedEngine::NewShowL END"); } @@ -393,7 +376,7 @@ { DP2("CFeedEngine::DBAddFeed BEGIN, title=%S, URL=%S", &aItem.Title(), &aItem.Url()); - CFeedInfo *info; + CFeedInfo *info = NULL; TRAPD(err, info = DBGetFeedInfoByUidL(aItem.Uid())); @@ -609,10 +592,7 @@ { if (!iCancelRequested) { iActiveFeed->SetLastError(aError); - TTime time; - time.HomeTime(); - iActiveFeed->SetLastUpdated(time); - + if( aError == KErrNone) { // Parse the feed. We need to trap this call since it could leave and then @@ -655,6 +635,9 @@ // even if it fails, this will allow us to move on iClientState = EIdle; } + TTime time; + time.HomeTime(); + iActiveFeed->SetLastUpdated(time); } iCancelRequested = EFalse; }break; @@ -749,6 +732,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"); } @@ -1203,3 +1197,13 @@ iObservers[i]->OpmlParsingComplete(aError, aNumFeedsAdded); } } + +void CFeedEngine::ParserShowUpdatedL(CShowInfo& aShow) + { + iPodcastModel.ShowEngine().UpdateShowL(aShow); + if (aShow.PlayState() == ENeverPlayed && + iPodcastModel.SettingsEngine().DownloadAutomatically()) + { + iPodcastModel.ShowEngine().AddDownloadL(aShow); + } + } diff -r 702ba9ffe210 -r d7abecc9d189 engine/src/FeedParser.cpp --- a/engine/src/FeedParser.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/FeedParser.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -54,6 +54,11 @@ iMaxItems = aMaxItems; iStoppedParsing = EFalse; iEncoding = ELatin1; + if (iNewestShow) + delete iNewestShow; + iNewestShow = 0; + + iNewFeed = (iActiveFeed->LastUpdated() == 0) ? ETrue : EFalse; TEntry entry; User::LeaveIfError(iRfs.Entry(feedFileName, entry)); @@ -73,6 +78,8 @@ HBufC* charset = HBufC::NewLC(KMaxParseBuffer); charset->Des().Copy(aDocParam.CharacterSetName().DesC()); iEncoding = EUtf8; + iFeedDirection = EFeedUnknown; + iPreviousPubDate = 0; if (charset->CompareF(_L("utf-8")) == 0) { DP("setting UTF8"); iEncoding = EUtf8; @@ -87,6 +94,18 @@ void CFeedParser::OnEndDocumentL(TInt /*aErrorCode*/) { //DP("OnEndDocumentL()"); + if (iNewFeed) + { + // if the feed adds at bottom, this + if (iNewestShow) + { + iNewestShow->SetPlayState(ENeverPlayed); + iCallbacks.ParserShowUpdatedL(*iNewestShow); + delete iNewestShow; + iNewestShow = 0; + } + } + iCallbacks.ParsingCompleteL(iActiveFeed); } @@ -302,11 +321,42 @@ iActiveShow->SetPubDate(now); } + if (iFeedDirection == EFeedUnknown) + { + if (iPreviousPubDate.Int64() != 0) { + if (iActiveShow->PubDate() > iPreviousPubDate) + { + DP("Feed adds at bottom"); + iFeedDirection = EFeedAddsAtBottom; + } + else + { + DP("Feed adds at top"); + iFeedDirection = EFeedAddsAtTop; + } + } + iPreviousPubDate = iActiveShow->PubDate(); + } + if (iUid) { iActiveShow->SetUid(iUid); } + + if (iNewFeed) + { + // set all played, except for the newest one + iActiveShow->SetPlayState(EPlayed); + + if (!iNewestShow || iActiveShow->PubDate() > iNewestShow->PubDate()) + { + if (iNewestShow) + delete iNewestShow; + iNewestShow = new CShowInfo(iActiveShow); + } + } + iCallbacks.NewShowL(*iActiveShow); delete iActiveShow; @@ -316,7 +366,8 @@ iItemsParsed++; DP2("iItemsParsed: %d, iMaxItems: %d", iItemsParsed, iMaxItems); - if (iItemsParsed >= iMaxItems) + // we stop parsing after iMaxItems, but not if feed builds at bottom + if (iItemsParsed >= iMaxItems && iFeedDirection != EFeedAddsAtBottom) { iStoppedParsing = ETrue; DP("*** Too many items, aborting parsing"); diff -r 702ba9ffe210 -r d7abecc9d189 engine/src/PodcastModel.cpp --- a/engine/src/PodcastModel.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/PodcastModel.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -228,8 +228,7 @@ if (err == KErrNone) { - aPodcast->SetPlayState(EPlayed); - iShowEngine->UpdateShowL(*aPodcast); + iShowEngine->PostPlayHandling(aPodcast); } else { @@ -457,12 +456,17 @@ iShowEngine->GetShowsByFeedL(iActiveShowList, aFeedUid); } +EXPORT_C void CPodcastModel::GetNewShowsL() + { + iActiveShowList.ResetAndDestroy(); + iShowEngine->GetNewShowsL(iActiveShowList); + } + EXPORT_C void CPodcastModel::MarkSelectionPlayedL() { for (int i=0;iPlayState() != EPlayed) { - iActiveShowList[i]->SetPlayState(EPlayed); - iShowEngine->UpdateShowL(*iActiveShowList[i]); + ShowEngine().PostPlayHandling(iActiveShowList[i]); } } } diff -r 702ba9ffe210 -r d7abecc9d189 engine/src/PodcastUtils.cpp --- a/engine/src/PodcastUtils.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/PodcastUtils.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -118,8 +118,9 @@ DP(" change HTML encoded chars to unicode"); startPos = str.Locate('&'); endPos = str.Locate(';'); - while (startPos != KErrNotFound && endPos != KErrNotFound && endPos > startPos) + while (startPos != KErrNotFound && endPos != KErrNotFound && endPos > startPos && endPos < str.Length()) { +// DP2("startPos=%d, endPos=%d", startPos, endPos); TPtrC ptr(str.Mid(startPos+1, endPos-startPos)); // check for whitespace if (ptr.Locate(' ') == KErrNotFound) @@ -162,10 +163,9 @@ _LIT(KQuot, "quot;"); _LIT(KNbsp, "nbsp;"); _LIT(KCopy, "copy;"); - + // copy start of string tmp.Copy(str.Left(startPos)); - if (ptr.CompareF(KAmp) == 0) { tmp.Append('&'); @@ -182,27 +182,26 @@ { tmp.Append('\xA9'); } - // copy end of string tmp.Append(str.Mid(endPos+1)); str.Copy(tmp); } } - TInt newPos = str.Mid(startPos+1).Locate('&'); - - if (newPos != KErrNotFound) - { - startPos = startPos+1 + newPos; - endPos = str.Locate(';'); - } - else - { - startPos = KErrNotFound; - endPos = KErrNotFound; + if (startPos+1 <= str.Length()) { + TInt newPos = str.Mid(startPos+1).Locate('&'); + if (newPos != KErrNotFound) + { + startPos = startPos+1 + newPos; + endPos = str.Locate(';'); + } + else + { + startPos = KErrNotFound; + endPos = KErrNotFound; + } } } - CleanupStack::PopAndDestroy(tmpBuf); if(str.Length()>1) diff -r 702ba9ffe210 -r d7abecc9d189 engine/src/SettingsEngine.cpp --- a/engine/src/SettingsEngine.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/SettingsEngine.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -159,8 +159,9 @@ TInt low = stream.ReadInt32L(); TInt high = stream.ReadInt32L(); iUpdateFeedTime = MAKE_TINT64(high, low); + + iDeleteAutomatically = (TAutoDeleteSetting) stream.ReadInt32L(); TInt dummy; - dummy = stream.ReadInt32L(); // was iSelectOnlyUnplayed dummy = stream.ReadInt32L(); // was iSeekStepTime CleanupStack::PopAndDestroy(1); // readStream and iniFile @@ -192,7 +193,7 @@ stream.WriteInt32L(I64LOW(iUpdateFeedTime.Int64())); stream.WriteInt32L(I64HIGH(iUpdateFeedTime.Int64())); - stream.WriteInt32L(0); // was iSelectOnlyUnplayed + stream.WriteInt32L(iDeleteAutomatically); stream.WriteInt32L(0); // was iSeekStepTime stream.CommitL(); @@ -342,3 +343,13 @@ DP1("CSettingsEngine::SetDownloadSuspended, aSuspended=%d", aSuspended); iDownloadSuspended = aSuspended; } + +EXPORT_C TAutoDeleteSetting CSettingsEngine::DeleteAutomatically() + { + return iDeleteAutomatically; + } + +EXPORT_C void CSettingsEngine::SetDeleteAutomatically(TAutoDeleteSetting aDeleteAuto) + { + iDeleteAutomatically = aDeleteAuto; + } diff -r 702ba9ffe210 -r d7abecc9d189 engine/src/ShowEngine.cpp --- a/engine/src/ShowEngine.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/ShowEngine.cpp Mon Nov 22 15:41:41 2010 +0000 @@ -38,11 +38,13 @@ EXPORT_C CShowEngine::~CShowEngine() { + DP("CShowEngine::~CShowEngine BEGIN"); delete iShowClient; iObservers.Close(); delete iShowDownloading; delete iMetaDataReader; iApaSession.Close(); + DP("CShowEngine::~CShowEngine END"); } EXPORT_C CShowEngine* CShowEngine::NewL(CPodcastModel& aPodcastModel) @@ -374,11 +376,12 @@ { return DBGetShowByUidL(aShowUid); } + CShowInfo* CShowEngine::DBGetShowByUidL(TUint aUid) { DP("CShowEngine::DBGetShowByUid"); CShowInfo *showInfo = NULL; - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype from shows where uid=%u"); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, deletedate from shows where uid=%u"); iSqlBuffer.Format(KSqlStatement, aUid); sqlite3_stmt *st; @@ -408,7 +411,7 @@ { DP("CShowEngine::DBGetShowByUid"); CShowInfo *showInfo = NULL; - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype from shows where filename=\"%S\""); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror, deletedate from shows where filename=\"%S\""); iSqlBuffer.Format(KSqlStatement, &aFileName); sqlite3_stmt *st; @@ -435,7 +438,7 @@ void CShowEngine::DBGetAllShowsL(RShowInfoArray& aShowArray) { DP("CShowEngine::DBGetAllShows"); - _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype from shows"); + _LIT(KSqlStatement, "select url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype, lasterror, deletedate from shows"); iSqlBuffer.Format(KSqlStatement); sqlite3_stmt *st; @@ -463,7 +466,7 @@ void CShowEngine::DBGetAllDownloadsL(RShowInfoArray& aShowArray) { DP("CShowEngine::DBGetAllDownloads"); - _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); #ifndef DONT_SORT_SQL @@ -513,11 +516,69 @@ } } +void CShowEngine::DBGetOldShowsL(RShowInfoArray& aShowArray) + { + DP("CShowEngine::DBGetOldShowsL BEGIN"); + TTime now; + now.HomeTime(); +// TTimeIntervalYears years(5); +// now += years; + + _LIT(KSqlStatement, "select filename from shows where downloadstate=%d and deletedate != 0 and deletedate < \"%Ld\""); + iSqlBuffer.Format(KSqlStatement, EDownloaded, now.Int64()); + + sqlite3_stmt *st; + + int rc = sqlite3_prepare16_v2(&iDB, (const void*) iSqlBuffer.PtrZ(), -1, + &st, (const void**) NULL); + + if (rc == SQLITE_OK) + { + rc = sqlite3_step(st); + Cleanup_sqlite3_finalize_PushL(st); + while (rc == SQLITE_ROW) + { + CShowInfo* showInfo = CShowInfo::NewLC(); + + const void *filez = sqlite3_column_text16(st, 0); + TPtrC16 file((const TUint16*) filez); + showInfo->SetFileNameL(file); + + aShowArray.Append(showInfo); + CleanupStack::Pop(showInfo); + rc = sqlite3_step(st); + } + CleanupStack::PopAndDestroy();//st + } + else + { + User::Leave(KErrCorrupt); + } + + // now update DB + _LIT(KSqlStatement2, "update shows set downloadstate=%d and deletedate = 0 where downloadstate=%d and deletedate != 0 and deletedate < \"%Ld\""); + iSqlBuffer.Format(KSqlStatement2, ENotDownloaded, EDownloaded, now.Int64()); + + + rc = sqlite3_prepare16_v2(&iDB, (const void*) iSqlBuffer.PtrZ(), -1, + &st, (const void**) NULL); + + if (rc == SQLITE_OK) + { + rc = sqlite3_step(st); + Cleanup_sqlite3_finalize_PushL(st); + CleanupStack::PopAndDestroy();//st + } + + + 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 +621,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 +694,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 +730,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 +854,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 +874,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 +947,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); @@ -1428,6 +1477,12 @@ EXPORT_C void CShowEngine::UpdateShowL(CShowInfo& aInfo) { DBUpdateShowL(aInfo); + + // hack to ensure change in playstate is stored for the show actively downloading + if (iShowDownloading && iShowDownloading->Uid() == aInfo.Uid()) + { + iShowDownloading->SetPlayState(aInfo.PlayState()); + } } EXPORT_C CMetaDataReader& CShowEngine::MetaDataReader() @@ -1440,6 +1495,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 +1542,6 @@ } } -EXPORT_C void CShowEngine::SetShowFilter(TShowFilter aFilter) - { - iShowFilter = aFilter; - } - EXPORT_C void CShowEngine::MoveDownloadUpL(TUint aUid) { DP("CShowEngine::MoveDownLoadUpL"); @@ -1599,3 +1667,39 @@ 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; + } + + if (daysAhead.Int() > 0) + { + TTime deleteDate; + deleteDate.HomeTime(); + deleteDate += daysAhead; + aShow->SetDeleteDate(deleteDate); + DP2("Setting show %S to be deleted on the %d th", &aShow->Title(), deleteDate.DayNoInMonth()+1); + } + + UpdateShowL(*aShow); + DP("CShowEngine::PostPlayHandling END"); + } diff -r 702ba9ffe210 -r d7abecc9d189 engine/src/ShowInfo.cpp --- a/engine/src/ShowInfo.cpp Sat Nov 13 15:05:16 2010 +0000 +++ b/engine/src/ShowInfo.cpp Mon Nov 22 15:41:41 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; + }