Diff of /trunk/src/cache.c

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

revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC revision 179 by harbaum, Thu Nov 12 20:51:33 2009 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  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {
25    return html_view(appdata, cache->long_description,    return html_view(appdata, cache->long_description,
26                     cache->long_is_html, TRUE, cache, NULL);             cache->long_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL);
27  }  }
28    
29  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips
# Line 100  void overview_coordinate_update(cache_co Line 101  void overview_coordinate_update(cache_co
101    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
102  }  }
103    
104  #ifdef ENABLE_BROWSER_INTERFACE  static void gcvote_set(cache_context_t *context, vote_t *vote) {
105  static void on_www_clicked(GtkButton *button, gpointer data) {    if(!vote) return;
106    
107      if(context->quality) {
108        gtk_widget_destroy(context->quality);
109        context->quality = NULL;
110      }
111    
112      if(context->votes) {
113        gtk_widget_destroy(context->votes);
114        context->votes = NULL;
115      }
116    
117      /* update/draw the voting */
118    #ifndef USE_MAEMO
119      GtkTooltips *tips = gtk_tooltips_new();
120    #endif
121    
122      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
123                                          (vote->votes == 1)?_("vote"):_("votes"));
124      context->votes = GTK_LABEL_SMALL(votes_str);
125      gtk_box_pack_start(GTK_BOX(context->votebox),
126                         context->votes, FALSE, FALSE, 0);
127      g_free(votes_str);
128      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
129      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
130                         FALSE, FALSE, 0);
131    
132    #ifndef USE_MAEMO
133      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
134      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
135      g_free(str);
136    #endif
137    
138      gtk_widget_show_all(context->votebox);
139    
140      g_free(vote);
141    }
142    
143    static void gcvote_callback(vote_t *vote, gpointer data) {
144    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
145    browser_url(context->appdata, context->cache->url);  
146      /* no vote returned: request failed, just cleanup */
147      if(!vote) {
148        printf("gcvote: callback for failed request\n");
149    
150        gcvote_request_free(context->gcvote_request);
151        context->gcvote_request = NULL;
152        return;
153      }
154    
155      printf("gcvote: callback is being called with a %d/%d\n",
156             vote->quality, vote->votes);
157    
158      gcvote_set(context, vote);
159    
160      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
161    
162      gcvote_request_free(context->gcvote_request);
163      context->gcvote_request = NULL;
164  }  }
 #endif  
165    
166  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
167    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 122  static GtkWidget *cache_overview(cache_c Line 178  static GtkWidget *cache_overview(cache_c
178    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
179    
180    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
181      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
182        tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1);  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
183                 tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type),
184    #else
185                 tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type),
186    #endif
187                         0,1,0,1, GTK_FILL, 0, GTK_FILL, 0);
188  #ifndef USE_MAEMO  #ifndef USE_MAEMO
189      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
190  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 194  static GtkWidget *cache_overview(cache_c
194    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
195      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
196      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
197      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
198      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
199          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
200      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
201                           FALSE, FALSE, 0);
202        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
203                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
204  #ifndef USE_MAEMO  #ifndef USE_MAEMO
205      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
206  #endif  #endif
# Line 146  static GtkWidget *cache_overview(cache_c Line 210  static GtkWidget *cache_overview(cache_c
210    if(cache->id) {    if(cache->id) {
211      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
212        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
213      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
214                                            cache->id, context->cache->url,
215  #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_signal_connect(GTK_OBJECT(lbl), "clicked",  
                          (GtkSignalFunc)on_www_clicked, context);  
     }  
 #endif  
   
