# HG changeset patch # User Mychaela Falconia # Date 1604877140 0 # Node ID 598489a0ce3cc155b2499ce4ad2a677fe4139c05 # Parent a7398f7007bb9db4b14c130b37f7fe5e05c566bc mmiDialogs.h: bogotab fixes diff -r a7398f7007bb -r 598489a0ce3c src/ui/bmi/mmiDialogs.h --- a/src/ui/bmi/mmiDialogs.h Sun Nov 08 23:07:30 2020 +0000 +++ b/src/ui/bmi/mmiDialogs.h Sun Nov 08 23:12:20 2020 +0000 @@ -14,12 +14,12 @@ $Project name: Basic MMI $Project code: BMI (6349) - $Module: MmiDialogs - $File: MmiDialogs.h - $Revision: 1.0 + $Module: MmiDialogs + $File: MmiDialogs.h + $Revision: 1.0 - $Author: Condat(UK) - $Date: 25/10/00 + $Author: Condat(UK) + $Date: 25/10/00 ******************************************************************************** @@ -31,19 +31,19 @@ ******************************************************************************** $History: MmiDialogs.h - Apr 03, 2007 ER: OMAPS00122561 x0pleela - Description: [ACI] Phone lock feature has to be supported by ACI - Solution: Phone Lock ER implementation + Apr 03, 2007 ER: OMAPS00122561 x0pleela + Description: [ACI] Phone lock feature has to be supported by ACI + Solution: Phone Lock ER implementation - Mar 11, 2006 REF:DR:OMAPS00061467 x0035544 - Description: 27.22.4.13.3 SET UP CALL (display of icons) fails. - Solution: added the new structure T_SAT_IconData and defined its variable at the structures T_dialog_info - and T_DISPLAY_DATA. + Mar 11, 2006 REF:DR:OMAPS00061467 x0035544 + Description: 27.22.4.13.3 SET UP CALL (display of icons) fails. + Solution: added the new structure T_SAT_IconData and defined its variable at the structures T_dialog_info + and T_DISPLAY_DATA. - Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar + Feb 24, 2005 REF: CRR MMI-SPR-29102 xnkulkar Description: The phone resets when user presses the ''End All' key while the SMSs are being deleted. Solution: As the user has already confirmed that all SMS messages are to be deleted, ''End All' key - press is ignored till the delete operation is over. + press is ignored till the delete operation is over. xrashmic 08 Feb, 2005 MMI-SPR-27853 Moved the T_dialog_info structure from MmiDialogs.c to MmiDialogs.h @@ -51,10 +51,10 @@ xrashmic 08 Feb, 2005 MMI-SPR-27853 Moved the T_dialog_info structure from MmiDialogs.c to MmiDialogs.h - Jun 04,2004 CRR:13601 xpradipg - SASKEN - Description: CFO interrogation display : Timer to long - Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key - press. + Jun 04,2004 CRR:13601 xpradipg - SASKEN + Description: CFO interrogation display : Timer to long + Fix: Timer is enabled for the information dialog. It times out after 5 seconds from the last key + press. 25/10/00 Original Condat(UK) BMI version. $End @@ -74,7 +74,7 @@ #include "MmiMmi.h" //for 'DialogsDummy' #include "Mmiicons.h" -//#include "font_bitmaps.h" //For t_font_bitmap definition +//#include "font_bitmaps.h" //For t_font_bitmap definition #define TIMER_EXIT 0x0BB8 /* Default SMS timer period - 3 secs. */ /* Information dialogue display times. */ @@ -83,7 +83,7 @@ #define THREE_SECS 0x0BB8 /* 3000 milliseconds. */ #define FOUR_SECS (4000) #define FIVE_SECS 0x1388 /* 5000 milliseconds. */ -#define SIX_SECS (6000) +#define SIX_SECS (6000) #define TEN_SECS 0x2710 /* 10000 milliseconds. */ #define TWO_MIN 0x1D4C0 /* 2 min */ #define FOREVER 0xFFFF /* Infinite time period. */ @@ -101,25 +101,25 @@ #define FRAMEX2 92 #define FRAMEY2 52 -#define DLG_BORDER_VERTICAL_0 0x0000 //leave no border -#define DLG_BORDER_VERTICAL_1 0x0001 //leave 25% of bitmap to the left/right unused -#define DLG_BORDER_VERTICAL_2 0x0002 -#define DLG_BORDER_VERTICAL_3 0x0003 -#define DLG_BORDER_VERTICAL 0x0003 +#define DLG_BORDER_VERTICAL_0 0x0000 //leave no border +#define DLG_BORDER_VERTICAL_1 0x0001 //leave 25% of bitmap to the left/right unused +#define DLG_BORDER_VERTICAL_2 0x0002 +#define DLG_BORDER_VERTICAL_3 0x0003 +#define DLG_BORDER_VERTICAL 0x0003 -#define DLG_BORDER_HORIZONTAL_0 0x0000 -#define DLG_BORDER_HORIZONTAL_1 0x0004 //leave 25% of bitmap to the top/bottom unused -#define DLG_BORDER_HORIZONTAL_2 0x0008 -#define DLG_BORDER_HORIZONTAL_3 0x000C -#define DLG_BORDER_HORIZONTAL 0x000C +#define DLG_BORDER_HORIZONTAL_0 0x0000 +#define DLG_BORDER_HORIZONTAL_1 0x0004 //leave 25% of bitmap to the top/bottom unused +#define DLG_BORDER_HORIZONTAL_2 0x0008 +#define DLG_BORDER_HORIZONTAL_3 0x000C +#define DLG_BORDER_HORIZONTAL 0x000C -#define DLG_INFO_LAYOUT_BOTTOM 0x0010 //display data on bottom of bitmap -#define DLG_INFO_LAYOUT_TOP 0x0020 //display data at top of bitmap -#define DLG_INFO_LAYOUT_LEFT 0x0040 -#define DLG_INFO_LAYOUT_RIGHT 0x0080 -#define DLG_INFO_LAYOUT_CENTRE 0x0000 -#define DLG_INFO_LAYOUT_FILL 0x00F0 //move data to edges of available area +#define DLG_INFO_LAYOUT_BOTTOM 0x0010 //display data on bottom of bitmap +#define DLG_INFO_LAYOUT_TOP 0x0020 //display data at top of bitmap +#define DLG_INFO_LAYOUT_LEFT 0x0040 +#define DLG_INFO_LAYOUT_RIGHT 0x0080 +#define DLG_INFO_LAYOUT_CENTRE 0x0000 +#define DLG_INFO_LAYOUT_FILL 0x00F0 //move data to edges of available area /* @@ -159,30 +159,30 @@ #define WRAP_STRING_1 (0x01) #define WRAP_STRING_2 (0x02) -#define DLG_TYPE_NORMAL 0x01 -#define DLG_TYPE_POPUP 0x02 +#define DLG_TYPE_NORMAL 0x01 +#define DLG_TYPE_POPUP 0x02 //#define T_BITMAP t_font_bitmap - defined in Mmiicons.h //x0035544 Feb 07, 2006 DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON typedef struct { - /* SAT ICON DATA */ - U8 width; /* SAT Icon width */ - U8 height; /* SAT Icon height */ - char* dst; /* Icon data */ - BOOL selfExplanatory; + /* SAT ICON DATA */ + U8 width; /* SAT Icon width */ + U8 height; /* SAT Icon height */ + char* dst; /* Icon data */ + BOOL selfExplanatory; } T_SAT_IconData; #endif typedef struct { char * TextString; - BOOL SoftKeyStrings; // SH - TRUE if we are providing strings for softkeys rather than IDs + BOOL SoftKeyStrings; // SH - TRUE if we are providing strings for softkeys rather than IDs USHORT LeftSoftKey; USHORT RightSoftKey; - char *LSKString; // SH - Text for customised softkey - char *RSKString; // SH - Text for customised softkey + char *LSKString; // SH - Text for customised softkey + char *RSKString; // SH - Text for customised softkey ULONG Time; T_MFW_EVENT KeyEvents; USHORT TextId; @@ -190,19 +190,19 @@ char * TextString2; USHORT TextId2; T_VOID_FUNC Callback; - UBYTE WrapStrings; // GW-SPR#762 - bits 0,1 set=wrap string 1,2 + UBYTE WrapStrings; // GW-SPR#762 - bits 0,1 set=wrap string 1,2 //GW Added colour definition - U32 displayCol; + U32 displayCol; - int dlgType; //Type of popup - T_BITMAP *bgdBitmap; //Bitmap for background image - MfwRect *dlgPos; //Position of dialog - MfwIcnAttr* icon_array; - int current_icon; - UBYTE number_of_frames; - UBYTE current_frame; - T_MFW_HND animation_timer; - int anim_time; + int dlgType; //Type of popup + T_BITMAP *bgdBitmap; //Bitmap for background image + MfwRect *dlgPos; //Position of dialog + MfwIcnAttr* icon_array; + int current_icon; + UBYTE number_of_frames; + UBYTE current_frame; + T_MFW_HND animation_timer; + int anim_time; //x0035544 Feb 07, 2006 DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON T_SAT_IconData IconData; //Sat icon information @@ -221,38 +221,38 @@ T_MFW_HND info_kbd; T_MFW_HND info_kbd_long; T_MFW_HND icon; - /* + /* * animation fields */ - UBYTE number_of_frames; - UBYTE current_frame; - T_MFW_HND anim_time; - MfwIcnAttr *icon_array; - MfwIcnAttr *current_icon; - T_MFW_HND animation_timer; + UBYTE number_of_frames; + UBYTE current_frame; + T_MFW_HND anim_time; + MfwIcnAttr *icon_array; + MfwIcnAttr *current_icon; + T_MFW_HND animation_timer; - /* + /* * internal data */ char *TextString; - USHORT LeftSoftKey; - USHORT RightSoftKey; - char *LSKString; // SH - text for left soft key - char *RSKString; // SH - text for right soft key - BOOL SoftKeyStrings; // SH - TRUE if using text rather than IDs for soft keys - UBYTE WrapStrings; // GW - bits 0,1 set=wrap string 1,2 - ULONG Time; - T_MFW_EVENT KeyEvents; - USHORT TextId; - USHORT Identifier; + USHORT LeftSoftKey; + USHORT RightSoftKey; + char *LSKString; // SH - text for left soft key + char *RSKString; // SH - text for right soft key + BOOL SoftKeyStrings; // SH - TRUE if using text rather than IDs for soft keys + UBYTE WrapStrings; // GW - bits 0,1 set=wrap string 1,2 + ULONG Time; + T_MFW_EVENT KeyEvents; + USHORT TextId; + USHORT Identifier; char * TextString2; - USHORT TextId2; - T_VOID_FUNC Callback; + USHORT TextId2; + T_VOID_FUNC Callback; - U32 dlgCol; - U32 dlgType; - T_BITMAP *dlgBgdBitmap; - int dlgSkFormat; + U32 dlgCol; + U32 dlgType; + T_BITMAP *dlgBgdBitmap; + int dlgSkFormat; //x0035544 Feb 07, 2006 DR:OMAPS00061467 #ifdef FF_MMI_SAT_ICON T_SAT_IconData IconData; //Sat icon information @@ -263,10 +263,10 @@ { USHORT TitleTextId; char * TextString; -#ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ - T_ED_ATTR EditorAttrScroll; +#ifdef NEW_EDITOR /* SPR#1428 - SH - New Editor changes */ + T_ED_ATTR EditorAttrScroll; #else /* NEW_EDITOR */ - MfwEdtAttr EdtAttrScroll; + MfwEdtAttr EdtAttrScroll; #endif /* NEW_EDITOR */ USHORT LeftSoftKey; USHORT RightSoftKey; @@ -346,6 +346,3 @@ // end c018 rsa #endif - - -