Diff of /trunk/src/cache.c

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

revision 138 by harbaum, Tue Oct 20 13:25:04 2009 UTC revision 295 by harbaum, Wed Aug 18 18:59:48 2010 UTC
# Line 19  Line 19 
19    
20  #include "gpxview.h"  #include "gpxview.h"
21  #include <math.h>  #include <math.h>
22    #include <string.h>
23    
24    #if MAEMO_VERSION_MAJOR == 5
25    #include <gdk/gdkx.h>
26    #include <X11/Xatom.h>
27    #endif
28    
29  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {
30    return html_view(appdata, cache->long_description,    return html_view(appdata, cache->long_description,
31                     cache->long_is_html, TRUE, cache, NULL);             cache->long_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL);
32  }  }
33    
34  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips
# Line 41  static const char *cache_size_tip[] = { Line 47  static const char *cache_size_tip[] = {
47  #endif  #endif
48    
49  static const char *cache_size_name[] = {  static const char *cache_size_name[] = {
50    "Regular", "Small", "Micro", "Other",    "Regular", "Small", "Micro", "Other", "Not chosen", "Large", "Virtual"
   "Not chosen", "Large", "Virtual"  
51  };  };
52    
53  void bearing_fill_hbox(GtkWidget *hbox,  void bearing_fill_hbox(GtkWidget *hbox,
# Line 51  void bearing_fill_hbox(GtkWidget *hbox, Line 56  void bearing_fill_hbox(GtkWidget *hbox,
56    
57    if(!isnan(pos.lat) && !isnan(pos.lon)) {    if(!isnan(pos.lat) && !isnan(pos.lon)) {
58      gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(      gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(
59                                          icon_bearing(refpos, pos)),1,0,0);                          icon_bearing(refpos, pos)),TRUE,FALSE,0);
60    
61      if(!isnan(refpos.lat) && !isnan(refpos.lon)) {      if(!isnan(refpos.lat) && !isnan(refpos.lon)) {
       gtk_box_pack_start_defaults(GTK_BOX(hbox),  
                    GTK_LABEL_SMALL((char*)pos_get_bearing_str(refpos, pos)));  
62        snprintf(str, sizeof(str), _("%.1f°"),        snprintf(str, sizeof(str), _("%.1f°"),
63                 gpx_pos_get_bearing(refpos, pos));                 gpx_pos_get_bearing(refpos, pos));
64        gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL(str));        gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL(str));
65        gpx_pos_get_distance_str(str, sizeof(str),        gpx_pos_get_distance_str(str, sizeof(str),
66                               refpos, pos, appdata->imperial);                               refpos, pos, appdata->imperial);
67          gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL("  "));
68        gtk_box_pack_start(GTK_BOX(hbox),        gtk_box_pack_start(GTK_BOX(hbox),
69               gtk_label_attrib(str, SIZE_SMALL, STRIKETHROUGH_NONE),1,0,0);            gtk_label_attrib(str, SIZE_SMALL, STRIKETHROUGH_NONE),TRUE,FALSE,0);
70      } else      } else
71        gtk_box_pack_start(GTK_BOX(hbox),        gtk_box_pack_start(GTK_BOX(hbox),
72                           gtk_label_attrib(_("(no position)"),                   gtk_label_attrib(_("(no position)"),
73                           SIZE_SMALL, STRIKETHROUGH_NONE),1,0,0);                   SIZE_SMALL, STRIKETHROUGH_NONE),TRUE,FALSE,0);
74    } else    } else
75      gtk_box_pack_start(GTK_BOX(hbox),      gtk_box_pack_start(GTK_BOX(hbox),
76             gtk_label_attrib(_("(invalid position in notes)"),                         gtk_label_attrib(_("(invalid position in notes)"),
77                              SIZE_SMALL, STRIKETHROUGH_NONE),1,0,0);                  SIZE_SMALL, STRIKETHROUGH_NONE),TRUE,FALSE,0);
78  }  }
79    
80  /* this function sets everthing related to the coordinate. used to */  /* this function sets everything related to the coordinate. used to */
81  /* cope with the user setting a new "note coordinate" */  /* cope with the user setting a new "note coordinate" */
82  void overview_coordinate_update(cache_context_t *context) {  void overview_coordinate_update(cache_context_t *context) {
83    if(!context->notes.modified)    if(!context->notes.modified)
84      return;      return;
85    
86    /* update position labels */    /* update position labels */
87    int strike = notes_get_override(context)?STRIKETHROUGH:STRIKETHROUGH_NONE;    int strike = notes_get_override(context)?STRIKETHROUGH:STRIKETHROUGH_NONE;
88    char str[32];    lat_label_attrib_set(context->pos_lat_label,
89    pos_lat_str(str, sizeof(str), context->cache->pos.lat);                         context->cache->pos.lat, SIZE_BIG, strike);
90    gtk_label_attrib_set(context->pos_lat_label, str, SIZE_BIG, strike);    lon_label_attrib_set(context->pos_lon_label,
91    pos_lon_str(str, sizeof(str), context->cache->pos.lon);                         context->cache->pos.lon, SIZE_BIG, strike);
92    gtk_label_attrib_set(context->pos_lon_label, str, SIZE_BIG, strike);  
   
93    /* remove enire hbox and build a new one */    /* remove enire hbox and build a new one */
94    gtk_container_foreach(GTK_CONTAINER(context->bearing_hbox),    gtk_container_foreach(GTK_CONTAINER(context->bearing_hbox),
95                          (GtkCallback)gtk_widget_destroy, NULL);                          (GtkCallback)gtk_widget_destroy, NULL);
96    
97    /* update distance/etc */    /* update distance/etc */
98    if(!isnan(context->cache->pos.lat) &&    if(!isnan(context->cache->pos.lat) &&
99       !isnan(context->cache->pos.lon))       !isnan(context->cache->pos.lon))
100      bearing_fill_hbox(context->bearing_hbox, context->appdata,      bearing_fill_hbox(context->bearing_hbox, context->appdata,
101                        *get_pos(context->appdata), notes_get_pos(context));                        *get_pos(context->appdata), notes_get_pos(context));
102    
103    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
104  }  }
105    
106    static void gcvote_set(cache_context_t *context, vote_t *vote) {
107      if(!vote) return;
108    
109      if(context->quality) {
110        gtk_widget_destroy(context->quality);
111        context->quality = NULL;
112      }
113    
114      if(context->votes) {
115        gtk_widget_destroy(context->votes);
116        context->votes = NULL;
117      }
118    
119      /* update/draw the voting */
120    #ifndef USE_MAEMO
121      GtkTooltips *tips = gtk_tooltips_new();
122    #endif
123    
124      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
125                                        (vote->votes == 1)?_("vote"):_("votes"));
126      context->votes = GTK_LABEL_SMALL(votes_str);
127      gtk_box_pack_start(GTK_BOX(context->votebox),
128                         context->votes, FALSE, FALSE, 0);
129      g_free(votes_str);
130      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
131      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
132                         FALSE, FALSE, 0);
133    
134    #ifndef USE_MAEMO
135      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
136      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
137      g_free(str);
138    #endif
139    
140      gtk_widget_show_all(context->votebox);
141    
142      g_free(vote);
143    }
144    
145    static void gcvote_callback(vote_t *vote, gpointer data) {
146      cache_context_t *context = (cache_context_t*)data;
147    
148      /* no vote returned: request failed, just cleanup */
149      if(!vote) {
150        printf("gcvote: callback for failed request\n");
151    
152        gcvote_request_free(context->gcvote_request);
153        context->gcvote_request = NULL;
154        return;
155      }
156    
157      printf("gcvote: callback is being called with a %d/%d\n",
158             vote->quality, vote->votes);
159    
160      gcvote_set(context, vote);
161    
162      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
163    
164      gcvote_request_free(context->gcvote_request);
165      context->gcvote_request = NULL;
166    }
167    
168    static void pack_vcentered(GtkWidget *vbox, GtkWidget *child) {
169      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
170      gtk_container_add(GTK_CONTAINER(align), child);
171      gtk_box_pack_start_defaults(GTK_BOX(vbox), align);
172    }
173    
174    #ifdef FREMANTLE
175    #define ICON_SIZE  ICON_CACHE_TYPE_2X
176    #else
177    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
178    #endif
179    
180  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
181    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
182    GtkWidget *table, *tip;    GtkWidget *colbox, *tip;
183    char str[64];    char str[64];
184  #ifndef USE_MAEMO  #ifndef USE_MAEMO
185    GtkTooltips *tips = gtk_tooltips_new();    GtkTooltips *tips = gtk_tooltips_new();
186  #endif  #endif
187    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
188    cache_t *cache = context->cache;    cache_t *cache = context->cache;
189    
190      vbox = gtk_vbox_new(FALSE, 4);
191    
192      /* hbox containing the four columns of cache details */
193      GtkWidget *pbox = portrait_box_new(FALSE, 0);
194    
195    vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
196    
197    table =  gtk_table_new(3,4, FALSE);    /* vbox containing leftmost column (icon and container) */
198      colbox = gtk_vbox_new(FALSE, 0);
199    
200    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
201      gtk_table_attach(GTK_TABLE(table),      gtk_box_pack_start_defaults(GTK_BOX(colbox),
202               tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1,          tip = icon_get_widget(ICON_SIZE, cache->type));
203               GTK_FILL, 0, GTK_FILL, 0);  
204  #ifndef USE_MAEMO  #ifndef USE_MAEMO
205      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
206  #endif  #endif
207    }    }
208    
209    /* ------------ box containing container info ------------ */    /* ------------ box containing container info ------------ */
210    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
211      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
# Line 132  static GtkWidget *cache_overview(cache_c Line 215  static GtkWidget *cache_overview(cache_c
215      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
216                         icon_get_widget(ICON_CACHE_SIZE, cache->container),                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
217                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
218      gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,  
219                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      pack_vcentered(colbox, ivbox);
220  #ifndef USE_MAEMO  #ifndef USE_MAEMO
221      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
222  #endif  #endif
223    }    }
224    
225      gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
226      colbox = gtk_vbox_new(FALSE, 0);
227    
228    /* ----------------------- id ---------------------------- */    /* ----------------------- id ---------------------------- */
229    if(cache->id) {    if(cache->id) {
230      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
# Line 146  static GtkWidget *cache_overview(cache_c Line 232  static GtkWidget *cache_overview(cache_c
232      GtkWidget *lbl = link_button_attrib(context->appdata,      GtkWidget *lbl = link_button_attrib(context->appdata,
233                                          cache->id, context->cache->url,                                          cache->id, context->cache->url,
234                                          SIZE_BIG, strike);                                          SIZE_BIG, strike);
235      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);      pack_vcentered(colbox, lbl);
236    }    }
237    
238    /* --------------- box containing owner info ------------- */    /* --------------- box containing owner info ------------- */
239    if(cache->owner) {    if(cache->owner) {
240      ivbox = gtk_vbox_new(FALSE, 0);      gtk_box_pack_start_defaults(GTK_BOX(colbox), GTK_LABEL_SMALL(_("by")));
     gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));  
