# HG changeset patch # User Mychaela Falconia # Date 1616906644 0 # Node ID 03ac997d2d43860807f247cbf40d82474d46d306 # Parent cf882d95c7999476dc866ea0711ea427c3e65fcd mmiIcons.c: use #if 0 and #else instead of comments for old Condat vs. TI logo selection for smallbw diff -r cf882d95c799 -r 03ac997d2d43 src/ui/bmi/mmiIcons.c --- a/src/ui/bmi/mmiIcons.c Sat Jan 30 07:40:33 2021 +0000 +++ b/src/ui/bmi/mmiIcons.c Sun Mar 28 04:44:04 2021 +0000 @@ -1638,7 +1638,8 @@ #ifndef COLOURDISPLAY const MfwIcnAttr goodbye_Attr [animGoodbye] = /* all goodby icon attributes */ { -/* { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 }, +#if 0 + { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe6 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe5 }, @@ -1647,7 +1648,8 @@ { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe2 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe1 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 }, - { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 } */ + { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 } +#else { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, @@ -1658,11 +1660,13 @@ { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] } +#endif }; const MfwIcnAttr welcome_Attr [animwelcome] = { -/* { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 }, +#if 0 + { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe1 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe2 }, @@ -1672,7 +1676,7 @@ { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe6 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 } -*/ +#else { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, @@ -1683,6 +1687,7 @@ { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] } +#endif }; #else