Diff of /trunk/src/cache.c

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

revision 66 by harbaum, Wed Aug 19 20:03:28 2009 UTC revision 180 by harbaum, Fri Nov 13 12:11:00 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);  
183    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
184                 tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type),
185    #else
186                 tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type),
187    #endif
188                         0,1,0,1, GTK_FILL, 0, GTK_FILL, 0);
189    
190  #ifndef USE_MAEMO  #ifndef USE_MAEMO
191      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
192  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 196  static GtkWidget *cache_overview(cache_c
196    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
197      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
198      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
199      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
200      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
201          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
202      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
203                           FALSE, FALSE, 0);
204        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
205                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
206  #ifndef USE_MAEMO  #ifndef USE_MAEMO
207      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
208  #endif  #endif
# Line 146  static GtkWidget *cache_overview(cache_c Line 212  static GtkWidget *cache_overview(cache_c
212    if(cache->id) {    if(cache->id) {
213      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
214        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
215      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
216                                            cache->id, context->cache->url,
217  #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  
   
218      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);
219    }    }
220    
# Line 169  static GtkWidget *cache_overview(cache_c Line 222  static GtkWidget *cache_overview(cache_c
222    if(cache->owner) {    if(cache->owner) {
223      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
224      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
225      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
226      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
227        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
228                    link_button_by_id(appdata, cache->owner->name,
229                                      owner_type, cache->owner->id));
230        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
231    }    }
232    
233      /* ----------- vbox containing all ratings ---------- */
234      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
235    
236    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
237    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
238      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
239      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
240                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
241      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
242         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
243      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
244                           FALSE, FALSE, 0);
245    
246        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
247        gtk_container_add(GTK_CONTAINER(align), ivbox);
248        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
249  #ifndef USE_MAEMO  #ifndef USE_MAEMO
250      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
251      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 255  static GtkWidget *cache_overview(cache_c
255    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
256    if(cache->terrain != 0) {    if(cache->terrain != 0) {
257      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
258      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
259      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
260        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
261      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
262                           FALSE, FALSE, 0);
263        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
264        gtk_container_add(GTK_CONTAINER(align), ivbox);
265        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
266  #ifndef USE_MAEMO  #ifndef USE_MAEMO
267      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
268      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
269  #endif  #endif
270    }    }
271    
272      /* --------------------- GCVote ------------------------ */
273      if(!appdata->disable_gcvote) {
274        vote_t *vote = gcvote_restore(appdata, cache);
275    
276        context->gcvote_request =
277          gcvote_request(appdata, gcvote_callback, cache->url, context);
278    
279        context->votebox = gtk_vbox_new(FALSE, 0);
280        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
281        gtk_container_add(GTK_CONTAINER(align), context->votebox);
282        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
283    
284        /* fill with vote if present on disk (will also free vote) */
285        if(vote)
286          gcvote_set(context, vote);
287      }
288    
289      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
290    
291      /* ----------------------------------------------------- */
292    
293    
294    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
295    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
296    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 229  static GtkWidget *cache_overview(cache_c Line 320  static GtkWidget *cache_overview(cache_c
320    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
321    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);
322    
323      /* ----------------------------------------------------- */
324    
325    if(cache->short_description)    if(cache->short_description)
326      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
327          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
328                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
329    
330    return vbox;    return vbox;
331  }  }
# Line 278  static void on_decrypt(GtkWidget *widget Line 371  static void on_decrypt(GtkWidget *widget
371  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
372    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
373    if(cache->hint_is_html)    if(cache->hint_is_html)
374      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
375    
376    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
377    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
378    
379    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
380    rot13(hint);    rot13(hint);
381    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
382        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
383    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
384    free(hint);    free(hint);
385    
# Line 362  static GtkWidget *cache_wpts(appdata_t * Line 456  static GtkWidget *cache_wpts(appdata_t *
456                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
457    
458      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
459      if(wpt->desc) {      if(wpt->desc)
460        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
461        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,  
462                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
463    
464      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
465      if(wpt->cmt) {      if(wpt->cmt)
466        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
467        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,  
468                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
469    
470      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
471      if(wpt->next)      if(wpt->next) {
472          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
473        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
474                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
475          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
476        }
477    
478      wpt_row+=4;      wpt_row+=4;
479      wpt = wpt->next;      wpt = wpt->next;
# Line 442  static GtkWidget *cache_tbs(appdata_t *a Line 512  static GtkWidget *cache_tbs(appdata_t *a
512    
513    int tb_row=0;    int tb_row=0;
514    while(tb) {    while(tb) {
515        static const char *tb_type = "track/details.aspx";
516    
517      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
518      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      GtkWidget *icon = NULL;
519        if((strcasestr(tb->name, "coin") != 0) ||
520           (strcasestr(tb->name, "muenze") != 0) ||
521           (strcasestr(tb->name, "münze") != 0))
522          icon = icon_get_widget(ICON_TB, 1);   /* coin icon */
523        else
524          icon = icon_get_widget(ICON_TB, 0);   /* tb icon */
525    
526        gtk_table_attach_defaults(GTK_TABLE(table), icon,
527                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
528      if(tb->ref)  
529        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),      if(tb->ref) {
530          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
531          gtk_table_attach_defaults(GTK_TABLE(table), ref,
532                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
533        }
534    
535      if(tb->name)      if(tb->name)
536        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
537                                  2, 3, tb_row+0, tb_row+1);                                  2, 3, tb_row+0, tb_row+1);
# Line 482  static void on_gclink_clicked(GtkButton Line 566  static void on_gclink_clicked(GtkButton
566  }  }
567  #endif  #endif
568    
569  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,
570                                 log_t *log, int is_html) {
571  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
572    /* put this inside a scrolled view */    /* put this inside a scrolled view */
573    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 498  static GtkWidget *cache_logs(appdata_t * Line 583  static GtkWidget *cache_logs(appdata_t *
583  #define gc_link (FALSE)  #define gc_link (FALSE)
584  #endif  #endif
585    
586    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;  
587    
588  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
589    if(gc_link) {    if(gc_link) {
590      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
591          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
592  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
593    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
594             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 511  static GtkWidget *cache_logs(appdata_t * Line 596  static GtkWidget *cache_logs(appdata_t *
596      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
597                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
598    
599      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
     cnt++;  
600    }    }
601  #endif  #endif
602    
603      int logs = gpx_number_of_logs(log);
604      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
605      int log_cnt = 0;
606    
607      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
608    
609    /* add all logs to the vbox */    /* add all logs to the vbox */
610    while(log) {    while(log) {
611      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
612                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
613      gtk_table_attach_defaults(GTK_TABLE(table),  
614                                icon_get_widget(ICON_LOG, log->type),      static const char *finder_type = "profile/";
615                                0, 1, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
616                                              finder_type, log->finder->id);
617    
618        /* if the finder is a button make sure it's the right size and */
619        /* does not exceed the size limits */
620        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
621    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
622          hildon_gtk_widget_set_theme_size(finder,
623                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
624    #endif
625    
626          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
627                                  PANGO_ELLIPSIZE_END);
628        } else
629          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
630    
631        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
632    
633        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
634                  icon_get_widget(ICON_LOG, log->type));
635    
636      char date_str[32];      char date_str[32];
637      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 532  static GtkWidget *cache_logs(appdata_t * Line 641  static GtkWidget *cache_logs(appdata_t *
641      } else      } else
642        strcpy(date_str, "---");        strcpy(date_str, "---");
643    
644      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);  
645    
646      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);  
647    
648        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
649                                  2*log_cnt, 2*log_cnt+1);
650    
651      if(log->text) {      if(log->text) {
652        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
653                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
654                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
655                                    1, 2, 2*log_cnt, 2*log_cnt+1);
656        }
657    
658        if(log_cnt < logs-1) {
659          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
660    
661          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
662                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
663    
664          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
665      }      }
666    
667      log = log->next;      log = log->next;
668      cnt+=4;      log_cnt++;
669    }    }
670    
671      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
672    
673  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
674    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
675                                          table);                                          vbox);
676    return scrolled_window;    return scrolled_window;
677  #else  #else
678    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
679                                           table);                                           vbox);
680    return pannable_area;    return pannable_area;
681  #endif  #endif
682  }  }
# Line 590  static void on_notebook_page_change(GtkN Line 710  static void on_notebook_page_change(GtkN
710    
711    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
712    /* 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 */
713    /* 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. */
714    /* seems to work ... */    /* seems to work ... */
715    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
716      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
717    }    } else if(strcasecmp(name, _("TBs")) == 0) {
718        gtk_widget_queue_resize(w);
719    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
720  #ifdef USE_MAEMO  #ifdef USE_MAEMO
721      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
722                                            context->appdata);                                            context->appdata);
# Line 616  static void on_notebook_destroy(GtkWidge Line 736  static void on_notebook_destroy(GtkWidge
736    
737    printf("destroying notebook\n");    printf("destroying notebook\n");
738    
739      /* cancel a pending gcvote request */
740      if(context->gcvote_request) {
741        gcvote_request_free(context->gcvote_request);
742        context->gcvote_request = NULL;
743      }
744    
745    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
746    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
747    
# Line 627  static void on_notebook_destroy(GtkWidge Line 753  static void on_notebook_destroy(GtkWidge
753    free(user_data);    free(user_data);
754  }  }
755    
756    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
757    #define CUSTOM_NOTEBOOK
758    #endif
759    
760    static GtkWidget *notebook_new(void) {
761    #ifdef CUSTOM_NOTEBOOK
762      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
763    
764      GtkWidget *notebook =  gtk_notebook_new();
765    
766      /* prevents user from accidentially touching the breadcrumb trail */
767      /* (looks ugly on fremantle as it isn't themed) */
768      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
769    
770      /* solution for fremantle: we use a row of ordinary buttons instead */
771      /* of regular tabs */
772    
773      /* hide the regular tabs */
774      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
775    
776      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
777    
778      /* store a reference to the notebook in the vbox */
779      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
780    
781      /* create a hbox for the buttons */
782      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
783      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
784      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
785    
786      return vbox;
787    #else
788      return gtk_notebook_new();
789    #endif
790    }
791    
792    #ifdef CUSTOM_NOTEBOOK
793    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
794      GtkNotebook *nb =
795        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
796    
797      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
798      gtk_notebook_set_current_page(nb, page);
799    }
800    #endif
801    
802    static void notebook_append_page(GtkWidget *notebook,
803                                     GtkWidget *page, char *label) {
804    #ifdef CUSTOM_NOTEBOOK
805      GtkNotebook *nb =
806        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
807    
808      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
809      GtkWidget *button = NULL;
810    
811      /* select button for page 0 by default */
812      if(!page_num) {
813        button = gtk_radio_button_new_with_label(NULL, label);
814        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
815        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
816      } else {
817        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
818        button = gtk_radio_button_new_with_label_from_widget(
819                                     GTK_RADIO_BUTTON(master), label);
820      }
821    
822      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
823      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
824    
825      gtk_signal_connect(GTK_OBJECT(button), "clicked",
826               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
827    
828    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
829      hildon_gtk_widget_set_theme_size(button,
830               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
831    #endif
832    
833      gtk_box_pack_start_defaults(
834         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
835         button);
836    
837    #else
838      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
839    #endif
840    }
841    
842    static GObject *notebook_object(GtkWidget *notebook) {
843    #ifdef CUSTOM_NOTEBOOK
844      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
845    #else
846      return G_OBJECT(notebook);
847    #endif
848    }
849    
850  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
851    GtkWidget *notebook;    GtkWidget *notebook;
852    
# Line 643  GtkWidget *cache_view(appdata_t *appdata Line 863  GtkWidget *cache_view(appdata_t *appdata
863  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
864  #endif  #endif
865    
866    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  
867    
868    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
869         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
870    
871    if(cache->long_description)    if(cache->long_description)
872      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
873             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
874    
875    if(cache->hint)    if(cache->hint)
876      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
877             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
878    
879    if(cache->log)    if(cache->log)
880      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
881       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
882             gtk_label_new(_("Logs")));             _("Logs"));
883    
884    if(cache->wpt)    if(cache->wpt)
885      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
886               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
887    
888    if(cache->tb)    if(cache->tb)
889      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
890               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
891    
892    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
893             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
894    
895    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
896             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
897    
898    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
899             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
900    
901    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
902             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
903    
904    return notebook;    return notebook;
Legend:
Removed from v.66  
changed lines
  Added in v.180