Diff of /trunk/src/cache.c

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

revision 13 by harbaum, Sat Jun 27 11:09:19 2009 UTC revision 176 by harbaum, Wed Nov 11 20:21:55 2009 UTC
# Line 22  Line 22 
22    
23  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {
24    return html_view(appdata, cache->long_description,    return html_view(appdata, cache->long_description,
25                     cache->long_is_html, TRUE, cache, NULL);             cache->long_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL);
26  }  }
27    
28  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips
# Line 53  void bearing_fill_hbox(GtkWidget *hbox, Line 53  void bearing_fill_hbox(GtkWidget *hbox,
53      gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(      gtk_box_pack_start(GTK_BOX(hbox), gtk_image_new_from_pixbuf(
54                                          icon_bearing(refpos, pos)),1,0,0);                                          icon_bearing(refpos, pos)),1,0,0);
55    
56      if(refpos.lat && refpos.lon) {      if(!isnan(refpos.lat) && !isnan(refpos.lon)) {
57        gtk_box_pack_start_defaults(GTK_BOX(hbox),        gtk_box_pack_start_defaults(GTK_BOX(hbox),
58                     GTK_LABEL_SMALL((char*)pos_get_bearing_str(refpos, pos)));                     GTK_LABEL_SMALL((char*)pos_get_bearing_str(refpos, pos)));
59        snprintf(str, sizeof(str), _("%.1f°"),        snprintf(str, sizeof(str), _("%.1f°"),
# Line 100  void overview_coordinate_update(cache_co Line 100  void overview_coordinate_update(cache_co
100    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
101  }  }
102    
103  #ifdef ENABLE_BROWSER_INTERFACE  static void gcvote_set(cache_context_t *context, vote_t *vote) {
104  static void on_www_clicked(GtkButton *button, gpointer data) {    if(!vote) return;
105    
106      if(context->quality) {
107        gtk_widget_destroy(context->quality);
108        context->quality = NULL;
109      }
110    
111      if(context->votes) {
112        gtk_widget_destroy(context->votes);
113        context->votes = NULL;
114      }
115    
116      /* update/draw the voting */
117    #ifndef USE_MAEMO
118      GtkTooltips *tips = gtk_tooltips_new();
119    #endif
120    
121      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
122                                          (vote->votes == 1)?_("vote"):_("votes"));
123      context->votes = GTK_LABEL_SMALL(votes_str);
124      gtk_box_pack_start(GTK_BOX(context->votebox),
125                         context->votes, FALSE, FALSE, 0);
126      g_free(votes_str);
127      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
128      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
129                         FALSE, FALSE, 0);
130    
131    #ifndef USE_MAEMO
132      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
133      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
134      g_free(str);
135    #endif
136    
137      gtk_widget_show_all(context->votebox);
138    
139      g_free(vote);
140    }
141    
142    static void gcvote_callback(vote_t *vote, gpointer data) {
143    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
144    browser_url(context->appdata, context->cache->url);  
145      /* no vote returned: request failed, just cleanup */
146      if(!vote) {
147        printf("gcvote: callback for failed request\n");
148    
149        gcvote_request_free(context->gcvote_request);
150        context->gcvote_request = NULL;
151        return;
152      }
153    
154      printf("gcvote: callback is being called with a %d/%d\n",
155             vote->quality, vote->votes);
156    
157      gcvote_set(context, vote);
158    
159      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
160    
161      gcvote_request_free(context->gcvote_request);
162      context->gcvote_request = NULL;
163  }  }
 #endif  
