FreeCalypso > hg > fc-tourmaline
diff src/ui/bmi/mmiSoftKeys.c @ 92:c0052fe355d3
src/ui/bmi/*.[ch]: rm trailing white space
| author | Mychaela Falconia <falcon@freecalypso.org> |
|---|---|
| date | Sun, 08 Nov 2020 06:39:16 +0000 |
| parents | 67bfe9f274f6 |
| children | 717f87d300ae |
line wrap: on
line diff
--- a/src/ui/bmi/mmiSoftKeys.c Sun Nov 08 05:12:05 2020 +0000 +++ b/src/ui/bmi/mmiSoftKeys.c Sun Nov 08 06:39:16 2020 +0000 @@ -2,27 +2,27 @@ CONDAT (UK) -******************************************************************************** +******************************************************************************** This software product is the property of Condat (UK) Ltd and may not be - disclosed to any third party without the express permission of the owner. - + disclosed to any third party without the express permission of the owner. + ******************************************************************************** - $Project name: Basic MMI - $Project code: BMI (6349) + $Project name: Basic MMI + $Project code: BMI (6349) $Module: Softkeys $File: MmiSoftkeys.c - $Revision: 1.0 - - $Author: Condat(UK) - $Date: 22/02/01 - + $Revision: 1.0 + + $Author: Condat(UK) + $Date: 22/02/01 + ******************************************************************************** - + Description: - + ******************************************************************************** @@ -31,17 +31,17 @@ xrashmic 5 Oct, 2005 MMI-SPR-29356, MMI-SPR-29357 To display '?' to indicate to the user that help is available for a STK menu - 25/10/00 Original Condat(UK) BMI version. - + 25/10/00 Original Condat(UK) BMI version. + $End *******************************************************************************/ /******************************************************************************* - + Include Files - + *******************************************************************************/ #define ENTITY_MFW @@ -349,27 +349,27 @@ /******************************************************************************* - $Function: + $Function: + + $Description: - $Description: - - $Returns: + $Returns: - $Arguments: - + $Arguments: + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ static void softKeys_displayAll(T_SK_DSPL_STRUCT* sk_data , int format, unsigned int colIndex ) { resources_setSKColour(colIndex); -// #ifdef COLOURDISPLAY +// #ifdef COLOURDISPLAY dspl_Clear( sk_data->rect->px, sk_data->rect->py, sk_data->rect->px+sk_data->rect->sx-1, sk_data->rect->py+sk_data->rect->sy-1); - /* Line height must be less than rect.sy */ + /* Line height must be less than rect.sy */ // #endif if (sk_data->lsk.str!= NULL) dspl_TextOut(sk_data->lsk.posX, sk_data->lsk.posY,DSPL_TXTATTR_CURRENT_MODE, sk_data->lsk.str); @@ -380,22 +380,22 @@ /******************************************************************************* - $Function: + $Function: + + $Description: - $Description: - - $Returns: + $Returns: - $Arguments: - + $Arguments: + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ void softKeys_displayStrXY(char* leftSoftKey_str,char* rightSoftKey_str, int format, unsigned int colIndex, MfwRect* rect ) { MfwRect defRect; - + T_SK_DSPL_STRUCT sk_data; sk_data.lsk.str = leftSoftKey_str; sk_data.rsk.str = rightSoftKey_str; @@ -403,7 +403,7 @@ sk_data.rect = rect; else { - Mmi_layout_softkeyArea( &defRect ); + Mmi_layout_softkeyArea( &defRect ); sk_data.rect = &defRect; } sk_data.lsk.posY = sk_data.rect->py + (sk_data.rect->sy-Mmi_layout_line_height())/2; @@ -415,16 +415,16 @@ } /******************************************************************************* - $Function: + $Function: + + $Description: - $Description: - - $Returns: + $Returns: - $Arguments: - + $Arguments: + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ void softKeys_displayStr(char* leftSoftKey_str,char* rightSoftKey_str, int format, int unsigned colIndex) @@ -434,16 +434,16 @@ /******************************************************************************* - $Function: + $Function: + + $Description: - $Description: - - $Returns: + $Returns: - $Arguments: - + $Arguments: + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ void softKeys_displayId(int leftSoftKey,int rightSoftKey, int format, unsigned int colIndex) @@ -456,16 +456,16 @@ /******************************************************************************* - $Function: + $Function: + + $Description: - $Description: - - $Returns: + $Returns: - $Arguments: - + $Arguments: + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ //Old function - replace with calls to 'softKeys_displayId' @@ -480,23 +480,23 @@ /******************************************************************************* - $Function: + $Function: + + $Description: - $Description: - - $Returns: + $Returns: - $Arguments: - + $Arguments: + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ void displaySoftKeysXY(int leftSoftKey,int rightSoftKey,int lskX,int rskX, int lpos) { char *lsk,*rsk; MfwRect rect; - + lsk = MmiRsrcGetText(leftSoftKey); rsk = MmiRsrcGetText(rightSoftKey); rect.px = lskX; @@ -514,12 +514,12 @@ $Function: displaySoftKeys_edition - $Description: - - $Returns: + $Description: - $Arguments: - + $Returns: + + $Arguments: + $History *******************************************************************************/ @@ -527,7 +527,7 @@ { char *lsk,*rsk, *ind; USHORT lpos; - + lsk = MmiRsrcGetText(leftSoftKey); ind = MmiRsrcGetText(index); rsk = MmiRsrcGetText(rightSoftKey); @@ -546,16 +546,16 @@ $Function: displayCustSoftKeys $Description: Display softkeys with text strings instead of text ID's - + $Returns: None - $Arguments: LeftSoftKey - char array to be displayed at the bottom-left of the display + $Arguments: LeftSoftKey - char array to be displayed at the bottom-left of the display or NULL if no string is to be displayed RightSoftKey- char array to be displayed at the bottom-right of the display or NULL if no string is to be displayed - + $History - GW 28/11/02 - + GW 28/11/02 - *******************************************************************************/ // SH - 25/5/01 @@ -567,27 +567,27 @@ softKeys_displayStrXY(LeftSoftKey,RightSoftKey,0,COLOUR_LIST_MAIN, NULL); } - + /******************************************************************************* $Function: displayHelpSymbol $Description: Displaying '?' to indicate to the user that help is available for a menu xrashmic 5 Oct, 2005 MMI-SPR-29356, MMI-SPR-29357 - + $Returns: None - $Arguments: None + $Arguments: None *******************************************************************************/ void displayHelpSymbol(void) { MfwRect defRect, rect; /* x0045876, 14-Aug-2006 (WR - "line_height" & "sk_data" was declared but never referenced) */ - /* U16 line_height; + /* U16 line_height; T_SK_DSPL_STRUCT sk_data; */ - Mmi_layout_softkeyArea( &defRect ); - rect.px = defRect.sx >> 1; + Mmi_layout_softkeyArea( &defRect ); + rect.px = defRect.sx >> 1; rect.py = defRect.py + 4; resources_setSKColour(COLOUR_LIST_XX); //Display the symbol in the center between the softkeys @@ -621,16 +621,16 @@ $Description: Displaying Camera icon to indicate to the user that user can use the menu select key to capture the image. - + $Returns: None - $Arguments: None + $Arguments: None *******************************************************************************/ void displayCameraIcon(void) { MfwRect rect; - - rect.px = (SCREEN_SIZE_X - ICON_WIDTH)/2; + + rect.px = (SCREEN_SIZE_X - ICON_WIDTH)/2; rect.py = ((SCREEN_SIZE_Y - ICON_HEIGHT) -((Mmi_layout_softkeyHeight() -ICON_HEIGHT)/2)); rect.sx = ICON_WIDTH; rect.sy = ICON_HEIGHT; @@ -731,16 +731,16 @@ $Description: Displaying Camera icon to indicate to the user that user can use the menu select key to capture the image. - + $Returns: None - $Arguments: None + $Arguments: None *******************************************************************************/ void displayMenuKeys(T_MENU_KEY key) { MfwRect rect; char * buf = NULL; - rect.px = (SCREEN_SIZE_X - ICON_WIDTH)/2; + rect.px = (SCREEN_SIZE_X - ICON_WIDTH)/2; rect.py = ((SCREEN_SIZE_Y - ICON_HEIGHT) -((Mmi_layout_softkeyHeight() -MENU_ICON_HEIGHT)/2)); rect.sx = MENU_ICON_WIDTH; rect.sy = MENU_ICON_HEIGHT; @@ -762,7 +762,7 @@ break; case MENU_KEY_WAIT: buf = (char *)wait; - break; + break; } dspl_Clear(rect.px, rect.py, rect.px+rect.sx-1,rect.py+rect.sy-1); dspl_BitBlt2(rect.px, rect.py, rect.sx,rect.sy,buf, 0,ICON_TYPE_256_COL);