216      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);
217    }    }
218    
# Line 168  static GtkWidget *cache_overview(cache_c Line 220  static GtkWidget *cache_overview(cache_c
220    if(cache->owner) {    if(cache->owner) {
221      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
222      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
223      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
224      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
225        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
226                    link_button_by_id(appdata, cache->owner->name,
227                                      owner_type, cache->owner->id));
228        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
229    }    }
230    
231      /* ----------- vbox containing all ratings ---------- */
232      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
233    
234    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
235    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
236      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
237      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
238                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
239      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
240         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
241      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
242                           FALSE, FALSE, 0);
243    
244        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
245        gtk_container_add(GTK_CONTAINER(align), ivbox);
246        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
247  #ifndef USE_MAEMO  #ifndef USE_MAEMO
248      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
249      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 189  static GtkWidget *cache_overview(cache_c Line 253  static GtkWidget *cache_overview(cache_c
253    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
254    if(cache->terrain != 0) {    if(cache->terrain != 0) {
255      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
256      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
257      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
258        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
259      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
260                           FALSE, FALSE, 0);
261        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
262        gtk_container_add(GTK_CONTAINER(align), ivbox);
263        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
264  #ifndef USE_MAEMO  #ifndef USE_MAEMO
265      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
266      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
267  #endif  #endif
268    }    }
269    
270      /* --------------------- GCVote ------------------------ */
271      if(!appdata->disable_gcvote) {
272        vote_t *vote = gcvote_restore(appdata, cache);
273    
274        context->gcvote_request =
275          gcvote_request(appdata, gcvote_callback, cache->url, context);
276    
277        context->votebox = gtk_vbox_new(FALSE, 0);
278        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
279        gtk_container_add(GTK_CONTAINER(align), context->votebox);
280        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
281    
282        /* fill with vote if present on disk (will also free vote) */
283        if(vote)
284          gcvote_set(context, vote);
285    
286        gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
287      }
288    
289      /* ----------------------------------------------------- */
290    
291    
292    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
293    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
294    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 228  static GtkWidget *cache_overview(cache_c Line 318  static GtkWidget *cache_overview(cache_c
318    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
319    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);
320    
321      /* ----------------------------------------------------- */
322    
323    if(cache->short_description)    if(cache->short_description)
324      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
325          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
326                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
327    
328    return vbox;    return vbox;
329  }  }
# Line 277  static void on_decrypt(GtkWidget *widget Line 369  static void on_decrypt(GtkWidget *widget
369  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
370    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
371    if(cache->hint_is_html)    if(cache->hint_is_html)
372      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
373    
374    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
375    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
376    
377    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
378    rot13(hint);    rot13(hint);
379    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
380        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
381    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
382    free(hint);    free(hint);
383    
# Line 361  static GtkWidget *cache_wpts(appdata_t * Line 454  static GtkWidget *cache_wpts(appdata_t *
454                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
455    
456      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
457      if(wpt->desc) {      if(wpt->desc)
458        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
459        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));                                  simple_text_widget(wpt->desc), 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,  
460                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
461    
462      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
463      if(wpt->cmt) {      if(wpt->cmt)
464        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
465        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,  
466                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
467    
468      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
469      if(wpt->next)      if(wpt->next) {
470          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
471        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
472                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
473          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
474        }
475    
476      wpt_row+=4;      wpt_row+=4;
477      wpt = wpt->next;      wpt = wpt->next;
# Line 421  static GtkWidget *cache_wpts(appdata_t * Line 490  static GtkWidget *cache_wpts(appdata_t *
490  #endif  #endif
491  }  }
492    
 #ifdef ENABLE_BROWSER_INTERFACE  
 static void on_tbref_clicked(GtkButton *button, gpointer data) {  
   appdata_t *appdata = (appdata_t *)data;  
   
   unsigned int id = (unsigned int)g_object_get_data(G_OBJECT(button), "id");  
   if(id) {  
     printf("clicked tb id %u\n", id);  
     char *url =  
       g_strdup_printf("http://www.geocaching.com/track/details.aspx?id=%u", id);  
     browser_url(appdata, url);  
     g_free(url);  
   }  
 }  
 #endif  
   