241    
242      static const char *owner_type = "profile/";      static const char *owner_type = "profile/";
243      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      pack_vcentered(colbox,
244                  link_button_by_id(appdata, cache->owner->name,                  link_button_by_id(appdata, cache->owner->name,
245                                    owner_type, cache->owner->id));                                    owner_type, cache->owner->id));
     gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);  
246    }    }
247    
248      gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
249    
250      /* pack left two columns into portrait box */
251      gtk_box_pack_start_defaults(GTK_BOX(pbox), ihbox);
252      ihbox = gtk_hbox_new(FALSE, 0);
253    
254      /* ----------- vbox containing all ratings ---------- */
255      colbox = gtk_vbox_new(FALSE, 0);
256    
257    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
258    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
259      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
# Line 170  static GtkWidget *cache_overview(cache_c Line 263  static GtkWidget *cache_overview(cache_c
263      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
264                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
265                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
266      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,0,1,  
267                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      pack_vcentered(colbox, ivbox);
268  #ifndef USE_MAEMO  #ifndef USE_MAEMO
269      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
270      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 186  static GtkWidget *cache_overview(cache_c Line 279  static GtkWidget *cache_overview(cache_c
279      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
280                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
281                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
282      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,1,2,      pack_vcentered(colbox, ivbox);
                      GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);  
283  #ifndef USE_MAEMO  #ifndef USE_MAEMO
284      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
285      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
286  #endif  #endif
287    }    }
288    
289      /* --------------------- GCVote ------------------------ */
290      if(!appdata->disable_gcvote) {
291        vote_t *vote = gcvote_restore(appdata, cache);
292    
293        context->gcvote_request =
294          gcvote_request(appdata, gcvote_callback, cache->url, context);
295    
296        context->votebox = gtk_vbox_new(FALSE, 0);
297        pack_vcentered(colbox, context->votebox);
298    
299        /* fill with vote if present on disk (will also free vote) */
300        if(vote)
301          gcvote_set(context, vote);
302      }
303    
304      gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
305    
306      /* ----------------------------------------------------- */
307    
308    
309    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
310    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
311      colbox = gtk_vbox_new(FALSE, 0);
312    
313    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
314    
315    ivbox = gtk_vbox_new(FALSE, 0);    ivbox = gtk_vbox_new(FALSE, 0);
# Line 203  static GtkWidget *cache_overview(cache_c Line 317  static GtkWidget *cache_overview(cache_c
317                    STRIKETHROUGH:STRIKETHROUGH_NONE;                    STRIKETHROUGH:STRIKETHROUGH_NONE;
318    
319    /* the original coordinate is being displayed */    /* the original coordinate is being displayed */
320    gtk_box_pack_start_defaults(GTK_BOX(ivbox),    gtk_box_pack_start(GTK_BOX(ivbox),
321         context->pos_lat_label = pos_lat(cache->pos.lat, SIZE_BIG, strike));         context->pos_lat_label = pos_lat(cache->pos.lat, SIZE_BIG, strike), FALSE, FALSE, 0);
322    gtk_box_pack_start_defaults(GTK_BOX(ivbox),    gtk_box_pack_start(GTK_BOX(ivbox),
323         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike), FALSE, FALSE, 0);
324    
325      pack_vcentered(colbox, ivbox);
326    
327    /* but calculations may be done with respect to the overriden one */    /* but calculations may be done with respect to the overriden one */
328    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
329      context->bearing_hbox = gtk_hbox_new(FALSE, 0);      context->bearing_hbox = gtk_hbox_new(FALSE, 0);
330      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,
331                        gpx_cache_pos(cache));                        gpx_cache_pos(cache));
332      gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);      pack_vcentered(colbox, context->bearing_hbox);
333    }    }
334    
335    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
336      gtk_box_pack_start_defaults(GTK_BOX(pbox), ihbox);
337    
338    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
339    
340    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), pbox, FALSE, FALSE, 0);
341    gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(),FALSE,FALSE,0);    gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
342    
343      /* ----------------------------------------------------- */
344    
345      if(cache->attribute) {
346        GtkWidget *thbox = gtk_hbox_new(FALSE, 0);
347        ihbox = gtk_hbox_new(FALSE, 0);
348    
349        attribute_t *att = cache->attribute;
350        while(att) {
351          if(att->inc)
352            tip = icon_get_widget(ICON_ATT, att->id+1);
353          else
354            tip = icon_get_widget_ovl(ICON_ATT, att->id+1, 0);
355    
356          gtk_box_pack_start(GTK_BOX(ihbox), tip, FALSE, FALSE, 4);
357    
358    #ifndef USE_MAEMO
359          gtk_tooltips_set_tip(tips, tip, _(att->name), NULL);
360    #endif
361    
362          att = att->next;
363        }
364    
365        gtk_box_pack_start(GTK_BOX(thbox), ihbox, TRUE, FALSE, 0);
366        gtk_box_pack_start(GTK_BOX(vbox), thbox, FALSE, FALSE, 0);
367        gtk_box_pack_start(GTK_BOX(vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
368      }
369    
370      /* ----------------------------------------------------- */
371    
372    if(cache->short_description)    if(cache->short_description)
373      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
374          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
375                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
376    
377    return vbox;    return vbox;
378  }  }
# Line 272  static void on_decrypt(GtkWidget *widget Line 418  static void on_decrypt(GtkWidget *widget
418  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
419    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
420    if(cache->hint_is_html)    if(cache->hint_is_html)
421      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
422    
423    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
424    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
425    
426    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
427    rot13(hint);    rot13(hint);
428    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
429        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
430    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
431    free(hint);    free(hint);
432    
# Line 340  static GtkWidget *cache_wpts(appdata_t * Line 487  static GtkWidget *cache_wpts(appdata_t *
487                        pos_lon(wpt->pos.lon, SIZE_BIG, STRIKETHROUGH_NONE),                        pos_lon(wpt->pos.lon, SIZE_BIG, STRIKETHROUGH_NONE),
488                        2,3, wpt_row, wpt_row+1);                        2,3, wpt_row, wpt_row+1);
489    
490      ihbox = gtk_hbox_new(FALSE, 0);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
491      gtk_box_pack_start(GTK_BOX(ihbox), gtk_image_new_from_pixbuf(        ihbox = gtk_hbox_new(FALSE, 0);
492          gtk_box_pack_start(GTK_BOX(ihbox), gtk_image_new_from_pixbuf(
493                             icon_bearing(*refpos, wpt->pos)),1,0,0);                             icon_bearing(*refpos, wpt->pos)),1,0,0);
494      gtk_box_pack_start_defaults(GTK_BOX(ihbox),        snprintf(str, sizeof(str), _("%.1f°"),
495            GTK_LABEL_SMALL((char*)pos_get_bearing_str(*refpos, wpt->pos)));                 gpx_pos_get_bearing(*refpos, wpt->pos));
496      snprintf(str, sizeof(str), _("%.1f°"),        gtk_box_pack_start_defaults(GTK_BOX(ihbox), GTK_LABEL_SMALL(str));
            gpx_pos_get_bearing(*refpos, wpt->pos));  
     gtk_box_pack_start_defaults(GTK_BOX(ihbox), GTK_LABEL_SMALL(str));  
     gpx_pos_get_distance_str(str, sizeof(str),  
                              *refpos, wpt->pos, appdata->imperial);  
     gtk_box_pack_start(GTK_BOX(ihbox), GTK_LABEL_SMALL(str),1,0,0);  
   
     gtk_table_attach_defaults(GTK_TABLE(table), ihbox, 3,4,  
                               wpt_row+0, wpt_row+1);  
   
     /* ------------------ description ------------------------- */  
     if(wpt->desc) {  
       GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);  
       gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));  
   
 #ifndef USE_HILDON_TEXT_VIEW  
       GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);  
 #else  
       GtkWidget *textview = hildon_text_view_new();  
       hildon_text_view_set_buffer(HILDON_TEXT_VIEW(textview), buffer);  
 #endif  
