# HG changeset patch # User Sebastian Brannstrom # Date 1287683538 -3600 # Node ID 6dfdf1d9da5c36046efb47a0c0a723ca7a89564e # Parent af83e0ffbf4b5ca5dba5d5122deccffd5aa699bb Adding new toolbar icons diff -r af83e0ffbf4b -r 6dfdf1d9da5c 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 18:52:18 2010 +0100 @@ -128,9 +128,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; } }; @@ -146,9 +147,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; } }; @@ -165,10 +167,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; } }; @@ -184,10 +186,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 af83e0ffbf4b -r 6dfdf1d9da5c 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 18:52:18 2010 +0100 @@ -87,9 +87,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; } }; @@ -105,9 +106,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; } }; @@ -123,9 +125,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 af83e0ffbf4b -r 6dfdf1d9da5c 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 18:52:18 2010 +0100 @@ -103,9 +103,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; } }; @@ -121,9 +122,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; } }; @@ -141,9 +143,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; } }; diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/add_pod.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/add_pod.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/cancel.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/cancel.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/delete.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/delete.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,14 @@ + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/download.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/download.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/dwn_pause.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/dwn_pause.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/dwn_start.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/dwn_start.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/marknew.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/marknew.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,12 @@ + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/markold.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/markold.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,16 @@ + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/reload.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/reload.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,15 @@ + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/reload_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/reload_all.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,20 @@ + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/remove.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/remove.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,14 @@ + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/remove_all.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/remove_all.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/data/images/settings.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/application/data/images/settings.svg Thu Oct 21 18:52:18 2010 +0100 @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + diff -r af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c 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 af83e0ffbf4b -r 6dfdf1d9da5c application/group/Podcast.mmp --- a/application/group/Podcast.mmp Tue Oct 19 14:02:32 2010 +0100 +++ b/application/group/Podcast.mmp Thu Oct 21 18:52:18 2010 +0100 @@ -17,7 +17,7 @@ */ // MPX integration can not be enabled for self signed versions -#define ENABLE_MPX_INTEGRATION +//#define ENABLE_MPX_INTEGRATION TARGET Podcast.exe TARGETTYPE exe diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/group/bld.inf --- a/application/group/bld.inf Tue Oct 19 14:02:32 2010 +0100 +++ b/application/group/bld.inf Thu Oct 21 18:52:18 2010 +0100 @@ -17,7 +17,7 @@ */ PRJ_PLATFORMS -DEFAULT +WINSCW GCCE PRJ_MMPFILES @@ -34,15 +34,15 @@ OPTION HEADERFILE Podcast.mbg OPTION SOURCEDIR ../data/images OPTION SOURCES \ - -c16,1 podcatcher_64px\ - -c16,1 Audio\ - -c16,1 Audio_new\ - -c16,1 Audio_queued\ - -c16,1 Audio_downloading\ - -c16,1 Audio_downloaded\ - -c16,1 Audio_downloaded_new\ - -c16,1 Audio_failed\ - -c16,1 Audio_suspended\ + -c16,1 podcatcher_64px.svg\ + -c16,1 Audio.svg\ + -c16,1 Audio_new.svg\ + -c16,1 Audio_queued.svg\ + -c16,1 Audio_downloading.svg\ + -c16,1 Audio_downloaded.svg\ + -c16,1 Audio_downloaded_new.svg\ + -c16,1 Audio_failed.svg\ + -c16,1 Audio_suspended.svg\ -c16,1 Video.svg\ -c16,1 Video_new.svg\ -c16,1 Video_queued.svg\ @@ -51,5 +51,18 @@ -c16,1 Video_downloaded_new.svg\ -c16,1 Video_failed.svg\ -c16,1 Video_suspended.svg\ - -c16,1 Feed + -c16,1 Feed.svg\ + -c16,1 add_pod.svg\ + -c16,1 delete.svg\ + -c16,1 dwn_pause.svg\ + -c16,1 dwn_start.svg\ + -c16,1 reload.svg\ + -c16,1 reload_all.svg\ + -c16,1 settings.svg\ + -c16,1 cancel.svg\ + -c16,1 remove.svg\ + -c16,1 remove_all.svg\ + -c16,1 download.svg\ + -c16,1 markold.svg\ + -c16,1 marknew.svg END diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/sis/make_s3_sis.cmd --- a/application/sis/make_s3_sis.cmd Tue Oct 19 14:02:32 2010 +0100 +++ b/application/sis/make_s3_sis.cmd Thu Oct 21 18:52:18 2010 +0100 @@ -1,6 +1,3 @@ del *.sis -makesis -d\ podcatcher_udeb.pkg +makesis -d\symbian\pdk3.0.2\ podcatcher_udeb.pkg signsis podcatcher_udeb.sis podcatcher_udeb_signed.sis podcast.cer podcast.key - -makesis -d\ podcatcher_urel.pkg -signsis podcatcher_urel.sis podcatcher_urel_signed.sis podcast.cer podcast.key \ No newline at end of file diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/sis/podcatcher_udeb.sis Binary file application/sis/podcatcher_udeb.sis has changed diff -r af83e0ffbf4b -r 6dfdf1d9da5c application/sis/podcatcher_udeb_signed.sis Binary file application/sis/podcatcher_udeb_signed.sis has changed diff -r af83e0ffbf4b -r 6dfdf1d9da5c engine/group/bld.inf --- a/engine/group/bld.inf Tue Oct 19 14:02:32 2010 +0100 +++ b/engine/group/bld.inf Thu Oct 21 18:52:18 2010 +0100 @@ -17,7 +17,7 @@ */ PRJ_PLATFORMS -DEFAULT +WINSCW GCCE PRJ_MMPFILES engine.mmp diff -r af83e0ffbf4b -r 6dfdf1d9da5c engine/group/engine.mmp --- a/engine/group/engine.mmp Tue Oct 19 14:02:32 2010 +0100 +++ b/engine/group/engine.mmp Thu Oct 21 18:52:18 2010 +0100 @@ -17,7 +17,7 @@ */ // MPX integration can not be enabled for self signed versions -#define ENABLE_MPX_INTEGRATION +//#define ENABLE_MPX_INTEGRATION TARGET podcastengine.dll TARGETTYPE DLL