Diff of /trunk/src/cache.c

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

revision 138 by harbaum, Tue Oct 20 13:25:04 2009 UTC revision 185 by harbaum, Sat Nov 14 16:55: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    static void gcvote_set(cache_context_t *context, vote_t *vote) {
105      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;
145    
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    }
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;
168    GtkWidget *table, *tip;    GtkWidget *table, *tip;
# Line 116  static GtkWidget *cache_overview(cache_c Line 179  static GtkWidget *cache_overview(cache_c
179    
180    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
181      gtk_table_attach(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
182               tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1,  
183               GTK_FILL, 0, GTK_FILL, 0);  #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 161  static GtkWidget *cache_overview(cache_c Line 230  static GtkWidget *cache_overview(cache_c
230      gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);      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);
# Line 170  static GtkWidget *cache_overview(cache_c Line 242  static GtkWidget *cache_overview(cache_c
242      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
243                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
244                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
245      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,0,1,  
246                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      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 186  static GtkWidget *cache_overview(cache_c Line 260  static GtkWidget *cache_overview(cache_c
260      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
261                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
262                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
263      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,1,2,      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
264                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      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 223  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 272  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 340  static GtkWidget *cache_wpts(appdata_t * Line 440  static GtkWidget *cache_wpts(appdata_t *
440                        pos_lon(wpt->pos.lon, SIZE_BIG, STRIKETHROUGH_NONE),                        pos_lon(wpt->pos.lon, SIZE_BIG, STRIKETHROUGH_NONE),
441                        2,3, wpt_row, wpt_row+1);                        2,3, wpt_row, wpt_row+1);
442    
443      ihbox = gtk_hbox_new(FALSE, 0);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
444      gtk_box_pack_start(GTK_BOX(ihbox), gtk_image_new_from_pixbuf(        ihbox = gtk_hbox_new(FALSE, 0);
445          gtk_box_pack_start(GTK_BOX(ihbox), gtk_image_new_from_pixbuf(
446                             icon_bearing(*refpos, wpt->pos)),1,0,0);                             icon_bearing(*refpos, wpt->pos)),1,0,0);
447      gtk_box_pack_start_defaults(GTK_BOX(ihbox),        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
448            GTK_LABEL_SMALL((char*)pos_get_bearing_str(*refpos, wpt->pos)));            GTK_LABEL_SMALL((char*)pos_get_bearing_str(*refpos, wpt->pos)));
449      snprintf(str, sizeof(str), _("%.1f°"),        snprintf(str, sizeof(str), _("%.1f°"),
450             gpx_pos_get_bearing(*refpos, wpt->pos));                 gpx_pos_get_bearing(*refpos, wpt->pos));
451      gtk_box_pack_start_defaults(GTK_BOX(ihbox), GTK_LABEL_SMALL(str));        gtk_box_pack_start_defaults(GTK_BOX(ihbox), GTK_LABEL_SMALL(str));
     gpx_pos_get_distance_str(str, sizeof(str),  
                              *refpos, wpt->pos, appdata->imperial);  
     gtk_box_pack_start(GTK_BOX(ihbox), GTK_LABEL_SMALL(str),1,0,0);  
   
     gtk_table_attach_defaults(GTK_TABLE(table), ihbox, 3,4,  
                               wpt_row+0, wpt_row+1);  
   
     /* ------------------ description ------------------------- */  
     if(wpt->desc) {  
       GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);  
       gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));  
   
 #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  