493  static GtkWidget *cache_tbs(appdata_t *appdata, tb_t *tb) {  static GtkWidget *cache_tbs(appdata_t *appdata, tb_t *tb) {
494    pos_t *refpos = NULL;    pos_t *refpos = NULL;
495    
# Line 456  static GtkWidget *cache_tbs(appdata_t *a Line 510  static GtkWidget *cache_tbs(appdata_t *a
510    
511    int tb_row=0;    int tb_row=0;
512    while(tb) {    while(tb) {
513        static const char *tb_type = "track/details.aspx";
514    
515      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
516      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      GtkWidget *icon = NULL;
517        if((strcasestr(tb->name, "coin") != 0) ||
518           (strcasestr(tb->name, "muenze") != 0) ||
519           (strcasestr(tb->name, "münze") != 0))
520          icon = icon_get_widget(ICON_TB, 1);   /* coin icon */
521        else
522          icon = icon_get_widget(ICON_TB, 0);   /* tb icon */
523    
524        gtk_table_attach_defaults(GTK_TABLE(table), icon,
525                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
526    
527      if(tb->ref) {      if(tb->ref) {
528  #ifdef ENABLE_BROWSER_INTERFACE        GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
       GtkWidget *ref = gtk_button_new_with_label(tb->ref);  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  
       hildon_gtk_widget_set_theme_size(ref,  
                                        (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));  
 #endif  
       g_object_set_data(G_OBJECT(ref), "id", (gpointer)tb->id);  
       gtk_signal_connect(GTK_OBJECT(ref), "clicked",  
                        GTK_SIGNAL_FUNC(on_tbref_clicked), appdata);  
 #else  
       GtkWidget *ref = GTK_LABEL_BIG(tb->ref);  
 #endif  
529        gtk_table_attach_defaults(GTK_TABLE(table), ref,        gtk_table_attach_defaults(GTK_TABLE(table), ref,
530                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
531      }      }
# Line 511  static void on_gclink_clicked(GtkButton Line 564  static void on_gclink_clicked(GtkButton
564  }  }
565  #endif  #endif
566    
567  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,
568                                 log_t *log, int is_html) {
569  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
570    /* put this inside a scrolled view */    /* put this inside a scrolled view */
571    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 527  static GtkWidget *cache_logs(appdata_t * Line 581  static GtkWidget *cache_logs(appdata_t *
581  #define gc_link (FALSE)  #define gc_link (FALSE)
582  #endif  #endif
583    
584    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;  
585    
586  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
587    if(gc_link) {    if(gc_link) {
588      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
589          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
590  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
591    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
592             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 540  static GtkWidget *cache_logs(appdata_t * Line 594  static GtkWidget *cache_logs(appdata_t *
594      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
595                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
596    
597      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
     cnt++;  
598    }    }
599  #endif  #endif
600    
601      int logs = gpx_number_of_logs(log);
602      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
603      int log_cnt = 0;
604    
605      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
606    
607    /* add all logs to the vbox */    /* add all logs to the vbox */
608    while(log) {    while(log) {
609      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
610                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
611      gtk_table_attach_defaults(GTK_TABLE(table),  
612                                icon_get_widget(ICON_LOG, log->type),      static const char *finder_type = "profile/";
613                                0, 1, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
614                                              finder_type, log->finder->id);
615    
616        /* if the finder is a button make sure it's the right size and */
617        /* does not exceed the size limits */
618        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
619    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
620          hildon_gtk_widget_set_theme_size(finder,
621                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
622    #endif
623    
624          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
625                                  PANGO_ELLIPSIZE_END);
626        } else
627          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
628    
629        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
630    
631        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
632                  icon_get_widget(ICON_LOG, log->type));
633    
634      char date_str[32];      char date_str[32];
635      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 561  static GtkWidget *cache_logs(appdata_t * Line 639  static GtkWidget *cache_logs(appdata_t *
639      } else      } else
640        strcpy(date_str, "---");        strcpy(date_str, "---");
641    
642      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);  
643    
644      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
                               2, 3, cnt+1, cnt+2);  
     gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),  
                               0, 3, cnt+2, cnt+3);  
645    
646        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
647                                  2*log_cnt, 2*log_cnt+1);
648    
649      if(log->text) {      if(log->text) {
650        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
651                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
652                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
653                                    1, 2, 2*log_cnt, 2*log_cnt+1);
654        }
655    
656        if(log_cnt < logs-1) {
657          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
658    
659          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
660                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
661    
662          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
663      }      }
664    
665      log = log->next;      log = log->next;
666      cnt+=4;      log_cnt++;
667    }    }
668    
669      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
670    
671  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
672    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
673                                          table);                                          vbox);
674    return scrolled_window;    return scrolled_window;
675  #else  #else
676    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
677                                           table);                                           vbox);
678    return pannable_area;    return pannable_area;
679  #endif  #endif
680  }  }
# Line 619  static void on_notebook_page_change(GtkN Line 708  static void on_notebook_page_change(GtkN
708    
709    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
710    /* 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 */
711    /* 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. */
712    /* seems to work ... */    /* seems to work ... */
713    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
714      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
715    }    } else if(strcasecmp(name, _("TBs")) == 0) {
716        gtk_widget_queue_resize(w);
717    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
718  #ifdef USE_MAEMO  #ifdef USE_MAEMO
719      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
720                                            context->appdata);                                            context->appdata);
# Line 645  static void on_notebook_destroy(GtkWidge Line 734  static void on_notebook_destroy(GtkWidge
734    
735    printf("destroying notebook\n");    printf("destroying notebook\n");
736    
737      /* cancel a pending gcvote request */
738      if(context->gcvote_request) {
739        gcvote_request_free(context->gcvote_request);
740        context->gcvote_request = NULL;
741      }
742    
743    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
744    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
745    
# Line 656  static void on_notebook_destroy(GtkWidge Line 751  static void on_notebook_destroy(GtkWidge
751    free(user_data);    free(user_data);
752  }  }
753    
754    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
755    #define CUSTOM_NOTEBOOK
756    #endif
757    
758    static GtkWidget *notebook_new(void) {
759    #ifdef CUSTOM_NOTEBOOK
760      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
761    
762      GtkWidget *notebook =  gtk_notebook_new();
763    
764      /* prevents user from accidentially touching the breadcrumb trail */
765      /* (looks ugly on fremantle as it isn't themed) */
766      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
767    
768      /* solution for fremantle: we use a row of ordinary buttons instead */
769      /* of regular tabs */
770    
771      /* hide the regular tabs */
772      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
773    
774      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
775    
776      /* store a reference to the notebook in the vbox */
777      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
778    
779      /* create a hbox for the buttons */
780      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
781      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
782      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
783    
784      return vbox;
785    #else
786      return gtk_notebook_new();
787    #endif
788    }
789    
790    #ifdef CUSTOM_NOTEBOOK
791    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
792      GtkNotebook *nb =
793        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
794    
795      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
796      gtk_notebook_set_current_page(nb, page);
797    }
798    #endif
799    
800    static void notebook_append_page(GtkWidget *notebook,
801                                     GtkWidget *page, char *label) {
802    #ifdef CUSTOM_NOTEBOOK
803      GtkNotebook *nb =
804        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
805    
806      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
807      GtkWidget *button = NULL;
808    
809      /* select button for page 0 by default */
810      if(!page_num) {
811        button = gtk_radio_button_new_with_label(NULL, label);
812        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
813        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
814      } else {
815        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
816        button = gtk_radio_button_new_with_label_from_widget(
817                                     GTK_RADIO_BUTTON(master), label);
818      }
819    
820      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
821      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
822    
823      gtk_signal_connect(GTK_OBJECT(button), "clicked",
824               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
825    
826    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
827      hildon_gtk_widget_set_theme_size(button,
828               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
829    #endif
830    
831      gtk_box_pack_start_defaults(
832         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
833         button);
834    
835    #else
836      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
837    #endif
838    }
839    
840    static GObject *notebook_object(GtkWidget *notebook) {
841    #ifdef CUSTOM_NOTEBOOK
842      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
843    #else
844      return G_OBJECT(notebook);
845    #endif
846    }
847    
848  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
849    GtkWidget *notebook;    GtkWidget *notebook;
850    
# Line 672  GtkWidget *cache_view(appdata_t *appdata Line 861  GtkWidget *cache_view(appdata_t *appdata
861  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
862  #endif  #endif
863    
864    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  
865    
866    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
867         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
868    
869    if(cache->long_description)    if(cache->long_description)
870      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
871             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
872    
873    if(cache->hint)    if(cache->hint)
874      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
875             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
876    
877    if(cache->log)    if(cache->log)
878      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
879       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
880             gtk_label_new(_("Logs")));             _("Logs"));
881    
882    if(cache->wpt)    if(cache->wpt)
883      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
884               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
885    
886    if(cache->tb)    if(cache->tb)
887      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
888               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
889    
890    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
891             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
892    
893    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
894             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
895    
896    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
897             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
898    
899    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
900             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
901    
902    return notebook;    return notebook;
Legend:
Removed from v.133  
changed lines
  Added in v.179