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 174 by harbaum, Tue Nov 10 20:27:30 2009 UTC
# Line 22  Line 22 
22    
23  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {
24    return html_view(appdata, cache->long_description,    return html_view(appdata, cache->long_description,
25                     cache->long_is_html, TRUE, cache, NULL);             cache->long_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL);
26  }  }
27    
28  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips
# Line 100  void overview_coordinate_update(cache_co Line 100  void overview_coordinate_update(cache_co
100    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
101  }  }
102    
103  #ifdef ENABLE_BROWSER_INTERFACE  static void gcvote_set(cache_context_t *context, vote_t *vote) {
104  static void on_www_clicked(GtkButton *button, gpointer data) {    if(!vote) return;
105    
106      if(context->quality) {
107        gtk_widget_destroy(context->quality);
108        context->quality = NULL;
109      }
110    
111      if(context->votes) {
112        gtk_widget_destroy(context->votes);
113        context->votes = NULL;
114      }
115    
116      /* update/draw the voting */
117    #ifndef USE_MAEMO
118      GtkTooltips *tips = gtk_tooltips_new();
119    #endif
120    
121      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
122                                          (vote->votes == 1)?_("vote"):_("votes"));
123      context->votes = GTK_LABEL_SMALL(votes_str);
124      gtk_box_pack_start(GTK_BOX(context->votebox),
125                         context->votes, FALSE, FALSE, 0);
126      g_free(votes_str);
127      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
128      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
129                         FALSE, FALSE, 0);
130    
131    #ifndef USE_MAEMO
132      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
133      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
134      g_free(str);
135    #endif
136    
137      gtk_widget_show_all(context->votebox);
138    
139      g_free(vote);
140    }
141    
142    static void gcvote_callback(vote_t *vote, gpointer data) {
143    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
144    browser_url(context->appdata, context->cache->url);  
145      /* no vote returned: request failed, just cleanup */
146      if(!vote) {
147        printf("gcvote: callback for failed request\n");
148    
149        gcvote_request_free(context->gcvote_request);
150        context->gcvote_request = NULL;
151        return;
152      }
153    
154      printf("gcvote: callback is being called with a %d/%d\n",
155             vote->quality, vote->votes);
156    
157      gcvote_set(context, vote);
158    
159      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
160    
161      gcvote_request_free(context->gcvote_request);
162      context->gcvote_request = NULL;
163  }  }
 #endif  