164    
165  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
166    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 122  static GtkWidget *cache_overview(cache_c Line 177  static GtkWidget *cache_overview(cache_c
177    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
178    
179    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
180      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
181        tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1);  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
182                 tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type),
183    #else
184                 tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type),
185    #endif
186                         0,1,0,1, GTK_FILL, 0, GTK_FILL, 0);
187  #ifndef USE_MAEMO  #ifndef USE_MAEMO
188      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
189  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 193  static GtkWidget *cache_overview(cache_c
193    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
194      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
195      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
196      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
197      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
198          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
199      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
200                           FALSE, FALSE, 0);
201        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
202                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
203  #ifndef USE_MAEMO  #ifndef USE_MAEMO
204      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
205  #endif  #endif
# Line 146  static GtkWidget *cache_overview(cache_c Line 209  static GtkWidget *cache_overview(cache_c
209    if(cache->id) {    if(cache->id) {
210      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
211        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
212      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
213                                            cache->id, context->cache->url,
214  #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  
   
215      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);
216    }    }
217    
# Line 169  static GtkWidget *cache_overview(cache_c Line 219  static GtkWidget *cache_overview(cache_c
219    if(cache->owner) {    if(cache->owner) {
220      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
221      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
222      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
223      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
224        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
225                    link_button_by_id(appdata, cache->owner->name,
226                                      owner_type, cache->owner->id));
227        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
228    }    }
229    
230      /* ----------- vbox containing all ratings ---------- */
231      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
232    
233    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
234    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
235      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
236      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
237                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
238      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
239         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
240      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
241                           FALSE, FALSE, 0);
242    
243        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
244        gtk_container_add(GTK_CONTAINER(align), ivbox);
245        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
246  #ifndef USE_MAEMO  #ifndef USE_MAEMO
247      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
248      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 252  static GtkWidget *cache_overview(cache_c
252    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
253    if(cache->terrain != 0) {    if(cache->terrain != 0) {
254      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
255      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
256      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
257        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
258      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
259                           FALSE, FALSE, 0);
260        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
261        gtk_container_add(GTK_CONTAINER(align), ivbox);
262        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
263  #ifndef USE_MAEMO  #ifndef USE_MAEMO
264      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
265      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
266  #endif  #endif
267    }    }
268    
269      /* --------------------- GCVote ------------------------ */
270      if(!appdata->disable_gcvote) {
271        vote_t *vote = gcvote_restore(appdata, cache);
272    
273        context->gcvote_request =
274          gcvote_request(appdata, gcvote_callback, cache->url, context);
275    
276        context->votebox = gtk_vbox_new(FALSE, 0);
277        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
278        gtk_container_add(GTK_CONTAINER(align), context->votebox);
279        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
280    
281        /* fill with vote if present on disk (will also free vote) */
282        if(vote)
283          gcvote_set(context, vote);
284    
285        gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
286      }
287    
288      /* ----------------------------------------------------- */
289    
290    
291    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
292    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
293    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 229  static GtkWidget *cache_overview(cache_c Line 317  static GtkWidget *cache_overview(cache_c
317    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
318    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);
319    
320      /* ----------------------------------------------------- */
321    
322    if(cache->short_description)    if(cache->short_description)
323      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
324          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
325                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
326    
327    return vbox;    return vbox;
328  }  }
329    
330  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
331  static void rot13(char *t) {  static void rot13(char *t) {
332      int braces = 0;
333    
334    while(*t) {    while(*t) {
335      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
336         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
337      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
338              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
339                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
340          else if(((*t >= 'n') && (*t <= 'z')) ||
341                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
342        } else {
343          if(braces > 0 && *t == ']')
344            braces--;
345        }
346    
347      t++;      t++;
348    }    }
# Line 269  static void on_decrypt(GtkWidget *widget Line 368  static void on_decrypt(GtkWidget *widget
368  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
369    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
370    if(cache->hint_is_html)    if(cache->hint_is_html)
371      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
372    
373    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
374    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
375    
376    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
377    rot13(hint);    rot13(hint);
378    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
379        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
380    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
381    free(hint);    free(hint);
382    
383    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
384    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
385      hildon_gtk_widget_set_theme_size(button,
386               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
387    #endif
388    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
389    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
390             GTK_SIGNAL_FUNC(on_decrypt), gtk_bin_get_child(GTK_BIN(view)));             GTK_SIGNAL_FUNC(on_decrypt), gtk_bin_get_child(GTK_BIN(view)));
# Line 350  static GtkWidget *cache_wpts(appdata_t * Line 453  static GtkWidget *cache_wpts(appdata_t *
453                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
454    
455      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
456      if(wpt->desc) {      if(wpt->desc)
457        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
458        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,  
459                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
460    
461      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
462      if(wpt->cmt) {      if(wpt->cmt)
463        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
464        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,  
465                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
466    
467      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
468      if(wpt->next)      if(wpt->next) {
469          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
470        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
471                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
472          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
473        }
474    
475      wpt_row+=4;      wpt_row+=4;
476      wpt = wpt->next;      wpt = wpt->next;
# Line 430  static GtkWidget *cache_tbs(appdata_t *a Line 509  static GtkWidget *cache_tbs(appdata_t *a
509    
510    int tb_row=0;    int tb_row=0;
511    while(tb) {    while(tb) {
512        static const char *tb_type = "track/details.aspx";
513    
514      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
515      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),
516                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
517      if(tb->ref)  
518        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
519        if(tb->ref) {
520          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
521          gtk_table_attach_defaults(GTK_TABLE(table), ref,
522                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
523        }
524    
525      if(tb->name)      if(tb->name)
526        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
527                                  2, 3, tb_row+0, tb_row+1);                                  2, 3, tb_row+0, tb_row+1);
# Line 461  static GtkWidget *cache_tbs(appdata_t *a Line 547  static GtkWidget *cache_tbs(appdata_t *a
547  #endif  #endif
548  }  }
549    
550  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
551    static void on_gclink_clicked(GtkButton *button, gpointer data) {
552      cache_context_t *context = (cache_context_t*)data;
553      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
554      browser_url(context->appdata, url);
555      g_free(url);
556    }
557    #endif
558    
559    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context,
560                                 log_t *log, int is_html) {
561  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
562    /* put this inside a scrolled view */    /* put this inside a scrolled view */
563    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 471  static GtkWidget *cache_logs(appdata_t * Line 567  static GtkWidget *cache_logs(appdata_t *
567    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
568  #endif  #endif
569    
570    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
571    int cnt = 0;    gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
572    #else
573    #define gc_link (FALSE)
574    #endif
575    
576      GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
577    
578    #ifdef ENABLE_BROWSER_INTERFACE
579      if(gc_link) {
580        GtkWidget *but =
581          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
582    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
583      hildon_gtk_widget_set_theme_size(but,
584               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
585    #endif
586        gtk_signal_connect(GTK_OBJECT(but), "clicked",
587                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
588    
589        gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
590      }
591    #endif
592    
593      int logs = gpx_number_of_logs(log);
594      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
595      int log_cnt = 0;
596    
597      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
598    
599    /* add all logs to the vbox */    /* add all logs to the vbox */
600    while(log) {    while(log) {
601      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
602                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
603      gtk_table_attach_defaults(GTK_TABLE(table),  
604                                icon_get_widget(ICON_LOG, log->type),      static const char *finder_type = "profile/";
605                                0, 1, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
606                                              finder_type, log->finder->id);
607    
608        /* if the finder is a button make sure it's the right size and */
609        /* does not exceed the size limits */
610        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
611    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
612          hildon_gtk_widget_set_theme_size(finder,
613                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
614    #endif
615    
616          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
617                                  PANGO_ELLIPSIZE_END);
618        } else
619          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
620    
621        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
622    
623        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
624                  icon_get_widget(ICON_LOG, log->type));
625    
626      char date_str[32];      char date_str[32];
627      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 490  static GtkWidget *cache_logs(appdata_t * Line 631  static GtkWidget *cache_logs(appdata_t *
631      } else      } else
632        strcpy(date_str, "---");        strcpy(date_str, "---");
633    
634      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);  
635    
636      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);  
637    
638        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
639                                  2*log_cnt, 2*log_cnt+1);
640    
641      if(log->text) {      if(log->text) {
642        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
643                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
644                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
645                                    1, 2, 2*log_cnt, 2*log_cnt+1);
646        }
647    
648        if(log_cnt < logs-1) {
649          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
650    
651          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
652                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
653    
654          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
655      }      }
656    
657      log = log->next;      log = log->next;
658      cnt+=4;      log_cnt++;
659    }    }
660    
661      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
662    
663  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
664    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
665                                          table);                                          vbox);
666    return scrolled_window;    return scrolled_window;
667  #else  #else
668    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
669                                           table);                                           vbox);
670    return pannable_area;    return pannable_area;
671  #endif  #endif
672  }  }
# Line 548  static void on_notebook_page_change(GtkN Line 700  static void on_notebook_page_change(GtkN
700    
701    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
702    /* 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 */
703    /* 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. */
704    /* seems to work ... */    /* seems to work ... */
705    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
706      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
707    }    } else if(strcasecmp(name, _("TBs")) == 0) {
708        gtk_widget_queue_resize(w);
709    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
710  #ifdef USE_MAEMO  #ifdef USE_MAEMO
711      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
712                                            context->appdata);                                            context->appdata);
# Line 574  static void on_notebook_destroy(GtkWidge Line 726  static void on_notebook_destroy(GtkWidge
726    
727    printf("destroying notebook\n");    printf("destroying notebook\n");
728    
729      /* cancel a pending gcvote request */
730      if(context->gcvote_request) {
731        gcvote_request_free(context->gcvote_request);
732        context->gcvote_request = NULL;
733      }
734    
735    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
736    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
737    
# Line 585  static void on_notebook_destroy(GtkWidge Line 743  static void on_notebook_destroy(GtkWidge
743    free(user_data);    free(user_data);
744  }  }
745    
746    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
747    #define CUSTOM_NOTEBOOK
748    #endif
749    
750    static GtkWidget *notebook_new(void) {
751    #ifdef CUSTOM_NOTEBOOK
752      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
753    
754      GtkWidget *notebook =  gtk_notebook_new();
755    
756      /* prevents user from accidentially touching the breadcrumb trail */
757      /* (looks ugly on fremantle as it isn't themed) */
758      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
759    
760      /* solution for fremantle: we use a row of ordinary buttons instead */
761      /* of regular tabs */
762    
763      /* hide the regular tabs */
764      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
765    
766      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
767    
768      /* store a reference to the notebook in the vbox */
769      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
770    
771      /* create a hbox for the buttons */
772      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
773      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
774      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
775    
776      return vbox;
777    #else
778      return gtk_notebook_new();
779    #endif
780    }
781    
782    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
783      GtkNotebook *nb =
784        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
785    
786      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
787      gtk_notebook_set_current_page(nb, page);
788    }
789    
790    static void notebook_append_page(GtkWidget *notebook,
791                                     GtkWidget *page, char *label) {
792    #ifdef CUSTOM_NOTEBOOK
793      GtkNotebook *nb =
794        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
795    
796      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
797      GtkWidget *button = NULL;
798    
799      /* select button for page 0 by default */
800      if(!page_num) {
801        button = gtk_radio_button_new_with_label(NULL, label);
802        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
803        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
804      } else {
805        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
806        button = gtk_radio_button_new_with_label_from_widget(
807                                     GTK_RADIO_BUTTON(master), label);
808      }
809    
810      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
811      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
812    
813      gtk_signal_connect(GTK_OBJECT(button), "clicked",
814               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
815    
816    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
817      hildon_gtk_widget_set_theme_size(button,
818               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
819    #endif
820    
821      gtk_box_pack_start_defaults(
822         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
823         button);
824    
825    #else
826      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
827    #endif
828    }
829    
830    static GObject *notebook_object(GtkWidget *notebook) {
831    #ifdef CUSTOM_NOTEBOOK
832      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
833    #else
834      return G_OBJECT(notebook);
835    #endif
836    }
837    
838  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
839    GtkWidget *notebook;    GtkWidget *notebook;
840    
# Line 601  GtkWidget *cache_view(appdata_t *appdata Line 851  GtkWidget *cache_view(appdata_t *appdata
851  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
852  #endif  #endif
853    
854    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  
855    
856    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
857         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
858    
859    if(cache->long_description)    if(cache->long_description)
860      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
861             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
862    
863    if(cache->hint)    if(cache->hint)
864      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
865             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
866    
867    if(cache->log)    if(cache->log)
868      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
869             cache_logs(appdata, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
870             gtk_label_new(_("Logs")));             _("Logs"));
871    
872    if(cache->wpt)    if(cache->wpt)
873      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
874               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
875    
876    if(cache->tb)    if(cache->tb)
877      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
878               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
879    
880    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
881             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
882    
883    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
884             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
885    
886    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
887             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
888    
889    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
890             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
891    
892    return notebook;    return notebook;
# Line 684  void cache_dialog(appdata_t *appdata, ca Line 928  void cache_dialog(appdata_t *appdata, ca
928    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
929    
930    appdata->cur_cache = cache;    appdata->cur_cache = cache;
931    char *title = g_strdup_printf("GPXView - %s", cache->name);    char *title = g_strdup_printf("%s - GPXView", cache->name);
932    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
933    g_free(title);    g_free(title);
934    
Legend:
Removed from v.13  
changed lines
  Added in v.176