--- np2/embed/menubase/menuicon.c 2003/11/21 06:51:10 1.1 +++ np2/embed/menubase/menuicon.c 2005/02/11 21:17:22 1.3 @@ -22,7 +22,7 @@ typedef struct { static ICONREG iconreg[MICON_MAX - 1]; static ICONCACHE iconcache[MICON_CACHE]; -static const BYTE icon24a[178] = { // 32x32 +static const UINT8 icon24a[178] = { // 32x32 0x07,0x17,0x00,0x00,0x80,0x01,0x7f,0xff,0x01,0x16,0x2b,0x56,0x34, 0x44,0xff,0x2e,0x29,0x31,0x2f,0x2c,0xaf,0x32,0xac,0x2e,0x3b,0x31, 0x23,0x2f,0xc2,0x00,0x14,0xff,0x2e,0x14,0x00,0x02,0x26,0x9d,0x10, @@ -38,7 +38,7 @@ static const BYTE icon24a[178] = { // 3 0x29,0x31,0x2e,0x2c,0xaa,0x64,0x10,0x34,0x1a,0x10,0x06,0xf8,0x00, 0x3e,0x34,0x0a,0x01,0x0c,0x00,0x7f,0x00,0x66}; -static const BYTE icon24am[83] = { // 32x32 +static const UINT8 icon24am[83] = { // 32x32 0x06,0x5f,0x00,0x00,0x09,0xff,0x00,0x06,0x04,0x8a,0x07,0x11,0x08, 0x96,0x07,0x8d,0xff,0x08,0x0f,0x07,0x4f,0x08,0x4e,0x07,0x93,0x08, 0x0a,0x07,0x95,0x08,0x09,0x07,0xd7,0xfe,0x08,0x06,0x07,0x98,0x08, @@ -47,7 +47,7 @@ static const BYTE icon24am[83] = { // 3 0x21,0xff,0x78,0x7b,0x98,0x24,0xa8,0x61,0xb8,0x5f,0xc8,0x60,0xd8, 0x60,0xe8,0x61,0xf8,0x56}; -static const BYTE icon24b[195] = { // 32x32 +static const UINT8 icon24b[195] = { // 32x32 0x06,0x61,0x80,0x00,0x3f,0x00,0x3f,0xc0,0xc0,0xc0,0xff,0x00,0x10, 0xff,0x05,0x02,0x15,0xbf,0x15,0x93,0x1a,0x3f,0x16,0x6b,0x19,0x75, 0x16,0x6f,0x00,0x0b,0x73,0x00,0x00,0x1c,0x17,0x17,0x33,0x83,0x00, @@ -64,7 +64,7 @@ static const BYTE icon24b[195] = { // 3 0xbf,0x7f,0x5f,0x17,0xff,0x17,0xff,0x18,0xbf,0x17,0xff,0xfe,0x18, 0x9f,0x17,0xff,0x7c,0x62,0x11,0x7f,0x00,0x3f,0x00,0x3f,0x00,0x26}; -static const BYTE icon24bm[97] = { // 32x32 +static const UINT8 icon24bm[97] = { // 32x32 0x06,0x5f,0x00,0x00,0x09,0xff,0x00,0x06,0x04,0x8a,0x07,0x11,0x08, 0x95,0x07,0x4d,0xff,0x08,0x50,0x07,0x91,0x08,0x0c,0x07,0x93,0x08, 0x0a,0x07,0x95,0x08,0x08,0x07,0x97,0xff,0x08,0x06,0x07,0x99,0x08, @@ -74,7 +74,7 @@ static const BYTE icon24bm[97] = { // 3 0x07,0xd9,0x08,0x05,0x07,0xda,0xfc,0x08,0x04,0x07,0xdb,0x08,0x03, 0x07,0xdc,0x08,0x02,0x03,0x0a}; -static const BYTE icon24c[200] = { // 32x32 +static const UINT8 icon24c[200] = { // 32x32 0x07,0x19,0x00,0x80,0x80,0x01,0x7f,0x01,0x04,0xff,0xff,0x01,0x02, 0x0e,0xc0,0xc0,0xc0,0x00,0x00,0x50,0x2e,0x07,0x31,0x0b,0x80,0xff, 0x00,0x49,0x2f,0x8e,0x01,0x03,0x2f,0xc9,0x2e,0x12,0x61,0x4c,0x2f, @@ -92,7 +92,7 @@ static const BYTE icon24c[200] = { // 3 0xe7,0xf1,0x11,0x31,0x4a,0x2e,0x11,0x31,0x09,0x00,0x46,0x2e,0x11, 0xc0,0x00,0x7f,0x00,0x3c}; -static const BYTE icon24cm[106] = { // 32x32 +static const UINT8 icon24cm[106] = { // 32x32 0x06,0x47,0x00,0x00,0x0b,0xff,0xff,0xff,0x03,0xcc,0x00,0x0e,0x07, 0x82,0xff,0x08,0x1b,0x07,0x84,0x08,0x5a,0x07,0xc7,0x08,0x16,0x07, 0x88,0x08,0x16,0x07,0xde,0xff,0x07,0x8a,0x08,0x14,0x07,0xde,0x07, @@ -103,7 +103,7 @@ static const BYTE icon24cm[106] = { // 0x08,0x02,0x07,0xfe,0x00,0x20,0x18,0x20,0xe0,0x08,0x1e,0x50,0x63, 0x60,0x5b}; -static const BYTE icon24d[179] = { // 32x32 +static const UINT8 icon24d[179] = { // 32x32 0x07,0x43,0x80,0x00,0x7f,0xc0,0xc0,0xc0,0xff,0x00,0x10,0x0a,0x02, 0xf8,0x2b,0x53,0x34,0x44,0x2c,0xa6,0x32,0xb5,0x1f,0x17,0xff,0x00, 0x00,0xdf,0x01,0x08,0x40,0x17,0x00,0x00,0x1c,0x2e,0x17,0x1c,0x85, @@ -119,7 +119,7 @@ static const BYTE icon24d[179] = { // 3 0x2b,0x41,0xfe,0x9d,0x2f,0xff,0xff,0x31,0x3f,0x2f,0xd6,0x31,0x08, 0x2f,0xd9,0xf8,0x88,0x2f,0xd9,0x00,0x7f,0x00,0x0c}; -static const BYTE icon24dm[97] = { // 32x32 +static const UINT8 icon24dm[97] = { // 32x32 0x06,0x5f,0x00,0x00,0x09,0xff,0x00,0x06,0x04,0x8a,0x07,0x11,0x08, 0x95,0x07,0x4d,0xff,0x08,0x50,0x07,0x91,0x08,0x0c,0x07,0x93,0x08, 0x0a,0x07,0x95,0x08,0x08,0x07,0x97,0xff,0x08,0x06,0x07,0x99,0x08, @@ -129,7 +129,7 @@ static const BYTE icon24dm[97] = { // 3 0x07,0xd9,0x08,0x05,0x07,0xda,0xfc,0x08,0x04,0x07,0xdb,0x08,0x03, 0x07,0xdc,0x08,0x02,0x03,0x0a}; -static const BYTE iconfld[75] = { // 32x32 +static const UINT8 iconfld[75] = { // 32x32 0x09,0x18,0x00,0x9c,0x9c,0x04,0x84,0x00,0x41,0x9c,0x9c,0xff,0x3f, 0xff,0xff,0x06,0x02,0x04,0x14,0xc4,0x3f,0xb8,0x1c,0xc4,0x3f,0xb8, 0x22,0x83,0xc4,0x39,0x9c,0x9c,0x63,0xce,0xce,0x04,0x29,0xc4,0x03, @@ -137,12 +137,23 @@ static const BYTE iconfld[75] = { // 32 0x04,0x50,0x1f,0x63,0xce,0xce,0xbf,0xff,0xbf,0xff,0xbf,0xff,0xbe, 0xc5,0x10,0x02,0xe0,0x04,0x56,0xbe,0x03,0x01,0xde}; -static const BYTE iconfldm[38] = { // 32x32 +static const UINT8 iconflp[113] = { // 32x32 + 0x09,0x18,0x00,0x9c,0x9c,0x04,0x84,0x00,0x41,0x9c,0x9c,0xff,0x3f, + 0xff,0xff,0x06,0x02,0x04,0x14,0xc4,0x3f,0xb8,0x1c,0xc4,0x3f,0xb8, + 0x22,0x83,0xc4,0x39,0x9c,0x9c,0x63,0xce,0xce,0x04,0x29,0xc4,0x03, + 0xaf,0x04,0x2e,0xff,0x00,0x55,0x00,0x00,0x05,0xbe,0x04,0x06,0x02, + 0x04,0x50,0x1f,0x63,0xce,0xce,0xbe,0xdd,0x3a,0x03,0x3e,0x02,0xbe, + 0x55,0xb8,0x05,0xff,0xc4,0x3b,0xbe,0x7a,0xb8,0x0b,0xc4,0x38,0xbe, + 0x77,0xb8,0x11,0xc4,0x35,0xbe,0x77,0xff,0xd0,0x0e,0xac,0x2f,0xbe, + 0xef,0x00,0x29,0xbe,0x2f,0xc4,0x2f,0xbe,0x32,0x04,0x3b,0xf8,0xbf, + 0x28,0x10,0x02,0x04,0x56,0xbe,0x03,0x01,0xde}; + +static const UINT8 iconfldm[38] = { // 32x32 0x0a,0x5f,0x00,0x00,0x22,0xff,0x00,0x08,0x78,0x1e,0x80,0x14,0x78, 0x0b,0x80,0x12,0xfb,0x78,0x0d,0x80,0x10,0x78,0x0f,0xb0,0x0f,0x7c, 0x1d,0xff,0x7c,0x1f,0x02,0x60,0x60,0x00,0x78,0x1e,0x00,0x7f}; -static const BYTE iconfil[178] = { // 32x32 +static const UINT8 iconfil[178] = { // 32x32 0x07,0x5b,0x84,0x00,0x6a,0xff,0x00,0x34,0x1c,0x02,0x00,0x00,0x22, 0x2f,0xbb,0xc7,0x31,0x23,0x2f,0xbb,0xc6,0xc6,0xc6,0x31,0x20,0x2f, 0xbb,0x02,0x82,0xff,0x31,0x20,0x2f,0xbe,0x31,0x20,0xef,0xff,0x00, @@ -158,15 +169,16 @@ static const BYTE iconfil[178] = { // 3 0x17,0xbf,0xad,0x00,0x31,0x2f,0xff,0x2f,0xff,0xfc,0x2f,0xff,0x2f, 0xfa,0x0d,0x02,0x00,0x44,0x2f,0x94,0x00,0x56}; -static const BYTE iconfilm[34] = { // 32x32 +static const UINT8 iconfilm[34] = { // 32x32 0x0b,0x0f,0x00,0x00,0x00,0xff,0x00,0x12,0xb0,0x02,0x00,0x08,0xf8, 0x13,0x55,0xff,0xf8,0x1f,0xff,0xf8,0x1f,0xff,0xf8,0x1f,0xff,0xf8, 0x1f,0x50,0xff,0xf8,0x1f,0xff,0xfb,0x22}; -static const MENURES icon24[6] = { +static const MENURES icon24[7] = { {32, 32, icon24a, icon24am}, {32, 32, icon24b, icon24bm}, {32, 32, icon24c, icon24cm}, {32, 32, icon24d, icon24dm}, - {32, 32, iconfld, iconfldm}, {32, 32, iconfil, iconfilm}}; + {32, 32, iconfld, iconfldm}, {32, 32, iconflp, iconfldm}, + {32, 32, iconfil, iconfilm}}; void menuicon_initialize(void) { @@ -175,7 +187,7 @@ void menuicon_initialize(void) { ZeroMemory(iconreg, sizeof(iconreg)); ZeroMemory(iconcache, sizeof(iconcache)); - for (i=0; i<6; i++) { + for (i=0; i<7; i++) { iconreg[i].res = icon24 + i; } }