497    
498        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);        gpx_pos_get_distance_str(str, sizeof(str),
499        gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);                                 *refpos, wpt->pos, appdata->imperial);
500        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);        gtk_box_pack_start(GTK_BOX(ihbox), GTK_LABEL_SMALL(str),1,0,0);
501    
502          gtk_table_attach_defaults(GTK_TABLE(table), ihbox, 3,4,
503                                    wpt_row+0, wpt_row+1);
504        }
505    
506        gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,      /* ------------------ description ------------------------- */
507        if(wpt->desc)
508          gtk_table_attach_defaults(GTK_TABLE(table),
509                                    simple_text_widget(wpt->desc), 0,4,
510                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
511    
512      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
513      if(wpt->cmt) {      if(wpt->cmt)
514        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
515        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));                                  simple_text_widget(wpt->cmt), 0,4,
 #ifndef USE_HILDON_TEXT_VIEW  
       GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);  
 #else  
       GtkWidget *textview = hildon_text_view_new();  
       hildon_text_view_set_buffer(HILDON_TEXT_VIEW(textview), buffer);  
 #endif  
       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);  
       gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);  
       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);  
   
       gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,  
516                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
517    
518      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
519      if(wpt->next)      if(wpt->next) {
520          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
521        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
522                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
523          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
524        }
525    
526      wpt_row+=4;      wpt_row+=4;
527      wpt = wpt->next;      wpt = wpt->next;
# Line 439  static GtkWidget *cache_tbs(appdata_t *a Line 563  static GtkWidget *cache_tbs(appdata_t *a
563      static const char *tb_type = "track/details.aspx";      static const char *tb_type = "track/details.aspx";
564    
565      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
566      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      GtkWidget *icon = NULL;
567                                0, 1, tb_row+0, tb_row+1);      if((strcasestr(tb->name, "coin") != 0) ||
568           (strcasestr(tb->name, "muenze") != 0) ||
569           (strcasestr(tb->name, "münze") != 0))
570          icon = icon_get_widget(ICON_TB, 1);   /* coin icon */
571        else
572          icon = icon_get_widget(ICON_TB, 0);   /* tb icon */
573    
574        gtk_table_attach_defaults(GTK_TABLE(table), icon,
575                                  0, 1, tb_row+0, tb_row+1);
576    
577      if(tb->ref) {      if(tb->ref) {
578        GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);        GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
# Line 483  static void on_gclink_clicked(GtkButton Line 614  static void on_gclink_clicked(GtkButton
614  }  }
615  #endif  #endif
616    
617  static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context, log_t *log, int is_html) {  static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context,
618                                 log_t *log, int is_html) {
619  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
620    /* put this inside a scrolled view */    /* put this inside a scrolled view */
621    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 499  static GtkWidget *cache_logs(appdata_t * Line 631  static GtkWidget *cache_logs(appdata_t *
631  #define gc_link (FALSE)  #define gc_link (FALSE)
632  #endif  #endif
633    
634    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log)+(gc_link?1:0), 3, FALSE);    GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
   int cnt = 0;  
635    
636  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
637    if(gc_link) {    if(gc_link) {
638      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
639          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
640  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
641    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
642             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 512  static GtkWidget *cache_logs(appdata_t * Line 644  static GtkWidget *cache_logs(appdata_t *
644      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
645                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
646    
647      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start(GTK_BOX(vbox), but, FALSE, FALSE, 0);
     cnt++;  
648    }    }
649  #endif  #endif
650    
651      int logs = gpx_number_of_logs(log);
652      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
653      int log_cnt = 0;
654    
655      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
656    
657    /* add all logs to the vbox */    /* add all logs to the vbox */
658    while(log) {    while(log) {
659      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
660                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
661  #if 0  
662      static const char *log_type = "seek/log.aspx";      static const char *finder_type = "profile/";
663      GtkWidget *log_but =      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
664        link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),                                            finder_type, log->finder->id);
665                               log_type, log->id);  
666      gtk_table_attach(GTK_TABLE(table), log_but,      /* if the finder is a button make sure it's the right size and */
667                       0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);      /* does not exceed the size limits */
668  #else      if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
669      gtk_table_attach_defaults(GTK_TABLE(table),  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
670                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);        hildon_gtk_widget_set_theme_size(finder,
671  #endif                     (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
672    #endif
673    
674        gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
675                                  PANGO_ELLIPSIZE_END);
676        } else
677          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
678    
679        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
680    
681        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
682                  icon_get_widget(ICON_LOG, log->type));
683    
684      char date_str[32];      char date_str[32];
685      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 541  static GtkWidget *cache_logs(appdata_t * Line 689  static GtkWidget *cache_logs(appdata_t *
689      } else      } else
690        strcpy(date_str, "---");        strcpy(date_str, "---");
691    
692      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_box_pack_start_defaults(GTK_BOX(ihbox), gtk_label_new(date_str));
                               1, 2, cnt+1, cnt+2);  
   
     static const char *finder_type = "profile/";  
     GtkWidget *finder = link_button_by_id(appdata, log->finder->name,  
                                           finder_type, log->finder->id);  
