Diff of /trunk/src/cache.c

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

revision 13 by harbaum, Sat Jun 27 11:09:19 2009 UTC revision 163 by harbaum, Thu Nov 5 15:12:37 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 100  void overview_coordinate_update(cache_co Line 100  void overview_coordinate_update(cache_co
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_set(cache_context_t *context, vote_t *vote) {
104  static void on_www_clicked(GtkButton *button, gpointer data) {    if(!vote) return;
105    
106      if(context->quality) {
107        gtk_widget_destroy(context->quality);
108        context->quality = NULL;
109      }
110    
111      if(context->votes) {
112        gtk_widget_destroy(context->votes);
113        context->votes = NULL;
114      }
115    
116      /* update/draw the voting */
117    #ifndef USE_MAEMO
118      GtkTooltips *tips = gtk_tooltips_new();
119    #endif
120    
121      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
122                                          (vote->votes == 1)?_("vote"):_("votes"));
123      context->votes = GTK_LABEL_SMALL(votes_str);
124      gtk_box_pack_start(GTK_BOX(context->votebox),
125                         context->votes, FALSE, FALSE, 0);
126      g_free(votes_str);
127      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
128      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
129                         FALSE, FALSE, 0);
130    
131    #ifndef USE_MAEMO
132      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
133      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
134      g_free(str);
135    #endif
136    
137      gtk_widget_show_all(context->votebox);
138    
139      g_free(vote);
140    }
141    
142    static void gcvote_callback(vote_t *vote, gpointer data) {
143    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
144    browser_url(context->appdata, context->cache->url);  
145      /* no vote returned: request failed, just cleanup */
146      if(!vote) {
147        printf("gcvote: callback for failed request\n");
148    
149        gcvote_request_free(context->gcvote_request);
150        context->gcvote_request = NULL;
151        return;
152      }
153    
154      printf("gcvote: callback is being called with a %d/%d\n",
155             vote->quality, vote->votes);
156    
157      gcvote_set(context, vote);
158    
159      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
160    
161      gcvote_request_free(context->gcvote_request);
162      context->gcvote_request = NULL;
163  }  }
 #endif  
