Diff of /trunk/src/cache.c

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

revision 6 by harbaum, Wed Jun 24 19:20:21 2009 UTC revision 158 by harbaum, Wed Nov 4 14:54:52 2009 UTC
# Line 22  Line 22 
22    
23  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {
24    return html_view(appdata, cache->long_description,    return html_view(appdata, cache->long_description,
25                     cache->long_is_html, TRUE, cache, NULL);             cache->long_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL);
26  }  }
27    
28  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips
# Line 53  void bearing_fill_hbox(GtkWidget *hbox, Line 53  void bearing_fill_hbox(GtkWidget *hbox,
53      gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(      gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(
54                                          icon_bearing(refpos, pos)),1,0,0);                                          icon_bearing(refpos, pos)),1,0,0);
55    
56      if(refpos.lat && refpos.lon) {      if(!isnan(refpos.lat) && !isnan(refpos.lon)) {
57        gtk_box_pack_start_defaults(GTK_BOX(hbox),        gtk_box_pack_start_defaults(GTK_BOX(hbox),
58                     GTK_LABEL_SMALL((char*)pos_get_bearing_str(refpos, pos)));                     GTK_LABEL_SMALL((char*)pos_get_bearing_str(refpos, pos)));
59        snprintf(str, sizeof(str), _("%.1f°"),        snprintf(str, sizeof(str), _("%.1f°"),
# Line 92  void overview_coordinate_update(cache_co Line 92  void overview_coordinate_update(cache_co
92                          (GtkCallback)gtk_widget_destroy, NULL);                          (GtkCallback)gtk_widget_destroy, NULL);
93    
94    /* update distance/etc */    /* update distance/etc */
95    bearing_fill_hbox(context->bearing_hbox, context->appdata,    if(!isnan(context->cache->pos.lat) &&
96                      *get_pos(context->appdata), notes_get_pos(context));       !isnan(context->cache->pos.lon))
97        bearing_fill_hbox(context->bearing_hbox, context->appdata,
98                          *get_pos(context->appdata), notes_get_pos(context));
99    
100    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
101  }  }
102    
103  #ifdef ENABLE_BROWSER_INTERFACE  static void gcvote_callback(vote_t *vote, gpointer data) {
 static void on_www_clicked(GtkButton *button, gpointer data) {  
104    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
105    browser_url(context->appdata, context->cache->url);  
106  }    /* no vote returned: request failed, just cleanup */
107      if(!vote) {
108        printf("gcvote callback for failed request\n");
109    
110        gcvote_request_free(context->gcvote_request);
111        context->gcvote_request = NULL;
112        return FALSE;
113      }
114    
115      printf("gcvote callback is being called with a %d/%d\n",
116             vote->quality, vote->votes);
117    
118      /* update/draw the voting */
119      if(!context->quality) {
120    #ifndef USE_MAEMO
121        GtkTooltips *tips = gtk_tooltips_new();
122  #endif  #endif
123    
124        GtkWidget *ivbox = gtk_vbox_new(FALSE, 0);
125    
126        char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
127                                          (vote->votes == 1)?_("vote"):_("votes"));
128        context->votes = GTK_LABEL_SMALL(votes_str);
129        gtk_box_pack_start(GTK_BOX(ivbox), context->votes, FALSE, FALSE, 0);
130        g_free(votes_str);
131        context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
132        gtk_box_pack_start(GTK_BOX(ivbox), context->quality,
133                                   FALSE, FALSE, 0);
134    
135        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
136        gtk_container_add(GTK_CONTAINER(align), ivbox);
137        gtk_box_pack_start_defaults(GTK_BOX(context->ratebox), align);
138    #ifndef USE_MAEMO
139        char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
140        gtk_tooltips_set_tip(tips, ivbox, str, NULL);
141        g_free(str);
142    #endif
143    
144        gtk_widget_show_all(context->ratebox);
145    
146        gcvote_request_free(context->gcvote_request);
147        context->gcvote_request = NULL;
148      }
149    }
150    
151  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
152    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
153    GtkWidget *table, *tip;    GtkWidget *table, *tip;
# Line 119  static GtkWidget *cache_overview(cache_c Line 163  static GtkWidget *cache_overview(cache_c
163    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
164    
165    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
166      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
167        tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1);               tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1,
168                 GTK_FILL, 0, GTK_FILL, 0);
169  #ifndef USE_MAEMO  #ifndef USE_MAEMO
170      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
171  #endif  #endif
# Line 130  static GtkWidget *cache_overview(cache_c Line 175  static GtkWidget *cache_overview(cache_c
175    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
176      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
177      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
178      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
179      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
180          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
181      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
182                           FALSE, FALSE, 0);
183        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
184                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
185  #ifndef USE_MAEMO  #ifndef USE_MAEMO
186      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
187  #endif  #endif
# Line 143  static GtkWidget *cache_overview(cache_c Line 191  static GtkWidget *cache_overview(cache_c
191    if(cache->id) {    if(cache->id) {
192      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
193        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
194      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
195                                            cache->id, context->cache->url,
196  #ifdef ENABLE_BROWSER_INTERFACE                                          SIZE_BIG, strike);
     if(!cache->url)  
 #endif  
       lbl = gtk_label_attrib(cache->id, SIZE_BIG, strike);  
 #ifdef ENABLE_BROWSER_INTERFACE  
     else {  
       /* add Go button */  
       lbl = gtk_button_attrib(cache->id, SIZE_BIG, strike);  
       //      gtk_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NONE);  
       gtk_signal_connect(GTK_OBJECT(lbl), "clicked",  
                          (GtkSignalFunc)on_www_clicked, context);  
     }  
 #endif  
   
197      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);
198    }    }
199    
# Line 166  static GtkWidget *cache_overview(cache_c Line 201  static GtkWidget *cache_overview(cache_c
201    if(cache->owner) {    if(cache->owner) {
202      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
203      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
204      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
205      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
206        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
207                    link_button_by_id(appdata, cache->owner->name,
208                                      owner_type, cache->owner->id));
209        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
210    }    }
211    
212      /* ----------- vbox containing all ratings ---------- */
213      GtkWidget *ratebox = context->ratebox = gtk_vbox_new(FALSE, 0);
214    
215    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
216    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
217      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
218      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
219                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
220      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
221         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
222      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
223                           FALSE, FALSE, 0);
224    
225        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
226        gtk_container_add(GTK_CONTAINER(align), ivbox);
227        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
228  #ifndef USE_MAEMO  #ifndef USE_MAEMO
229      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
230      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 187  static GtkWidget *cache_overview(cache_c Line 234  static GtkWidget *cache_overview(cache_c
234    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
235    if(cache->terrain != 0) {    if(cache->terrain != 0) {
236      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
237      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
238      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
239        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
240      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
241                           FALSE, FALSE, 0);
242        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
243        gtk_container_add(GTK_CONTAINER(align), ivbox);
244        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
245  #ifndef USE_MAEMO  #ifndef USE_MAEMO
246      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
247      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
248  #endif  #endif
249    }    }
250    
251      /* --------------------- GCVote ------------------------ */
252      /* gcvote if present and possible */
253    
254      context->gcvote_request =
255        gcvote_request(appdata, gcvote_callback, cache->url, context);
256    
257    #if 0
258      vote_t *vote = gcvote_get(appdata, cache->url);
259      if(vote) {
260        ivbox = gtk_vbox_new(FALSE, 0);
261    
262        char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
263                                          (vote->votes == 1)?_("vote"):_("votes"));
264        gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(votes_str),
265                           FALSE, FALSE, 0);
266        g_free(votes_str);
267        gtk_box_pack_start(GTK_BOX(ivbox),
268             icon_get_widget(ICON_STARS, (int)(vote->quality*2-2)), FALSE, FALSE, 0);
269    
270        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
271        gtk_container_add(GTK_CONTAINER(align), ivbox);
272        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
273    #ifndef USE_MAEMO
274        sprintf(str, _("Quality: %d"), vote->quality);
275        gtk_tooltips_set_tip(tips, ivbox, str, NULL);
276    #endif
277    
278        gcvote_free(vote);
279      }
280    #endif
281    
282      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
283    
284      /* ----------------------------------------------------- */
285    
286    
287    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
288    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
289    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 212  static GtkWidget *cache_overview(cache_c Line 299  static GtkWidget *cache_overview(cache_c
299         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));
300    
301    /* but calculations may be done with respect to the overriden one */    /* but calculations may be done with respect to the overriden one */
302    context->bearing_hbox = gtk_hbox_new(FALSE, 0);    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
303    bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,      context->bearing_hbox = gtk_hbox_new(FALSE, 0);
304                      gpx_cache_pos(cache));      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,
305    gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);                        gpx_cache_pos(cache));
306        gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);
307      }
308    
309    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);
310    
# Line 224  static GtkWidget *cache_overview(cache_c Line 313  static GtkWidget *cache_overview(cache_c
313    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
314    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);
315    
316      /* ----------------------------------------------------- */
317    
318    if(cache->short_description)    if(cache->short_description)
319      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
320          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
321                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
322    
323    return vbox;    return vbox;
324  }  }
325    
326  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
327  static void rot13(char *t) {  static void rot13(char *t) {
328      int braces = 0;
329    
330    while(*t) {    while(*t) {
331      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
332         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
333      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
334              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
335                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
336          else if(((*t >= 'n') && (*t <= 'z')) ||
337                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
338        } else {
339          if(braces > 0 && *t == ']')
340            braces--;
341        }
342    
343      t++;      t++;
344    }    }
# Line 264  static void on_decrypt(GtkWidget *widget Line 364  static void on_decrypt(GtkWidget *widget
364  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
365    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
366    if(cache->hint_is_html)    if(cache->hint_is_html)
367      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
368    
369    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
370    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
371    
372    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
373    rot13(hint);    rot13(hint);
374    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
375        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
376    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
377    free(hint);    free(hint);
378    
379    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
380    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
381      hildon_gtk_widget_set_theme_size(button,
382               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
383    #endif
384    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
385    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
386             GTK_SIGNAL_FUNC(on_decrypt), gtk_bin_get_child(GTK_BIN(view)));             GTK_SIGNAL_FUNC(on_decrypt), gtk_bin_get_child(GTK_BIN(view)));
# Line 349  static GtkWidget *cache_wpts(appdata_t * Line 453  static GtkWidget *cache_wpts(appdata_t *
453        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
454        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));
455    
456  #ifndef USE_MAEMO  #ifndef USE_HILDON_TEXT_VIEW
457        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);
458  #else  #else
459        GtkWidget *textview = hildon_text_view_new();        GtkWidget *textview = hildon_text_view_new();
# Line 368  static GtkWidget *cache_wpts(appdata_t * Line 472  static GtkWidget *cache_wpts(appdata_t *
472      if(wpt->cmt) {      if(wpt->cmt) {
473        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
474        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));
475  #ifndef USE_MAEMO  #ifndef USE_HILDON_TEXT_VIEW
476        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);
477  #else  #else
478        GtkWidget *textview = hildon_text_view_new();        GtkWidget *textview = hildon_text_view_new();
# Line 425  static GtkWidget *cache_tbs(appdata_t *a Line 529  static GtkWidget *cache_tbs(appdata_t *a
529    
530    int tb_row=0;    int tb_row=0;
531    while(tb) {    while(tb) {
532        static const char *tb_type = "track/details.aspx";
533    
534      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
535      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),
536                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
537      if(tb->ref)  
538        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
539        if(tb->ref) {
540          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
541          gtk_table_attach_defaults(GTK_TABLE(table), ref,
542                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
543        }
544    
545      if(tb->name)      if(tb->name)
546        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
547                                  2, 3, tb_row+0, tb_row+1);                                  2, 3, tb_row+0, tb_row+1);
# Line 456  static GtkWidget *cache_tbs(appdata_t *a Line 567  static GtkWidget *cache_tbs(appdata_t *a
567  #endif  #endif
568  }  }
569    
570  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
571    static void on_gclink_clicked(GtkButton *button, gpointer data) {
572      cache_context_t *context = (cache_context_t*)data;
573      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
574      browser_url(context->appdata, url);
575      g_free(url);
576    }
577    #endif
578    
579    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context, log_t *log, int is_html) {
580  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
581    /* put this inside a scrolled view */    /* put this inside a scrolled view */
582    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 466  static GtkWidget *cache_logs(appdata_t * Line 586  static GtkWidget *cache_logs(appdata_t *
586    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
587  #endif  #endif
588    
589    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
590      gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
591    #else
592    #define gc_link (FALSE)
593    #endif
594    
595      GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log)+(gc_link?1:0), 3, FALSE);
596    int cnt = 0;    int cnt = 0;
597    
598    #ifdef ENABLE_BROWSER_INTERFACE
599      if(gc_link) {
600        GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));
601    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
602      hildon_gtk_widget_set_theme_size(but,
603               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
604    #endif
605        gtk_signal_connect(GTK_OBJECT(but), "clicked",
606                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
607    
608        gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);
609        cnt++;
610      }
611    #endif
612    
613    /* add all logs to the vbox */    /* add all logs to the vbox */
614    while(log) {    while(log) {
615      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
616                                0, 3, cnt+0, cnt+1);                                0, 3, cnt+0, cnt+1);
617    #if 0
618        static const char *log_type = "seek/log.aspx";
619        GtkWidget *log_but =
620          link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),
621                                 log_type, log->id);
622        gtk_table_attach(GTK_TABLE(table), log_but,
623                         0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
624    #else
625      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach_defaults(GTK_TABLE(table),
626                                icon_get_widget(ICON_LOG, log->type),                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);
627                                0, 1, cnt+1, cnt+2);  #endif
628    
629      char date_str[32];      char date_str[32];
630      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 488  static GtkWidget *cache_logs(appdata_t * Line 637  static GtkWidget *cache_logs(appdata_t *
637      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),
638                                1, 2, cnt+1, cnt+2);                                1, 2, cnt+1, cnt+2);
639    
640      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      static const char *finder_type = "profile/";
641                                2, 3, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
642                                              finder_type, log->finder->id);
643    
644        gtk_table_attach(GTK_TABLE(table), finder,
645                         2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
646    
647      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
648                                0, 3, cnt+2, cnt+3);                                0, 3, cnt+2, cnt+3);
649    
650      if(log->text) {      if(log->text) {
651        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
652                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
653                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
654                                    0, 3, cnt+3, cnt+4);
655      }      }
656    
657      log = log->next;      log = log->next;
658      cnt+=4;      cnt+=4;
659    }    }
# Line 543  static void on_notebook_page_change(GtkN Line 698  static void on_notebook_page_change(GtkN
698    
699    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
700    /* i tried to get info on this and everybody agreed that this is a bug */    /* i tried to get info on this and everybody agreed that this is a bug */
701    /* in gtk but noone had a read fix. so i came up with this. */    /* in gtk but noone had a fix ready. so i came up with this. */
702    /* seems to work ... */    /* seems to work ... */
703    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
704      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
705    }    } else if(strcasecmp(name, _("TBs")) == 0) {
706        gtk_widget_queue_resize(w);
707    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
708  #ifdef USE_MAEMO  #ifdef USE_MAEMO
709      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
710                                            context->appdata);                                            context->appdata);
# Line 597  GtkWidget *cache_view(appdata_t *appdata Line 752  GtkWidget *cache_view(appdata_t *appdata
752  #endif  #endif
753    
754    notebook =  gtk_notebook_new();    notebook =  gtk_notebook_new();
755    
756  #ifdef USE_MAEMO  #ifdef USE_MAEMO
757  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
758    /* prevents user from accidentially touching the breadcrumb trail */    /* prevents user from accidentially touching the breadcrumb trail */
# Line 617  GtkWidget *cache_view(appdata_t *appdata Line 773  GtkWidget *cache_view(appdata_t *appdata
773    
774    if(cache->log)    if(cache->log)
775      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
776             cache_logs(appdata, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
777             gtk_label_new(_("Logs")));             gtk_label_new(_("Logs")));
778    
779    if(cache->wpt)    if(cache->wpt)
# Line 665  void cache_dialog(appdata_t *appdata, ca Line 821  void cache_dialog(appdata_t *appdata, ca
821    
822  #else  #else
823  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
824    static void on_cache_destroy (GtkWidget *widget, appdata_t *appdata) {
825      appdata->cur_cache = NULL;
826    
827      /* restore cur_view */
828      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
829    }
830    
831  void cache_dialog(appdata_t *appdata, cache_t *cache) {  void cache_dialog(appdata_t *appdata, cache_t *cache) {
832    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
833    
834    char *title = g_strdup_printf("GPXView - %s", cache->name);    /* store last "cur_view" in window */
835      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
836    
837      appdata->cur_cache = cache;
838      char *title = g_strdup_printf("%s - GPXView", cache->name);
839    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
840    g_free(title);    g_free(title);
841    
842    /* create cache visualization widget */    /* create cache visualization widget */
843    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_view = cache_view(appdata, cache);
844                      cache_view(appdata, cache));    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
845    
846    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
847                               menu_create(appdata, MENU_CACHE));                               menu_create(appdata, MENU_CACHE));
848    
849      g_signal_connect(G_OBJECT(window), "destroy",
850                       G_CALLBACK(on_cache_destroy), appdata);
851    
852    gtk_widget_show_all(window);    gtk_widget_show_all(window);
853  }  }
854  #endif // USE_STACKABLE_WINDOW  #endif // USE_STACKABLE_WINDOW
Legend:
Removed from v.6  
changed lines
  Added in v.158