452    
453        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);        gpx_pos_get_distance_str(str, sizeof(str),
454        gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);                                 *refpos, wpt->pos, appdata->imperial);
455        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);        gtk_box_pack_start(GTK_BOX(ihbox), GTK_LABEL_SMALL(str),1,0,0);
456    
457          gtk_table_attach_defaults(GTK_TABLE(table), ihbox, 3,4,
458                                    wpt_row+0, wpt_row+1);
459        }
460    
461        gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,      /* ------------------ description ------------------------- */
462        if(wpt->desc)
463          gtk_table_attach_defaults(GTK_TABLE(table),
464                                    simple_text_widget(wpt->desc), 0,4,
465                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
466    
467      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
468      if(wpt->cmt) {      if(wpt->cmt)
469        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
470        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,  
471                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
472    
473      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
474      if(wpt->next)      if(wpt->next) {
475          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
476        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
477                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
478          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
479        }
480    
481      wpt_row+=4;      wpt_row+=4;
482      wpt = wpt->next;      wpt = wpt->next;
# Line 439  static GtkWidget *cache_tbs(appdata_t *a Line 518  static GtkWidget *cache_tbs(appdata_t *a
518      static const char *tb_type = "track/details.aspx";      static const char *tb_type = "track/details.aspx";
519    
520      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
521      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      GtkWidget *icon = NULL;
522                                0, 1, tb_row+0, tb_row+1);      if((strcasestr(tb->name, "coin") != 0) ||
523           (strcasestr(tb->name, "muenze") != 0) ||
524           (strcasestr(tb->name, "münze") != 0))
525          icon = icon_get_widget(ICON_TB, 1);   /* coin icon */
526        else
527          icon = icon_get_widget(ICON_TB, 0);   /* tb icon */
528    
529        gtk_table_attach_defaults(GTK_TABLE(table), icon,
530                                  0, 1, tb_row+0, tb_row+1);
531    
532      if(tb->ref) {      if(tb->ref) {
533        GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);        GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
# Line 483  static void on_gclink_clicked(GtkButton Line 569  static void on_gclink_clicked(GtkButton
569  }  }
570  #endif  #endif
571    
572  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,
573                                 log_t *log, int is_html) {
574  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
575    /* put this inside a scrolled view */    /* put this inside a scrolled view */
576    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 499  static GtkWidget *cache_logs(appdata_t * Line 586  static GtkWidget *cache_logs(appdata_t *
586  #define gc_link (FALSE)  #define gc_link (FALSE)
587  #endif  #endif
588    
589    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;  
590    
591  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
592    if(gc_link) {    if(gc_link) {
593      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
594          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
595  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
596    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
597             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 512  static GtkWidget *cache_logs(appdata_t * Line 599  static GtkWidget *cache_logs(appdata_t *
599      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
600                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
601    
602      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start(GTK_BOX(vbox), but, FALSE, FALSE, 0);
     cnt++;  
603    }    }
604  #endif  #endif
605    
606      int logs = gpx_number_of_logs(log);
607      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
608      int log_cnt = 0;
609    
610      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
611    
612    /* add all logs to the vbox */    /* add all logs to the vbox */
613    while(log) {    while(log) {
614      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
615                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
616  #if 0  
617      static const char *log_type = "seek/log.aspx";      static const char *finder_type = "profile/";
618      GtkWidget *log_but =      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
619        link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),                                            finder_type, log->finder->id);
620                               log_type, log->id);  
621      gtk_table_attach(GTK_TABLE(table), log_but,      /* if the finder is a button make sure it's the right size and */
622                       0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);      /* does not exceed the size limits */
623  #else      if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
624      gtk_table_attach_defaults(GTK_TABLE(table),  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
625                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);        hildon_gtk_widget_set_theme_size(finder,
626  #endif                     (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
627    #endif
628    
629          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
630                                  PANGO_ELLIPSIZE_END);
631        } else
632          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
633    
634        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
635    
636        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
637                  icon_get_widget(ICON_LOG, log->type));
638    
639      char date_str[32];      char date_str[32];
640      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 541  static GtkWidget *cache_logs(appdata_t * Line 644  static GtkWidget *cache_logs(appdata_t *
644      } else      } else
645        strcpy(date_str, "---");        strcpy(date_str, "---");
646    
647      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);  
648    
649      static const char *finder_type = "profile/";      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
     GtkWidget *finder = link_button_by_id(appdata, log->finder->name,  
                                           finder_type, log->finder->id);  
650    
651      gtk_table_attach(GTK_TABLE(table), finder,      gtk_table_attach(GTK_TABLE(table), ivbox, 0, 1,
652                       2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);                       2*log_cnt, 2*log_cnt+1, 0, GTK_EXPAND | GTK_FILL, 0, 0);
   
     gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),  
                               0, 3, cnt+2, cnt+3);  