164    
165  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
166    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 122  static GtkWidget *cache_overview(cache_c Line 177  static GtkWidget *cache_overview(cache_c
177    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
178    
179    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
180      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
181        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,
182                 GTK_FILL, 0, GTK_FILL, 0);
183  #ifndef USE_MAEMO  #ifndef USE_MAEMO
184      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
185  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 189  static GtkWidget *cache_overview(cache_c
189    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
190      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
191      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
192      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
193      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
194          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
195      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
196                           FALSE, FALSE, 0);
197        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
198                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
199  #ifndef USE_MAEMO  #ifndef USE_MAEMO
200      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
201  #endif  #endif
# Line 146  static GtkWidget *cache_overview(cache_c Line 205  static GtkWidget *cache_overview(cache_c
205    if(cache->id) {    if(cache->id) {
206      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
207        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
208      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
209                                            cache->id, context->cache->url,
210  #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  
   
211      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);
212    }    }
213    
# Line 169  static GtkWidget *cache_overview(cache_c Line 215  static GtkWidget *cache_overview(cache_c
215    if(cache->owner) {    if(cache->owner) {
216      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
217      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
218      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
219      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
220        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
221                    link_button_by_id(appdata, cache->owner->name,
222                                      owner_type, cache->owner->id));
223        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
224    }    }
225    
226      /* ----------- vbox containing all ratings ---------- */
227      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
228    
229    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
230    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
231      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
232      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
233                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
234      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
235         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
236      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
237                           FALSE, FALSE, 0);
238    
239        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
240        gtk_container_add(GTK_CONTAINER(align), ivbox);
241        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
242  #ifndef USE_MAEMO  #ifndef USE_MAEMO
243      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
244      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 190  static GtkWidget *cache_overview(cache_c Line 248  static GtkWidget *cache_overview(cache_c
248    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
249    if(cache->terrain != 0) {    if(cache->terrain != 0) {
250      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
251      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
252      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
253        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
254      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
255                           FALSE, FALSE, 0);
256        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
257        gtk_container_add(GTK_CONTAINER(align), ivbox);
258        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
259  #ifndef USE_MAEMO  #ifndef USE_MAEMO
260      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
261      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
262  #endif  #endif
263    }    }
264    
265      /* --------------------- GCVote ------------------------ */
266    
267      vote_t *vote = gcvote_restore(appdata, cache);
268    
269      context->gcvote_request =
270        gcvote_request(appdata, gcvote_callback, cache->url, context);
271    
272      context->votebox = gtk_vbox_new(FALSE, 0);
273      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
274      gtk_container_add(GTK_CONTAINER(align), context->votebox);
275      gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
276    
277      /* fill with vote if present on disk (will also free vote) */
278      if(vote)
279        gcvote_set(context, vote);
280    
281      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
282    
283      /* ----------------------------------------------------- */
284    
285    
286    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
287    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
288    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 229  static GtkWidget *cache_overview(cache_c Line 312  static GtkWidget *cache_overview(cache_c
312    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
313    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);
314    
315      /* ----------------------------------------------------- */
316    
317    if(cache->short_description)    if(cache->short_description)
318      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
319          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
320                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
321    
322    return vbox;    return vbox;
323  }  }
324    
325  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
326  static void rot13(char *t) {  static void rot13(char *t) {
327      int braces = 0;
328    
329    while(*t) {    while(*t) {
330      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
331         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
332      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
333              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
334                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
335          else if(((*t >= 'n') && (*t <= 'z')) ||
336                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
337        } else {
338          if(braces > 0 && *t == ']')
339            braces--;
340        }
341    
342      t++;      t++;
343    }    }
# Line 269  static void on_decrypt(GtkWidget *widget Line 363  static void on_decrypt(GtkWidget *widget
363  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
364    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
365    if(cache->hint_is_html)    if(cache->hint_is_html)
366      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
367    
368    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
369    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
370    
371    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
372    rot13(hint);    rot13(hint);
373    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
374        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
375    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
376    free(hint);    free(hint);
377    
378    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
379    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
380      hildon_gtk_widget_set_theme_size(button,
381               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
382    #endif
383    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
384    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
385             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 430  static GtkWidget *cache_tbs(appdata_t *a Line 528  static GtkWidget *cache_tbs(appdata_t *a
528    
529    int tb_row=0;    int tb_row=0;
530    while(tb) {    while(tb) {
531        static const char *tb_type = "track/details.aspx";
532    
533      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
534      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),
535                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
536      if(tb->ref)  
537        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
538        if(tb->ref) {
539          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
540          gtk_table_attach_defaults(GTK_TABLE(table), ref,
541                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
542        }
543    
544      if(tb->name)      if(tb->name)
545        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
546                                  2, 3, tb_row+0, tb_row+1);                                  2, 3, tb_row+0, tb_row+1);
# Line 461  static GtkWidget *cache_tbs(appdata_t *a Line 566  static GtkWidget *cache_tbs(appdata_t *a
566  #endif  #endif
567  }  }
568    
569  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
570    static void on_gclink_clicked(GtkButton *button, gpointer data) {
571      cache_context_t *context = (cache_context_t*)data;
572      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
573      browser_url(context->appdata, url);
574      g_free(url);
575    }
576    #endif
577    
578    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context, log_t *log, int is_html) {
579  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
580    /* put this inside a scrolled view */    /* put this inside a scrolled view */
581    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 471  static GtkWidget *cache_logs(appdata_t * Line 585  static GtkWidget *cache_logs(appdata_t *
585    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
586  #endif  #endif
587    
588    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
589    int cnt = 0;    gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
590    #else
591    #define gc_link (FALSE)
592    #endif
593    
594      GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
595    
596    #ifdef ENABLE_BROWSER_INTERFACE
597      if(gc_link) {
598        GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));
599    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
600      hildon_gtk_widget_set_theme_size(but,
601               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
602    #endif
603        gtk_signal_connect(GTK_OBJECT(but), "clicked",
604                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
605    
606        gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
607      }
608    #endif
609    
610    /* add all logs to the vbox */    /* add all logs to the vbox */
611    while(log) {    while(log) {
612      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),  
613                                0, 3, cnt+0, cnt+1);      GtkWidget *frame = gtk_frame_new(NULL);
614      gtk_table_attach_defaults(GTK_TABLE(table),  
615                                icon_get_widget(ICON_LOG, log->type),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
616                                0, 1, cnt+1, cnt+2);  
617        GtkWidget *ihbox = gtk_hbox_new(TRUE, 2);
618    
619        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
620                  icon_get_widget(ICON_LOG, log->type));
621    
622      char date_str[32];      char date_str[32];
623      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 490  static GtkWidget *cache_logs(appdata_t * Line 627  static GtkWidget *cache_logs(appdata_t *
627      } else      } else
628        strcpy(date_str, "---");        strcpy(date_str, "---");
629    
630      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);  
631    
632      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      static const char *finder_type = "profile/";
633                                2, 3, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
634      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),                                            finder_type, log->finder->id);
                               0, 3, cnt+2, cnt+3);  
