Diff of /trunk/src/icons.c

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

revision 213 by harbaum, Wed Nov 25 20:19:32 2009 UTC revision 220 by harbaum, Sat Nov 28 14:20:28 2009 UTC
# Line 24  struct icon_data { Line 24  struct icon_data {
24    GdkPixbuf **data;    GdkPixbuf **data;
25    int count;    int count;
26  } icons[] = {  } icons[] = {
27    { NULL, CACHE_TYPE_MAX+5 },  /* ICON_CACHE_TYPE      */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE      */
28    { NULL, CACHE_TYPE_MAX+5 },  /* ICON_CACHE_TYPE_SEMI */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE_SEMI */
29    { NULL, CACHE_TYPE_MAX+5 },  /* ICON_CACHE_TYPE_1_5X */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE_1_5X */
30    { NULL, CACHE_TYPE_MAX+5 },  /* ICON_CACHE_TYPE_2X   */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE_2X   */
31    { NULL, CACHE_CONT_MAX+1 },  /* ICON_CACHE_SIZE      */    { NULL, CACHE_CONT_MAX+1 },             /* ICON_CACHE_SIZE      */
32    { NULL, 9 },                 /* ICON_STARS           */    { NULL, 9 },                            /* ICON_STARS           */
33    { NULL, LOG_TYPE_MAX+1 },    /* ICON_LOG             */    { NULL, LOG_TYPE_MAX+1 },               /* ICON_LOG             */
34    { NULL, 9 },                 /* ICON_HEADING         */    { NULL, 9 },                            /* ICON_HEADING         */
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, 6 },                 /* ICON_MISC            */    { NULL, 7 },                            /* ICON_MISC            */
38    { NULL, WPT_SYM_MAX+3 },     /* ICON_POS             */    { NULL, WPT_SYM_MAX+CACHE_TYPE_MAX+7 }, /* ICON_POS             */
39    { NULL, 3 },                 /* ICON_FILE            */    { NULL, 3 },                            /* ICON_FILE            */
40    { NULL, -1 }    { NULL, -1 }
41  };  };
42    
# Line 93  const char *tb_icon_name[] = { Line 93  const char *tb_icon_name[] = {
93  const char *misc_icon_name[] = {  const char *misc_icon_name[] = {
94    "maemo-mapper-out", "locked", "unlocked",    "maemo-mapper-out", "locked", "unlocked",
95    "maemo-mapper-in", "delete", "paypal",    "maemo-mapper-in", "delete", "paypal",
96      "32x32/pos_geomath",
97    NULL    NULL
98  };  };
99    
100  /* ICON_POS        */  /* ICON_POS        */
101  const char *pos_icon_name[] = {  const char *pos_icon_name[] = {
102    "wpt_multistage", "wpt_parking", "wpt_final", "wpt_question",    "wpt_multistage",         "wpt_parking",           "wpt_final",
103    "wpt_trailhead", "wpt_refpoint",    "wpt_question",           "wpt_trailhead",         "wpt_refpoint",
104    
105    "pos_btn", "pos_gps",    "cache_type_traditional", "cache_type_multi",      "cache_type_mystery",
106      "cache_type_virtual",     "cache_type_webcam",     "cache_type_event",
107      "cache_type_letterbox",   "cache_type_earthcache", "cache_type_wherigo",
108      "cache_type_megaevent",   "cache_type_cito",
109    
110      "pos_btn", "pos_gps", "pos_geomath", "pos_map", "pos_home",
111    NULL    NULL
112  };  };
113    
# Line 147  static void icons_load(int type, char *f Line 153  static void icons_load(int type, char *f
153        }        }
154      }      }
155    }    }
156    
157    g_assert(!names[i]);    g_assert(!names[i]);
158  }  }
159    
# Line 199  void icons_init(void) { Line 205  void icons_init(void) {
205    icons_load(ICON_MISC, "%s.%s", misc_icon_name);    icons_load(ICON_MISC, "%s.%s", misc_icon_name);
206    
207    /* load pos icons */    /* load pos icons */
208    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
209    icons_load(ICON_POS, "16x16/%s.%s", pos_icon_name);    icons_load(ICON_POS, "16x16/%s.%s", pos_icon_name);
210    #else
211      icons_load(ICON_POS, "32x32/%s.%s", pos_icon_name);
212    #endif
213    
214    /* load file icons */    /* load file icons */
215    icons_load(ICON_FILE, "file_%s.%s", file_icon_name);    icons_load(ICON_FILE, "file_%s.%s", file_icon_name);
Legend:
Removed from v.213  
changed lines
  Added in v.220