FreeCalypso > hg > fc-tourmaline
changeset 100:609eb8031c17
mmiBook*.h: bogotab fixes
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 08 Nov 2020 22:53:20 +0000 |
| parents | 8142e6773a49 |
| children | ada0621d4e74 |
| files | src/ui/bmi/mmiBookCallDetailsWindow.h src/ui/bmi/mmiBookCallListWindow.h src/ui/bmi/mmiBookController.h src/ui/bmi/mmiBookDetailsWindow.h src/ui/bmi/mmiBookMenuWindow.h src/ui/bmi/mmiBookPhonebook.h src/ui/bmi/mmiBookSDNWindow.h src/ui/bmi/mmiBookSearchWindow.h src/ui/bmi/mmiBookServices.h src/ui/bmi/mmiBookShared.h src/ui/bmi/mmiBookUtils.h |
| diffstat | 11 files changed, 283 insertions(+), 283 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ui/bmi/mmiBookCallDetailsWindow.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookCallDetailsWindow.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,26 +12,26 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookCallDetailsWindow.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookCallDetailsWindow.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** Description: This provides the implementation of the call details window for the - phone book module + phone book module ******************************************************************************** $History: MmiBookCallDetailsWindow.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookCallListWindow.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookCallListWindow.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,14 +12,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookCallListWindow.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookCallListWindow.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -30,7 +30,7 @@ ******************************************************************************** $History: MmiBookCallListWindow.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookController.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookController.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,31 +12,31 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookController.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookController.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** Description: - The book controller module provides the external - interface to the phone book. It provides ALL external - entry points to the phone book system. + The book controller module provides the external + interface to the phone book. It provides ALL external + entry points to the phone book system. ******************************************************************************** $History: MmiBookController.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. - Nov 10, 2006 DRT: OMAPS000103354 x0039928 - Description: Delete all failure in LDN Phonebook - Solution: A new function phbDeleteRec is added + Nov 10, 2006 DRT: OMAPS000103354 x0039928 + Description: Delete all failure in LDN Phonebook + Solution: A new function phbDeleteRec is added $End
--- a/src/ui/bmi/mmiBookDetailsWindow.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookDetailsWindow.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,26 +12,26 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookDetailsWindow.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookDetailsWindow.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** Description: - Provides the details handlig for the phone book + Provides the details handlig for the phone book ******************************************************************************** $History: MmiBookDetailsWindow.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookMenuWindow.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookMenuWindow.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,14 +12,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookMenuWindow.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookMenuWindow.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -30,7 +30,7 @@ ******************************************************************************** $History: MmiBookMenuWindow.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookPhonebook.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookPhonebook.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,14 +12,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookPhoneBook.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookPhoneBook.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -31,7 +31,7 @@ ******************************************************************************** $History: MmiBookPhoneBook.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookSDNWindow.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookSDNWindow.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,14 +12,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookSDNWindow.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookSDNWindow.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -30,7 +30,7 @@ ******************************************************************************** $History: MmiBookSDNWindow.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookSearchWindow.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookSearchWindow.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,26 +12,26 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiSearchWindow.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiSearchWindow.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** Description: - This module provides the phone book search window functionality for the - phone book module of the basic MMI + This module provides the phone book search window functionality for the + phone book module of the basic MMI ******************************************************************************** $History: MmiSearchWindow.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End
--- a/src/ui/bmi/mmiBookServices.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookServices.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,36 +12,36 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookServices.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookServices.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** Description: This module provides the basic phone book services required by - the other phone book modules + the other phone book modules ******************************************************************************** $History: MmiMsgs.c - June 07, 2005 REF: CRR MMI-FIX-31545 x0021334 - Issue description: SIM: wrong behavior when FDN is not allocated in SST - Solution: Before displaying the FDN options, a check is made if FDN is allocated. Only if - FDN is allocated, the options are displayed. + June 07, 2005 REF: CRR MMI-FIX-31545 x0021334 + Issue description: SIM: wrong behavior when FDN is not allocated in SST + Solution: Before displaying the FDN options, a check is made if FDN is allocated. Only if + FDN is allocated, the options are displayed. - Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN - Description: Current state of FDN not highlighted - Fix: Instead of showing the submenu directly we call this function - where we set the menu and also higlight the previously selected menu item + Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN + Description: Current state of FDN not highlighted + Fix: Instead of showing the submenu directly we call this function + where we set the menu and also higlight the previously selected menu item - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End @@ -90,7 +90,7 @@ /* SPR1112 - SH - Show an info screen */ T_MFW_HND bookShowInfoScreen( MfwHnd parent, int txtId1, int txtId2, T_VOID_FUNC cb_function, - USHORT Identifier, ULONG Time); + USHORT Identifier, ULONG Time); /* Add name when the number is already known */ @@ -134,7 +134,7 @@ void bookActivateFDN( T_MFW_HND window ); int bookFDNMenu(MfwMnu* menu, MfwMnuItem* item);//MMI SPR 18555 -// Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN +// Jul 28, 2004 REF: CRR:20887 xrashmic - SASKEN void settingsFocusFDNCurSel(void); // June 07, 2005 REF: CRR MMI-FIX-31545 x0021334
--- a/src/ui/bmi/mmiBookShared.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookShared.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,14 +12,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookShared.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookShared.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -34,39 +34,39 @@ Oct 8 2006 OMAPS00097714 x0039928(sumanth) TTY HCO/VCO options in MMI - 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. + 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. - 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 - Added prototype for function SIMPCategoryListAttributes + 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 + Added prototype for function SIMPCategoryListAttributes - Apr 24, 2006 ERT: OMAPS00067603 x0043642 - Description: Engineering mode - Solution: Added new engineering mode function prototypes. + Apr 24, 2006 ERT: OMAPS00067603 x0043642 + Description: Engineering mode + Solution: Added new engineering mode function prototypes. - Jan 22, 2006 REF: OMAPS00061930 x0039928 - Bug:PhoneBook -Change entry and view entry through Change option-failed - Fix: Phonebook is populated with phone numbers after some time and not immediately while saving the changed entries. + Jan 22, 2006 REF: OMAPS00061930 x0039928 + Bug:PhoneBook -Change entry and view entry through Change option-failed + Fix: Phonebook is populated with phone numbers after some time and not immediately while saving the changed entries. - 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. + 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. - 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. + 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. May 04, 2005 REF: CRR 30285 x0021334 Description: SMS Status Request in idle and dedicated mode (using Menu) setting does not work @@ -84,22 +84,22 @@ MMS/EMS is added - Jul 29, 2004 REF: CRR 20898 xkundadu - Description: No identification for user whether 'Auto-Answer' is On/Off - Solution: Added the function GetAutoAnswerMenu() prototype. + Jul 29, 2004 REF: CRR 20898 xkundadu + Description: No identification for user whether 'Auto-Answer' is On/Off + Solution: Added the function GetAutoAnswerMenu() prototype. - Jul 22,2004 CRR:20896 xrashmic - SASKEN - Description: The current time format is not highlighted - Fix: Instead of providing the submenu directly we call a function - where we set the menu and also higlight the previously selected menu item + Jul 22,2004 CRR:20896 xrashmic - SASKEN + Description: The current time format is not highlighted + Fix: Instead of providing the submenu directly we call a function + where we set the menu and also higlight the previously selected menu item - 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 + 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 - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End @@ -192,47 +192,47 @@ /* Standard definitions which are shared across the phonebook modules */ -#define MAX_CALL_LISTS 15 +#define MAX_CALL_LISTS 15 /*SPR 1455, */ #ifndef LSCREEN -#define NAME_SCREEN_MAX 13 +#define NAME_SCREEN_MAX 13 #else -#define NAME_SCREEN_MAX 41 +#define NAME_SCREEN_MAX 41 #endif /*SPR 1456*/ #ifdef LSCREEN -#define NAME_LIST_SIZE 10 -#define MAX_SEARCHED 10 +#define NAME_LIST_SIZE 10 +#define MAX_SEARCHED 10 // -#define MAX_SEARCH_NAME 10 -#define MAX_SEARCH_CALL_LIST 10 +#define MAX_SEARCH_NAME 10 +#define MAX_SEARCH_CALL_LIST 10 #else -#define NAME_LIST_SIZE 3 -#define MAX_SEARCHED 3 +#define NAME_LIST_SIZE 3 +#define MAX_SEARCHED 3 -#define MAX_SEARCH_NAME 3 -#define MAX_SEARCH_CALL_LIST 3 +#define MAX_SEARCH_NAME 3 +#define MAX_SEARCH_CALL_LIST 3 #endif -//#define EDITOR_SIZE 32 -//#define EDITOR_SIZE 96 defined in mmimain.h +//#define EDITOR_SIZE 32 +//#define EDITOR_SIZE 96 defined in mmimain.h /*SPR 2102, should be long enough to cope with displaying a name and number with time and date in unicode*/ -#define STANDARD_EDITOR_SIZE (PHB_MAX_LEN*2+50) +#define STANDARD_EDITOR_SIZE (PHB_MAX_LEN*2+50) //GW-SPR#762- 40 digit phonebook size. #ifdef TI_PS_FFS_PHB -#define NUMBER_LENGTH 41 +#define NUMBER_LENGTH 41 #else #ifdef PHONEBOOK_EXTENSION -#define NUMBER_LENGTH 41 +#define NUMBER_LENGTH 41 #else -#define NUMBER_LENGTH 20 +#define NUMBER_LENGTH 20 #endif /* else, #ifdef PHONEBOOK_EXTENSION */ #endif /* else, #ifdef TI_PS_FFS_PHB */ -#define MAX_SEARCH_CHAR 8 +#define MAX_SEARCH_CHAR 8 #define PHONEBOOK_ITEM_LENGTH 41 /*SPR2123, length of phonebook entry*/ -//#define PHB_UPN MAX_PHB_TYPE+1 +//#define PHB_UPN MAX_PHB_TYPE+1 //This definition conflicts with the MFW definition @@ -273,10 +273,10 @@ T_MFW_PHB_LIST list; T_MFW_PHB_STATUS status; UBYTE result; - UBYTE selectedName; + UBYTE selectedName; SHORT index; - UBYTE missedCallsOffset; - int mode; + UBYTE missedCallsOffset; + int mode; tSearchTypes KindOfSearch; } tMmiPhbData, *pMmiPhbData; @@ -288,46 +288,46 @@ */ typedef struct T_phbk_data { - T_MMI_CONTROL mmi_control; - T_MFW_HND win; + T_MMI_CONTROL mmi_control; + T_MFW_HND win; /* internal data */ - T_MFW_HND search_win; - T_MFW_HND root_win; - T_MFW_HND menu_main_win; - T_MFW_HND calls_list_win; - T_MFW_HND menu_options_win; - T_MFW_HND menu_options_win_2; - T_MFW_HND menu_call_options_win; - T_MFW_HND menu_call_options_win_2; - T_MFW_HND name_details_win; - T_MFW_HND input_number_win; - T_MFW_HND input_name_win; - T_MFW_HND parent_win; + T_MFW_HND search_win; + T_MFW_HND root_win; + T_MFW_HND menu_main_win; + T_MFW_HND calls_list_win; + T_MFW_HND menu_options_win; + T_MFW_HND menu_options_win_2; + T_MFW_HND menu_call_options_win; + T_MFW_HND menu_call_options_win_2; + T_MFW_HND name_details_win; + T_MFW_HND input_number_win; + T_MFW_HND input_name_win; + T_MFW_HND parent_win; - char fromSMS; - char fromSMSSC; - char fromDivert; + char fromSMS; + char fromSMSSC; + char fromDivert; //CRR: 25302 - xpradipg 10 Nov 2004 //Is set to True if invoked from MMS/EMS char fromMmsEms; - char fromDeflect;/*SPR 1392, call deflection*/ - tMmiPhbData current; - T_MFW_PHB_ENTRY newEntry; - T_MFW_UPN_LIST *upnList; - struct T_phbk_data *phbk; - UBYTE edt_buf_name[MAX_ALPHA_LEN]; - /*MC SPR 1257, replacing PHB_MAX_LEN with MAX_ALPHA_LEN for name strings*/ - char edt_buf_number[PHB_MAX_LEN]; - /* SPR#1428 - SH - Not required for new editor */ + char fromDeflect;/*SPR 1392, call deflection*/ + tMmiPhbData current; + T_MFW_PHB_ENTRY newEntry; + T_MFW_UPN_LIST *upnList; + struct T_phbk_data *phbk; + UBYTE edt_buf_name[MAX_ALPHA_LEN]; + /*MC SPR 1257, replacing PHB_MAX_LEN with MAX_ALPHA_LEN for name strings*/ + char edt_buf_number[PHB_MAX_LEN]; + /* SPR#1428 - SH - Not required for new editor */ #ifndef NEW_EDITOR - MfwEdtAttr edt_attr_name; - MfwEdtAttr edt_attr_number; + MfwEdtAttr edt_attr_name; + MfwEdtAttr edt_attr_number; #endif /* NEW_EDITOR */ - T_VOID_FUNC pin2_next; - struct MfwMnuTag *menu; //Added for FDN -- MC - struct MfwMnuItemTag *item; //Added for FDN -- MC + T_VOID_FUNC pin2_next; + struct MfwMnuTag *menu; //Added for FDN -- MC + struct MfwMnuItemTag *item; //Added for FDN -- MC tUpdateTypes UpdateAction; } T_phbk; @@ -340,48 +340,48 @@ */ typedef struct _tInputSpecifics_ { - int text; - MfwEdtAttr *edt_attr_input; + int text; + MfwEdtAttr *edt_attr_input; int left_soft_key; int right_soft_key; - short abc; - void (* callback)( T_MFW_HND win,UBYTE reason ); + short abc; + void (* callback)( T_MFW_HND win,UBYTE reason ); } tInputSpecifics, *pInputSpecifics; #endif /* NEW_EDITOR */ typedef struct _tBookStandard_ { - /* Standard elements which are consistent across all phonebook - window control blocks - */ + /* Standard elements which are consistent across all phonebook + window control blocks + */ T_MMI_CONTROL mmi_control; T_MFW_HND win; T_MFW_HND kbd; T_MFW_HND kbd_long; T_MFW_HND menu_tim; T_MFW_HND menu; - T_MFW_HND tim; //Jan 22, 2006 REF: OMAPS00061930 x0039928, Add a timer handle + T_MFW_HND tim; //Jan 22, 2006 REF: OMAPS00061930 x0039928, Add a timer handle #ifdef NEW_EDITOR - T_ED_DATA *editor; - T_AUI_ENTRY_DATA *entry_data; + T_ED_DATA *editor; + T_AUI_ENTRY_DATA *entry_data; #else /* NEW_EDITOR */ - T_MFW_HND edt; + T_MFW_HND edt; #endif /* NEW_EDITOR */ T_MFW_HND parent_win; - T_phbk *phbk; + T_phbk *phbk; T_VOID_FUNC Callback; /* internal data */ UBYTE status_of_timer; /* use for the keypadlock */ -#ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ - T_ED_ATTR editor_attr; +#ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ + T_ED_ATTR editor_attr; #else /* NEW_EDITOR */ MfwEdtAttr attr; #endif /* NEW_EDITOR */ char edtBuf[STANDARD_EDITOR_SIZE*sizeof(USHORT)]; -#ifndef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ - tInputSpecifics properties; /* No longer required with NEW_EDITOR */ +#ifndef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ + tInputSpecifics properties; /* No longer required with NEW_EDITOR */ #endif /* NEW_EDITOR */ } tBookStandard, *pBookStandard; @@ -391,17 +391,17 @@ it's own terms of reference, we will provide the following type definition overrides. */ -#define tBookStatus int -#define tBookPtr void * -#define tBookDialogData T_DISPLAY_DATA -#define tBookMfwMenu struct MfwMnuTag -#define tBookMfwMenuItem struct MfwMnuItemTag -#define tBookMfwHnd MfwHnd -#define tBookMfwHdr MfwHdr +#define tBookStatus int +#define tBookPtr void * +#define tBookDialogData T_DISPLAY_DATA +#define tBookMfwMenu struct MfwMnuTag +#define tBookMfwMenuItem struct MfwMnuItemTag +#define tBookMfwHnd MfwHnd +#define tBookMfwHdr MfwHdr #define tBookMfwWin MfwWin #define tBookMfwEvent MfwEvt #define tBookMfwBook int -#define tBookPhonebook T_phbk +#define tBookPhonebook T_phbk #define pBookPhonebook tBookPhonebook * #define pBookStandard tBookStandard * @@ -428,45 +428,45 @@ PhbkReplyListNormal, PhbkRepRedOptionsNormal, PhbkRedialListNormal, - PhbkDetailListToIdle, - PhbkFromSms, - PhbkFromSmsSC, /*SH*/ - PhbkFromDivert, - PhbkSendAsDTMF, - //CRR: 25302 - xpradipg 10 Nov 2004 - PhbkFromMms, - PhbkFromDeflect/*SPR 1392, call deflection*/ + PhbkDetailListToIdle, + PhbkFromSms, + PhbkFromSmsSC, /*SH*/ + PhbkFromDivert, + PhbkSendAsDTMF, + //CRR: 25302 - xpradipg 10 Nov 2004 + PhbkFromMms, + PhbkFromDeflect/*SPR 1392, call deflection*/ } tBookActionIdentifiers; typedef enum { - INPUT_INIT, - INPUT_LEFT, - INPUT_RIGHT, - INPUT_CLEAR, - INPUT_DESTROY, - MENU_INIT, - ADD_CALLBACK, - DEFAULT_OPTION, - SEARCH_INIT, - SEARCH_SCROLL_UP, - SEARCH_SCROLL_DOWN, - SEARCH_STRING, - SEARCH_UPDATE, - //CRR: 25302 - xpradipg 10 Nov 2004 - MMS_EMS_PHBK_NUMBER, -#ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor: So we can redraw screen when required */ - SEARCH_REDRAW, + INPUT_INIT, + INPUT_LEFT, + INPUT_RIGHT, + INPUT_CLEAR, + INPUT_DESTROY, + MENU_INIT, + ADD_CALLBACK, + DEFAULT_OPTION, + SEARCH_INIT, + SEARCH_SCROLL_UP, + SEARCH_SCROLL_DOWN, + SEARCH_STRING, + SEARCH_UPDATE, + //CRR: 25302 - xpradipg 10 Nov 2004 + MMS_EMS_PHBK_NUMBER, +#ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor: So we can redraw screen when required */ + SEARCH_REDRAW, #endif /* NEW_EDITOR */ - CALL_DETAILS_INIT, - CALLS_LIST_INIT, - PHBK_INIT, - PHBK_SEND_NUMBER, - SMS_PHBK_NUMBER, - SMSSC_PHBK_NUMBER, /* SH - Service centre number */ - DIVERT_PHBK_NUMBER, //MZ 26/02/01 definition for set divert. - DEFLECT_PHBK_NUMBER /*SPR 1392, call deflection*/ + CALL_DETAILS_INIT, + CALLS_LIST_INIT, + PHBK_INIT, + PHBK_SEND_NUMBER, + SMS_PHBK_NUMBER, + SMSSC_PHBK_NUMBER, /* SH - Service centre number */ + DIVERT_PHBK_NUMBER, //MZ 26/02/01 definition for set divert. + DEFLECT_PHBK_NUMBER /*SPR 1392, call deflection*/ } tBookMessageEvents; @@ -702,7 +702,7 @@ MfwMnuAttr *FMDestRootFolderAttributes(void); #endif // Sep 27,2005 REF: SPR 34402 xdeepadh -// 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); #endif
--- a/src/ui/bmi/mmiBookUtils.h Sun Nov 08 08:33:36 2020 +0000 +++ b/src/ui/bmi/mmiBookUtils.h Sun Nov 08 22:53:20 2020 +0000 @@ -3,7 +3,7 @@ /******************************************************************************* - CONDAT (UK) + CONDAT (UK) ******************************************************************************** @@ -12,14 +12,14 @@ ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) - $Module: PhoneBook - $File: MmiBookUtils.h - $Revision: 1.0 + $Project name: Basic MMI + $Project code: BMI (6349) + $Module: PhoneBook + $File: MmiBookUtils.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -32,7 +32,7 @@ $History: MmiBookUtils.h - 25/10/00 Original Condat(UK) BMI version. + 25/10/00 Original Condat(UK) BMI version. $End @@ -127,10 +127,10 @@ // GW - Changed colour from 8 bits (foreground) to 2x32bits fgd and bgd void bookSetEditAttributes( int editZone, - U32 colindex, - U8 font, U8 mode, U8 *controls, - char *text, U16 size, - MfwEdtAttr* attr); + U32 colindex, + U8 font, U8 mode, U8 *controls, + char *text, U16 size, + MfwEdtAttr* attr); #endif /* Memory allocation and freeing functions @@ -149,18 +149,18 @@ Sample usage: - tStructure *ptr; + tStructure *ptr; if ( ( ptr = (tStructure *) bookMemAlloc( sizeof(tStructure) ) ) != NULL ) - { - // use the allocated memory - // - ... + { + // use the allocated memory + // + ... - // free the memory - // - bookMemFree( &ptr ); - } + // free the memory + // + bookMemFree( &ptr ); + } */ void *bookMemAlloc( long int NumBytes ); void bookMemFree( void **Pointer ); @@ -183,7 +183,7 @@ /* SPR#1112 - SH - Internal phonebook use */ #ifdef INT_PHONEBOOK void bookChangePB(T_MFW_HND win, UBYTE identifier, UBYTE reason); -UBYTE bookCopy( T_MFW_PHB_ENTRY *entry, T_MFW_PHB_STATUS *destStatus, T_MFW_PHB_STATUS *srcStatus, UBYTE move); +UBYTE bookCopy( T_MFW_PHB_ENTRY *entry, T_MFW_PHB_STATUS *destStatus, T_MFW_PHB_STATUS *srcStatus, UBYTE move); void bookCopySingle(T_MFW_HND win, UBYTE identifier, UBYTE reason); void bookCopyMultiple(T_MFW_HND win, UBYTE move, UBYTE reason); #endif