635    
636        gtk_box_pack_start_defaults(GTK_BOX(ihbox), finder);
637    
638        gtk_box_pack_start_defaults(GTK_BOX(ivbox), ihbox);
639    
640      if(log->text) {      if(log->text) {
641        gtk_table_attach_defaults(GTK_TABLE(table),        /* ---- */
642                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),        gtk_box_pack_start_defaults(GTK_BOX(ivbox), gtk_hseparator_new());
643                  0, 3, cnt+3, cnt+4);  
644          gtk_box_pack_start_defaults(GTK_BOX(ivbox),
645            html_view(appdata, log->text,
646                      is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL));
647      }      }
648    
649        gtk_container_add(GTK_CONTAINER(frame), ivbox);
650        gtk_box_pack_start_defaults(GTK_BOX(vbox), frame);
651    
652      log = log->next;      log = log->next;
     cnt+=4;  
653    }    }
654    
655  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
656    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
657                                          table);                                          vbox);
658    return scrolled_window;    return scrolled_window;
659  #else  #else
660    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
661                                           table);                                           vbox);
662    return pannable_area;    return pannable_area;
663  #endif  #endif
664  }  }
# Line 548  static void on_notebook_page_change(GtkN Line 692  static void on_notebook_page_change(GtkN
692    
693    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
694    /* 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 */
695    /* 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. */
696    /* seems to work ... */    /* seems to work ... */
697    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
698      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
699    }    } else if(strcasecmp(name, _("TBs")) == 0) {
700        gtk_widget_queue_resize(w);
701    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
702  #ifdef USE_MAEMO  #ifdef USE_MAEMO
703      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
704                                            context->appdata);                                            context->appdata);
# Line 574  static void on_notebook_destroy(GtkWidge Line 718  static void on_notebook_destroy(GtkWidge
718    
719    printf("destroying notebook\n");    printf("destroying notebook\n");
720    
721      /* cancel a pending gcvote request */
722      if(context->gcvote_request) {
723        gcvote_request_free(context->gcvote_request);
724        context->gcvote_request = NULL;
725      }
726    
727    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
728    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
729    
# Line 602  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 622  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 684  void cache_dialog(appdata_t *appdata, ca Line 835  void cache_dialog(appdata_t *appdata, ca
835    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
836    
837    appdata->cur_cache = cache;    appdata->cur_cache = cache;
838    char *title = g_strdup_printf("GPXView - %s", cache->name);    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    
Legend:
Removed from v.13  
changed lines
  Added in v.163