693    
694      gtk_table_attach(GTK_TABLE(table), finder,      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
                      2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);  
695    
696      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach(GTK_TABLE(table), ivbox, 0, 1,
697                                0, 3, cnt+2, cnt+3);                       2*log_cnt, 2*log_cnt+1, 0, GTK_EXPAND | GTK_FILL, 0, 0);
698    
699      if(log->text) {      if(log->text) {
700        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
701                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
702                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
703                                    1, 2, 2*log_cnt, 2*log_cnt+1);
704        }
705    
706        if(log_cnt < logs-1) {
707          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
708    
709          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
710                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
711    
712          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
713      }      }
714    
715      log = log->next;      log = log->next;
716      cnt+=4;      log_cnt++;
717    }    }
718    
719      gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
720    
721  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
722    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
723                                          table);                                          vbox);
724    return scrolled_window;    return scrolled_window;
725  #else  #else
726    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
727                                           table);                                           vbox);
728    return pannable_area;    return pannable_area;
729  #endif  #endif
730  }  }
# Line 608  static void on_notebook_page_change(GtkN Line 762  static void on_notebook_page_change(GtkN
762    /* seems to work ... */    /* seems to work ... */
763    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
764      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
   } else if(strcasecmp(name, _("TBs")) == 0) {  
     gtk_widget_queue_resize(w);  
765    } else if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
766  #ifdef USE_MAEMO  #ifdef USE_MAEMO
767      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
768                                            context->appdata);                                            context->appdata);
769  #endif  #endif
770    
771      goto_coordinate_update(context);      goto_coordinate_update(context);
772    }    }
773    
# Line 630  static void on_notebook_destroy(GtkWidge Line 783  static void on_notebook_destroy(GtkWidge
783    
784    printf("destroying notebook\n");    printf("destroying notebook\n");
785    
786      /* cancel a pending gcvote request */
787      if(context->gcvote_request) {
788        gcvote_request_free(context->gcvote_request);
789        context->gcvote_request = NULL;
790      }
791    
792    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
793    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
794    
# Line 638  static void on_notebook_destroy(GtkWidge Line 797  static void on_notebook_destroy(GtkWidge
797      gtk_timeout_remove(context->handler_id);      gtk_timeout_remove(context->handler_id);
798  #endif  #endif
799    
800    free(user_data);  #ifdef USE_STACKABLE_WINDOW
801      if(context->notes_have_been_changed) {
802        printf("notes changed -> cachelist redraw\n");
803    
804        /* now the cachelist is visible again. so redraw it since it may */
805        /* have changed */
806        cachelist_redraw(context->appdata);
807      }
808    #endif
809    
810      printf("freeing cache context\n");
811      context->appdata->cache_context = NULL;
812      g_free(context);
813    }
814    
815    static GObject *notebook_object(GtkWidget *notebook) {
816      return G_OBJECT(notebook_get_gtk_notebook(notebook));
817  }  }
818    
819  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
820    GtkWidget *notebook;    GtkWidget *notebook;
821    
822    cache_context_t *cache_context = malloc(sizeof(cache_context_t));    cache_context_t *cache_context = g_new0(cache_context_t, 1);
823    memset(cache_context, 0, sizeof(cache_context_t));    appdata->cache_context = cache_context;
824    cache_context->appdata = appdata;    cache_context->appdata = appdata;
825    cache_context->cache = cache;    cache_context->cache = cache;
826    
# Line 657  GtkWidget *cache_view(appdata_t *appdata Line 832  GtkWidget *cache_view(appdata_t *appdata
832  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
833  #endif  #endif
834    
835    notebook =  gtk_notebook_new();    notebook = notebook_new();
   
 #ifdef USE_MAEMO  
 #if MAEMO_VERSION_MAJOR >= 5  
   /* prevents user from accidentially touching the breadcrumb trail */  
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);  
 #endif  
 #endif  
