FreeCalypso > hg > fc-tourmaline
diff src/ui/bmi/mmiBookShared.c @ 142:ec9f955fc487
mmiBook*.c: bogotab fixes
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sat, 14 Nov 2020 08:43:59 +0000 |
| parents | c0052fe355d3 |
| children |
line wrap: on
line diff
--- a/src/ui/bmi/mmiBookShared.c Sat Nov 14 04:29:03 2020 +0000 +++ b/src/ui/bmi/mmiBookShared.c Sat Nov 14 08:43:59 2020 +0000 @@ -11,12 +11,12 @@ $Project name: Basic MMI $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookShared.c - $Revision: 1.0 - - $Author: Condat(UK) - $Date: 25/10/00 + $Module: PhoneBook + $File: MmiBookShared.c + $Revision: 1.0 + + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -30,110 +30,110 @@ $History: MmiBookShared.c - Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) - Description: Support from MMI to configure drives (NOR, NORMS, NAND, TFLASH) - is added as part of SBuild 2.3.0 Migration + Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) + Description: Support from MMI to configure drives (NOR, NORMS, NAND, TFLASH) + is added as part of SBuild 2.3.0 Migration April 03 2007 ER:OMAPS00116772 x0061088(Prachi) Description:Support of 1.3 Mpixel camera on Locosto Plus Solution: Auto Save option is added for the Camera Application - Apr 03, 2007 ER: OMAPS00122561 x0pleela - Description: [ACI] Phone lock feature has to be supported by ACI - Solution: Phone Lock ER implementation - - Mar 28, 2007 ER: OMAPS00106188 x0039928 - Description: Align Midi application menu choices and audio Player menu choices - - Nov 10, 2006 DRT: OMAPS000103354 x0039928 - Description: Delete all failure in LDN Phonebook - Solution: Delete all for Recent list is mapped to bookDeleteRec instead of bookDeleteAll. - - Sep 26, 2006 DR: OMAPS00095524 x0pleela - Description:Implement 2 missing SIM Lock types - Solution: Added new category "Blocked Network" as menu item in menuCategory and menuBootupCatList + Apr 03, 2007 ER: OMAPS00122561 x0pleela + Description: [ACI] Phone lock feature has to be supported by ACI + Solution: Phone Lock ER implementation + + Mar 28, 2007 ER: OMAPS00106188 x0039928 + Description: Align Midi application menu choices and audio Player menu choices + + Nov 10, 2006 DRT: OMAPS000103354 x0039928 + Description: Delete all failure in LDN Phonebook + Solution: Delete all for Recent list is mapped to bookDeleteRec instead of bookDeleteAll. + + Sep 26, 2006 DR: OMAPS00095524 x0pleela + Description:Implement 2 missing SIM Lock types + Solution: Added new category "Blocked Network" as menu item in menuCategory and menuBootupCatList Oct 8 2006 OMAPS00097714 x0039928(sumanth) TTY HCO/VCO options in MMI - xashmic 27 Sep 2006, OMAPS00096389 - ENH - a) Providing static menu for re-selection of enum options for enumeration - b) Popup menu displayed on connect event, can be enabled or disabled via menu option - - Sep 11, 2006 DR: OMAPS00094182 xrashmic - Description: midi and mp3 files is not being populated on accessing corresponding menu, but only during bootup - Solution: Populate files on accessing the "browse files" list - xrashmic 9 Sep 2006, OMAPS00092732 - USBMS ER: Added menu in phone setting to set or unset PS shutdown while enumeration of USB MS - On USB connect event, a list of possible ports that can be enumerated would be displayed. - - Aug 18, 2006 ER: OMAPS00089840 x0039928 - Description: Changes to be made in MMI for the functionality "Delete all" ADN entries - Solution: A new menu item "Delete All" is added in the phone book menu. - - Mar 15, 2006 ER: OMAPS00067709 x0pleela - Description: Voice Buffering implementation on C+ for PTT via PCM API - Solution: Defined new sub menu items for PCM voice memo and Voice buffering - Added newly created sub menu items as menu items into "Application" menu - - Feb 24, 2006 ER: OMAPS00067709 x0pleela - Description: Voice Buffering implementation on C+ for PTT via PCM API - Solution: Added new menu items for PCM voice memo and Voice buffering - Added PCM Voice memo and Voice buffering menu items into "Application" menu - Defined functions GetPcmVoiceMemoMenu, GetVoiceBufferingMenu to populate the - PCM Voice memo and Voice buffering menus - - Jun 19, 2006 DR: OMAPS00070657 xdeepadh - Description: MMI allows to MP3 and MIDI play during an active call - Solution: From the active call screen, only selected applications can be accessed now. - - July 21, 2006 ER: OMAPS00087586, OMAPS00087587 x0pleela - Description: OMAPS00087586: MasterKey funtion in TCS3.2 SW - OMAPS00087587: Time Penaly feature extend handset security - Solution:Made the following changes - 1) Included the header file "MmiPins.h" - 2) Added new menu item "Master unlock" for menu menuMEPersonalization - 3) Defined new menu "menuBootupCatList" to display during bootup for unlocking categories or unblocking ME - 4) New function SIMPCategoryListAttributes(): function to call the new menu "menuBootupCatList" from any file - - May 30, 2006 DR: OMAPS00070657 x0pleela - Description: CPHS feature on Locosto-Lite - Solution: For ALS feature, - a) Defined a new menu item for the user to customize the strings (line1 and line2) - - Apr 24, 2006 ERT: OMAPS00067603 x0043642 - Description: Engineering mode - Solution: Added new engineering mode menus to call respective functions. - - Apr 06, 2006 ERT: OMAPS00070660 x0039928(sumanth) - Description: Need to reduce flash foot-print for Locosto Lite - Solution: Voice Memo feature is put under the flag #ifndef FF_NO_VOICE_MEMO to compile - out voice memo feature if the above flag is enabled. - - Nov 14, 2005 REF: OMAPS00044445 xdeepadh - Description: Implementation of Test Menu for AAC - Solution: The existing MP3 test Application has been enhanced to support the AAC file testing. - - Sep 27,2005 REF: SPR 34402 xdeepadh - Bug:Mono option is always highlighted even when Stereo is selected - Fix:The channel setting will be saved in the FFS, which will be retrieved later - and the selected channel will be higlighted. - - Jul 18, 2005 REF: SPR 31695 xdeepadh - Bug:Problems with MP3 test application - Fix:The window handling of MP3 Test Application has been done properly. - - - Aug 22, 2005 REF: ENH 31154 xdeepadh - Description: Application to Test Camera - Solution: Implemeted the Fileviewer to view the jpeg images.Camera Application to - preview,capture and save image has been implemented. - - July 19, 2005 REF: CRR LOCOSTO-ENH-28173 xpradipg - Description: To provide MMI Support to enable/disable/change password and - query all the Personalization locks - Solution: Integration of the changes for the same provided by the soldel - team + xashmic 27 Sep 2006, OMAPS00096389 + ENH - a) Providing static menu for re-selection of enum options for enumeration + b) Popup menu displayed on connect event, can be enabled or disabled via menu option + + Sep 11, 2006 DR: OMAPS00094182 xrashmic + Description: midi and mp3 files is not being populated on accessing corresponding menu, but only during bootup + Solution: Populate files on accessing the "browse files" list + xrashmic 9 Sep 2006, OMAPS00092732 + USBMS ER: Added menu in phone setting to set or unset PS shutdown while enumeration of USB MS + On USB connect event, a list of possible ports that can be enumerated would be displayed. + + Aug 18, 2006 ER: OMAPS00089840 x0039928 + Description: Changes to be made in MMI for the functionality "Delete all" ADN entries + Solution: A new menu item "Delete All" is added in the phone book menu. + + Mar 15, 2006 ER: OMAPS00067709 x0pleela + Description: Voice Buffering implementation on C+ for PTT via PCM API + Solution: Defined new sub menu items for PCM voice memo and Voice buffering + Added newly created sub menu items as menu items into "Application" menu + + Feb 24, 2006 ER: OMAPS00067709 x0pleela + Description: Voice Buffering implementation on C+ for PTT via PCM API + Solution: Added new menu items for PCM voice memo and Voice buffering + Added PCM Voice memo and Voice buffering menu items into "Application" menu + Defined functions GetPcmVoiceMemoMenu, GetVoiceBufferingMenu to populate the + PCM Voice memo and Voice buffering menus + + Jun 19, 2006 DR: OMAPS00070657 xdeepadh + Description: MMI allows to MP3 and MIDI play during an active call + Solution: From the active call screen, only selected applications can be accessed now. + + July 21, 2006 ER: OMAPS00087586, OMAPS00087587 x0pleela + Description: OMAPS00087586: MasterKey funtion in TCS3.2 SW + OMAPS00087587: Time Penaly feature extend handset security + Solution:Made the following changes + 1) Included the header file "MmiPins.h" + 2) Added new menu item "Master unlock" for menu menuMEPersonalization + 3) Defined new menu "menuBootupCatList" to display during bootup for unlocking categories or unblocking ME + 4) New function SIMPCategoryListAttributes(): function to call the new menu "menuBootupCatList" from any file + + May 30, 2006 DR: OMAPS00070657 x0pleela + Description: CPHS feature on Locosto-Lite + Solution: For ALS feature, + a) Defined a new menu item for the user to customize the strings (line1 and line2) + + Apr 24, 2006 ERT: OMAPS00067603 x0043642 + Description: Engineering mode + Solution: Added new engineering mode menus to call respective functions. + + Apr 06, 2006 ERT: OMAPS00070660 x0039928(sumanth) + Description: Need to reduce flash foot-print for Locosto Lite + Solution: Voice Memo feature is put under the flag #ifndef FF_NO_VOICE_MEMO to compile + out voice memo feature if the above flag is enabled. + + Nov 14, 2005 REF: OMAPS00044445 xdeepadh + Description: Implementation of Test Menu for AAC + Solution: The existing MP3 test Application has been enhanced to support the AAC file testing. + + Sep 27,2005 REF: SPR 34402 xdeepadh + Bug:Mono option is always highlighted even when Stereo is selected + Fix:The channel setting will be saved in the FFS, which will be retrieved later + and the selected channel will be higlighted. + + Jul 18, 2005 REF: SPR 31695 xdeepadh + Bug:Problems with MP3 test application + Fix:The window handling of MP3 Test Application has been done properly. + + + Aug 22, 2005 REF: ENH 31154 xdeepadh + Description: Application to Test Camera + Solution: Implemeted the Fileviewer to view the jpeg images.Camera Application to + preview,capture and save image has been implemented. + + July 19, 2005 REF: CRR LOCOSTO-ENH-28173 xpradipg + Description: To provide MMI Support to enable/disable/change password and + query all the Personalization locks + Solution: Integration of the changes for the same provided by the soldel + team June 07, 2005 REF: CRR MMI-FIX-31545 x0021334 Issue description: SIM: wrong behavior when FDN is not allocated in SST @@ -146,7 +146,7 @@ Description: SMS Status Request in idle and dedicated mode (using Menu) setting does not work Solution: status of sms status request is read and focus is set accrodingly. - Apr 06, 2005 REF: ENH 30011 xdeepadh + Apr 06, 2005 REF: ENH 30011 xdeepadh Description: Replacing the Test Application compilation flags with new flags. Solution: The existing flags for Camera and MP3 test application have beeen replaced with the new compilation flags,FF_MMI_TEST_CAMERA and FF_MMI_TEST_MP3 respectively. @@ -162,11 +162,11 @@ xreddymn Jan-06-2004 MMI-SPR-27618: Display list of WAP push messages before displaying the Options list. - Dec 08, 2004 REF: CRR MMI-SPR-27284 + Dec 08, 2004 REF: CRR MMI-SPR-27284 Description: MIDI Player: Back Key malfunctions in MIDI application. Solution: A window is created to hold list window. When the user presses Back key, the newly - created window is deleted along with list window, bringing the control back to Midi options - screen. + created window is deleted along with list window, bringing the control back to Midi options + screen. Nov 29, 2004 REF: CRR 25051 xkundadu Description: INCALL SCREEN ?ADJUSTING THE VOLUME @@ -180,24 +180,24 @@ Description: The sent EMS is stored in unsent folder. Solution: The Outbox has been removed, instead we now have Sent folder for the sent EMS - Jul 29, 2004 REF: CRR 20898 xkundadu - Description: No identification for user whether 'Auto-Answer' is On/Off - Solution: The menu focus will be on the 'On' menu if the 'Auto-Answer' - is enabled, otherwise focus will be on 'Off' menu item. - Changed 'submenu' to 'menuItem' to call a function,which set the - focus to the selected item. + Jul 29, 2004 REF: CRR 20898 xkundadu + Description: No identification for user whether 'Auto-Answer' is On/Off + Solution: The menu focus will be on the 'On' menu if the 'Auto-Answer' + is enabled, otherwise focus will be on 'Off' menu item. + Changed 'submenu' to 'menuItem' to call a function,which set the + focus to the selected item. Jun 02, 2004 CRR:13649 - xpradipg-SASKEN subject: CBA : Management of password solution: password is promted on selecting activation/deactivation option as against the previous case where it was shown up on selecting Call May 27, 2004 REF: CRR 19186 Deepa M.D - Bug : "Setting" menu not available during a call - Fix : "Setting" menu has been provided to set the SMS settings, during the active call + Bug : "Setting" menu not available during a call + Fix : "Setting" menu has been provided to set the SMS settings, during the active call May 10, 2004 REF: CRR 15753 Deepa M.D Menuitem provided to set the validity period to maximum. - Issue Number : SPR#12822 on 31/03/04 by v vadiraj - 25/10/00 Original Condat(UK) BMI version. + Issue Number : SPR#12822 on 31/03/04 by v vadiraj + 25/10/00 Original Condat(UK) BMI version. Mar 28, 2006 REF:ER OMAPS00071798 x0043642 @@ -272,7 +272,7 @@ #ifdef FF_MMI_TEST_MIDI #include "mfw_midi.h" #endif //FF_MMI_TEST_MIDI -// Apr 06, 2005 REF: ENH 30011 xdeepadh +// Apr 06, 2005 REF: ENH 30011 xdeepadh #ifdef FF_MMI_TEST_CAMERA #include "mfw_cam.h" #endif //FF_MMI_TEST_CAMERA @@ -281,10 +281,10 @@ #include "mfw_camapp.h" #endif //FF_MMI_TEST_CAMERA -#if 0 /* FreeCalypso */ -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +#if 0 /* FreeCalypso */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ #include "mfw_fm.h" -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ #endif #include "dspl.h" @@ -362,14 +362,14 @@ #ifdef FF_MMI_TEST_MIDI #include "MmiMidiTest.h" #endif//#ifdef FF_MMI_TEST_MIDI -//Apr 06, 2005 REF: ENH 30011 xdeepadh +//Apr 06, 2005 REF: ENH 30011 xdeepadh #ifdef FF_MMI_TEST_CAMERA #include "MmiCameraTest.h" #endif //FF_MMI_TEST_CAMERA #ifdef FF_MMI_CAMERA_APP #include "MmiCameraApp.h" #endif //FF_MMI_TEST_CAMERA -// Nov 14, 2005 REF: OMAPS00044445 xdeepadh +// Nov 14, 2005 REF: OMAPS00044445 xdeepadh #if defined(FF_MMI_TEST_MP3) || defined(FF_MMI_TEST_AAC) #include "MmiMP3Test.h" #endif//FF_MMI_TEST_MP3 @@ -432,7 +432,6 @@ #endif - extern void soundsSetVolume(void); extern int SmsSend_R_OPTExeCentreEdit(MfwMnu* m, MfwMnuItem* i); @@ -449,7 +448,6 @@ /*GW Changed all submenus to use the same colour definitions 'COLOUR_LIST_SUBMENU' */ - /* menu buffers */ @@ -478,17 +476,17 @@ EXTERN UBYTE testSelected; #endif -extern MfwIcnAttr mainIconFrame1 ; - - -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +extern MfwIcnAttr mainIconFrame1 ; + + +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ static USHORT mmi_check_tflash( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi ); static USHORT mmi_check_nand( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi ); static USHORT mmi_check_nor( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi ); static USHORT mmi_check_norms( struct MfwMnuTag *m, struct MfwMnuAttrTag *ma, struct MfwMnuItemTag *mi ); -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ /****************************************************************************** @@ -497,9 +495,9 @@ *******************************************************************************/ -#define DEF_MENU_STYLE (MNU_LEFT | MNU_LIST | MNU_CUR_LINE) -#define DEF_COLOUR_MENU_STYLE (MNU_LEFT | MNU_LIST_COLOUR | MNU_CUR_LINE) -#define DEF_MENU_ICON_LIST_STYLE (MNU_LEFT | MNU_LIST_ICONS | MNU_CUR_LINE) +#define DEF_MENU_STYLE (MNU_LEFT | MNU_LIST | MNU_CUR_LINE) +#define DEF_COLOUR_MENU_STYLE (MNU_LEFT | MNU_LIST_COLOUR | MNU_CUR_LINE) +#define DEF_MENU_ICON_LIST_STYLE (MNU_LEFT | MNU_LIST_ICONS | MNU_CUR_LINE) #define BEGIN_MENU( name ) \ static const MfwMnuItem name##Items [] = { @@ -587,22 +585,22 @@ #ifdef MMI_TTY_ENABLED /* SPR#1352 - SH - TTY menu */ BEGIN_MENU( menuTTY ) - MENU_ITEM( TxtOff, call_tty_menuselect, item_flag_none), - MENU_ITEM( TxtAlwaysOn, call_tty_menuselect, item_flag_none), - MENU_ITEM( TxtOnNextCall, call_tty_menuselect, item_flag_none) + MENU_ITEM( TxtOff, call_tty_menuselect, item_flag_none), + MENU_ITEM( TxtAlwaysOn, call_tty_menuselect, item_flag_none), + MENU_ITEM( TxtOnNextCall, call_tty_menuselect, item_flag_none) END_MENU( menuTTY, menuListArea, COLOUR_LIST_SUBMENU1 ) /*x0039928 OMAPS00097714 HCO/VCO option - menu items added*/ #ifdef FF_TTY_HCO_VCO BEGIN_MENU( menucoTTYAlways ) - MENU_ITEM( TxtTTYAll, call_tty_co_menuselect_always, item_flag_none), - MENU_ITEM( TxtTTYVco, call_tty_co_menuselect_always, item_flag_none), - MENU_ITEM( TxtTTYHco, call_tty_co_menuselect_always, item_flag_none) + MENU_ITEM( TxtTTYAll, call_tty_co_menuselect_always, item_flag_none), + MENU_ITEM( TxtTTYVco, call_tty_co_menuselect_always, item_flag_none), + MENU_ITEM( TxtTTYHco, call_tty_co_menuselect_always, item_flag_none) END_MENU( menucoTTYAlways, menuListArea, COLOUR_LIST_SUBMENU1 ) BEGIN_MENU( menucoTTYNextCall ) - MENU_ITEM( TxtTTYAll, call_tty_co_menuselect_nextcall, item_flag_none), - MENU_ITEM( TxtTTYVco, call_tty_co_menuselect_nextcall, item_flag_none), - MENU_ITEM( TxtTTYHco, call_tty_co_menuselect_nextcall, item_flag_none) + MENU_ITEM( TxtTTYAll, call_tty_co_menuselect_nextcall, item_flag_none), + MENU_ITEM( TxtTTYVco, call_tty_co_menuselect_nextcall, item_flag_none), + MENU_ITEM( TxtTTYHco, call_tty_co_menuselect_nextcall, item_flag_none) END_MENU( menucoTTYNextCall, menuListArea, COLOUR_LIST_SUBMENU1 ) #endif #endif @@ -613,7 +611,7 @@ BEGIN_MENU( menuEngMode ) #ifndef NEPTUNE_BOARD MENU_ITEM( TxtMobileInfo, Mmi_em_display_mobile_info_data, item_flag_none ), - MENU_ITEM( TxtServingCell, Mmi_em_display_serving_cell_params, item_flag_none ), + MENU_ITEM( TxtServingCell, Mmi_em_display_serving_cell_params, item_flag_none ), MENU_ITEM( TxtNeighbourCell, Mmi_em_display_neighbour_cell_params, item_flag_none ), MENU_ITEM( TxtLocation, Mmi_em_display_location_params, item_flag_none ), MENU_ITEM( TxtCiphHopDTX, Mmi_em_display_ciph_hop_DTX_params, item_flag_none ), @@ -646,18 +644,18 @@ #ifdef INT_PHONEBOOK BEGIN_MENU( menuSelectBook ) - MENU_ITEM( TxtSIM, bookSelectBookSIM, item_flag_none ), + MENU_ITEM( TxtSIM, bookSelectBookSIM, item_flag_none ), MENU_ITEM( TxtPhone, bookSelectBookPhone, item_flag_none ), END_MENU( menuSelectBook, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuCopy ) - MENU_ITEM( TxtThisEntry, bookCopyEntry, item_flag_none ), - MENU_ITEM( TxtAll, bookCopyAll, item_flag_none ), + MENU_ITEM( TxtThisEntry, bookCopyEntry, item_flag_none ), + MENU_ITEM( TxtAll, bookCopyAll, item_flag_none ), END_MENU( menuCopy, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuMove ) - MENU_ITEM( TxtThisEntry, bookMoveEntry, item_flag_none ), - MENU_ITEM( TxtAll, bookMoveAll, item_flag_none ), + MENU_ITEM( TxtThisEntry, bookMoveEntry, item_flag_none ), + MENU_ITEM( TxtAll, bookMoveAll, item_flag_none ), END_MENU( menuMove, menuListArea, COLOUR_LIST_SUBMENU ) #endif @@ -805,7 +803,7 @@ MENU_ITEM( TxtSaveHistory, AUI_savehist, item_flag_none ), MENU_ITEM( TxtScaleImages, AUI_scaleimages, item_flag_none ), #if defined (FF_WAP) && defined (FF_GPF_TCPIP) - MENU_ITEM( TxtShowMessages, AUI_wap_push_showmessages, item_flag_none )/*added by ellen*/ + MENU_ITEM( TxtShowMessages, AUI_wap_push_showmessages, item_flag_none )/*added by ellen*/ #endif END_MENU( menuWAPSettings, menuListArea, COLOUR_LIST_SUBMENU ) @@ -857,7 +855,7 @@ BEGIN_MENU( menuBookmarks ) MENU_ITEM( TxtList, AUI_bookmarks_list, item_flag_none ), - MENU_ITEM( TxtNewBookmark, AUI_bookmarks_add, item_flag_none ) /* SPR#1983 - SH */ + MENU_ITEM( TxtNewBookmark, AUI_bookmarks_add, item_flag_none ) /* SPR#1983 - SH */ END_MENU( menuBookmarks, menuListArea, COLOUR_LIST_SUBMENU ) /* WAP Menu @@ -897,8 +895,8 @@ MENU_ITEM( Txt1Hour, SmsValidityPeriod, item_flag_none ), MENU_ITEM( Txt12Hours, SmsValidityPeriod, item_flag_none ), MENU_ITEM( Txt24Hours, SmsValidityPeriod, item_flag_none ), - MENU_ITEM( Txt1Week, SmsValidityPeriod, item_flag_none ), - MENU_ITEM( TxtMaxTime, SmsValidityPeriod, item_flag_none ), // May 10, 2004 REF: CRR 15753 Deepa M.D .Menuitem to set the validity period to Maximum. + MENU_ITEM( Txt1Week, SmsValidityPeriod, item_flag_none ), + MENU_ITEM( TxtMaxTime, SmsValidityPeriod, item_flag_none ), // May 10, 2004 REF: CRR 15753 Deepa M.D .Menuitem to set the validity period to Maximum. END_MENU( menuSetSmsValidityPeriod, menuListArea, COLOUR_LIST_SUBMENU ) //Aug 22, 2005 REF: ENH 31154 xdeepadh @@ -926,7 +924,7 @@ MENU_ITEM( TxtHigh, mmi_camera_set_quality, item_flag_none ), END_MENU( menuSetQuality, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ BEGIN_MENU( menuStorage ) MENU_ITEM( TxtFFS, mmi_camera_set_storage, mmi_check_nor ), @@ -935,7 +933,7 @@ MENU_ITEM( TxtTflash, mmi_camera_set_storage, mmi_check_tflash ), END_MENU( menuStorage, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ /* April 03 2007 ER:OMAPS00116772 x0061088(Prachi)*/ @@ -977,15 +975,15 @@ SUB_MENU( TxtQuality, menuSetQuality, item_flag_none ), SUB_MENU( TxtFrame, menuFrameMenu , item_flag_none ), SUB_MENU( TxtRotate, menuSetRotate, item_flag_none ), - SUB_MENU( TxtShootingMode, menuSetBurstmode, item_flag_none), - SUB_MENU( TxtStorageDevice, menuStorage, item_flag_none), + SUB_MENU( TxtShootingMode, menuSetBurstmode, item_flag_none), + SUB_MENU( TxtStorageDevice, menuStorage, item_flag_none), /* April 03 2007 ER:OMAPS00116772 x0061088(Prachi)*/ - SUB_MENU( TxtAutoSave, menuAutoSave, item_flag_none), + SUB_MENU( TxtAutoSave, menuAutoSave, item_flag_none), //added by prachi add flag here #if CAM_SENSOR == 1 - SUB_MENU( TxtCamMenuResolution, menuResolution, item_flag_none), + SUB_MENU( TxtCamMenuResolution, menuResolution, item_flag_none), #endif - MENU_ITEM( TxtFilename, mmi_camera_edit_filename, item_flag_none), + MENU_ITEM( TxtFilename, mmi_camera_edit_filename, item_flag_none), END_MENU( menuSetCameraparams, menuListArea, COLOUR_LIST_SUBMENU ) @@ -995,9 +993,9 @@ //1227 - 01/10/02 - API - Sub Menu for the Concatenate Switch menu option //Sub Menu of Concatenate Switch BEGIN_MENU( menuConcatenate ) - MENU_ITEM( TxtActivate, Concatenate_Activate, item_flag_none), - MENU_ITEM( TxtDeactivate, Concatenate_DeActivate, item_flag_none), - MENU_ITEM( TxtStatus, Concatenate_Status, item_flag_none) + MENU_ITEM( TxtActivate, Concatenate_Activate, item_flag_none), + MENU_ITEM( TxtDeactivate, Concatenate_DeActivate, item_flag_none), + MENU_ITEM( TxtStatus, Concatenate_Status, item_flag_none) END_MENU( menuConcatenate, menuListArea, COLOUR_LIST_SUBMENU ) #endif /*TI_PS_FF_CONC_SMS*/ @@ -1025,7 +1023,7 @@ MENU_ITEM( TxtServiceCentre, SmsSend_R_OPTExeCentreEdit, item_flag_none ), SUB_MENU( TxtValidity, menuSetSmsValidityPeriod, item_flag_none ), #ifdef TI_PS_FF_CONC_SMS - SUB_MENU( TxtConcat, menuConcatenate, ConcatenateDisplay), + SUB_MENU( TxtConcat, menuConcatenate, ConcatenateDisplay), #endif /*TI_PS_FF_CONC_SMS*/ // May04, 2005 REF: CRR 30285 x0021334 @@ -1039,7 +1037,7 @@ SUB_MENU( TxtValidity, menuSetSmsValidityPeriod, item_flag_none ), SUB_MENU( TxtEasyText, menuEasyText, item_flag_none), #ifdef TI_PS_FF_CONC_SMS - SUB_MENU( TxtConcat, menuConcatenate, ConcatenateDisplay), + SUB_MENU( TxtConcat, menuConcatenate, ConcatenateDisplay), #endif /*TI_PS_FF_CONC_SMS*/ // May04, 2005 REF: CRR 30285 x0021334 // Changed SUB_MENU to MENU_ITEM to call function settingsStatusRequestCurSel() @@ -1061,13 +1059,13 @@ END_MENU( menuRotateActivate, menuListArea, COLOUR_LIST_SUBMENU1 ) BEGIN_MENU( menuFileViewer ) - MENU_ITEM( TxtView , mmi_fv_view_image_start, item_flag_none ), - MENU_ITEM( TxtRename, mmi_fv_reame_edit, item_flag_none ), - MENU_ITEM( TxtDelete, mmi_fv_delete_start, item_flag_none), + MENU_ITEM( TxtView , mmi_fv_view_image_start, item_flag_none ), + MENU_ITEM( TxtRename, mmi_fv_reame_edit, item_flag_none ), + MENU_ITEM( TxtDelete, mmi_fv_delete_start, item_flag_none), END_MENU( menuFileViewer, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuViewOptions ) - SUB_MENU( TxtRotate, menuRotateActivate, item_flag_none ), + SUB_MENU( TxtRotate, menuRotateActivate, item_flag_none ), END_MENU( menuViewOptions, menuListArea, COLOUR_LIST_SUBMENU ) #endif @@ -1167,7 +1165,7 @@ #else MENU_ITEM( TxtWrite, M_exeSendNew, item_flag_none ), #endif - /*MC end*/ + /*MC end*/ /* API - 03/09/03 - SPR2383 - END*/ MENU_ITEM( TxtDeleteAll, M_exeDelAll, item_flag_none ), SUB_MENU ( TxtSettings, menuSetMsg, item_flag_none ), @@ -1193,7 +1191,7 @@ #else MENU_ITEM( TxtWrite, M_exeSendNew, item_flag_none ), #endif - /*MC end*/ + /*MC end*/ /* API - 03/09/03 - SPR2383 - END*/ MENU_ITEM( TxtDeleteAll, M_exeDelAll, item_flag_none ), SUB_MENU ( TxtSettings, menuSetMsg, item_flag_none ), @@ -1208,7 +1206,7 @@ */ BEGIN_MENU( menuMsg ) #if defined (FF_MMI_EMS) || defined (FF_MMI_MMS) - //yanbin add MMS menu + //yanbin add MMS menu //TISHMMS Project SUB_MENU ( TxtMMS, menuMMS, item_flag_none ), SUB_MENU ( TxtSMS, menuSMS, item_flag_none ), @@ -1226,7 +1224,7 @@ #else MENU_ITEM( TxtWrite, M_exeSendNew, item_flag_none ), #endif - /*MC end*/ + /*MC end*/ /* API - 03/09/03 - SPR2383 - END*/ MENU_ITEM( TxtDeleteAll, M_exeDelAll, item_flag_none ), SUB_MENU ( TxtSettings, menuSetMsg, item_flag_none ), @@ -1279,10 +1277,10 @@ /* SPR#1112 - SH - Options for when internal phonebook present */ #ifdef INT_PHONEBOOK - SUB_MENU( TxtCopy, menuCopy, item_flag_none), - SUB_MENU( TxtMove, menuMove, item_flag_none), + SUB_MENU( TxtCopy, menuCopy, item_flag_none), + SUB_MENU( TxtMove, menuMove, item_flag_none), #endif - MENU_ITEM( TxtDelete, bookNameDelete, item_flag_none ), + MENU_ITEM( TxtDelete, bookNameDelete, item_flag_none ), END_MENU( menuNameOptions, menuListArea, COLOUR_LIST_SUBMENU ) /*SPR 1327, UPN number menu*/ @@ -1314,19 +1312,17 @@ MENU_ITEM( TxtDeleteAll, bookDeleteAll, item_flag_none ), /* SPR#1112 - SH - Internal Phonebook new menu option */ #ifdef INT_PHONEBOOK - MENU_ITEM( TxtSelectBook, bookSelectBook, item_flag_none ), + MENU_ITEM( TxtSelectBook, bookSelectBook, item_flag_none ), #endif #ifdef FF_MMI_CPHS - SUB_MENU( TxtEmergencyNumbers, menuEmergency, item_flag_none ), + SUB_MENU( TxtEmergencyNumbers, menuEmergency, item_flag_none ), #endif END_MENU( menuPhbk, menuListArea, COLOUR_LIST_SUBMENU ) - /*---------------------------------------------------------------------------*/ - //Sub-Menu of Call Timers BEGIN_MENU(menuCallTimers) MENU_ITEM( TxtLastCall, timerLastCall, item_flag_none), @@ -1335,7 +1331,6 @@ END_MENU(menuCallTimers, menuListArea, COLOUR_LIST_SUBMENU) - //Sub-Menu of Charge Limit / AOC BEGIN_MENU( menuLimitAOC ) MENU_ITEM( TxtView, aoc_view_limit, item_flag_none ), @@ -1366,8 +1361,6 @@ /*---------------------------------------------------------------------------*/ - - //Sub-Menu BEGIN_MENU( menuCallDivert ) MENU_ITEM ( TxtCheckStatus, servicesDivertCheck, item_flag_none ), @@ -1430,7 +1423,7 @@ MENU_ITEM( TxtYes, bookFDNActivate, item_flag_none ), MENU_ITEM( TxtNo, bookFDNDeactivate, item_flag_none ), // May 3, 2004 REF: CRR MMI-SPR-18555 Rashmi C N(Sasken) -// Added FDN Numbers menu +// Added FDN Numbers menu MENU_ITEM( TxtFDNName, bookFDNMenu, item_flag_none ), END_MENU( menuFixedDialSet, menuListArea, COLOUR_LIST_SUBMENU ) @@ -1498,7 +1491,7 @@ BEGIN_MENU( menuPhLockAutomatic ) MENU_ITEM ( TxtPhLockAutoOn, phLock_Automatic_On, item_flag_none), MENU_ITEM ( TxtPhLockAutoOff, phLock_Automatic_Off, item_flag_none) - END_MENU( menuPhLockAutomatic, menuListArea, COLOUR_LIST_SUBMENU ) +END_MENU( menuPhLockAutomatic, menuListArea, COLOUR_LIST_SUBMENU ) //x0pleela 19 Feb, 2007 ER: OMAPS00122561 //Sub-menu of Phone Lock @@ -1512,7 +1505,7 @@ // Menu of Security BEGIN_MENU( menuSecurity ) -// Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN +// Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN // Instead of providing the submenu directly we call a function // where we set the menu and also higlight the previously selected menu item // MENU_ITEM( TxtFixedNames, settingsFocusFDNCurSel, item_flag_none ), @@ -1540,11 +1533,11 @@ //Options-Menu of Calculator BEGIN_MENU( menuCalcOptions ) - MENU_ITEM( TxtEquals, calcEquals, item_flag_none ), + MENU_ITEM( TxtEquals, calcEquals, item_flag_none ), MENU_ITEM( TxtPlus, calcPlus, item_flag_none ), MENU_ITEM( TxtMinus, calcMinus, item_flag_none ), - MENU_ITEM( TxtDivideBy, calcDivide, item_flag_none ), - MENU_ITEM( TxtMultiplyBy, calcMultiply, item_flag_none ) + MENU_ITEM( TxtDivideBy, calcDivide, item_flag_none ), + MENU_ITEM( TxtMultiplyBy, calcMultiply, item_flag_none ) END_MENU( menuCalcOptions, menuListArea, COLOUR_LIST_SUBMENU ) //Options-Menu of Melodie Generator @@ -1563,7 +1556,7 @@ //x0pleela 24 Feb, 2006 ER OMAPS00067709 #ifdef FF_PCM_VM_VB -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ BEGIN_MENU( menuPCMVoiceMemoStorage ) MENU_ITEM( TxtFFS, PCM_voice_memo_storeage, mmi_check_nor ), @@ -1579,7 +1572,7 @@ MENU_ITEM( TxtTflash, voice_buffer_storeage, mmi_check_tflash ), END_MENU( menuVoicebufferStorage, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ //Sub-Menu of PCM Voice Memo BEGIN_MENU( menuPcmVoiceMemo ) @@ -1599,8 +1592,8 @@ #endif #ifndef FF_NO_VOICE_MEMO -#if 0 /* FreeCalypso */ -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +#if 0 /* FreeCalypso */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ BEGIN_MENU( menuVoiceMemoStorage ) MENU_ITEM( TxtFFS, voice_memo_storeage, mmi_check_nor ), @@ -1609,14 +1602,14 @@ MENU_ITEM( TxtTflash, voice_memo_storeage, mmi_check_tflash ), END_MENU( menuVoiceMemoStorage, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ #endif //Sub-Menu of Voice Memo BEGIN_MENU( menuVoiceMemo ) MENU_ITEM( TxtPlay, voice_memo_play, item_flag_none ), MENU_ITEM( TxtRecord, voice_memo_record, item_flag_none ), -#if 0 /* FreeCalypso */ +#if 0 /* FreeCalypso */ SUB_MENU( TxtStorageDevice, menuVoiceMemoStorage, item_flag_none ) #endif END_MENU( menuVoiceMemo, menuListArea, COLOUR_LIST_SUBMENU ) @@ -1624,8 +1617,8 @@ //e-armanetsaid 18/05/04 Add menu for Midi driver test //Sub-Menu of Loop On/Off -// Apr 06, 2005 REF: ENH 30011 xdeepadh -// Nov 14, 2005 REF: OMAPS00044445 xdeepadh +// Apr 06, 2005 REF: ENH 30011 xdeepadh +// Nov 14, 2005 REF: OMAPS00044445 xdeepadh #if defined(FF_MMI_TEST_MP3) || defined(FF_MMI_TEST_AAC) BEGIN_MENU(menuPlayerChannels) MENU_ITEM( TxtPlayerMonoChannel, mmi_audio_player_set_channel_mono, item_flag_none ), @@ -1633,13 +1626,13 @@ END_MENU( menuPlayerChannels, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuPlayerTest ) - MENU_ITEM(TxtPlayerSelectFile, mmi_audio_player_files_browse, item_flag_none), - // Sep 27,2005 REF: SPR 34402 xdeepadh - // Instead of providing the submenu directly, we call a function - // where we set the menu and also higlight the previously selected menu item - MENU_ITEM( TxtPlayerSetChannels, mmi_audio_player_set_cur_selected_channels, item_flag_none ), - //Jul 18, 2005 REF: SPR 31695 xdeepadh - MENU_ITEM( TxtPlayerPlay, mmi_audio_player_play, item_flag_none ) + MENU_ITEM(TxtPlayerSelectFile, mmi_audio_player_files_browse, item_flag_none), + // Sep 27,2005 REF: SPR 34402 xdeepadh + // Instead of providing the submenu directly, we call a function + // where we set the menu and also higlight the previously selected menu item + MENU_ITEM( TxtPlayerSetChannels, mmi_audio_player_set_cur_selected_channels, item_flag_none ), + //Jul 18, 2005 REF: SPR 31695 xdeepadh + MENU_ITEM( TxtPlayerPlay, mmi_audio_player_play, item_flag_none ) END_MENU( menuPlayerTest, menuListArea, COLOUR_LIST_SUBMENU ) #endif //FF_MMI_TEST_MP3 @@ -1681,7 +1674,7 @@ END_MENU( menuMidiChangeConfig, menuListArea, COLOUR_LIST_SUBMENU ) //Sub-Menu of Midi Test -// Dec 08, 2004 REF: CRR MMI-SPR-27284 +// Dec 08, 2004 REF: CRR MMI-SPR-27284 // Description: MIDI Player: Back Key malfunctions in MIDI application. // Solution: Calling function midi_test_files_browse() when user select "Browse Midi Files" BEGIN_MENU( menuMidiTest ) @@ -1695,9 +1688,9 @@ #ifdef BTE_MOBILE //Sub-Menu of Bluetooth Discoverable BEGIN_MENU( menuBluetoothDiscoverable ) - MENU_ITEM( TxtBtDiscoverable, mmi_bluetooth_set_discoverable_on, item_flag_none ), - MENU_ITEM( TxtBtHidden, mmi_bluetooth_set_discoverable_off, item_flag_none ), - MENU_ITEM( TxtBtTimed, mmi_bluetooth_set_discoverable_timed, item_flag_none ) + MENU_ITEM( TxtBtDiscoverable, mmi_bluetooth_set_discoverable_on, item_flag_none ), + MENU_ITEM( TxtBtHidden, mmi_bluetooth_set_discoverable_off, item_flag_none ), + MENU_ITEM( TxtBtTimed, mmi_bluetooth_set_discoverable_timed, item_flag_none ) END_MENU( menuBluetoothDiscoverable, menuListArea, COLOUR_LIST_SUBMENU ) //Sub-Menu of Bluetooth Devices @@ -1717,9 +1710,9 @@ //Sub-Menu of Bluetooth BEGIN_MENU( menuBluetooth ) - MENU_ITEM( TxtBluetoothEnable, mmi_bluetooth_on, isBluetoothActive ), + MENU_ITEM( TxtBluetoothEnable, mmi_bluetooth_on, isBluetoothActive ), MENU_ITEM( TxtAutomatic, mmi_bluetooth_automatic, isBluetoothActive ), - MENU_ITEM( TxtBluetoothDisable, mmi_bluetooth_off, isBluetoothInactive ), + MENU_ITEM( TxtBluetoothDisable, mmi_bluetooth_off, isBluetoothInactive ), MENU_ITEM( TxtBtSetLocalName, mmi_bluetooth_change_name, item_flag_none ), SUB_MENU( TxtBtDiscoverable, menuBluetoothDiscoverable, item_flag_none), SUB_MENU(TxtBtDevices, menuBluetoothDevices, item_flag_none) @@ -1729,8 +1722,8 @@ #ifdef FF_MMI_MULTIMEDIA /* Configuration Parameter Menu Items */ BEGIN_MENU( menuSelectOutputScreemode ) - MENU_ITEM( TxtHalfScreenMode, mmi_Set_ScreenMode, item_flag_none), - MENU_ITEM( TxtFullScreenMode, mmi_Set_ScreenMode , item_flag_none ) + MENU_ITEM( TxtHalfScreenMode, mmi_Set_ScreenMode, item_flag_none), + MENU_ITEM( TxtFullScreenMode, mmi_Set_ScreenMode , item_flag_none ) END_MENU( menuSelectOutputScreemode, menuListArea, COLOUR_LIST_SUBMENU ) @@ -1743,55 +1736,55 @@ BEGIN_MENU( menuSelectAudioEncodingFormat ) SUB_MENU ( TxtPCM, menuPcmEncodeConfig, item_flag_none), - MENU_ITEM( TxtAMR, mmi_Set_AudioFormat, item_flag_none ), + MENU_ITEM( TxtAMR, mmi_Set_AudioFormat, item_flag_none ), MENU_ITEM( TxtAAC, mmi_Set_AudioFormat, item_flag_none ), - MENU_ITEM( TxtMP3, mmi_Set_AudioFormat, item_flag_none ) + MENU_ITEM( TxtMP3, mmi_Set_AudioFormat, item_flag_none ) END_MENU( menuSelectAudioEncodingFormat, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuSelectVideoEncodingFormat ) - MENU_ITEM( TxtMpeg4, mmi_Set_VideoFormat , item_flag_none ), - MENU_ITEM( TxtH263, mmi_Set_VideoFormat , item_flag_none ), - MENU_ITEM( TxtNone, mmi_Set_VideoFormat , item_flag_none ) + MENU_ITEM( TxtMpeg4, mmi_Set_VideoFormat , item_flag_none ), + MENU_ITEM( TxtH263, mmi_Set_VideoFormat , item_flag_none ), + MENU_ITEM( TxtNone, mmi_Set_VideoFormat , item_flag_none ) END_MENU( menuSelectVideoEncodingFormat, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuSelectVideoCaptureSize ) - MENU_ITEM( TxtQcif, mmi_Set_VideoSize , item_flag_none ), - MENU_ITEM( TxtCif, mmi_Set_VideoSize , item_flag_none ), - MENU_ITEM( TxtQQVga, mmi_Set_VideoSize , item_flag_none ) + MENU_ITEM( TxtQcif, mmi_Set_VideoSize , item_flag_none ), + MENU_ITEM( TxtCif, mmi_Set_VideoSize , item_flag_none ), + MENU_ITEM( TxtQQVga, mmi_Set_VideoSize , item_flag_none ) END_MENU( menuSelectVideoCaptureSize, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuSelectFrameRate ) - MENU_ITEM( Txt5fps, mmi_Set_FrameRate , item_flag_none ), - MENU_ITEM( Txt10fps, mmi_Set_FrameRate , item_flag_none ), - MENU_ITEM( Txt15fps, mmi_Set_FrameRate , item_flag_none ), - MENU_ITEM( Txt30fps, mmi_Set_FrameRate , item_flag_none ) + MENU_ITEM( Txt5fps, mmi_Set_FrameRate , item_flag_none ), + MENU_ITEM( Txt10fps, mmi_Set_FrameRate , item_flag_none ), + MENU_ITEM( Txt15fps, mmi_Set_FrameRate , item_flag_none ), + MENU_ITEM( Txt30fps, mmi_Set_FrameRate , item_flag_none ) END_MENU( menuSelectFrameRate, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuSelectAACBitRate ) - MENU_ITEM( Txt48Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt66p15Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt72Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt96pKbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt132p3Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt144Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt192Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt264p6Kbps, mmi_Set_AAC_BitRate , item_flag_none ), - MENU_ITEM( Txt288Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt48Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt66p15Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt72Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt96pKbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt132p3Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt144Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt192Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt264p6Kbps, mmi_Set_AAC_BitRate , item_flag_none ), + MENU_ITEM( Txt288Kbps, mmi_Set_AAC_BitRate , item_flag_none ), END_MENU( menuSelectAACBitRate, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuSelectAMRBitRate ) - MENU_ITEM( Txt1p80Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt4p75Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt5p15Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt5p9Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt6p7Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt7p4Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt7p95Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt10p2Kbps, mmi_Set_AMR_BitRate , item_flag_none ), - MENU_ITEM( Txt12p2Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt1p80Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt4p75Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt5p15Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt5p9Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt6p7Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt7p4Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt7p95Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt10p2Kbps, mmi_Set_AMR_BitRate , item_flag_none ), + MENU_ITEM( Txt12p2Kbps, mmi_Set_AMR_BitRate , item_flag_none ), END_MENU( menuSelectAMRBitRate, menuListArea, COLOUR_LIST_SUBMENU ) @@ -1802,94 +1795,94 @@ BEGIN_MENU( menuSelectVideoRate ) - MENU_ITEM( Txt64Kbps, mmi_Set_VideoBitRate , item_flag_none ), - MENU_ITEM( Txt128Kbps, mmi_Set_VideoBitRate , item_flag_none ), + MENU_ITEM( Txt64Kbps, mmi_Set_VideoBitRate , item_flag_none ), + MENU_ITEM( Txt128Kbps, mmi_Set_VideoBitRate , item_flag_none ), END_MENU( menuSelectVideoRate, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuAudioPath ) - MENU_ITEM( TxtHeadset, mmi_Set_AudioPath , item_flag_none ), - MENU_ITEM( TxtSpeaker, mmi_Set_AudioPath, item_flag_none ), + MENU_ITEM( TxtHeadset, mmi_Set_AudioPath , item_flag_none ), + MENU_ITEM( TxtSpeaker, mmi_Set_AudioPath, item_flag_none ), END_MENU( menuAudioPath, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuPreferredStorage ) - MENU_ITEM( TxtFFS, mmi_Set_PreferredStorage , item_flag_none ), - MENU_ITEM( TxtMMC, mmi_Set_PreferredStorage , item_flag_none) + MENU_ITEM( TxtFFS, mmi_Set_PreferredStorage , item_flag_none ), + MENU_ITEM( TxtMMC, mmi_Set_PreferredStorage , item_flag_none) END_MENU( menuPreferredStorage, menuListArea, COLOUR_LIST_SUBMENU ) /* PCM Decode Sampling Rate */ BEGIN_MENU( menuPcmSampleRate ) - MENU_ITEM( Txt8kRate, mmi_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt11kRate, mmi_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt12kRate, mmi_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 12k Menu addition */ - MENU_ITEM( Txt16kRate, mmi_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt22kRate, mmi_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt24kRate, mmi_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 24k Menu addition */ - MENU_ITEM( Txt32kRate, mmi_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt44kRate, mmi_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt48kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt8kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt11kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt12kRate, mmi_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 12k Menu addition */ + MENU_ITEM( Txt16kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt22kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt24kRate, mmi_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 24k Menu addition */ + MENU_ITEM( Txt32kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt44kRate, mmi_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt48kRate, mmi_set_pcm_samplerate, item_flag_none ), END_MENU( menuPcmSampleRate, menuListArea, COLOUR_LIST_SUBMENU ) /*Voice Memo PCM Sampling Rate */ BEGIN_MENU( menuVmPcmSampleRate ) - MENU_ITEM( Txt8kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt11kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt12kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 12k Menu addition */ - MENU_ITEM( Txt16kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt22kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt24kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 24k Menu addition */ - MENU_ITEM( Txt32kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt44kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), - MENU_ITEM( Txt48kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt8kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt11kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt12kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 12k Menu addition */ + MENU_ITEM( Txt16kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt22kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt24kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), /*OMAPS00081264 - 24k Menu addition */ + MENU_ITEM( Txt32kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt44kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), + MENU_ITEM( Txt48kRate, mmi_vm_set_pcm_samplerate, item_flag_none ), END_MENU( menuVmPcmSampleRate, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuPcmDecodeChanMode ) - MENU_ITEM( TxtMonoMode, mmi_Set_PcmDecodeChanMode , item_flag_none ), - MENU_ITEM( TxtStreoMode, mmi_Set_PcmDecodeChanMode, item_flag_none ), + MENU_ITEM( TxtMonoMode, mmi_Set_PcmDecodeChanMode , item_flag_none ), + MENU_ITEM( TxtStreoMode, mmi_Set_PcmDecodeChanMode, item_flag_none ), END_MENU( menuPcmDecodeChanMode, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuVmPcmDecodeChanMode ) - MENU_ITEM( TxtMonoMode, mmi_Set_VmPcmDecodeChanMode , item_flag_none ), - MENU_ITEM( TxtStreoMode, mmi_Set_VmPcmDecodeChanMode, item_flag_none ), + MENU_ITEM( TxtMonoMode, mmi_Set_VmPcmDecodeChanMode , item_flag_none ), + MENU_ITEM( TxtStreoMode, mmi_Set_VmPcmDecodeChanMode, item_flag_none ), END_MENU( menuVmPcmDecodeChanMode, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuVolumeConfig ) - MENU_ITEM( TxtLevel1, mmi_Set_VolumeConfig , item_flag_none ), - MENU_ITEM( TxtLevel2, mmi_Set_VolumeConfig , item_flag_none ), - MENU_ITEM( TxtLevel3, mmi_Set_VolumeConfig , item_flag_none ), - MENU_ITEM( TxtLevel4, mmi_Set_VolumeConfig , item_flag_none ), - MENU_ITEM( TxtLevel5, mmi_Set_VolumeConfig , item_flag_none ), + MENU_ITEM( TxtLevel1, mmi_Set_VolumeConfig , item_flag_none ), + MENU_ITEM( TxtLevel2, mmi_Set_VolumeConfig , item_flag_none ), + MENU_ITEM( TxtLevel3, mmi_Set_VolumeConfig , item_flag_none ), + MENU_ITEM( TxtLevel4, mmi_Set_VolumeConfig , item_flag_none ), + MENU_ITEM( TxtLevel5, mmi_Set_VolumeConfig , item_flag_none ), END_MENU( menuVolumeConfig, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuCamera ) - MENU_ITEM( TxtCameraCapture, mmi_Select_CameraCapture, item_flag_none ), - MENU_ITEM( TxtVideoRecording, mmi_Select_AudioVideo_Recording, item_flag_none ), - MENU_ITEM( TxtAudioRecording, mmi_Select_Audio_Recording, item_flag_none ) + MENU_ITEM( TxtCameraCapture, mmi_Select_CameraCapture, item_flag_none ), + MENU_ITEM( TxtVideoRecording, mmi_Select_AudioVideo_Recording, item_flag_none ), + MENU_ITEM( TxtAudioRecording, mmi_Select_Audio_Recording, item_flag_none ) END_MENU( menuCamera, menuListArea, COLOUR_LIST_SUBMENU ) #ifdef FF_MMI_NEPTUNE_IMAGE_VIEWER BEGIN_MENU( menuImageEdit ) - MENU_ITEM( TxtCrop, mmi_ImageEdit_Crop, item_flag_none ), - MENU_ITEM( TxtRescale, mmi_ImageEdit_Rescale, item_flag_none ), - MENU_ITEM( TxtRotate, mmi_ImageEdit_Rotate, item_flag_none ), + MENU_ITEM( TxtCrop, mmi_ImageEdit_Crop, item_flag_none ), + MENU_ITEM( TxtRescale, mmi_ImageEdit_Rescale, item_flag_none ), + MENU_ITEM( TxtRotate, mmi_ImageEdit_Rotate, item_flag_none ), END_MENU( menuImageEdit, menuListArea, COLOUR_LIST_SUBMENU ) #endif /* Image Capture Quality */ BEGIN_MENU( menuImageCaptureQuality ) - MENU_ITEM( Txt0Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt10Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt20Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt30Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt40Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt50Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt60Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt70Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt80Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt90Set, mmi_Set_ImageCaptureQuality , item_flag_none ), - MENU_ITEM( Txt100Set, mmi_Set_ImageCaptureQuality , item_flag_none ) + MENU_ITEM( Txt0Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt10Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt20Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt30Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt40Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt50Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt60Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt70Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt80Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt90Set, mmi_Set_ImageCaptureQuality , item_flag_none ), + MENU_ITEM( Txt100Set, mmi_Set_ImageCaptureQuality , item_flag_none ) END_MENU( menuImageCaptureQuality, menuListArea, COLOUR_LIST_SUBMENU ) @@ -1906,70 +1899,70 @@ #endif /* Pcm Stero / Mono Setting Menu for Recording */ BEGIN_MENU( menuPcmChannelMode ) - MENU_ITEM( TxtMonoMode, mmi_Set_PcmChannelMode , item_flag_none ), - MENU_ITEM( TxtStreoMode, mmi_Set_PcmChannelMode, item_flag_none ), + MENU_ITEM( TxtMonoMode, mmi_Set_PcmChannelMode , item_flag_none ), + MENU_ITEM( TxtStreoMode, mmi_Set_PcmChannelMode, item_flag_none ), END_MENU( menuPcmChannelMode, menuListArea, COLOUR_LIST_SUBMENU ) /* Pcm Rate Selection for Recording */ BEGIN_MENU( menuPcmRateSelection ) - MENU_ITEM( Txt8kRate, mmi_Set_PcmRateSelection , item_flag_none ), - MENU_ITEM( Txt16kRate, mmi_Set_PcmRateSelection, item_flag_none ), + MENU_ITEM( Txt8kRate, mmi_Set_PcmRateSelection , item_flag_none ), + MENU_ITEM( Txt16kRate, mmi_Set_PcmRateSelection, item_flag_none ), END_MENU( menuPcmRateSelection, menuListArea, COLOUR_LIST_SUBMENU ) /* To Specify whether file access is from FFS / MMC */ BEGIN_MENU( menuMMStorageDevice ) - MENU_ITEM( TxtFFS, mmi_Select_AudioVideo_Files , item_flag_none ), - MENU_ITEM( TxtMMC, mmi_Select_AudioVideo_Files , item_flag_none ) + MENU_ITEM( TxtFFS, mmi_Select_AudioVideo_Files , item_flag_none ), + MENU_ITEM( TxtMMC, mmi_Select_AudioVideo_Files , item_flag_none ) END_MENU( menuMMStorageDevice, menuListArea, COLOUR_LIST_SUBMENU ) /* To Specify whether file access is from FFS / MMC for Image Viewer */ BEGIN_MENU( menuMMImageStorageDevice ) - MENU_ITEM( TxtFFS, mmi_Select_Image_Files , item_flag_none ), - MENU_ITEM( TxtMMC, mmi_Select_Image_Files , item_flag_none ) + MENU_ITEM( TxtFFS, mmi_Select_Image_Files , item_flag_none ), + MENU_ITEM( TxtMMC, mmi_Select_Image_Files , item_flag_none ) END_MENU( menuMMImageStorageDevice, menuListArea, COLOUR_LIST_SUBMENU ) /*Audio Decode configuration */ BEGIN_MENU( menuAudioDecodeConfig ) - MENU_ITEM( TxtAudioPath,(MenuFunc)FocusCurSel_AudioPath, item_flag_none ), + MENU_ITEM( TxtAudioPath,(MenuFunc)FocusCurSel_AudioPath, item_flag_none ), END_MENU( menuAudioDecodeConfig, menuListArea, COLOUR_LIST_SUBMENU ) /*Audio Encode Configuration */ BEGIN_MENU( menuAudioEncodeConfig ) - MENU_ITEM( TxtAudioEncodingFormat,(MenuFunc)FocusCurSel_AudioFormat, item_flag_none ), - SUB_MENU( TxtAudioBitRate, menuSelectAudioRate, item_flag_none ), + MENU_ITEM( TxtAudioEncodingFormat,(MenuFunc)FocusCurSel_AudioFormat, item_flag_none ), + SUB_MENU( TxtAudioBitRate, menuSelectAudioRate, item_flag_none ), END_MENU( menuAudioEncodeConfig, menuListArea, COLOUR_LIST_SUBMENU ) /*Audio & Video Sync Option */ BEGIN_MENU( menuAudioVideoSyncOption ) - MENU_ITEM( TxtAudioVideoPlay, mmi_Audio_Video_Play_Option, item_flag_none ), - MENU_ITEM( TxtVideoPlay, mmi_Audio_Video_Play_Option, item_flag_none ), + MENU_ITEM( TxtAudioVideoPlay, mmi_Audio_Video_Play_Option, item_flag_none ), + MENU_ITEM( TxtVideoPlay, mmi_Audio_Video_Play_Option, item_flag_none ), END_MENU( menuAudioVideoSyncOption, menuListArea, COLOUR_LIST_SUBMENU ) /*Audio & Video Sync Option */ BEGIN_MENU( menuVideoRecordDuration ) - MENU_ITEM( TxtNonStop, mmi_Video_Record_Duration, item_flag_none ), - MENU_ITEM( Txt10sec, mmi_Video_Record_Duration, item_flag_none ), - MENU_ITEM( Txt15sec, mmi_Video_Record_Duration, item_flag_none ), - MENU_ITEM( Txt20sec, mmi_Video_Record_Duration, item_flag_none ), + MENU_ITEM( TxtNonStop, mmi_Video_Record_Duration, item_flag_none ), + MENU_ITEM( Txt10sec, mmi_Video_Record_Duration, item_flag_none ), + MENU_ITEM( Txt15sec, mmi_Video_Record_Duration, item_flag_none ), + MENU_ITEM( Txt20sec, mmi_Video_Record_Duration, item_flag_none ), END_MENU( menuVideoRecordDuration, menuListArea, COLOUR_LIST_SUBMENU ) /*Audio & Video Record option */ BEGIN_MENU( menuAudioVideoRecordOption ) - MENU_ITEM( TxtAudioVideoRecord, mmi_Audio_Video_Record_Option, item_flag_none ), - MENU_ITEM( TxtVideoRecord, mmi_Audio_Video_Record_Option, item_flag_none ), + MENU_ITEM( TxtAudioVideoRecord, mmi_Audio_Video_Record_Option, item_flag_none ), + MENU_ITEM( TxtVideoRecord, mmi_Audio_Video_Record_Option, item_flag_none ), END_MENU( menuAudioVideoRecordOption, menuListArea, COLOUR_LIST_SUBMENU ) /* Video Encode Configuration */ BEGIN_MENU( menuVideoEncodeConfig ) - MENU_ITEM( TxtVideoEncodingFormat,(MenuFunc)FocusCurSel_VideoFormat, item_flag_none ), - MENU_ITEM( TxtVideoCaptureSize,(MenuFunc)FocusCurSel_VideoSize, item_flag_none ), - MENU_ITEM( TxtVideoFrameRateSelection,(MenuFunc)FocusCurSel_FrameRate, item_flag_none ), - MENU_ITEM( TxtVideoBitRate,(MenuFunc)FocusCurSel_VideoBitRate, item_flag_none ) + MENU_ITEM( TxtVideoEncodingFormat,(MenuFunc)FocusCurSel_VideoFormat, item_flag_none ), + MENU_ITEM( TxtVideoCaptureSize,(MenuFunc)FocusCurSel_VideoSize, item_flag_none ), + MENU_ITEM( TxtVideoFrameRateSelection,(MenuFunc)FocusCurSel_FrameRate, item_flag_none ), + MENU_ITEM( TxtVideoBitRate,(MenuFunc)FocusCurSel_VideoBitRate, item_flag_none ) END_MENU( menuVideoEncodeConfig, menuListArea, COLOUR_LIST_SUBMENU ) @@ -1987,24 +1980,24 @@ /* Multimedia Application Menu. */ BEGIN_MENU( menuMultimediaApp ) - SUB_MENU( TxtConfigurationParameters, menuConfigParam, item_flag_none ), + SUB_MENU( TxtConfigurationParameters, menuConfigParam, item_flag_none ), /* If MMC is available then show the menu, otherwise access directly from FFS */ - SUB_MENU( TxtAudioVideoPlayback, menuMMStorageDevice, item_flag_none ), - SUB_MENU( TxtImageViewer, menuMMImageStorageDevice, item_flag_none ), - SUB_MENU( TxtCamera, menuCamera, item_flag_none), - MENU_ITEM( TxtAudioRecording, mmi_Select_Audio_Recording, item_flag_none ) + SUB_MENU( TxtAudioVideoPlayback, menuMMStorageDevice, item_flag_none ), + SUB_MENU( TxtImageViewer, menuMMImageStorageDevice, item_flag_none ), + SUB_MENU( TxtCamera, menuCamera, item_flag_none), + MENU_ITEM( TxtAudioRecording, mmi_Select_Audio_Recording, item_flag_none ) END_MENU( menuMultimediaApp, menuListArea, COLOUR_LIST_SUBMENU ) /* Voice Meo Implemention */ #ifdef FF_MMI_VOICEMEMO BEGIN_MENU( menuStartRecord ) - MENU_ITEM( TxtStartRecord, mmi_Select_VM_Audio_Recording, item_flag_none ) + MENU_ITEM( TxtStartRecord, mmi_Select_VM_Audio_Recording, item_flag_none ) END_MENU( menuStartRecord, menuListArea, COLOUR_LIST_SUBMENU ) /* To Specify whether file access is from FFS / MMC for Image Viewer */ BEGIN_MENU( menuVMStorageDevice ) - MENU_ITEM( TxtFFS, mmi_VM_Select_AMR_Files , item_flag_none ), - MENU_ITEM( TxtMMC, mmi_VM_Select_AMR_Files , item_flag_none ) + MENU_ITEM( TxtFFS, mmi_VM_Select_AMR_Files , item_flag_none ), + MENU_ITEM( TxtMMC, mmi_VM_Select_AMR_Files , item_flag_none ) END_MENU( menuVMStorageDevice, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU( menuVoiceMemoUC ) @@ -2040,7 +2033,7 @@ MENU_ITEM(TxtFormat, mmi_fm_format, format_check_dev) , END_MENU( menuFMDrivesOptions, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ BEGIN_MENU( menuFMDrives ) MENU_ITEM( TxtFFS, mmi_fm_drives, mmi_check_nor), @@ -2049,14 +2042,14 @@ MENU_ITEM(TxtTflash, mmi_fm_drives, mmi_check_tflash), END_MENU( menuFMDrives, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ BEGIN_MENU( menuDestRootFolders ) MENU_ITEM( TxtImageFiles, mmi_fm_dest_display, check_source_image), MENU_ITEM( TxtAudioFiles, mmi_fm_dest_display, check_source_audio), END_MENU( menuDestRootFolders, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ BEGIN_MENU( menuDestFMDrives ) MENU_ITEM( TxtFFS, mmi_fm_dest_root_folders, mmi_check_nor), @@ -2065,7 +2058,7 @@ MENU_ITEM(TxtTflash, mmi_fm_dest_root_folders, mmi_check_tflash), END_MENU( menuDestFMDrives, menuListArea, COLOUR_LIST_SUBMENU ) -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ #endif @@ -2093,7 +2086,7 @@ MENU_ITEM( TxtMidiTest, mmi_midi_test_Application, item_flag_none ),//Sep 11, 2006 DR: OMAPS00094182 xrashmic #endif/*#ifdef FF_MMI_TEST_MIDI */ #endif /*FF_MMI_FILEMANAGER*/ - /* Apr 06, 2005 REF: ENH 30011 xdeepadh */ + /* Apr 06, 2005 REF: ENH 30011 xdeepadh */ #ifdef FF_MMI_CAMERA_APP MENU_ITEM(TxtCameraTest, mmi_camera_launch_view_finder, item_flag_none ), #endif //FF_MMI_CAMERA_APP @@ -2105,7 +2098,7 @@ #ifdef FF_MMI_FILE_VIEWER MENU_ITEM(TxtFileViewer, LaunchFileViewer, item_flag_none ), #endif //FF_MMI_FILE_VIEWER -// Nov 14, 2005 REF: OMAPS00044445 xdeepadh +// Nov 14, 2005 REF: OMAPS00044445 xdeepadh #ifndef FF_MMI_FILEMANAGER #if defined(FF_MMI_TEST_MP3) || defined(FF_MMI_TEST_AAC) MENU_ITEM( TxtPlayerTest, mmi_audio_player_Application, item_flag_none ),//Sep 11, 2006 DR: OMAPS00094182 xrashmic @@ -2126,11 +2119,11 @@ //x0pleela 24 Feb, 2006 ER OMAPS00067709 #ifdef FF_PCM_VM_VB - SUB_MENU( TxtPcmVoiceMemo, menuPcmVoiceMemo, item_flag_none ), - - //x0pleela 09 Mar, 2006 ER: OMAPS00067709 - //menu item of Voice Buffering - SUB_MENU( TxtVoiceBuffering, menuVoiceBuffering, item_flag_none ), + SUB_MENU( TxtPcmVoiceMemo, menuPcmVoiceMemo, item_flag_none ), + + //x0pleela 09 Mar, 2006 ER: OMAPS00067709 + //menu item of Voice Buffering + SUB_MENU( TxtVoiceBuffering, menuVoiceBuffering, item_flag_none ), #endif #ifdef FF_MMI_MULTIMEDIA /* Multimedia Application initial menu specification. */ @@ -2140,7 +2133,7 @@ /* Multimedia Application initial menu specification. */ SUB_MENU( TxtMultimediaApp, menuMultimediaApp, item_flag_none ), #endif -#if 0 /* FreeCalypso */ +#if 0 /* FreeCalypso */ MENU_ITEM( TxtBootTime, menuBootTimeMsmt, item_flag_none ), /*OMAPS00091029 x0039928(sumanth)*/ #endif #ifdef FF_MMI_FILEMANAGER @@ -2181,11 +2174,11 @@ #endif #ifdef FF_PCM_VM_VB - SUB_MENU( TxtPcmVoiceMemo, menuPcmVoiceMemo, item_flag_none ), - - //x0pleela 09 Mar, 2006 ER: OMAPS00067709 - //menu item of Voice Buffering - SUB_MENU( TxtVoiceBuffering, menuVoiceBuffering, item_flag_none ), + SUB_MENU( TxtPcmVoiceMemo, menuPcmVoiceMemo, item_flag_none ), + + //x0pleela 09 Mar, 2006 ER: OMAPS00067709 + //menu item of Voice Buffering + SUB_MENU( TxtVoiceBuffering, menuVoiceBuffering, item_flag_none ), #endif #ifdef FF_MMI_MULTIMEDIA @@ -2201,11 +2194,11 @@ */ /* Sub-Menu of Language */ BEGIN_MENU( menuLanguage ) - MENU_ITEM( TxtEnglish, Mmi_Set2English, item_flag_none ), + MENU_ITEM( TxtEnglish, Mmi_Set2English, item_flag_none ), #ifndef CHINESE_MMI - MENU_ITEM( TxtGerman, Mmi_Set2German, item_flag_none ) + MENU_ITEM( TxtGerman, Mmi_Set2German, item_flag_none ) #else - MENU_ITEM( TxtChinese, Mmi_Set2Chinese, item_flag_none ) + MENU_ITEM( TxtChinese, Mmi_Set2Chinese, item_flag_none ) #endif END_MENU( menuLanguage, menuListArea, COLOUR_LIST_SUBMENU ) @@ -2257,9 +2250,9 @@ #ifdef FF_TIMEZONE BEGIN_MENU( menuNITZ ) - MENU_ITEM( TxtAutomatic, settingsNITZ, item_flag_none ), - MENU_ITEM( TxtOn, settingsNITZ, item_flag_none ), - MENU_ITEM( TxtOff, settingsNITZ, item_flag_none ) + MENU_ITEM( TxtAutomatic, settingsNITZ, item_flag_none ), + MENU_ITEM( TxtOn, settingsNITZ, item_flag_none ), + MENU_ITEM( TxtOff, settingsNITZ, item_flag_none ) END_MENU( menuNITZ, menuListArea, COLOUR_LIST_SUBMENU ) #endif /* Sub-Menu of KeypadTones */ @@ -2434,7 +2427,7 @@ MENU_ITEM(TxtLockAls, CphsAlsLock, CphsALSUnlocked ), MENU_ITEM(TxtUnlockAls, CphsAlsUnlock, CphsALSLocked ) #ifdef FF_CPHS - , + , SUB_MENU(TxtEditLineName, cphs_edit_line, item_flag_none) #endif END_MENU(menuLineSelect, menuListArea,COLOUR_LIST_SUBMENU ) @@ -2474,12 +2467,12 @@ SUB_MENU ( TxtDataCount, menuDataCount, item_flag_none ), MENU_ITEM ( TxtSMS, GPRS_MenuSelectSms, item_flag_none ), /* SPR#2346 - SH - Removed GPRS test options */ -END_MENU( menuDataSettings, menuListArea, COLOUR_LIST_SUBMENU ) +END_MENU( menuDataSettings, menuListArea, COLOUR_LIST_SUBMENU ) #endif //MMI_GPRS_ENABLED //SPR#1113 - DS - New menu "Netw. Related" added //SPR#1347 - GW - Moved network menu outside of '#ifdef MMI_GPRS_ENABLED' -// Disabled 'Band selection' when GPRS is disabled. +// Disabled 'Band selection' when GPRS is disabled. //Menu of Network Related services BEGIN_MENU( menuNetwork ) //x0pleela 25 May, 2006 DR: OMAPS00070657 @@ -2491,11 +2484,11 @@ #endif SUB_MENU ( TxtCallDivert, menuDivert, item_flag_none), SUB_MENU( TxtNetworkSel, menuNetworkSet, item_flag_none ), - SUB_MENU(TxtBand, menuBandSelect, item_flag_none), + SUB_MENU(TxtBand, menuBandSelect, item_flag_none), //Jun 02,2004 CRR:13649 xpradipg-SASKEN: start //points to the menu structure of differnt callBarring services instead of calling the password entry screen - SUB_MENU(TxtCallBarringAll, menuBarringSet, item_flag_none), + SUB_MENU(TxtCallBarringAll, menuBarringSet, item_flag_none), //Jun 02,2004 CRR:13649 xpradipg-SASKEN: end SUB_MENU( TxtCallWaiting, menuCallWaitingSet, item_flag_none ), @@ -2503,8 +2496,8 @@ SUB_MENU(TxtCallBack, menuCCBS, item_flag_none ), // Marcus: CCBS: 13/11/2002 SUB_MENU(TxtCallDeflection, menuCallDeflection, item_flag_none ) //SPR 1392 #ifdef MMI_TTY_ENABLED - , /* Comma here so previous item won't report error when flag switched off */ - MENU_ITEM( TxtTTY, call_tty_menu, item_flag_none) /* SPR#1352 - SH - TTY menu */ + , /* Comma here so previous item won't report error when flag switched off */ + MENU_ITEM( TxtTTY, call_tty_menu, item_flag_none) /* SPR#1352 - SH - TTY menu */ #ifdef NEPTUNE_BOARD /* Mar 27, 2006 REF:ER OMAPS00071798 */ #ifdef MMI_TTY_ENABLED , /* Comma here so previous item won't report error when flag switched off */ @@ -2520,8 +2513,8 @@ // Menu of Settings #ifdef _TESTING__ BEGIN_MENU(menuCphsTesting) - MENU_ITEM (TxtRead, Cphs_reading_test, item_flag_none), - MENU_ITEM(TxtWrite, Cphs_writing_test, item_flag_none) + MENU_ITEM (TxtRead, Cphs_reading_test, item_flag_none), + MENU_ITEM(TxtWrite, Cphs_writing_test, item_flag_none) END_MENU(menuCphsTesting, menuListArea,COLOUR_LIST_SUBMENU) #endif @@ -2531,59 +2524,59 @@ int icon_bgdMenuSelected(MfwMnu* mnu, MfwMnuItem* mnuItem); BEGIN_MENU(menuColours) - MENU_ITEM (TxtColourBlack, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourBlue, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourCyan, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourGreen, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourMagenta, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourYellow, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourRed, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourWhite, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourPink, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourOrange, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourLightBlue, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourLightGreen, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourPaleYellow, colMenuSelected, item_flag_none), - MENU_ITEM (TxtColourTransparent, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourBlack, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourBlue, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourCyan, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourGreen, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourMagenta, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourYellow, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourRed, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourWhite, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourPink, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourOrange, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourLightBlue, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourLightGreen, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourPaleYellow, colMenuSelected, item_flag_none), + MENU_ITEM (TxtColourTransparent, colMenuSelected, item_flag_none), END_MENU_MULTICOLOUR(menuColours, menuListArea,COLOUR_LIST_COLOUR,TxtNull) BEGIN_MENU(menuColourObjects) - MENU_ITEM_SUB_MENU (TxtIdleScreenBackground, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtIdleScreenSoftKey, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtIdleScreenText, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtIdleScreenNetworkName, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtGeneralBackground , menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtMenuSoftKeyForeground , menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtMenuSoftKeyBackground , menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtSubMenuHeadingText , menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtSubMenuHeadingBackground, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtSubMenuTextForeground , menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtSubMenuTextBackground, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtSubMenuSelectionBar, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtPopUpTextForeground, menuColours, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtPopUpTextBackground , menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtIdleScreenBackground, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtIdleScreenSoftKey, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtIdleScreenText, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtIdleScreenNetworkName, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtGeneralBackground , menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtMenuSoftKeyForeground , menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtMenuSoftKeyBackground , menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtSubMenuHeadingText , menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtSubMenuHeadingBackground, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtSubMenuTextForeground , menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtSubMenuTextBackground, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtSubMenuSelectionBar, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtPopUpTextForeground, menuColours, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtPopUpTextBackground , menuColours, storeMenuOption, item_flag_none), END_MENU_MULTICOLOUR(menuColourObjects, menuListArea,COLOUR_LIST_COLOUR,TxtColourMenu) BEGIN_MENU(menuBackdrops) - MENU_ITEM (TxtNone, icon_bgdMenuSelected, item_flag_none), -// MENU_ITEM (TxtBgdSunset, icon_bgdMenuSelected, item_flag_none), -// MENU_ITEM (TxtBgdSquares, icon_bgdMenuSelected, item_flag_none), -// MENU_ITEM (TxtBgdTree, icon_bgdMenuSelected, item_flag_none), - MENU_ITEM (TxtBgdEdinburgh1, icon_bgdMenuSelected, item_flag_none), - MENU_ITEM (TxtBgdEdinburgh2, icon_bgdMenuSelected, item_flag_none), - MENU_ITEM (TxtBgdEdinburgh3, icon_bgdMenuSelected, item_flag_none), - MENU_ITEM (TxtBgdEdinburgh4, icon_bgdMenuSelected, item_flag_none), - MENU_ITEM (TxtBgdTILogo, icon_bgdMenuSelected, item_flag_none) + MENU_ITEM (TxtNone, icon_bgdMenuSelected, item_flag_none), +// MENU_ITEM (TxtBgdSunset, icon_bgdMenuSelected, item_flag_none), +// MENU_ITEM (TxtBgdSquares, icon_bgdMenuSelected, item_flag_none), +// MENU_ITEM (TxtBgdTree, icon_bgdMenuSelected, item_flag_none), + MENU_ITEM (TxtBgdEdinburgh1, icon_bgdMenuSelected, item_flag_none), + MENU_ITEM (TxtBgdEdinburgh2, icon_bgdMenuSelected, item_flag_none), + MENU_ITEM (TxtBgdEdinburgh3, icon_bgdMenuSelected, item_flag_none), + MENU_ITEM (TxtBgdEdinburgh4, icon_bgdMenuSelected, item_flag_none), + MENU_ITEM (TxtBgdTILogo, icon_bgdMenuSelected, item_flag_none) END_MENU(menuBackdrops, menuListArea,COLOUR_LIST_SUBMENU) BEGIN_MENU(menuBackgroundScrSelect) - MENU_ITEM_SUB_MENU (TxtIdleScreen, menuBackdrops, storeMenuOption, item_flag_none), - MENU_ITEM_SUB_MENU (TxtMenuScreen, menuBackdrops, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtIdleScreen, menuBackdrops, storeMenuOption, item_flag_none), + MENU_ITEM_SUB_MENU (TxtMenuScreen, menuBackdrops, storeMenuOption, item_flag_none), END_MENU(menuBackgroundScrSelect, menuListArea,COLOUR_LIST_SUBMENU) BEGIN_MENU(menuProviderIconSet) - MENU_ITEM (TxtYes, icon_networkShow, item_flag_none), - MENU_ITEM (TxtNo, icon_networkDontShow, item_flag_none), + MENU_ITEM (TxtYes, icon_networkShow, item_flag_none), + MENU_ITEM (TxtNo, icon_networkDontShow, item_flag_none), END_MENU(menuProviderIconSet, menuListArea,COLOUR_LIST_SUBMENU) #endif @@ -2595,12 +2588,12 @@ //xashmic 27 Sep 2006, OMAPS00096389 #ifdef FF_MMI_USBMS BEGIN_MENU(menuPS) - MENU_ITEM (TxtPSShutdown, setUSBMSPS, item_flag_none), - MENU_ITEM (TxtNoPSShutdown, setUSBMSPS, item_flag_none), + MENU_ITEM (TxtPSShutdown, setUSBMSPS, item_flag_none), + MENU_ITEM (TxtNoPSShutdown, setUSBMSPS, item_flag_none), END_MENU(menuPS, menuListArea,COLOUR_LIST_SUBMENU) BEGIN_MENU(menuPopup) - MENU_ITEM (TxtYes, setUSBMSPopup, item_flag_none), - MENU_ITEM (TxtNo, setUSBMSPopup, item_flag_none), + MENU_ITEM (TxtYes, setUSBMSPopup, item_flag_none), + MENU_ITEM (TxtNo, setUSBMSPopup, item_flag_none), END_MENU(menuPopup, menuListArea,COLOUR_LIST_SUBMENU) BEGIN_MENU( menuUSBPortOptions ) MENU_ITEM( TxtUSBMS, mmi_usb_enumeration, item_flag_none ), @@ -2612,30 +2605,30 @@ MENU_ITEM( TxtAll, mmi_usb_enumeration, item_flag_none ), END_MENU( menuUSBPortOptions, menuListArea, COLOUR_LIST_SUBMENU ) BEGIN_MENU(menuUSBMS) - SUB_MENU (TxtPS, menuPS, item_flag_none), - SUB_MENU (TxtPopupMenu, menuPopup, item_flag_none), - SUB_MENU(TxtUSBMSPorts, menuUSBPortOptions, item_flag_none), + SUB_MENU (TxtPS, menuPS, item_flag_none), + SUB_MENU (TxtPopupMenu, menuPopup, item_flag_none), + SUB_MENU(TxtUSBMSPorts, menuUSBPortOptions, item_flag_none), END_MENU(menuUSBMS, menuListArea,COLOUR_LIST_SUBMENU) #endif /*OMAPS00098881(removing power variant) a0393213(Prabakar)*/ #ifdef FF_POWER_MANAGEMENT BEGIN_MENU(menuScreenUpdate) - MENU_ITEM(TxtOn, screenUpdateOn, item_flag_none), - MENU_ITEM(TxtOff, screenUpdateOff,item_flag_none) + MENU_ITEM(TxtOn, screenUpdateOn, item_flag_none), + MENU_ITEM(TxtOff, screenUpdateOff,item_flag_none) END_MENU(menuScreenUpdate, menuListArea, COLOUR_LIST_SUBMENU) #endif BEGIN_MENU( menuSet ) #ifdef _TESTING__ - SUB_MENU(TxtExtra, menuCphsTesting, item_flag_none), + SUB_MENU(TxtExtra, menuCphsTesting, item_flag_none), #endif SUB_MENU( TxtLanguages, menuLanguage, item_flag_none ), #ifdef MMI_GPRS_ENABLED SUB_MENU( TxtGPRS, menuDataSettings, item_flag_none ), #endif - SUB_MENU( TxtTones, menuTonesSet, item_flag_none ), + SUB_MENU( TxtTones, menuTonesSet, item_flag_none ), SUB_MENU( TxtClock, menuTypclock, item_flag_none ), SUB_MENU( TxtAutoredial, menuAutoRedialSet, item_flag_none ), #ifdef FF_TIMEZONE @@ -2656,17 +2649,17 @@ MENU_ITEM( TxtAnyKeyAnswer,(MenuFunc)settingsFocusCurSelAnyKeyAns, item_flag_none ), MENU_ITEM( TxtFactoryReset, factoryReset, item_flag_none ), #ifdef COLOURDISPLAY - SUB_MENU( TxtColourMenu, menuColourObjects, item_flag_none ), - SUB_MENU( TxtBackground, menuBackgroundScrSelect, item_flag_none ), + SUB_MENU( TxtColourMenu, menuColourObjects, item_flag_none ), + SUB_MENU( TxtBackground, menuBackgroundScrSelect, item_flag_none ), // change by Sasken (VVADIRAJ) on March 31th 2004 // Issue Number : MMI-SPR-12822 // changed submenu to menuitem to call a function -// SUB_MENU( TxtProviderIcon, menuProviderIconSet, item_flag_none ), - MENU_ITEM( TxtProviderIcon, (MenuFunc)settingsFocusNwIconCurSel, item_flag_none ), +// SUB_MENU( TxtProviderIcon, menuProviderIconSet, item_flag_none ), + MENU_ITEM( TxtProviderIcon, (MenuFunc)settingsFocusNwIconCurSel, item_flag_none ), #endif //xrashmic 9 Sep 2006, OMAPS00092732 #ifdef FF_MMI_USBMS - SUB_MENU( TxtUSBMS, menuUSBMS, item_flag_none ), + SUB_MENU( TxtUSBMS, menuUSBMS, item_flag_none ), #endif /*OMAPS00098881(removing power variant) a0393213(Prabakar)*/ #ifdef FF_POWER_MANAGEMENT @@ -2679,10 +2672,10 @@ /* SPR890 - SH - Test mode menu */ #ifdef MMI_TEST_MODE BEGIN_MENU( menuTestMode ) - MENU_ITEM_SELECT( TxtTest, test_function, item_flag_none, testSelected), - MENU_ITEM( TxtTest, test_function, item_flag_none ), - MENU_ITEM( TxtTest, test_function, item_flag_none ), - MENU_ITEM( TxtTest, test_function, item_flag_none ) + MENU_ITEM_SELECT( TxtTest, test_function, item_flag_none, testSelected), + MENU_ITEM( TxtTest, test_function, item_flag_none ), + MENU_ITEM( TxtTest, test_function, item_flag_none ), + MENU_ITEM( TxtTest, test_function, item_flag_none ) END_MENU( menuTestMode, menuListArea ) #endif /*---------------------------------------------------------------------------*/ @@ -2690,10 +2683,10 @@ /* SPR890 - SH - Test mode menu */ #ifdef MMI_TEST_MODE BEGIN_MENU( menuTestMode ) - MENU_ITEM_SELECT( TxtTest, test_function, item_flag_none, testSelected), - MENU_ITEM( TxtTest, test_function, item_flag_none ), - MENU_ITEM( TxtTest, test_function, item_flag_none ), - MENU_ITEM( TxtTest, test_function, item_flag_none ) + MENU_ITEM_SELECT( TxtTest, test_function, item_flag_none, testSelected), + MENU_ITEM( TxtTest, test_function, item_flag_none ), + MENU_ITEM( TxtTest, test_function, item_flag_none ), + MENU_ITEM( TxtTest, test_function, item_flag_none ) END_MENU( menuTestMode, menuListArea ) #endif /*---------------------------------------------------------------------------*/ @@ -2705,13 +2698,13 @@ #ifdef SIM_TOOLKIT/*MC SPR 975, added compiler switch*/ MENU_ICON_ITEM( &mainIconSimToolkit,TxtSimToolkit, menuSimItemCallback, sim_toolkit_check ), #endif - SUB_ICON_MENU ( &mainIconMessages,TxtMessages, menuMsg, item_flag_none ), + SUB_ICON_MENU ( &mainIconMessages,TxtMessages, menuMsg, item_flag_none ), SUB_ICON_MENU ( &mainIconPhonebook,TxtPhonebook, menuPhbk, item_flag_none ), SUB_ICON_MENU ( &mainIconRecentCalls,TxtRecentCalls, menuRecent, item_flag_none ), SUB_ICON_MENU ( &mainIconCallDivert,TxtNetworkServices, menuNetwork, item_flag_none ), SUB_ICON_MENU ( &mainIconSecurity,TxtSecurity, menuSecurity, item_flag_none ), SUB_ICON_MENU ( &mainIconCalculator,TxtApplications, menuApplications, item_flag_none ), - SUB_ICON_MENU ( &mainIconSettings,TxtPhoneSettings, menuSet, item_flag_none ), + SUB_ICON_MENU ( &mainIconSettings,TxtPhoneSettings, menuSet, item_flag_none ), #ifdef FF_WAP MENU_ICON_ITEM ( &mainIconWAP,TxtWAP, AUI_menu, item_flag_none ) #endif @@ -2781,7 +2774,7 @@ return (MfwMnuAttr *) &menuNameOptions; } // May 3, 2004 REF: CRR MMI-SPR-18555 Rashmi C N(Sasken) -// FDN Numbers menu +// FDN Numbers menu MfwMnuAttr *bookNameMenuFDNAttributes( void ) { return (MfwMnuAttr *) &bookFDNNumbers; @@ -2798,7 +2791,7 @@ MfwMnuAttr *ringerVolumeLevels( void ) { - return (MfwMnuAttr *) &menuSelectVolume; + return (MfwMnuAttr *) &menuSelectVolume; } /*MC, SPR 1327, access UPN options menu*/ @@ -2872,14 +2865,14 @@ MfwMnuAttr *fileviewerMenuAttributes( void )//file viewer { - return (MfwMnuAttr *) &menuFileViewer; + return (MfwMnuAttr *) &menuFileViewer; } #endif #ifdef FF_MMI_FILE_VIEWER MfwMnuAttr *ViewOptionsMenuAttributes( void )//file viewer { - return (MfwMnuAttr *) &menuViewOptions; + return (MfwMnuAttr *) &menuViewOptions; } #endif @@ -2967,7 +2960,7 @@ MfwMnuItem *WAPConnectionTypeItems(void) { - return (MfwMnuItem *) menuWAPConnectionTypeItems; + return (MfwMnuItem *) menuWAPConnectionTypeItems; } /* SPR#1983 - SH */ @@ -2979,7 +2972,7 @@ MfwMnuItem *WAPConnectionSpeedItems(void) { - return (MfwMnuItem *) menuWAPConnectionSpeedItems; + return (MfwMnuItem *) menuWAPConnectionSpeedItems; } /* SPR#2324 - SH - "access type" menu is now GPRS/Dialup menu */ @@ -2991,7 +2984,7 @@ MfwMnuItem *WAPGPRSDialupItems(void) { - return (MfwMnuItem *) menuWAPGPRSDialupItems; + return (MfwMnuItem *) menuWAPGPRSDialupItems; } MfwMnuAttr *WAPGPRSProfileAttributes(void) @@ -3112,12 +3105,12 @@ #if defined (FF_WAP) && defined (FF_GPF_TCPIP) MfwMnuAttr *WAPPPGAuthenticationAttributes(void) { - return (MfwMnuAttr*)&MenuPPGAuthenticationOptions; + return (MfwMnuAttr*)&MenuPPGAuthenticationOptions; } MfwMnuAttr *WAPWirelessProfiledHTTPAttributes(void) { - return (MfwMnuAttr*)&MenuWirelessProfiledHTTPOptions; + return (MfwMnuAttr*)&MenuWirelessProfiledHTTPOptions; } #endif /* SPR#1112 - SH - Menus for internal phonebook */ @@ -3189,7 +3182,7 @@ *******************************************************************************/ -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- Start */ /******************************************************************************* @@ -3197,7 +3190,7 @@ $Description: Routine to check if TFlash exists or not - $Returns: 0 : Enable TFlash in all Menus; + $Returns: 0 : Enable TFlash in all Menus; MNU_ITEM_HIDE : Hide TFlash in all Menus $Arguments: MfwMnuTag* , MfwMnuAttrTag*, MfwMnuItemTag* @@ -3212,40 +3205,40 @@ /********************************************************/ #ifdef FF_MMI_TFLASH - char curDir[10]; - UINT16 curDir_uc[10]; - UINT16 objName_uc[10]; - char objName[10]; - T_RFS_DIR f_dir; - - strcpy(curDir, "/"); - convert_u8_to_unicode(curDir, curDir_uc); - - if (rfs_opendir (curDir_uc, &f_dir) < 0) - { - TRACE_EVENT_P1("Opening dir %s Failed",curDir); - return MNU_ITEM_HIDE; - } - - while(rfs_readdir (&f_dir, objName_uc, FM_MAX_OBJ_NAME_LENGTH) > 0x0 ) - { - if (objName_uc[0] == '\0') - { - return MNU_ITEM_HIDE; - } - - convert_unicode_to_u8(objName_uc, objName); - - if(strcmp(objName,"MMC")==0) - { - rfs_closedir(&f_dir); - return 0; - } - } - - rfs_closedir(&f_dir); - - return MNU_ITEM_HIDE; + char curDir[10]; + UINT16 curDir_uc[10]; + UINT16 objName_uc[10]; + char objName[10]; + T_RFS_DIR f_dir; + + strcpy(curDir, "/"); + convert_u8_to_unicode(curDir, curDir_uc); + + if (rfs_opendir (curDir_uc, &f_dir) < 0) + { + TRACE_EVENT_P1("Opening dir %s Failed",curDir); + return MNU_ITEM_HIDE; + } + + while(rfs_readdir (&f_dir, objName_uc, FM_MAX_OBJ_NAME_LENGTH) > 0x0 ) + { + if (objName_uc[0] == '\0') + { + return MNU_ITEM_HIDE; + } + + convert_unicode_to_u8(objName_uc, objName); + + if(strcmp(objName,"MMC")==0) + { + rfs_closedir(&f_dir); + return 0; + } + } + + rfs_closedir(&f_dir); + + return MNU_ITEM_HIDE; /********************************************************/ /* If the TFlash Feature Flag is disabled, then hide TFlash Item */ @@ -3253,7 +3246,7 @@ #else - return MNU_ITEM_HIDE; + return MNU_ITEM_HIDE; #endif @@ -3266,7 +3259,7 @@ $Description: Routine to check if NAND exists or not - $Returns: 0 : Enable NAND in all Menus; + $Returns: 0 : Enable NAND in all Menus; MNU_ITEM_HIDE : Hide NAND in all Menus $Arguments: MfwMnuTag* , MfwMnuAttrTag*, MfwMnuItemTag* @@ -3280,7 +3273,7 @@ /********************************************************/ #ifdef FF_MMI_NAND - return 0; + return 0; /********************************************************/ /* If the NAND Feature Flag is enabled, then hide the Menu Item */ @@ -3288,7 +3281,7 @@ #else - return MNU_ITEM_HIDE; + return MNU_ITEM_HIDE; #endif @@ -3300,7 +3293,7 @@ $Description: Routine to check if NOR exists or not - $Returns: 0 : Enable NOR in all Menus; + $Returns: 0 : Enable NOR in all Menus; MNU_ITEM_HIDE : Hide NOR in all Menus $Arguments: MfwMnuTag* , MfwMnuAttrTag*, MfwMnuItemTag* @@ -3314,7 +3307,7 @@ /********************************************************/ #ifdef FF_MMI_NOR - return 0; + return 0; /********************************************************/ /* If the NOR Feature Flag is enabled, then hide the Menu Item */ @@ -3322,7 +3315,7 @@ #else - return MNU_ITEM_HIDE; + return MNU_ITEM_HIDE; #endif @@ -3335,7 +3328,7 @@ $Description: Routine to check if NORMS exists or not - $Returns: 0 : Enable NORMS in all Menus; + $Returns: 0 : Enable NORMS in all Menus; MNU_ITEM_HIDE : Hide NORMS in all Menus $Arguments: MfwMnuTag* , MfwMnuAttrTag*, MfwMnuItemTag* @@ -3349,7 +3342,7 @@ /********************************************************/ #ifdef FF_MMI_NORMS - return 0; + return 0; /********************************************************/ /* If the NORMS Feature Flag is enabled, then hide the Menu Item */ @@ -3357,13 +3350,13 @@ #else - return MNU_ITEM_HIDE; + return MNU_ITEM_HIDE; #endif } -/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ +/* Sep 26, 2007 Configuration of Drives for SBuild 2.3.0 Migration x0080701 (Bharat) -- End */ /******************************************************************************* @@ -3411,67 +3404,67 @@ *******************************************************************************/ MfwMnuAttr* create_mmi_phonebook_names_list() -{ int i; - - TRACE_EVENT("create_mmi_phonebook_names_list()"); - if (phonebook_list != NULL) - return phonebook_list; +{ int i; + + TRACE_EVENT("create_mmi_phonebook_names_list()"); + if (phonebook_list != NULL) + return phonebook_list; /*allocate memory for list of phonenumbers*/ - phonebook_list = (MfwMnuAttr*)ALLOC_MEMORY(sizeof(MfwMnuAttr)); - if (phonebook_list == NULL) - { TRACE_EVENT("Phonebook list alloc failed"); - return NULL; - } + phonebook_list = (MfwMnuAttr*)ALLOC_MEMORY(sizeof(MfwMnuAttr)); + if (phonebook_list == NULL) + { TRACE_EVENT("Phonebook list alloc failed"); + return NULL; + } /*allocate memory for the array of items in the phonebook list*/ - items_in_phonebook_list = (MfwMnuItem*)ALLOC_MEMORY(sizeof(MfwMnuItem)*NAME_LIST_SIZE); - if (items_in_phonebook_list == NULL) - { TRACE_EVENT("Phonebook list items alloc failed"); - return NULL; - } + items_in_phonebook_list = (MfwMnuItem*)ALLOC_MEMORY(sizeof(MfwMnuItem)*NAME_LIST_SIZE); + if (items_in_phonebook_list == NULL) + { TRACE_EVENT("Phonebook list items alloc failed"); + return NULL; + } /*allocate memory for the array of pointers to strings holding phonebook list text*/ - menu_item_strings = (char**)ALLOC_MEMORY(sizeof(char*)*NAME_LIST_SIZE); - if (menu_item_strings == NULL) - { TRACE_EVENT("menu item string list alloc failed"); - return NULL; - } + menu_item_strings = (char**)ALLOC_MEMORY(sizeof(char*)*NAME_LIST_SIZE); + if (menu_item_strings == NULL) + { TRACE_EVENT("menu item string list alloc failed"); + return NULL; + } /*allocate memory for each text string in turn*/ - for (i=0;i<NAME_LIST_SIZE;i++) - { menu_item_strings[i] = (char*)ALLOC_MEMORY(sizeof(char)*PHONEBOOK_ITEM_LENGTH); - if (menu_item_strings[i] == NULL) - { TRACE_EVENT(" menu item string alloc failed"); - return NULL; - } - - } + for (i=0;i<NAME_LIST_SIZE;i++) + { menu_item_strings[i] = (char*)ALLOC_MEMORY(sizeof(char)*PHONEBOOK_ITEM_LENGTH); + if (menu_item_strings[i] == NULL) + { TRACE_EVENT(" menu item string alloc failed"); + return NULL; + } + + } /*specify phonebook list menu configuration*/ - phonebook_list->area = &menuNamesArea; - phonebook_list->mode = MNU_LEFT | MNU_LIST | MNU_CUR_LINE; - phonebook_list->font = (U8)-1; - phonebook_list->items = items_in_phonebook_list; - phonebook_list->nItems = NAME_LIST_SIZE; - phonebook_list->mnuColour = COLOUR_LIST_SUBMENU; - phonebook_list->hdrId = TxtNull; - phonebook_list->bgdBitmap= NULL; - phonebook_list->unused = MNUATTRSPARE; + phonebook_list->area = &menuNamesArea; + phonebook_list->mode = MNU_LEFT | MNU_LIST | MNU_CUR_LINE; + phonebook_list->font = (U8)-1; + phonebook_list->items = items_in_phonebook_list; + phonebook_list->nItems = NAME_LIST_SIZE; + phonebook_list->mnuColour = COLOUR_LIST_SUBMENU; + phonebook_list->hdrId = TxtNull; + phonebook_list->bgdBitmap= NULL; + phonebook_list->unused = MNUATTRSPARE; /*specify configuration of each meni item*/ - for(i=0; i<NAME_LIST_SIZE; i++) - { - items_in_phonebook_list[i].icon =0; - items_in_phonebook_list[i].exta =0; - items_in_phonebook_list[i].x =0; - items_in_phonebook_list[i].str =menu_item_strings[i]; - items_in_phonebook_list[i].menu =0; - items_in_phonebook_list[i].func =0; - items_in_phonebook_list[i].flagFunc =item_flag_none; - } - - return phonebook_list; + for(i=0; i<NAME_LIST_SIZE; i++) + { + items_in_phonebook_list[i].icon =0; + items_in_phonebook_list[i].exta =0; + items_in_phonebook_list[i].x =0; + items_in_phonebook_list[i].str =menu_item_strings[i]; + items_in_phonebook_list[i].menu =0; + items_in_phonebook_list[i].func =0; + items_in_phonebook_list[i].flagFunc =item_flag_none; + } + + return phonebook_list; } /******************************************************************************* @@ -3486,33 +3479,33 @@ *******************************************************************************/ BOOL destroy_mmi_phonebook_names_list(MfwMnuAttr* pointer) -{ int i; - - - TRACE_EVENT("destroy_mmi_phonebook_names_list()"); - /*if memory not allocated for phonebook list OR the pointer passed to the function is - NOT that of the phonebook list, stop here*/ - if ((phonebook_list == NULL) || (pointer != phonebook_list)) - return FALSE; - - /*dealloacte memory for each item's text string*/ - for(i=0; i<NAME_LIST_SIZE; i++) - { FREE_MEMORY((U8*)menu_item_strings[i], sizeof(char)*PHONEBOOK_ITEM_LENGTH); - menu_item_strings[i] = NULL; - - } - /*deallocate memory for the array of pointer to text strings*/ - FREE_MEMORY((U8*)menu_item_strings, sizeof(char*)*NAME_LIST_SIZE); - - /*deallocate memory for the array of items in the phonebook list*/ - FREE_MEMORY((U8*)items_in_phonebook_list, sizeof(MfwMnuItem)*NAME_LIST_SIZE); - items_in_phonebook_list = NULL; - - /*deallocate the phonebook list menu attributes*/ - FREE_MEMORY((U8*)phonebook_list, sizeof(MfwMnuAttr)); - phonebook_list = NULL; - - return TRUE; +{ int i; + + + TRACE_EVENT("destroy_mmi_phonebook_names_list()"); + /*if memory not allocated for phonebook list OR the pointer passed to the function is + NOT that of the phonebook list, stop here*/ + if ((phonebook_list == NULL) || (pointer != phonebook_list)) + return FALSE; + + /*dealloacte memory for each item's text string*/ + for(i=0; i<NAME_LIST_SIZE; i++) + { FREE_MEMORY((U8*)menu_item_strings[i], sizeof(char)*PHONEBOOK_ITEM_LENGTH); + menu_item_strings[i] = NULL; + + } + /*deallocate memory for the array of pointer to text strings*/ + FREE_MEMORY((U8*)menu_item_strings, sizeof(char*)*NAME_LIST_SIZE); + + /*deallocate memory for the array of items in the phonebook list*/ + FREE_MEMORY((U8*)items_in_phonebook_list, sizeof(MfwMnuItem)*NAME_LIST_SIZE); + items_in_phonebook_list = NULL; + + /*deallocate the phonebook list menu attributes*/ + FREE_MEMORY((U8*)phonebook_list, sizeof(MfwMnuAttr)); + phonebook_list = NULL; + + return TRUE; } /******************************************************************************* @@ -3540,9 +3533,9 @@ */ /*SPR 2123, if memory hasn't been allocated for menu items strings return NULL*/ if (menu_item_strings != NULL) - return menu_item_strings[index]; + return menu_item_strings[index]; else - return NULL; + return NULL; } /******************************************************************************* @@ -3577,12 +3570,9 @@ MfwMnuAttr *MmiBookMenuDetailsList( void ) { - /*SPR2123, return the pointer to the phonebook list attributes, it'll be NULL - if memory has not been alloacted to it*/ - return phonebook_list; - - - + /*SPR2123, return the pointer to the phonebook list attributes, it'll be NULL + if memory has not been alloacted to it*/ + return phonebook_list; } @@ -3606,9 +3596,6 @@ } - - - /******************************************************************************* $Function: MmiBookCurrentText @@ -3633,14 +3620,14 @@ /******************************************************************************* - $Function: storeMenuOption - - $Description: Stores the ID of the text string for the currently selected menu item - - $Returns: 0 - - $Arguments: mnu - unused - numItem - selected menu item + $Function: storeMenuOption + + $Description: Stores the ID of the text string for the currently selected menu item + + $Returns: 0 + + $Arguments: mnu - unused + numItem - selected menu item GW 28/11/02 Added a general purpose storage/retrieval procedure *******************************************************************************/ @@ -3648,27 +3635,27 @@ static int storedMenuId = TxtNull; int storeMenuOption(MfwMnu* mnu, MfwMnuItem* mnuItem) { - T_MFW_HND win = mfw_parent(mfw_header()); - - storedMenuId = (int)mnuItem->str; - return(0); + T_MFW_HND win = mfw_parent(mfw_header()); + + storedMenuId = (int)mnuItem->str; + return(0); } /******************************************************************************* - $Function: MmiBook_getStoredOption - - $Description: Returns the ID of the text string stored on a menu selection - - $Returns: storedMenuId - string Id of the selected menu item - - $Arguments: none. + $Function: MmiBook_getStoredOption + + $Description: Returns the ID of the text string stored on a menu selection + + $Returns: storedMenuId - string Id of the selected menu item + + $Arguments: none. GW 28/11/02 Added a general purpose storage/retrieval procedure *******************************************************************************/ int MmiBook_getStoredOption( void) { - return (storedMenuId); + return (storedMenuId); } //SPR12822 - vvadiraj@sasken.com @@ -3683,38 +3670,38 @@ // Jul 28, 2004 REF: CRR 20899 xkundadu // Returns the 'Any Key Answer' menu to display. /******************************************************************************* - $Function: GetAnyKeyAnswerMenu - - $Description: Returns the 'Any Key Answer' menu - - $Returns: menuAnyKeySet - Menu of the 'AnyKeyAnser'. - - $Arguments: none. + $Function: GetAnyKeyAnswerMenu + + $Description: Returns the 'Any Key Answer' menu + + $Returns: menuAnyKeySet - Menu of the 'AnyKeyAnser'. + + $Arguments: none. *******************************************************************************/ MfwMnuAttr *GetAnyKeyAnswerMenu() { - return (MfwMnuAttr *) &menuAnyKeySet; + return (MfwMnuAttr *) &menuAnyKeySet; } // Jul 29, 2004 REF: CRR 20898 xkundadu // Returns the 'AutAnswer' menu to display. /******************************************************************************* - $Function: GetAutoAnswerMenu - - $Description: Returns the 'AutoAnswer' menu - - $Returns: menuAutoAnswerSet - Menu of the 'AutoKeyAnswer'. - - $Arguments: none. + $Function: GetAutoAnswerMenu + + $Description: Returns the 'AutoAnswer' menu + + $Returns: menuAutoAnswerSet - Menu of the 'AutoKeyAnswer'. + + $Arguments: none. *******************************************************************************/ MfwMnuAttr *GetAutoAnswerMenu() { - return (MfwMnuAttr *) &menuAutoAnswerSet; + return (MfwMnuAttr *) &menuAutoAnswerSet; } -// Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN +// Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN // Returning the submenu for FDN submenu MfwMnuAttr *FDNMenu(void) { @@ -3729,7 +3716,7 @@ } // Sep 27,2005 REF: SPR 34402 xdeepadh // Returning the submenu for channels -// Nov 14, 2005 REF: OMAPS00044445 xdeepadh +// Nov 14, 2005 REF: OMAPS00044445 xdeepadh #if defined(FF_MMI_TEST_MP3) || defined(FF_MMI_TEST_AAC) MfwMnuAttr *PlayerChannelAttributes(void) { @@ -3737,7 +3724,7 @@ } #endif //endif FF_MMI_TEST_MP3 -// May 04, 2005 REF: CRR:30285 x0021334 +// May 04, 2005 REF: CRR:30285 x0021334 // Returning the submenu for SMS Status Report submenu MfwMnuAttr *SmsStatusReportAttributes(void) { @@ -3915,4 +3902,3 @@ End of File *******************************************************************************/ -