164    
165  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
166    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 122  static GtkWidget *cache_overview(cache_c Line 177  static GtkWidget *cache_overview(cache_c
177    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
178    
179    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
180      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
181        tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1);               tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type), 0,1,0,1,
182                 GTK_FILL, 0, GTK_FILL, 0);
183  #ifndef USE_MAEMO  #ifndef USE_MAEMO
184      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
185  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 189  static GtkWidget *cache_overview(cache_c
189    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
190      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
191      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
192      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
193      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
194          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
195      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
196                           FALSE, FALSE, 0);
197        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
198                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
199  #ifndef USE_MAEMO  #ifndef USE_MAEMO
200      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
201  #endif  #endif
# Line 146  static GtkWidget *cache_overview(cache_c Line 205  static GtkWidget *cache_overview(cache_c
205    if(cache->id) {    if(cache->id) {
206      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
207        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
208      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
209                                            cache->id, context->cache->url,
210  #ifdef ENABLE_BROWSER_INTERFACE                                          SIZE_BIG, strike);
     if(!cache->url)  
 #endif  
       lbl = gtk_label_attrib(cache->id, SIZE_BIG, strike);  
 #ifdef ENABLE_BROWSER_INTERFACE  
     else {  
       /* add Go button */  
       lbl = gtk_button_attrib(cache->id, SIZE_BIG, strike);  
       gtk_signal_connect(GTK_OBJECT(lbl), "clicked",  
                          (GtkSignalFunc)on_www_clicked, context);  
     }  
 #endif  
   
211      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);
212    }    }
213    
# Line 168  static GtkWidget *cache_overview(cache_c Line 215  static GtkWidget *cache_overview(cache_c
215    if(cache->owner) {    if(cache->owner) {
216      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
217      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
218      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
219      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
220        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
221                    link_button_by_id(appdata, cache->owner->name,
222                                      owner_type, cache->owner->id));
223        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
224    }    }
225    
226      /* ----------- vbox containing all ratings ---------- */
227      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
228    
229    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
230    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
231      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
232      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
233                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
234      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
235         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
236      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
237                           FALSE, FALSE, 0);
238    
239        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
240        gtk_container_add(GTK_CONTAINER(align), ivbox);
241        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
242  #ifndef USE_MAEMO  #ifndef USE_MAEMO
243      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
244      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 189  static GtkWidget *cache_overview(cache_c Line 248  static GtkWidget *cache_overview(cache_c
248    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
249    if(cache->terrain != 0) {    if(cache->terrain != 0) {
250      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
251      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
252      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
253        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
254      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
255                           FALSE, FALSE, 0);
256        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
257        gtk_container_add(GTK_CONTAINER(align), ivbox);
258        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
259  #ifndef USE_MAEMO  #ifndef USE_MAEMO
260      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
261      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
262  #endif  #endif
263    }    }
264    
265      /* --------------------- GCVote ------------------------ */
266      if(!appdata->disable_gcvote) {
267        vote_t *vote = gcvote_restore(appdata, cache);
268    
269        context->gcvote_request =
270          gcvote_request(appdata, gcvote_callback, cache->url, context);
271    
272        context->votebox = gtk_vbox_new(FALSE, 0);
273        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
274        gtk_container_add(GTK_CONTAINER(align), context->votebox);
275        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
276    
277        /* fill with vote if present on disk (will also free vote) */
278        if(vote)
279          gcvote_set(context, vote);
280    
281        gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
282      }
283    
284      /* ----------------------------------------------------- */
285    
286    
287    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
288    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
289    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 228  static GtkWidget *cache_overview(cache_c Line 313  static GtkWidget *cache_overview(cache_c
313    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
314    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);
315    
316      /* ----------------------------------------------------- */
317    
318    if(cache->short_description)    if(cache->short_description)
319      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
320          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
321                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
322    
323    return vbox;    return vbox;
324  }  }
# Line 277  static void on_decrypt(GtkWidget *widget Line 364  static void on_decrypt(GtkWidget *widget
364  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
365    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
366    if(cache->hint_is_html)    if(cache->hint_is_html)
367      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
368    
369    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
370    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
371    
372    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
373    rot13(hint);    rot13(hint);
374    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
375        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
376    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
377    free(hint);    free(hint);
378    
# Line 361  static GtkWidget *cache_wpts(appdata_t * Line 449  static GtkWidget *cache_wpts(appdata_t *
449                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
450    
451      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
452      if(wpt->desc) {      if(wpt->desc)
453        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
454        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,  
455                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
456    
457      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
458      if(wpt->cmt) {      if(wpt->cmt)
459        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
460        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,  
461                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
462    
463      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
464      if(wpt->next)      if(wpt->next) {
465          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
466        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
467                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
468          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
469        }
470    
471      wpt_row+=4;      wpt_row+=4;
472      wpt = wpt->next;      wpt = wpt->next;
# Line 421  static GtkWidget *cache_wpts(appdata_t * Line 485  static GtkWidget *cache_wpts(appdata_t *
485  #endif  #endif
486  }  }
487    
 #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  
   
