# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274780569 -10800 # Node ID 9f3ff466f56bfc42e241a452e60e09220c61d1d2 # Parent 97dcae98e602eee778185193e707b7aec172fcb1 Revision: 201018 Kit: 2010121 diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradio/aif/qgn_indi_tb_ovi_music.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fmradio/fmradio/aif/qgn_indi_tb_ovi_music.svg Tue May 25 12:42:49 2010 +0300 @@ -0,0 +1,7 @@ + + + + + + + diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradio/data/fmradio.rss --- a/fmradio/fmradio/data/fmradio.rss Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradio/data/fmradio.rss Tue May 25 12:42:49 2010 +0300 @@ -25,7 +25,7 @@ // #include #include - +#include #include #include #include @@ -75,7 +75,7 @@ #endif }; } - + // --------------------------------------------------------------------------- // r_fmradio_setting_frequency_editor // Editor for setting frequency of a channel. @@ -84,7 +84,7 @@ RESOURCE FMRADIO_FREQUENCY_EDITOR r_fmradio_setting_frequency_editor { } - + // --------------------------------------------------------------------------- // r_fmradio_manual_tuning_query // Manual tuning query resources @@ -111,6 +111,90 @@ }; } +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_prev_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbRadioPrevious; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_next_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbRadioNext; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_rename_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbRename; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_save_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbRadioStationSave; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_delete_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiCam4TbDelete; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_mshop_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiRadioTbMshop; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_ihfon_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbIhfOn; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_ihfoff_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbIhfOff; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_web_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiRadioTbGotoweb; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_stations_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiRadioTbList; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_ovi_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnMenuOviMusic; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_manual_tuning_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiRadioTbManualtune; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_scan_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbRadioScan; + } + +RESOURCE AVKON_BUTTON_STATE_EXTENSION r_fmradio_toolbar_save_all_button_state_extension + { + bmbSkinIdMajor = EAknsMajorGeneric; + bmbSkinIdMinor = EAknsMinorGenericQgnIndiTbRadioStationSaveAll; + } + // --------------------------------------------------------------------------- // r_fmradio_main_view_toolbar // --------------------------------------------------------------------------- @@ -134,6 +218,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_radio_previous; bmpmask = EMbmFmradioQgn_indi_tb_radio_previous_mask; + extension = r_fmradio_toolbar_prev_button_state_extension; } }; }; @@ -163,6 +248,7 @@ bmpfile = KFMRadioBitmapFile; bmpmask = EMbmFmradioQgn_indi_tb_rename; bmpid = EMbmFmradioQgn_indi_tb_rename_mask; + extension = r_fmradio_toolbar_rename_button_state_extension; } }; }; @@ -183,6 +269,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_radio_station_save; bmpmask = EMbmFmradioQgn_indi_tb_radio_station_save_mask; + extension = r_fmradio_toolbar_save_button_state_extension; } }; }; @@ -203,6 +290,7 @@ bmpfile = KFMRadioBitmapFile; bmpmask = EMbmFmradioQgn_indi_cam4_tb_delete_mask; bmpid = EMbmFmradioQgn_indi_cam4_tb_delete; + extension = r_fmradio_toolbar_delete_button_state_extension; } }; }; @@ -222,6 +310,7 @@ bmpfile = KFMRadioBitmapFile; bmpmask = EMbmFmradioQgn_indi_radio_tb_mshop; bmpid = EMbmFmradioQgn_indi_radio_tb_mshop_mask; + extension = r_fmradio_toolbar_mshop_button_state_extension; } }; }; @@ -242,6 +331,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_ihf_on; bmpmask = EMbmFmradioQgn_indi_tb_ihf_on_mask; + extension = r_fmradio_toolbar_ihfon_button_state_extension; }, AVKON_BUTTON_STATE { @@ -250,6 +340,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_ihf_off; bmpmask = EMbmFmradioQgn_indi_tb_ihf_off_mask; + extension = r_fmradio_toolbar_ihfoff_button_state_extension; } }; }; @@ -270,6 +361,7 @@ bmpfile = KFMRadioBitmapFile; bmpmask = EMbmFmradioQgn_indi_radio_tb_gotoweb; bmpid = EMbmFmradioQgn_indi_radio_tb_gotoweb_mask; + extension = r_fmradio_toolbar_web_button_state_extension; } }; }; @@ -290,6 +382,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_radio_tb_list; bmpmask = EMbmFmradioQgn_indi_radio_tb_list_mask; + extension = r_fmradio_toolbar_stations_button_state_extension; } }; }; @@ -308,8 +401,9 @@ txt = qtn_tbextension_ovi_music; helptxt = qtn_fmradio_tooltip_nokia_music_store; bmpfile = KFMRadioBitmapFile; - bmpid = EMbmFmradioQgn_menu_music; - bmpmask = EMbmFmradioQgn_menu_music_mask; + bmpid = EMbmFmradioQgn_indi_tb_ovi_music; + bmpmask = EMbmFmradioQgn_indi_tb_ovi_music_mask; + extension = r_fmradio_toolbar_ovi_button_state_extension; } }; }; @@ -331,6 +425,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_radio_next; bmpmask = EMbmFmradioQgn_indi_tb_radio_next_mask; + extension = r_fmradio_toolbar_next_button_state_extension; } }; }; @@ -576,24 +671,24 @@ //---------------------------------------------------- // RESOURCE MENU_PANE r_fmradio_options_af_sub_menu - { - items = - { - MENU_ITEM - { - command = EFMRadioCmdEnableRdsAfSearch; - txt = qtn_fmradio_options_on; - flags = EEikMenuItemRadioStart; - }, - MENU_ITEM - { - command = EFMRadioCmdDisableRdsAfSearch; - txt = qtn_fmradio_options_off; - flags = EEikMenuItemRadioEnd; - } - }; - } - + { + items = + { + MENU_ITEM + { + command = EFMRadioCmdEnableRdsAfSearch; + txt = qtn_fmradio_options_on; + flags = EEikMenuItemRadioStart; + }, + MENU_ITEM + { + command = EFMRadioCmdDisableRdsAfSearch; + txt = qtn_fmradio_options_off; + flags = EEikMenuItemRadioEnd; + } + }; + } + //---------------------------------------------------- // Resource : r_fmradio_ch_list_options_menu // Description : Channel list options menu items. @@ -638,6 +733,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_radio_tb_manualtune; bmpmask = EMbmFmradioQgn_indi_radio_tb_manualtune_mask; + extension = r_fmradio_toolbar_manual_tuning_button_state_extension; } }; }; @@ -656,6 +752,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_radio_scan; bmpmask = EMbmFmradioQgn_indi_tb_radio_scan_mask; + extension = r_fmradio_toolbar_scan_button_state_extension; } }; }; @@ -674,6 +771,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_ihf_on; bmpmask = EMbmFmradioQgn_indi_tb_ihf_on_mask; + extension = r_fmradio_toolbar_ihfon_button_state_extension; }, AVKON_BUTTON_STATE { @@ -681,10 +779,11 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_ihf_off; bmpmask = EMbmFmradioQgn_indi_tb_ihf_off_mask; + extension = r_fmradio_toolbar_ihfoff_button_state_extension; } }; }; - } + } }; } @@ -713,13 +812,13 @@ RESOURCE ARRAY r_fmradio_listquery_save_all_replace_append_items - { - items = - { - LBUF {txt = qtn_fmradio_list_query_replace_all; }, - LBUF {txt = qtn_fmradio_list_query_append; } - }; - } + { + items = + { + LBUF {txt = qtn_fmradio_list_query_replace_all; }, + LBUF {txt = qtn_fmradio_list_query_append; } + }; + } RESOURCE AVKON_LIST_QUERY r_fmradio_listquery_save_all_replace_append_list_almost_full { @@ -739,7 +838,7 @@ }; } }; - } + } RESOURCE ARRAY r_fmradio_listquery_save_all_replace_append_items_list_almost_full { @@ -748,7 +847,7 @@ LBUF {txt = qtn_fmradio_list_query_all_fits; }, LBUF {txt = qtn_fmradio_list_query_replace_all; } }; - } + } RESOURCE DIALOG r_fmradio_rename_query { @@ -805,53 +904,53 @@ //---------------------------------------------------- // Resource : r_fmradio_activate_in_offline_query // Description : A dialog shown when starting FM Radio -// and off-line mode is active. +// and off-line mode is active. //---------------------------------------------------- // RESOURCE DIALOG r_fmradio_activate_in_offline_query - { - flags = EGeneralQueryFlags; - buttons = R_AVKON_SOFTKEYS_YES_NO; - items = - { - DLG_LINE - { - type = EAknCtQuery; - id = EGeneralQuery; - control = AVKON_CONFIRMATION_QUERY - { - layout = EConfirmationQueryLayout; - label = qtn_fmradio_query_offline_activate; - }; - } - }; - } + { + flags = EGeneralQueryFlags; + buttons = R_AVKON_SOFTKEYS_YES_NO; + items = + { + DLG_LINE + { + type = EAknCtQuery; + id = EGeneralQuery; + control = AVKON_CONFIRMATION_QUERY + { + layout = EConfirmationQueryLayout; + label = qtn_fmradio_query_offline_activate; + }; + } + }; + } //---------------------------------------------------- // Resource : r_fmradio_continue_in_offline_query // Description : A dialog shown when coming to -// foreground and off-line mode has been -// activated in background. +// foreground and off-line mode has been +// activated in background. //---------------------------------------------------- // RESOURCE DIALOG r_fmradio_continue_in_offline_query - { - flags = EGeneralQueryFlags; - buttons = R_AVKON_SOFTKEYS_YES_NO; - items = - { - DLG_LINE - { - type = EAknCtQuery; - id = EGeneralQuery; - control = AVKON_CONFIRMATION_QUERY - { - layout = EConfirmationQueryLayout; - label = qtn_fmradio_query_offline_use; - }; - } - }; - } + { + flags = EGeneralQueryFlags; + buttons = R_AVKON_SOFTKEYS_YES_NO; + items = + { + DLG_LINE + { + type = EAknCtQuery; + id = EGeneralQuery; + control = AVKON_CONFIRMATION_QUERY + { + layout = EConfirmationQueryLayout; + label = qtn_fmradio_query_offline_use; + }; + } + }; + } //---------------------------------------------------- // Resource : r_fmradio_save_ch_confirmation_query @@ -911,25 +1010,25 @@ } RESOURCE DIALOG r_fmradio_connect_headset_note - { + { flags = EAknDialogGenericQueryFlags; buttons = r_fmradio_softkeys_exit; items = - { + { DLG_LINE - { + { type = EAknCtQuery; id = EConfirmationLayout; control = AVKON_CONFIRMATION_QUERY - { + { layout = EConfirmationQueryLayout; bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_note_radio_jackmini; bmpmask = EMbmFmradioQgn_note_radio_jackmini_mask; - }; - } - }; - } + }; + } + }; + } //---------------------------------------------------- // Resource : r_fmradio_query_save_current @@ -1190,8 +1289,8 @@ //---------------------------------------------------- // Resource : r_qtn_fmradio_use_long_tap // Description : Text for the information note that -// will be shown when the channels haven't been saved -// and tryed to change channel. +// will be shown when the channels haven't been saved +// and tryed to change channel. //---------------------------------------------------- // RESOURCE TBUF r_qtn_fmradio_use_long_tap { buf = qtn_fmradio_use_long_tap; } @@ -1199,8 +1298,8 @@ //---------------------------------------------------- // Resource : r_qtn_fmradio_list_query_list_full // Description : If the amount of added stations is about to exceed -// the limit, a List query is displayed with a prompt -// text Station list full: +// the limit, a List query is displayed with a prompt +// text Station list full: //---------------------------------------------------- // RESOURCE TBUF r_qtn_fmradio_list_query_list_full { buf = qtn_fmradio_list_query_list_full; } @@ -1327,13 +1426,13 @@ // --------------------------------------------------------------------------- // RESOURCE CBA r_fmradio_softkeys_empty_cancel - { - buttons= - { - CBA_BUTTON { txt = text_softkey_empty; }, - CBA_BUTTON { id = EAknSoftkeyCancel; txt = text_softkey_cancel; } - }; - } + { + buttons= + { + CBA_BUTTON { txt = text_softkey_empty; }, + CBA_BUTTON { id = EAknSoftkeyCancel; txt = text_softkey_cancel; } + }; + } // Search Stations view @@ -1404,6 +1503,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_radio_station_save_all; bmpmask = EMbmFmradioQgn_indi_tb_radio_station_save_all_mask; + extension = r_fmradio_toolbar_save_all_button_state_extension; } }; }; @@ -1422,6 +1522,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_radio_scan; bmpmask = EMbmFmradioQgn_indi_tb_radio_scan_mask; + extension = r_fmradio_toolbar_scan_button_state_extension; } }; }; @@ -1440,6 +1541,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_ihf_on; bmpmask = EMbmFmradioQgn_indi_tb_ihf_on_mask; + extension = r_fmradio_toolbar_ihfon_button_state_extension; }, AVKON_BUTTON_STATE { @@ -1447,6 +1549,7 @@ bmpfile = KFMRadioBitmapFile; bmpid = EMbmFmradioQgn_indi_tb_ihf_off; bmpmask = EMbmFmradioQgn_indi_tb_ihf_off_mask; + extension = r_fmradio_toolbar_ihfoff_button_state_extension; } }; }; @@ -1462,24 +1565,24 @@ //---------------------------------------------------- // RESOURCE DIALOG r_fmradio_search_stations_wait_note - { + { flags = EAknWaitNoteFlags; buttons = r_fmradio_softkeys_empty_stop; items = - { - DLG_LINE - { + { + DLG_LINE + { type = EAknCtNote; id = EGeneralNote; control = AVKON_NOTE - { - layout = EWaitLayout; - singular_label = qtn_fmradio_wait_note_scanning; - animation = R_QGN_GRAF_WAIT_BAR_ANIM; - }; - } - }; - } + { + layout = EWaitLayout; + singular_label = qtn_fmradio_wait_note_scanning; + animation = R_QGN_GRAF_WAIT_BAR_ANIM; + }; + } + }; + } // ----------------------------------------------------------------------------- // @@ -1539,24 +1642,24 @@ //---------------------------------------------------- // RESOURCE DIALOG r_fmradio_search_stations_wait_cancel_note - { + { flags = EAknWaitNoteFlags; buttons = r_fmradio_softkeys_empty_cancel; items = - { - DLG_LINE - { + { + DLG_LINE + { type = EAknCtNote; id = EGeneralNote; control = AVKON_NOTE - { - layout = EWaitLayout; - singular_label = qtn_fmradio_wait_note_scanning; - animation = R_QGN_GRAF_WAIT_BAR_ANIM; - }; - } - }; - } + { + layout = EWaitLayout; + singular_label = qtn_fmradio_wait_note_scanning; + animation = R_QGN_GRAF_WAIT_BAR_ANIM; + }; + } + }; + } // --------------------------------------------------------------------------- // r_fmradio_wait_anim_tuning // Tuning animation. diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradio/group/iconlist.txt --- a/fmradio/fmradio/group/iconlist.txt Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradio/group/iconlist.txt Tue May 25 12:42:49 2010 +0300 @@ -34,4 +34,5 @@ -c8,8 qgn_indi_radio_tb_mshop.svg -c8,8 qgn_indi_radio_tb_gotoweb.svg -c8,8 qgn_note_radio_jackmini.svg --c8,8 qgn_menu_music.svg +-c8,8 qgn_indi_tb_ovi_music.svg + diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradio/src/fmradioappui.cpp --- a/fmradio/fmradio/src/fmradioappui.cpp Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradio/src/fmradioappui.cpp Tue May 25 12:42:49 2010 +0300 @@ -659,12 +659,25 @@ if ( continueWithSave ) { + CFMRadioRdsReceiverBase& receiver = iRadioEngine->RdsReceiver(); CFMRadioRdsReceiverBase::TFMRadioProgrammeSeviceType type = - iRadioEngine->RdsReceiver().ProgrammeServiceNameType(); + receiver.ProgrammeServiceNameType(); const TDesC& channelName = type == CFMRadioRdsReceiverBase::EFMRadioPSNameStatic ? - iRadioEngine->RdsReceiver().ProgrammeService() : KNullDesC; - - AddChannelToListL( channelName, iRadioEngine->GetTunedFrequency() ); + receiver.ProgrammeService() : KNullDesC; + + CFMRadioPreset* preset = CFMRadioPreset::NewL(); + CleanupStack::PushL( preset ); + preset->SetPresetNameL( channelName ); + preset->SetPresetFrequency( iRadioEngine->GetTunedFrequency() ); + + const TDesC& webUrl = receiver.RtPlusProgramUrl(); + if ( webUrl.Length() ) + { + preset->SetPresetUrlL( webUrl ); + } + iChannels.AppendL( preset ); + CleanupStack::Pop( preset ); + UpdateChannelsL( EStoreAllToRepository, 0, 0 ); iMainView->SetStationChangeType( EFMRadioStationChangeNone ); diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradio/src/fmradiologo.cpp --- a/fmradio/fmradio/src/fmradiologo.cpp Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradio/src/fmradiologo.cpp Tue May 25 12:42:49 2010 +0300 @@ -19,6 +19,7 @@ // INCLUDE FILES #include +#include #include #include #include @@ -213,24 +214,24 @@ AknLayoutScalable_Apps::area_fmrd2_visual_pane_g1( KLAFVarietyBackgroundImagePortrait ).LayoutLine() ); // image for portrait - iPortraitImage = TAlfImage( KAknsIIDNone, - bitmapLayout.Rect().Size(), - EAspectRatioPreserved, - iBackgroundBitmapFileName, - EMbmFmradioQgn_menu_radio, - EMbmFmradioQgn_menu_radio_mask ); + iPortraitImage = TAlfImage( KAknsIIDQgnIndiRadioDefault, + bitmapLayout.Rect().Size(), + EAspectRatioPreserved, + iBackgroundBitmapFileName, + EMbmFmradioQgn_indi_radio_default, + EMbmFmradioQgn_indi_radio_default_mask ); // image for landscape bitmapLayout.LayoutRect( temp, AknLayoutScalable_Apps::area_fmrd2_visual_pane_g1( KLAFVarietyBackgroundImageLandscape ).LayoutLine() ); - iLandscapeImage = TAlfImage( KAknsIIDNone, - bitmapLayout.Rect().Size(), - EAspectRatioPreserved, - iBackgroundBitmapFileName, - EMbmFmradioQgn_menu_radio, - EMbmFmradioQgn_menu_radio_mask ); + iLandscapeImage = TAlfImage( KAknsIIDQgnIndiRadioDefault, + bitmapLayout.Rect().Size(), + EAspectRatioPreserved, + iBackgroundBitmapFileName, + EMbmFmradioQgn_indi_radio_default, + EMbmFmradioQgn_indi_radio_default_mask ); iImageVisual->SetImage( iPortraitImage ); iImageVisual->SetSecondaryImage( iLandscapeImage ); diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradioengine/src/fmradioaccessoryconnection.cpp --- a/fmradio/fmradioengine/src/fmradioaccessoryconnection.cpp Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradioengine/src/fmradioaccessoryconnection.cpp Tue May 25 12:42:49 2010 +0300 @@ -17,9 +17,9 @@ #include "fmradiovariant.hrh" // include first for variation #include #include -#include +#include #include -#include +#include #include "fmradioaccessoryconnection.h" #include "fmradioheadseteventobserver.h" diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradiomcpplugin/inc/fmradiomcpplugin.h --- a/fmradio/fmradiomcpplugin/inc/fmradiomcpplugin.h Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradiomcpplugin/inc/fmradiomcpplugin.h Tue May 25 12:42:49 2010 +0300 @@ -98,12 +98,6 @@ RBuf iSavedStationFormatNoName; RBuf iFrequencyFormat; - RBuf iSavedStationFormatMenu; - RBuf iSavedStationFormatNoNameMenu; - RBuf iFrequencyFormatMenu; - RBuf iNowPlayingText; - RBuf iLastPlayedText; - TUint iTbPreviousState; TUint iTbMuteUnmuteState; TUint iTbNextState; diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradiomcpplugin/resources/fmradiomcpplugin.rss --- a/fmradio/fmradiomcpplugin/resources/fmradiomcpplugin.rss Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradiomcpplugin/resources/fmradiomcpplugin.rss Tue May 25 12:42:49 2010 +0300 @@ -42,8 +42,4 @@ RESOURCE TBUF r_qtn_fmradio_widget_station_saved { buf = qtn_fmradio_widget_station_saved; } RESOURCE TBUF r_qtn_fmradio_widget_station_saved_freq { buf = qtn_fmradio_widget_station_saved_freq; } RESOURCE TBUF r_qtn_fmradio_widget_notsaved_frequency { buf = qtn_fmradio_widget_notsaved_frequency; } -RESOURCE TBUF r_qtn_fmradio_suite_last_played { buf = qtn_fmradio_suite_last_played; } -RESOURCE TBUF r_qtn_fmradio_suite_now_playing { buf = qtn_fmradio_suite_now_playing; } -RESOURCE TBUF r_qtn_fmradio_suite_playing_saved_with_name { buf = qtn_fmradio_suite_playing_saved_with_name; } -RESOURCE TBUF r_qtn_fmradio_suite_playing_saved_without_name { buf = qtn_fmradio_suite_playing_saved_without_name; } -RESOURCE TBUF r_qtn_fmradio_suite_playing_not_saved { buf = qtn_fmradio_suite_playing_not_saved; } + diff -r 97dcae98e602 -r 9f3ff466f56b fmradio/fmradiomcpplugin/src/fmradiomcpplugin.cpp --- a/fmradio/fmradiomcpplugin/src/fmradiomcpplugin.cpp Tue May 11 16:13:56 2010 +0300 +++ b/fmradio/fmradiomcpplugin/src/fmradiomcpplugin.cpp Tue May 25 12:42:49 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -38,7 +38,6 @@ #include "debug.h" #include "fmradiomcpplugin.h" #include "fmradiomcpplugin.hrh" -#include "AknsConstants.h" _LIT( KFMRadioMifFileName, "fmradio.mif" ); _LIT( KFMRadioMifDir, "\\resource\\apps\\" ); @@ -76,16 +75,11 @@ } delete iEngine; - iNowPlayingText.Close(); - iLastPlayedText.Close(); iAntennaNotConnectedText.Close(); iTuningText.Close(); iSavedStationFormat.Close(); iSavedStationFormatNoName.Close(); iFrequencyFormat.Close(); - iSavedStationFormatMenu.Close(); - iSavedStationFormatNoNameMenu.Close(); - iFrequencyFormatMenu.Close(); iMifFileName.Close(); } @@ -102,19 +96,12 @@ CCoeEnv* coeEnv = CCoeEnv::Static(); - iNowPlayingText.Assign( StringLoader::LoadL( R_QTN_FMRADIO_SUITE_NOW_PLAYING, coeEnv ) ); - iLastPlayedText.Assign( StringLoader::LoadL( R_QTN_FMRADIO_SUITE_LAST_PLAYED, coeEnv ) ); - iAntennaNotConnectedText.Assign( StringLoader::LoadL( R_QTN_FMRADIO_WIDGET_CON_HEADSET, coeEnv ) ); iTuningText.Assign( StringLoader::LoadL( R_QTN_FMRADIO_WIDGET_TUNING, coeEnv ) ); iSavedStationFormat.Assign( StringLoader::LoadL( R_QTN_FMRADIO_WIDGET_STATION_SAVED, coeEnv ) ); iSavedStationFormatNoName.Assign( StringLoader::LoadL( R_QTN_FMRADIO_WIDGET_STATION_SAVED_FREQ, coeEnv ) ); iFrequencyFormat.Assign( StringLoader::LoadL( R_QTN_FMRADIO_WIDGET_NOTSAVED_FREQUENCY, coeEnv ) ); - iSavedStationFormatMenu.Assign( StringLoader::LoadL( R_QTN_FMRADIO_SUITE_PLAYING_SAVED_WITH_NAME, coeEnv ) ); - iSavedStationFormatNoNameMenu.Assign( StringLoader::LoadL( R_QTN_FMRADIO_SUITE_PLAYING_SAVED_WITHOUT_NAME, coeEnv ) ); - iFrequencyFormatMenu.Assign( StringLoader::LoadL( R_QTN_FMRADIO_SUITE_PLAYING_NOT_SAVED, coeEnv ) ); - // Release the resource file, because we don't want to keep file handle open. // That would prevent updating the binary with SIS. if ( iResourceOffset > 0 ) @@ -219,21 +206,14 @@ iObserver->BecameActiveL( this ); iObserver->PublishTextL( this, EMusicWidgetDefaultText, KNullDesC ); - - iObserver->PublishImageL( this, EMusicMenuMusicInfoImage1, - KAknsIIDQgnIndiRadioDefault, - iMifFileName, - EMbmFmradioQgn_indi_radio_default, - EMbmFmradioQgn_indi_radio_default_mask); - + iObserver->PublishImageL( this, EMusicWidgetImage1, - KAknsIIDNone, + KAknsIIDQgnIndiRadioDefault, iMifFileName, - EMbmFmradioQgn_menu_radio, - EMbmFmradioQgn_menu_radio_mask ); + EMbmFmradioQgn_indi_radio_default, + EMbmFmradioQgn_indi_radio_default_mask ); InstallFMRadioCommandActionL( KFMRadioCommandValueStartNowPlaying, EMusicWidgetTrigger1 ); - InstallFMRadioCommandActionL( KFMRadioCommandValueStartNowPlaying, EMusicMenuMusicInfoTrigger ); HandleChannelChangeL( iEngine->Channel() ); } @@ -483,30 +463,6 @@ FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing Music Widget saved station: \"%S\""), &name )); iObserver->PublishTextL( this, EMusicWidgetText1, name ); CleanupStack::PopAndDestroy(); // name - - // For Music Suite - // Preserve space for the channel name, format string and maximum index number - name.CreateL( iEngine->ChannelName().Length() + - iSavedStationFormatMenu.Length() + - KDefaultRealWidth + - rightToLeftCharWidth ); - name.CleanupClosePushL(); - StringLoader::Format( name, iSavedStationFormatMenu, KErrNotFound, iEngine->Channel() + 1 ); - - tempName = name.AllocL(); - StringLoader::Format( name, *tempName, KErrNotFound, iEngine->ChannelName() ); - delete tempName; - tempName = NULL; - - if ( rightToLeftCharWidth ) - { - //E.g. 1. Name -> Name .1 - name.Insert( 0, KRightToLeftMark ); - } - - FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing Music Suite saved station: \"%S\""), &name )); - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine2, name ); - CleanupStack::PopAndDestroy(); // name } else { @@ -536,38 +492,13 @@ FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing Music Widget saved station with frequency: \"%S\""), &formattedFrequency )); iObserver->PublishTextL( this, EMusicWidgetText1, formattedFrequency ); - CleanupStack::PopAndDestroy(); // formattedFrequency - - // For Music Suite - formattedFrequency.CreateL( iSavedStationFormatNoNameMenu.Length() + - frequencyString->Length() + - KDefaultRealWidth + - rightToLeftCharWidth ); - formattedFrequency.CleanupClosePushL(); - StringLoader::Format( formattedFrequency, iSavedStationFormatNoNameMenu, KErrNotFound, iEngine->Channel() + 1 ); - - tempFrequency = formattedFrequency.AllocL(); - StringLoader::Format( formattedFrequency, *tempFrequency, KErrNotFound, *frequencyString ); - delete tempFrequency; - tempFrequency = NULL; - - AknTextUtils::LanguageSpecificNumberConversion( formattedFrequency ); - if ( rightToLeftCharWidth ) - { - //E.g. 1. Name -> Name .1 - formattedFrequency.Insert( 0, KRightToLeftMark ); - } - - FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing Music Suite saved station with frequency: \"%S\""), &formattedFrequency )); - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine2, formattedFrequency ); - CleanupStack::PopAndDestroy( 2, frequencyString ); // formattedFrequency, frequencyString + CleanupStack::PopAndDestroy( 2 ); // formattedFrequency, frequencyString } } else if ( iEngine->RDSProgramService().Length() > 0 ) { FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing HS PS name: \"%S\""), &iEngine->RDSProgramService() )); iObserver->PublishTextL( this, EMusicWidgetText1, iEngine->RDSProgramService() ); - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine2, iEngine->RDSProgramService() ); } else { @@ -595,42 +526,14 @@ FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing Music Widget frequency: \"%S\""), &formattedFrequency )); iObserver->PublishTextL( this, EMusicWidgetText1, formattedFrequency ); - CleanupStack::PopAndDestroy(); // formattedFrequency - - // For Music Suite - // Preserve space for the format string and maximum index number - formattedFrequency.CreateL( iFrequencyFormatMenu.Length() + - frequencyString->Length() + - rightToLeftCharWidth ); - formattedFrequency.CleanupClosePushL(); - StringLoader::Format( formattedFrequency, iFrequencyFormatMenu, KErrNotFound, *frequencyString ); - AknTextUtils::LanguageSpecificNumberConversion( formattedFrequency ); - - if ( rightToLeftCharWidth ) - { - //E.g. 1. Name -> Name .1 - formattedFrequency.Insert( 0, KRightToLeftMark ); - } - - FTRACE(FPrint(_L(" *** S60 FMRadio -- CFMRadioMCPPlugin::UpdateMusicWidgetTextL - Publishing Music Suite frequency: \"%S\""), &formattedFrequency )); - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine2, formattedFrequency ); - CleanupStack::PopAndDestroy( 2, frequencyString ); // formattedFrequency, frequencyString + CleanupStack::PopAndDestroy( 2 ); // formattedFrequency,frequencyString } else { // Publish empty text instead of 0.00 MHz iObserver->PublishTextL( this, EMusicWidgetText1, KNullDesC ); - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine2, KNullDesC ); } } - if( iEngine->PowerState() == EFMRadioPSRadioPowerOn && !aForceApplicationClosing ) - { - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine1, iNowPlayingText ); - } - else - { - iObserver->PublishTextL( this, EMusicMenuMusicInfoLine1, iLastPlayedText ); - } } }