Diff of /trunk/src/icons.c

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

revision 189 by harbaum, Tue Nov 17 09:07:17 2009 UTC revision 246 by harbaum, Tue Jan 19 20:26:37 2010 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+4 },  /* ICON_CACHE_TYPE      */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE      */
28    { NULL, CACHE_TYPE_MAX+4 },  /* ICON_CACHE_TYPE_SEMI */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE_SEMI */
29    { NULL, CACHE_TYPE_MAX+4 },  /* ICON_CACHE_TYPE_1_5X */    { NULL, CACHE_TYPE_MAX+5 },             /* ICON_CACHE_TYPE_1_5X */
30    { NULL, CACHE_TYPE_MAX+4 },  /* 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, 8 },                            /* ICON_MISC            */
38    { NULL, 3 },                 /* ICON_FILE            */    { NULL, WPT_SYM_MAX+CACHE_TYPE_MAX+10 },/* ICON_POS             */
39      { NULL, 3 },                            /* ICON_FILE            */
40    { NULL, -1 }    { NULL, -1 }
41  };  };
42    
# Line 45  const char *cache_type_icon_name[] = { Line 46  const char *cache_type_icon_name[] = {
46    "letterbox",   "earthcache", "wherigo", "megaevent", "cito",    "letterbox",   "earthcache", "wherigo", "megaevent", "cito",
47    
48    /* special overlays */    /* special overlays */
49    "ovl_override", "ovl_found", "ovl_note",    "ovl_override", "ovl_found", "ovl_note", "ovl_mine",
50    
51    NULL    NULL
52  };  };
# Line 90  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",
95    "maemo-mapper-in", "delete", "paypal", NULL  #ifdef FREMANTLE
96      "64x64/paypal",
97    #else
98      "32x32/paypal",
99    #endif
100      "32x32/pos_geomath",
101    #ifdef FREMANTLE
102      "64x64/gpxview",
103    #else
104      "32x32/gpxview",
105    #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
117    };
118    
119    /* ICON_POS        */
120    const char *pos_icon_name[] = {
121      "wpt_multistage",         "wpt_parking",           "wpt_final",
122      "wpt_question",           "wpt_trailhead",         "wpt_refpoint",
123    
124      "cache_type_traditional", "cache_type_multi",      "cache_type_mystery",
125      "cache_type_virtual",     "cache_type_webcam",     "cache_type_event",
126      "cache_type_letterbox",   "cache_type_earthcache", "cache_type_wherigo",
127      "cache_type_megaevent",   "cache_type_cito",
128    
129      "pos_wpt", "pos_gps", "pos_geomath", "pos_map", "pos_home",
130    
131      "pos_get", "pos_set", "maemo-mapper",
132    
133      NULL
134  };  };
135    
136  /* ICON_FILE         */  /* ICON_FILE         */
# Line 136  static void icons_load(int type, char *f Line 175  static void icons_load(int type, char *f
175        }        }
176      }      }
177    }    }
178    
179    g_assert(!names[i]);    g_assert(!names[i]);
180  }  }
181    
# Line 187  void icons_init(void) { Line 226  void icons_init(void) {
226    /* load misc icons */    /* load misc icons */
227    icons_load(ICON_MISC, "%s.%s", misc_icon_name);    icons_load(ICON_MISC, "%s.%s", misc_icon_name);
228    
229      /* load pos icons */
230    #if !defined(USE_MAEMO)
231      icons_load(ICON_POS, "16x16/%s.%s", pos_icon_name);
232    #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);
237    #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);
242  }  }
Legend:
Removed from v.189  
changed lines
  Added in v.246