--- trunk/src/icons.c 2009/11/23 20:12:22 205 +++ trunk/src/icons.c 2009/11/28 14:20:28 220 @@ -24,18 +24,19 @@ GdkPixbuf **data; int count; } icons[] = { - { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE */ - { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE_SEMI */ - { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE_1_5X */ - { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE_2X */ - { NULL, CACHE_CONT_MAX+1 }, /* ICON_CACHE_SIZE */ - { NULL, 9 }, /* ICON_STARS */ - { NULL, LOG_TYPE_MAX+1 }, /* ICON_LOG */ - { NULL, 9 }, /* ICON_HEADING */ - { NULL, WPT_SYM_MAX+1 }, /* ICON_WPT */ - { NULL, 2 }, /* ICON_TB */ - { NULL, 6 }, /* ICON_MISC */ - { NULL, 3 }, /* ICON_FILE */ + { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE */ + { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE_SEMI */ + { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE_1_5X */ + { NULL, CACHE_TYPE_MAX+5 }, /* ICON_CACHE_TYPE_2X */ + { NULL, CACHE_CONT_MAX+1 }, /* ICON_CACHE_SIZE */ + { NULL, 9 }, /* ICON_STARS */ + { NULL, LOG_TYPE_MAX+1 }, /* ICON_LOG */ + { NULL, 9 }, /* ICON_HEADING */ + { NULL, WPT_SYM_MAX+1 }, /* ICON_WPT */ + { NULL, 2 }, /* ICON_TB */ + { NULL, 7 }, /* ICON_MISC */ + { NULL, WPT_SYM_MAX+CACHE_TYPE_MAX+7 }, /* ICON_POS */ + { NULL, 3 }, /* ICON_FILE */ { NULL, -1 } }; @@ -91,7 +92,23 @@ /* ICON_MISC */ const char *misc_icon_name[] = { "maemo-mapper-out", "locked", "unlocked", - "maemo-mapper-in", "delete", "paypal", NULL + "maemo-mapper-in", "delete", "paypal", + "32x32/pos_geomath", + NULL +}; + +/* ICON_POS */ +const char *pos_icon_name[] = { + "wpt_multistage", "wpt_parking", "wpt_final", + "wpt_question", "wpt_trailhead", "wpt_refpoint", + + "cache_type_traditional", "cache_type_multi", "cache_type_mystery", + "cache_type_virtual", "cache_type_webcam", "cache_type_event", + "cache_type_letterbox", "cache_type_earthcache", "cache_type_wherigo", + "cache_type_megaevent", "cache_type_cito", + + "pos_btn", "pos_gps", "pos_geomath", "pos_map", "pos_home", + NULL }; /* ICON_FILE */ @@ -136,7 +153,7 @@ } } } - + g_assert(!names[i]); } @@ -187,6 +204,13 @@ /* load misc icons */ icons_load(ICON_MISC, "%s.%s", misc_icon_name); + /* load pos icons */ +#if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5) + icons_load(ICON_POS, "16x16/%s.%s", pos_icon_name); +#else + icons_load(ICON_POS, "32x32/%s.%s", pos_icon_name); +#endif + /* load file icons */ icons_load(ICON_FILE, "file_%s.%s", file_icon_name); }