# HG changeset patch # User Sebastian Brannstrom # Date 1287672700 -3600 # Node ID 55305e953f1202b42064ace5651638ccd60ab05c # Parent 72b950ec8da25d018659a913bd0c830f501d9350 Bug 3367 - new icons! diff -r 72b950ec8da2 -r 55305e953f12 application/data/PodcastFeedView.ra --- a/application/data/PodcastFeedView.ra Tue Oct 19 14:02:32 2010 +0100 +++ b/application/data/PodcastFeedView.ra Thu Oct 21 15:51:40 2010 +0100 @@ -110,9 +110,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_update_feed_short_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastReload_all; + bmpmask = EMbmPodcastReload_all_mask; + //txt = STRING_r_update_feed_short_cmd; helptxt = STRING_r_update_all_feeds_cmd; } }; @@ -128,9 +129,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_cancel_update_all_feeds_short_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastCancel; + bmpmask = EMbmPodcastCancel_mask; + //txt = STRING_r_cancel_update_all_feeds_short_cmd; helptxt = STRING_r_cancel_update_all_feeds_cmd; } }; @@ -147,10 +149,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - //press_bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_add_feed_cmd_short; + bmpfile = APPICON; + bmpid = EMbmPodcastAdd_pod; + bmpmask = EMbmPodcastAdd_pod_mask; + //txt = STRING_r_view_add_feed_cmd_short; helptxt = STRING_r_view_add_feed_cmd; } }; @@ -166,10 +168,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - //press_bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_settings_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastSettings; + bmpmask = EMbmPodcastSettings_mask; + //txt = STRING_r_settings_cmd; helptxt = STRING_r_settings_cmd; } }; diff -r 72b950ec8da2 -r 55305e953f12 application/data/PodcastQueueView.ra --- a/application/data/PodcastQueueView.ra Tue Oct 19 14:02:32 2010 +0100 +++ b/application/data/PodcastQueueView.ra Thu Oct 21 15:51:40 2010 +0100 @@ -69,9 +69,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_suspend_download_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastDwn_pause; + bmpmask = EMbmPodcastDwn_pause_mask; + //txt = STRING_r_suspend_download_cmd; helptxt = STRING_r_view_stop_downloads_cmd; } }; @@ -87,9 +88,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_resume_short_dls_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastDwn_start; + bmpmask = EMbmPodcastDwn_start_mask; + //txt = STRING_r_view_resume_short_dls_cmd; helptxt = STRING_r_view_resume_downloads_cmd; } }; @@ -105,9 +107,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_remove_download_short_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastRemove; + bmpmask = EMbmPodcastRemove_mask; + //txt = STRING_r_view_remove_download_short_cmd; helptxt = STRING_r_view_remove_download_cmd; } }; @@ -123,9 +126,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_remove_all_downloads_cmd_short; + bmpfile = APPICON; + bmpid = EMbmPodcastRemove_all; + bmpmask = EMbmPodcastRemove_all_mask; + //txt = STRING_r_view_remove_all_downloads_cmd_short; helptxt = STRING_r_view_remove_all_downloads_cmd; } }; diff -r 72b950ec8da2 -r 55305e953f12 application/data/PodcastShowsView.ra --- a/application/data/PodcastShowsView.ra Tue Oct 19 14:02:32 2010 +0100 +++ b/application/data/PodcastShowsView.ra Thu Oct 21 15:51:40 2010 +0100 @@ -105,9 +105,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_update_feed_short_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastReload; + bmpmask = EMbmPodcastReload_mask; + //txt = STRING_r_update_feed_short_cmd; helptxt = STRING_r_update_feed_cmd; } }; @@ -123,9 +124,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_cancel_update_all_feeds_short_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastCancel; + bmpmask = EMbmPodcastCancel_mask; + //txt = STRING_r_cancel_update_all_feeds_short_cmd; helptxt = STRING_r_cancel_update_all_feeds_cmd; } }; @@ -143,9 +145,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_download_show_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastDownload; + bmpmask = EMbmPodcastDownload_mask; + //txt = STRING_r_view_download_show_cmd; helptxt = STRING_r_view_download_show_cmd; } }; @@ -162,9 +165,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_delete_show_cmd; + bmpfile = APPICON; + bmpid = EMbmPodcastDelete; + bmpmask = EMbmPodcastDelete_mask; + //txt = STRING_r_view_delete_show_cmd; helptxt = STRING_r_view_delete_show_cmd; } }; @@ -180,9 +184,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_mark_as_played_cmd_short; + bmpfile = APPICON; + bmpid = EMbmPodcastMarkold; + bmpmask = EMbmPodcastMarkold_mask; + //txt = STRING_r_view_mark_as_played_cmd_short; helptxt = STRING_r_view_mark_as_played_cmd_short; } }; @@ -198,9 +203,10 @@ { AVKON_BUTTON_STATE { - //bmpfile = AVKON_BITMAP_FILE; - //bmpid = EMbmAvkonQgn_indi_find_goto; - txt = STRING_r_view_mark_as_unplayed_cmd_short; + bmpfile = APPICON; + bmpid = EMbmPodcastMarknew; + bmpmask = EMbmPodcastMarknew_mask; + //txt = STRING_r_view_mark_as_unplayed_cmd_short; helptxt = STRING_r_view_mark_as_unplayed_cmd_short; } }; diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/add_pod.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/add_pod.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/cancel.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/cancel.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/delete.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/delete.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,14 @@ + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/download.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/download.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/dwn_pause.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/dwn_pause.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/dwn_start.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/dwn_start.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/marknew.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/marknew.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,12 @@ + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/markold.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/markold.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,16 @@ + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tab_feeds.svg --- a/application/data/images/toolbars/podcast_tab_feeds.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tab_queue.svg --- a/application/data/images/toolbars/podcast_tab_queue.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tab_search.svg --- a/application/data/images/toolbars/podcast_tab_search.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_addfeed.svg --- a/application/data/images/toolbars/podcast_tb_addfeed.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_cancel.svg --- a/application/data/images/toolbars/podcast_tb_cancel.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_clear.svg --- a/application/data/images/toolbars/podcast_tb_clear.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_delete.svg --- a/application/data/images/toolbars/podcast_tb_delete.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_download.svg --- a/application/data/images/toolbars/podcast_tb_download.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_marknew.svg --- a/application/data/images/toolbars/podcast_tb_marknew.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_markold.svg --- a/application/data/images/toolbars/podcast_tb_markold.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_remove.svg --- a/application/data/images/toolbars/podcast_tb_remove.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_resume.svg --- a/application/data/images/toolbars/podcast_tb_resume.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_search.svg --- a/application/data/images/toolbars/podcast_tb_search.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_settings.svg --- a/application/data/images/toolbars/podcast_tb_settings.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_suspend.svg --- a/application/data/images/toolbars/podcast_tb_suspend.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ - - - - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_update.svg --- a/application/data/images/toolbars/podcast_tb_update.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/podcast_tb_updateall.svg --- a/application/data/images/toolbars/podcast_tb_updateall.svg Tue Oct 19 14:02:32 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/reload.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/reload.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,15 @@ + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/reload_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/reload_all.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,20 @@ + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/remove.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/remove.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,14 @@ + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/remove_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/remove_all.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/data/images/toolbars/settings.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/toolbars/settings.svg Thu Oct 21 15:51:40 2010 +0100 @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + diff -r 72b950ec8da2 -r 55305e953f12 application/group/icons.mk --- a/application/group/icons.mk Tue Oct 19 14:02:32 2010 +0100 +++ b/application/group/icons.mk Thu Oct 21 15:51:40 2010 +0100 @@ -8,6 +8,7 @@ ICONTARGETFILENAME=$(TARGETDIR)\Podcast.mif HEADERFILE=$(EPOCROOT)epoc32\include\Podcast.mbg DPATH=..\data\images +TPATH=..\data\images\toolbars do_nothing : @rem do_nothing @@ -41,7 +42,20 @@ $(DPATH)\Video_downloaded_new.svg\ $(DPATH)\Video_failed.svg\ $(DPATH)\Video_suspended.svg\ - $(DPATH)\Feed.svg + $(DPATH)\Feed.svg\ + $(TPATH)\add_pod.svg\ + $(TPATH)\delete.svg\ + $(TPATH)\dwn_pause.svg\ + $(TPATH)\dwn_start.svg\ + $(TPATH)\reload.svg\ + $(TPATH)\reload_all.svg\ + $(TPATH)\settings.svg\ + $(TPATH)\cancel.svg\ + $(TPATH)\remove.svg\ + $(TPATH)\remove_all.svg\ + $(TPATH)\download.svg\ + $(TPATH)\markold.svg\ + $(TPATH)\marknew.svg\ FREEZE : do_nothing