488  static GtkWidget *cache_tbs(appdata_t *appdata, tb_t *tb) {  static GtkWidget *cache_tbs(appdata_t *appdata, tb_t *tb) {
489    pos_t *refpos = NULL;    pos_t *refpos = NULL;
490    
# Line 456  static GtkWidget *cache_tbs(appdata_t *a Line 505  static GtkWidget *cache_tbs(appdata_t *a
505    
506    int tb_row=0;    int tb_row=0;
507    while(tb) {    while(tb) {
508        static const char *tb_type = "track/details.aspx";
509    
510      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
511      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),
512                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
513    
514    
515      if(tb->ref) {      if(tb->ref) {
516  #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  
517        gtk_table_attach_defaults(GTK_TABLE(table), ref,        gtk_table_attach_defaults(GTK_TABLE(table), ref,
518                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
519      }      }
# Line 511  static void on_gclink_clicked(GtkButton Line 552  static void on_gclink_clicked(GtkButton
552  }  }
553  #endif  #endif
554    
555  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,
556                                 log_t *log, int is_html) {
557  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
558    /* put this inside a scrolled view */    /* put this inside a scrolled view */
559    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 569  static GtkWidget *cache_logs(appdata_t *
569  #define gc_link (FALSE)  #define gc_link (FALSE)
570  #endif  #endif
571    
572    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;  
573    
574  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
575    if(gc_link) {    if(gc_link) {
576      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
577          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
578  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
579    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
580             (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 582  static GtkWidget *cache_logs(appdata_t *
582      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
583                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
584    
585      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
     cnt++;  
586    }    }
587  #endif  #endif
588    
589      int logs = gpx_number_of_logs(log);
590      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
591      int log_cnt = 0;
592    
593      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
594    
595    /* add all logs to the vbox */    /* add all logs to the vbox */
596    while(log) {    while(log) {
597      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
598                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
599      gtk_table_attach_defaults(GTK_TABLE(table),  
600                                icon_get_widget(ICON_LOG, log->type),      static const char *finder_type = "profile/";
601                                0, 1, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
602                                              finder_type, log->finder->id);
603    
604        /* if the finder is a button make sure it's the right size and */
605        /* does not exceed the size limits */
606        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
607    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
608          hildon_gtk_widget_set_theme_size(finder,
609                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
610    #endif
611    
612          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
613                                  PANGO_ELLIPSIZE_END);
614        } else
615          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
616    
617        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
618    
619        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
620                  icon_get_widget(ICON_LOG, log->type));
621    
622      char date_str[32];      char date_str[32];
623      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 561  static GtkWidget *cache_logs(appdata_t * Line 627  static GtkWidget *cache_logs(appdata_t *
627      } else      } else
628        strcpy(date_str, "---");        strcpy(date_str, "---");
629    
630      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_box_pack_start_defaults(GTK_BOX(ihbox), gtk_label_new(date_str));
                               1, 2, cnt+1, cnt+2);  
631    
632      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      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);  
633    
634        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
635                                  2*log_cnt, 2*log_cnt+1);
636    
637      if(log->text) {      if(log->text) {
638        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
639                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
640                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
641                                    1, 2, 2*log_cnt, 2*log_cnt+1);
642        }
643    
644        if(log_cnt < logs-1) {
645          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
646    
647          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
648                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
649    
650          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
651      }      }
652    
653      log = log->next;      log = log->next;
654      cnt+=4;      log_cnt++;
655    }    }
656    
657      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
658    
659  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
660    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
661                                          table);                                          vbox);
662    return scrolled_window;    return scrolled_window;
663  #else  #else
664    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
665                                           table);                                           vbox);
666    return pannable_area;    return pannable_area;
667  #endif  #endif
668  }  }
# Line 619  static void on_notebook_page_change(GtkN Line 696  static void on_notebook_page_change(GtkN
696    
697    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
698    /* 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 */
699    /* 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. */
700    /* seems to work ... */    /* seems to work ... */
701    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
702      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
703    }    } else if(strcasecmp(name, _("TBs")) == 0) {
704        gtk_widget_queue_resize(w);
705    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
706  #ifdef USE_MAEMO  #ifdef USE_MAEMO
707      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
708                                            context->appdata);                                            context->appdata);
# Line 645  static void on_notebook_destroy(GtkWidge Line 722  static void on_notebook_destroy(GtkWidge
722    
723    printf("destroying notebook\n");    printf("destroying notebook\n");
724    
725      /* cancel a pending gcvote request */
726      if(context->gcvote_request) {
727        gcvote_request_free(context->gcvote_request);
728        context->gcvote_request = NULL;
729      }
730    
731    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
732    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
733    
# Line 656  static void on_notebook_destroy(GtkWidge Line 739  static void on_notebook_destroy(GtkWidge
739    free(user_data);    free(user_data);
740  }  }
741    
742    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
743    #define CUSTOM_NOTEBOOK
744    #endif
745    
746    static GtkWidget *notebook_new(void) {
747    #ifdef CUSTOM_NOTEBOOK
748      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
749    
750      GtkWidget *notebook =  gtk_notebook_new();
751    
752      /* prevents user from accidentially touching the breadcrumb trail */
753      /* (looks ugly on fremantle as it isn't themed) */
754      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
755    
756      /* solution for fremantle: we use a row of ordinary buttons instead */
757      /* of regular tabs */
758    
759      /* hide the regular tabs */
760      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
761    
762      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
763    
764      /* store a reference to the notebook in the vbox */
765      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
766    
767      /* create a hbox for the buttons */
768      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
769      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
770      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
771    
772      return vbox;
773    #else
774      return gtk_notebook_new();
775    #endif
776    }
777    
778    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
779      GtkNotebook *nb =
780        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
781    
782      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
783      gtk_notebook_set_current_page(nb, page);
784    }
785    
786    static void notebook_append_page(GtkWidget *notebook,
787                                     GtkWidget *page, char *label) {
788    #ifdef CUSTOM_NOTEBOOK
789      GtkNotebook *nb =
790        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
791    
792      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
793      GtkWidget *button = NULL;
794    
795      /* select button for page 0 by default */
796      if(!page_num) {
797        button = gtk_radio_button_new_with_label(NULL, label);
798        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
799        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
800      } else {
801        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
802        button = gtk_radio_button_new_with_label_from_widget(
803                                     GTK_RADIO_BUTTON(master), label);
804      }
805    
806      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
807      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
808    
809      gtk_signal_connect(GTK_OBJECT(button), "clicked",
810               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
811    
812    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
813      hildon_gtk_widget_set_theme_size(button,
814               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
815    #endif
816    
817      gtk_box_pack_start_defaults(
818         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
819         button);
820    
821    #else
822      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
823    #endif
824    }
825    
826    static GObject *notebook_object(GtkWidget *notebook) {
827    #ifdef CUSTOM_NOTEBOOK
828      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
829    #else
830      return G_OBJECT(notebook);
831    #endif
832    }
833    
834  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
835    GtkWidget *notebook;    GtkWidget *notebook;
836    
# Line 672  GtkWidget *cache_view(appdata_t *appdata Line 847  GtkWidget *cache_view(appdata_t *appdata
847  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
848  #endif  #endif
849    
850    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  
851    
852    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
853         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
854    
855    if(cache->long_description)    if(cache->long_description)
856      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
857             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
858    
859    if(cache->hint)    if(cache->hint)
860      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
861             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
862    
863    if(cache->log)    if(cache->log)
864      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
865       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
866             gtk_label_new(_("Logs")));             _("Logs"));
867    
868    if(cache->wpt)    if(cache->wpt)
869      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
870               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
871    
872    if(cache->tb)    if(cache->tb)
873      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
874               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
875    
876    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
877             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
878    
879    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
880             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
881    
882    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
883             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
884    
885    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
886             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
887    
888    return notebook;    return notebook;
Legend:
Removed from v.133  
changed lines
  Added in v.174