Diff of /trunk/src/icons.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 229 by harbaum, Fri Dec 4 19:58:26 2009 UTC revision 249 by harbaum, Thu Jan 21 21:18:33 2010 UTC
# Line 35  struct icon_data { Line 35  struct icon_data {
35    { NULL, WPT_SYM_MAX+1 },                /* ICON_WPT             */    { NULL, WPT_SYM_MAX+1 },                /* ICON_WPT             */
36    { NULL, 2 },                            /* ICON_TB              */    { NULL, 2 },                            /* ICON_TB              */
37    { NULL, 8 },                            /* ICON_MISC            */    { NULL, 8 },                            /* ICON_MISC            */
38    { NULL, WPT_SYM_MAX+CACHE_TYPE_MAX+7 }, /* ICON_POS             */    { NULL, WPT_SYM_MAX+CACHE_TYPE_MAX+11 },/* ICON_POS             */
39    { NULL, 3 },                            /* ICON_FILE            */    { NULL, 3 },                            /* ICON_FILE            */
40    { NULL, -1 }    { NULL, -1 }
41  };  };
# Line 91  const char *tb_icon_name[] = { Line 91  const char *tb_icon_name[] = {
91    
92  /* ICON_MISC         */  /* ICON_MISC         */
93  const char *misc_icon_name[] = {  const char *misc_icon_name[] = {
94    "maemo-mapper-out", "locked", "unlocked",    "locked", "unlocked", "delete",
   "maemo-mapper-in", "delete",  
95  #ifdef FREMANTLE  #ifdef FREMANTLE
96    "64x64/paypal",    "64x64/paypal",
97  #else  #else
# Line 104  const char *misc_icon_name[] = { Line 103  const char *misc_icon_name[] = {
103  #else  #else
104    "32x32/gpxview",    "32x32/gpxview",
105  #endif  #endif
106    #ifndef USE_MAEMO
107      "16x16/speaker", "16x16/speaker_off",
108    #else
109    #ifndef FREMANTLE
110      "24x24/speaker", "24x24/speaker_off",
111    #else
112      "32x32/speaker", "32x32/speaker_off",
113    #endif
114    #endif
115    
116    NULL    NULL
117  };  };
118    
# Line 117  const char *pos_icon_name[] = { Line 126  const char *pos_icon_name[] = {
126    "cache_type_letterbox",   "cache_type_earthcache", "cache_type_wherigo",    "cache_type_letterbox",   "cache_type_earthcache", "cache_type_wherigo",
127    "cache_type_megaevent",   "cache_type_cito",    "cache_type_megaevent",   "cache_type_cito",
128    
129    "pos_btn", "pos_gps", "pos_geomath", "pos_map", "pos_home",    "pos_wpt", "pos_gps", "pos_geomath", "pos_map", "pos_home",
130    
131      "pos_get", "pos_set", "maemo-mapper", "clipboard",
132    
133    NULL    NULL
134  };  };
135    
# Line 215  void icons_init(void) { Line 227  void icons_init(void) {
227    icons_load(ICON_MISC, "%s.%s", misc_icon_name);    icons_load(ICON_MISC, "%s.%s", misc_icon_name);
228    
229    /* load pos icons */    /* load pos icons */
230  #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  #if !defined(USE_MAEMO)
231    icons_load(ICON_POS, "16x16/%s.%s", pos_icon_name);    icons_load(ICON_POS, "16x16/%s.%s", pos_icon_name);
232  #else  #else
233    #if (MAEMO_VERSION_MAJOR < 5)
234      icons_load(ICON_POS, "24x24/%s.%s", pos_icon_name);
235    #else
236    icons_load(ICON_POS, "32x32/%s.%s", pos_icon_name);    icons_load(ICON_POS, "32x32/%s.%s", pos_icon_name);
237  #endif  #endif
238    #endif
239    
240    /* load file icons */    /* load file icons */
241    icons_load(ICON_FILE, "file_%s.%s", file_icon_name);    icons_load(ICON_FILE, "file_%s.%s", file_icon_name);
Legend:
Removed from v.229  
changed lines
  Added in v.249