--- trunk/src/icons.c 2009/08/12 19:18:53 53 +++ trunk/src/icons.c 2009/11/11 20:21:55 176 @@ -24,19 +24,22 @@ GdkPixbuf **data; int count; } icons[] = { - { NULL, CACHE_TYPE_MAX+1 }, /* ICON_CACHE_TYPE */ - { 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, 1 }, /* ICON_TB */ - { NULL, 12 }, /* ICON_MISC */ - { NULL, 3 }, /* ICON_FILE */ + { NULL, CACHE_TYPE_MAX+1 }, /* ICON_CACHE_TYPE */ + { NULL, CACHE_TYPE_MAX+1 }, /* ICON_CACHE_TYPE_SEMI */ + { NULL, CACHE_TYPE_MAX+1 }, /* ICON_CACHE_TYPE_1_5X */ + { NULL, CACHE_TYPE_MAX+1 }, /* 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, 1 }, /* ICON_TB */ + { NULL, 9 }, /* ICON_MISC */ + { NULL, 3 }, /* ICON_FILE */ { NULL, -1 } }; -/* ICON_CACHE_TYPE */ +/* ICON_CACHE_TYPE / ICON_CACHE_TYPE_SEMI / ICON_CACHE_TYPE_2X */ const char *cache_type_icon_name[] = { "traditional", "multi", "mystery", "virtual", "webcam", "event", "letterbox", "earthcache", "wherigo", "megaevent", "cito" @@ -76,14 +79,13 @@ /* ICON_TB */ const char *tb_icon_name[] = { - "tb_coin" + "tb" }; /* ICON_MISC */ const char *misc_icon_name[] = { "maemo-mapper-out", "override", "locked", "unlocked", "found", - "maemo-mapper-in", "note", "delete", "paypal", - "user", "zoomin", "zoomout" + "maemo-mapper-in", "note", "delete", "paypal" }; /* ICON_FILE */ @@ -155,6 +157,15 @@ /* load cache type icons */ icons_load(ICON_CACHE_TYPE, "cache_type_%s.%s", cache_type_icon_name); + /* load semitransparent cache type icons */ + icons_load(ICON_CACHE_TYPE_SEMI, "cache_type_%s_semi.%s", cache_type_icon_name); + + /* load 150% sized cache type icons */ + icons_load(ICON_CACHE_TYPE_1_5X, "cache_type_%s_1.5x.%s", cache_type_icon_name); + + /* load double sized cache type icons */ + icons_load(ICON_CACHE_TYPE_2X, "cache_type_%s_2x.%s", cache_type_icon_name); + /* load cache container/size icons */ icons_load(ICON_CACHE_SIZE, "cache_size_%s.%s", cache_size_icon_name);