653    
654      if(log->text) {      if(log->text) {
655        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
656                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
657                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
658                                    1, 2, 2*log_cnt, 2*log_cnt+1);
659        }
660    
661        if(log_cnt < logs-1) {
662          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
663    
664          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
665                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
666    
667          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
668      }      }
669    
670      log = log->next;      log = log->next;
671      cnt+=4;      log_cnt++;
672    }    }
673    
674      gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
675    
676  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
677    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
678                                          table);                                          vbox);
679    return scrolled_window;    return scrolled_window;
680  #else  #else
681    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
682                                           table);                                           vbox);
683    return pannable_area;    return pannable_area;
684  #endif  #endif
685  }  }
# Line 630  static void on_notebook_destroy(GtkWidge Line 739  static void on_notebook_destroy(GtkWidge
739    
740    printf("destroying notebook\n");    printf("destroying notebook\n");
741    
742      /* cancel a pending gcvote request */
743      if(context->gcvote_request) {
744        gcvote_request_free(context->gcvote_request);
745        context->gcvote_request = NULL;
746      }
747    
748    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
749    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
750    
# Line 641  static void on_notebook_destroy(GtkWidge Line 756  static void on_notebook_destroy(GtkWidge
756    free(user_data);    free(user_data);
757  }  }
758    
759    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
760    #define CUSTOM_NOTEBOOK
761    #endif
762    
763    static GtkWidget *notebook_new(void) {
764    #ifdef CUSTOM_NOTEBOOK
765      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
766    
767      GtkWidget *notebook =  gtk_notebook_new();
768    
769      /* prevents user from accidentially touching the breadcrumb trail */
770      /* (looks ugly on fremantle as it isn't themed) */
771      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
772    
773      /* solution for fremantle: we use a row of ordinary buttons instead */
774      /* of regular tabs */
775    
776      /* hide the regular tabs */
777      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
778    
779      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
780    
781      /* store a reference to the notebook in the vbox */
782      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
783    
784      /* create a hbox for the buttons */
785      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
786      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
787      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
788    
789      return vbox;
790    #else
791      return gtk_notebook_new();
792    #endif
793    }
794    
795    #ifdef CUSTOM_NOTEBOOK
796    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
797      GtkNotebook *nb =
798        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
799    
800      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
801      gtk_notebook_set_current_page(nb, page);
802    }
803    #endif
804    
805    static void notebook_append_page(GtkWidget *notebook,
806                                     GtkWidget *page, char *label) {
807    #ifdef CUSTOM_NOTEBOOK
808      GtkNotebook *nb =
809        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
810    
811      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
812      GtkWidget *button = NULL;
813    
814      /* select button for page 0 by default */
815      if(!page_num) {
816        button = gtk_radio_button_new_with_label(NULL, label);
817        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
818        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
819      } else {
820        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
821        button = gtk_radio_button_new_with_label_from_widget(
822                                     GTK_RADIO_BUTTON(master), label);
823      }
824    
825      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
826      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
827    
828      gtk_signal_connect(GTK_OBJECT(button), "clicked",
829               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
830    
831    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
832      hildon_gtk_widget_set_theme_size(button,
833               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
834    #endif
835    
836      gtk_box_pack_start_defaults(
837         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
838         button);
839    
840    #else
841      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
842    #endif
843    }
844    
845    static GObject *notebook_object(GtkWidget *notebook) {
846    #ifdef CUSTOM_NOTEBOOK
847      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
848    #else
849      return G_OBJECT(notebook);
850    #endif
851    }
852    
853  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
854    GtkWidget *notebook;    GtkWidget *notebook;
855    
# Line 657  GtkWidget *cache_view(appdata_t *appdata Line 866  GtkWidget *cache_view(appdata_t *appdata
866  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
867  #endif  #endif
868    
869    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  
870    
871    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
872         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
873    
874    if(cache->long_description)    if(cache->long_description)
875      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
876             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
877    
878    if(cache->hint)    if(cache->hint)
879      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
880             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
881    
882    if(cache->log)    if(cache->log)
883      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
884       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
885             gtk_label_new(_("Logs")));             _("Logs"));
886    
887    if(cache->wpt)    if(cache->wpt)
888      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
889               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
890    
891    if(cache->tb)    if(cache->tb)
892      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
893               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
894    
895    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
896             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
897    
898    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
899             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
900    
901    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
902             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
903    
904    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
905             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
906    
907    return notebook;    return notebook;
Legend:
Removed from v.138  
changed lines
  Added in v.185