comparison src/ui/bmi/mmiIcons.c @ 193:03ac997d2d43

mmiIcons.c: use #if 0 and #else instead of comments for old Condat vs. TI logo selection for smallbw
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 28 Mar 2021 04:44:04 +0000
parents 8129ee8ee6c2
children 86375353219d
comparison
equal deleted inserted replaced
192:cf882d95c799 193:03ac997d2d43
1636 #endif 1636 #endif
1637 1637
1638 #ifndef COLOURDISPLAY 1638 #ifndef COLOURDISPLAY
1639 const MfwIcnAttr goodbye_Attr [animGoodbye] = /* all goodby icon attributes */ 1639 const MfwIcnAttr goodbye_Attr [animGoodbye] = /* all goodby icon attributes */
1640 { 1640 {
1641 /* { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 }, 1641 #if 0
1642 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 },
1642 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 }, 1643 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 },
1643 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe6 }, 1644 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe6 },
1644 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe5 }, 1645 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe5 },
1645 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe4 }, 1646 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe4 },
1646 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe3 }, 1647 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe3 },
1647 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe2 }, 1648 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe2 },
1648 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe1 }, 1649 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe1 },
1649 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 }, 1650 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 },
1650 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 } */ 1651 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 }
1652 #else
1651 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1653 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1652 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1654 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1653 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1655 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1654 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1656 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1655 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1657 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1656 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1658 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1657 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1659 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1658 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1660 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1659 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1661 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1660 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] } 1662 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }
1663 #endif
1661 }; 1664 };
1662 1665
1663 const MfwIcnAttr welcome_Attr [animwelcome] = 1666 const MfwIcnAttr welcome_Attr [animwelcome] =
1664 { 1667 {
1665 /* { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 }, 1668 #if 0
1669 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 },
1666 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 }, 1670 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 },
1667 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe1 }, 1671 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+13, 56, 19 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe1 },
1668 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe2 }, 1672 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+12, 56, 21 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe2 },
1669 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe3 }, 1673 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+11, 56, 23 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe3 },
1670 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe4 }, 1674 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+9, 56, 27 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe4 },
1671 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe5 }, 1675 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+6, 56, 32 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe5 },
1672 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe6 }, 1676 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+4, 56, 36 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe6 },
1673 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 }, 1677 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 },
1674 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 } 1678 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 }
1675 */ 1679 #else
1676 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1680 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1677 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1681 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1678 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1682 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1679 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1683 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1680 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1684 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1681 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1685 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1682 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1686 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1683 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1687 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1684 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, 1688 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] },
1685 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] } 1689 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }
1690 #endif
1686 }; 1691 };
1687 1692
1688 #else 1693 #else
1689 1694
1690 const MfwIcnAttr welcome_Attr [animwelcome] = 1695 const MfwIcnAttr welcome_Attr [animwelcome] =