836    
837    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
838         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
839    
840    if(cache->long_description)    if(cache->long_description)
841      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
842             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
843    
844    if(cache->hint)    if(cache->hint)
845      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
846             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
847    
848    if(cache->log)    // always display log page to allow user to post a new log
849      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    if(cache->log
850    #ifdef ENABLE_BROWSER_INTERFACE
851         || (strncmp(cache->id, "GC", 2) == 0)
852    #endif
853         )
854        notebook_append_page(notebook,
855       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
856             gtk_label_new(_("Logs")));             _("Logs"));
857    
858    if(cache->wpt)    if(cache->wpt)
859      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
860               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
861    
862    if(cache->tb)    if(cache->tb)
863      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
864               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
865    
866    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    /* the demo caches don't have coordinates, so avoid */
867             cache_notes(cache_context), gtk_label_new(_("Notes")));    /* having to deal with them */
868      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
869        notebook_append_page(notebook,
870                             cache_notes(cache_context), _("Notes"));
871    
872    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
873             goto_cache(cache_context), gtk_label_new(_("Goto")));                           goto_cache(cache_context), _("Goto"));
874      }
875    
876    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
877             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
878    
879    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
880             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
881    
882    return notebook;    return notebook;
# Line 727  void cache_dialog(appdata_t *appdata, ca Line 904  void cache_dialog(appdata_t *appdata, ca
904    
905  #else  #else
906  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
907    
908    #if !defined(__i386__)
909    /* get access to zoom buttons */
910    static void
911    on_window_realize(GtkWidget *widget, gpointer data) {
912      if (widget->window) {
913        unsigned char value = 1;
914        Atom hildon_zoom_key_atom =
915          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
916          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
917        Display *dpy =
918          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
919        Window w = GDK_WINDOW_XID(widget->window);
920    
921        XChangeProperty(dpy, w, hildon_zoom_key_atom,
922                        integer_atom, 8, PropModeReplace, &value, 1);
923      }
924    }
925    #endif
926    
927  static void on_cache_destroy (GtkWidget *widget, appdata_t *appdata) {  static void on_cache_destroy (GtkWidget *widget, appdata_t *appdata) {
928    appdata->cur_cache = NULL;    appdata->cur_cache = NULL;
929    
930      HildonWindowStack *stack = hildon_window_stack_get_default();
931      appdata->window = HILDON_WINDOW(hildon_window_stack_peek(stack));
932    
933    /* restore cur_view */    /* restore cur_view */
934    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");    appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
935  }  }
936    
937  void cache_dialog(appdata_t *appdata, cache_t *cache) {  void cache_dialog(appdata_t *appdata, cache_t *cache) {
938    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
939      appdata->window = HILDON_WINDOW(window);
940    
941    #if !defined(__i386__)
942      g_signal_connect(G_OBJECT(appdata->window), "realize",
943                       G_CALLBACK(on_window_realize), NULL);
944    #endif
945    
946      g_signal_connect(G_OBJECT(appdata->window), "key_press_event",
947                       G_CALLBACK(on_window_key_press), appdata);
948    
949    /* store last "cur_view" in window */    /* store last "cur_view" in window */
950    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
951    
952    appdata->cur_cache = cache;    appdata->cur_cache = cache;
953    char *title = g_strdup_printf("%s - GPXView", cache->name);    gtk_window_set_title(GTK_WINDOW(window), cache->name);
954    gtk_window_set_title(GTK_WINDOW(window), title);  
955    g_free(title);    /* make sure window can control gps */
956      g_signal_connect(G_OBJECT(window), "focus-in-event",
957                       G_CALLBACK(on_main_focus_change), appdata);
958    
959      g_signal_connect(G_OBJECT(window), "focus-out-event",
960                       G_CALLBACK(on_main_focus_change), appdata);
961    
962    /* create cache visualization widget */    /* create cache visualization widget */
963    appdata->cur_view = cache_view(appdata, cache);    appdata->cur_view = cache_view(appdata, cache);
Legend:
Removed from v.138  
changed lines
  Added in v.295