Diff of /trunk/src/cache.c

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 157 by harbaum, Tue Nov 3 20:20:39 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    gtk_widget_show_all(context->bearing_hbox);      bearing_fill_hbox(context->bearing_hbox, context->appdata,
98  }                        *get_pos(context->appdata), notes_get_pos(context));
99    
100  #ifdef ENABLE_BROWSER_INTERFACE    gtk_widget_show_all(context->bearing_hbox);
 static void on_www_clicked(GtkButton *button, gpointer data) {  
   cache_context_t *context = (cache_context_t*)data;  
   browser_url(context->appdata, context->cache->url);  
101  }  }
 #endif  
102    
103  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
104    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 119  static GtkWidget *cache_overview(cache_c Line 115  static GtkWidget *cache_overview(cache_c
115    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
116    
117    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
118      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
119        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,
120                 GTK_FILL, 0, GTK_FILL, 0);
121  #ifndef USE_MAEMO  #ifndef USE_MAEMO
122      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
123  #endif  #endif
# Line 130  static GtkWidget *cache_overview(cache_c Line 127  static GtkWidget *cache_overview(cache_c
127    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
128      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
129      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
130      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
131      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
132          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
133      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
134                           FALSE, FALSE, 0);
135        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
136                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
137  #ifndef USE_MAEMO  #ifndef USE_MAEMO
138      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
139  #endif  #endif
# Line 143  static GtkWidget *cache_overview(cache_c Line 143  static GtkWidget *cache_overview(cache_c
143    if(cache->id) {    if(cache->id) {
144      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
145        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
146      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
147                                            cache->id, context->cache->url,
148  #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  
   
149      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);
150    }    }
151    
# Line 166  static GtkWidget *cache_overview(cache_c Line 153  static GtkWidget *cache_overview(cache_c
153    if(cache->owner) {    if(cache->owner) {
154      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
155      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
156      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
157      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
158        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
159                    link_button_by_id(appdata, cache->owner->name,
160                                      owner_type, cache->owner->id));
161        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
162    }    }
163    
164      /* ----------- vbox containing all ratings ---------- */
165      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
166    
167    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
168    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
169      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
170      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
171                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
172      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
173         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
174      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
175                           FALSE, FALSE, 0);
176    
177        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
178        gtk_container_add(GTK_CONTAINER(align), ivbox);
179        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
180  #ifndef USE_MAEMO  #ifndef USE_MAEMO
181      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
182      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 186  static GtkWidget *cache_overview(cache_c
186    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
187    if(cache->terrain != 0) {    if(cache->terrain != 0) {
188      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
189      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
190      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
191        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
192      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
193                           FALSE, FALSE, 0);
194        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
195        gtk_container_add(GTK_CONTAINER(align), ivbox);
196        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
197  #ifndef USE_MAEMO  #ifndef USE_MAEMO
198      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
199      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
200  #endif  #endif
201    }    }
202    
203      /* --------------------- GCVote ------------------------ */
204      if(1) {
205        float quality = 2.5;
206        int votes = 2;
207    
208        ivbox = gtk_vbox_new(FALSE, 0);
209    
210        char *votes_str = g_strdup_printf(_("Quality (%d votes):"), votes);
211        gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(votes_str),
212                           FALSE, FALSE, 0);
213        g_free(votes_str);
214        gtk_box_pack_start(GTK_BOX(ivbox),
215             icon_get_widget(ICON_STARS, (int)(quality*2-2)), FALSE, FALSE, 0);
216    
217        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
218        gtk_container_add(GTK_CONTAINER(align), ivbox);
219        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
220    #ifndef USE_MAEMO
221        sprintf(str, _("Quality: %.1f"), quality);
222        gtk_tooltips_set_tip(tips, ivbox, str, NULL);
223    #endif
224      }
225    
226      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
227    
228      /* ----------------------------------------------------- */
229    
230    
231    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
232    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
233    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 212  static GtkWidget *cache_overview(cache_c Line 243  static GtkWidget *cache_overview(cache_c
243         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));
244    
245    /* but calculations may be done with respect to the overriden one */    /* but calculations may be done with respect to the overriden one */
246    context->bearing_hbox = gtk_hbox_new(FALSE, 0);    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
247    bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,      context->bearing_hbox = gtk_hbox_new(FALSE, 0);
248                      gpx_cache_pos(cache));      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,
249    gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);                        gpx_cache_pos(cache));
250        gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);
251      }
252    
253    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);
254    
255    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
256      /* gcvote if present and possible */
257    
258      gcvote_get(appdata, cache->url);
259    
260      /* ----------------------------------------------------- */
261    
262    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
263    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);
264    
265      /* ----------------------------------------------------- */
266    
267    if(cache->short_description)    if(cache->short_description)
268      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
269          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
270                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
271    
272    return vbox;    return vbox;
273  }  }
274    
275  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
276  static void rot13(char *t) {  static void rot13(char *t) {
277      int braces = 0;
278    
279    while(*t) {    while(*t) {
280      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
281         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
282      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
283              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
284                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
285          else if(((*t >= 'n') && (*t <= 'z')) ||
286                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
287        } else {
288          if(braces > 0 && *t == ']')
289            braces--;
290        }
291    
292      t++;      t++;
293    }    }
# Line 264  static void on_decrypt(GtkWidget *widget Line 313  static void on_decrypt(GtkWidget *widget
313  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
314    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
315    if(cache->hint_is_html)    if(cache->hint_is_html)
316      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
317    
318    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
319    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
320    
321    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
322    rot13(hint);    rot13(hint);
323    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
324        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
325    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
326    free(hint);    free(hint);
327    
328    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
329    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
330      hildon_gtk_widget_set_theme_size(button,
331               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
332    #endif
333    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
334    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
335             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 402  static GtkWidget *cache_wpts(appdata_t *
402        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
403        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));
404    
405  #ifndef USE_MAEMO  #ifndef USE_HILDON_TEXT_VIEW
406        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);
407  #else  #else
408        GtkWidget *textview = hildon_text_view_new();        GtkWidget *textview = hildon_text_view_new();
# Line 368  static GtkWidget *cache_wpts(appdata_t * Line 421  static GtkWidget *cache_wpts(appdata_t *
421      if(wpt->cmt) {      if(wpt->cmt) {
422        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
423        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));
424  #ifndef USE_MAEMO  #ifndef USE_HILDON_TEXT_VIEW
425        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);
426  #else  #else
427        GtkWidget *textview = hildon_text_view_new();        GtkWidget *textview = hildon_text_view_new();
# Line 425  static GtkWidget *cache_tbs(appdata_t *a Line 478  static GtkWidget *cache_tbs(appdata_t *a
478    
479    int tb_row=0;    int tb_row=0;
480    while(tb) {    while(tb) {
481        static const char *tb_type = "track/details.aspx";
482    
483      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
484      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),
485                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
486      if(tb->ref)  
487        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
488        if(tb->ref) {
489          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
490          gtk_table_attach_defaults(GTK_TABLE(table), ref,
491                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
492        }
493    
494      if(tb->name)      if(tb->name)
495        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
496                                  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 516  static GtkWidget *cache_tbs(appdata_t *a
516  #endif  #endif
517  }  }
518    
519  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
520    static void on_gclink_clicked(GtkButton *button, gpointer data) {
521      cache_context_t *context = (cache_context_t*)data;
522      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
523      browser_url(context->appdata, url);
524      g_free(url);
525    }
526    #endif
527    
528    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context, log_t *log, int is_html) {
529  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
530    /* put this inside a scrolled view */    /* put this inside a scrolled view */
531    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 535  static GtkWidget *cache_logs(appdata_t *
535    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
536  #endif  #endif
537    
538    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
539      gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
540    #else
541    #define gc_link (FALSE)
542    #endif
543    
544      GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log)+(gc_link?1:0), 3, FALSE);
545    int cnt = 0;    int cnt = 0;
546    
547    #ifdef ENABLE_BROWSER_INTERFACE
548      if(gc_link) {
549        GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));
550    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
551      hildon_gtk_widget_set_theme_size(but,
552               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
553    #endif
554        gtk_signal_connect(GTK_OBJECT(but), "clicked",
555                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
556    
557        gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);
558        cnt++;
559      }
560    #endif
561    
562    /* add all logs to the vbox */    /* add all logs to the vbox */
563    while(log) {    while(log) {
564      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
565                                0, 3, cnt+0, cnt+1);                                0, 3, cnt+0, cnt+1);
566    #if 0
567        static const char *log_type = "seek/log.aspx";
568        GtkWidget *log_but =
569          link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),
570                                 log_type, log->id);
571        gtk_table_attach(GTK_TABLE(table), log_but,
572                         0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
573    #else
574      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach_defaults(GTK_TABLE(table),
575                                icon_get_widget(ICON_LOG, log->type),                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);
576                                0, 1, cnt+1, cnt+2);  #endif
577    
578      char date_str[32];      char date_str[32];
579      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 488  static GtkWidget *cache_logs(appdata_t * Line 586  static GtkWidget *cache_logs(appdata_t *
586      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),
587                                1, 2, cnt+1, cnt+2);                                1, 2, cnt+1, cnt+2);
588    
589      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      static const char *finder_type = "profile/";
590                                2, 3, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
591                                              finder_type, log->finder->id);
592    
593        gtk_table_attach(GTK_TABLE(table), finder,
594                         2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
595    
596      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
597                                0, 3, cnt+2, cnt+3);                                0, 3, cnt+2, cnt+3);
598    
599      if(log->text) {      if(log->text) {
600        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
601                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
602                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
603                                    0, 3, cnt+3, cnt+4);
604      }      }
605    
606      log = log->next;      log = log->next;
607      cnt+=4;      cnt+=4;
608    }    }
# Line 543  static void on_notebook_page_change(GtkN Line 647  static void on_notebook_page_change(GtkN
647    
648    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
649    /* 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 */
650    /* 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. */
651    /* seems to work ... */    /* seems to work ... */
652    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
653      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
654    }    } else if(strcasecmp(name, _("TBs")) == 0) {
655        gtk_widget_queue_resize(w);
656    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
657  #ifdef USE_MAEMO  #ifdef USE_MAEMO
658      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
659                                            context->appdata);                                            context->appdata);
# Line 597  GtkWidget *cache_view(appdata_t *appdata Line 701  GtkWidget *cache_view(appdata_t *appdata
701  #endif  #endif
702    
703    notebook =  gtk_notebook_new();    notebook =  gtk_notebook_new();
704    
705  #ifdef USE_MAEMO  #ifdef USE_MAEMO
706  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
707    /* 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 722  GtkWidget *cache_view(appdata_t *appdata
722    
723    if(cache->log)    if(cache->log)
724      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
725             cache_logs(appdata, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
726             gtk_label_new(_("Logs")));             gtk_label_new(_("Logs")));
727    
728    if(cache->wpt)    if(cache->wpt)
# Line 665  void cache_dialog(appdata_t *appdata, ca Line 770  void cache_dialog(appdata_t *appdata, ca
770    
771  #else  #else
772  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
773    static void on_cache_destroy (GtkWidget *widget, appdata_t *appdata) {
774      appdata->cur_cache = NULL;
775    
776      /* restore cur_view */
777      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
778    }
779    
780  void cache_dialog(appdata_t *appdata, cache_t *cache) {  void cache_dialog(appdata_t *appdata, cache_t *cache) {
781    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
782    
783    gtk_window_set_title(GTK_WINDOW(window), cache->name);    /* store last "cur_view" in window */
784      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
785    
786      appdata->cur_cache = cache;
787      char *title = g_strdup_printf("%s - GPXView", cache->name);
788      gtk_window_set_title(GTK_WINDOW(window), title);
789      g_free(title);
790    
791    /* create cache visualization widget */    /* create cache visualization widget */
792    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_view = cache_view(appdata, cache);
793                      cache_view(appdata, cache));    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
794    
795      hildon_window_set_app_menu(HILDON_WINDOW(window),
796                                 menu_create(appdata, MENU_CACHE));
797    
798      g_signal_connect(G_OBJECT(window), "destroy",
799                       G_CALLBACK(on_cache_destroy), appdata);
800    
801    gtk_widget_show_all(window);    gtk_widget_show_all(window);
802  }  }
Legend:
Removed from v.1  
changed lines
  Added in v.157