Diff of /trunk/src/cache.c

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

revision 1 by harbaum, Sat Jun 20 11:08:47 2009 UTC revision 166 by harbaum, Sun Nov 8 20:34:22 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 92  void overview_coordinate_update(cache_co Line 92  void overview_coordinate_update(cache_co
92                          (GtkCallback)gtk_widget_destroy, NULL);                          (GtkCallback)gtk_widget_destroy, NULL);
93    
94    /* update distance/etc */    /* update distance/etc */
95    bearing_fill_hbox(context->bearing_hbox, context->appdata,    if(!isnan(context->cache->pos.lat) &&
96                      *get_pos(context->appdata), notes_get_pos(context));       !isnan(context->cache->pos.lon))
97        bearing_fill_hbox(context->bearing_hbox, context->appdata,
98                          *get_pos(context->appdata), notes_get_pos(context));
99    
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 119  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, 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 130  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 143  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_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NONE);  
       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 166  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 187  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    
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    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
287    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
288    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 212  static GtkWidget *cache_overview(cache_c Line 298  static GtkWidget *cache_overview(cache_c
298         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));
299    
300    /* but calculations may be done with respect to the overriden one */    /* but calculations may be done with respect to the overriden one */
301    context->bearing_hbox = gtk_hbox_new(FALSE, 0);    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
302    bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,      context->bearing_hbox = gtk_hbox_new(FALSE, 0);
303                      gpx_cache_pos(cache));      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,
304    gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);                        gpx_cache_pos(cache));
305        gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);
306      }
307    
308    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);
309    
# Line 224  static GtkWidget *cache_overview(cache_c Line 312  static GtkWidget *cache_overview(cache_c
312    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
313    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);
314    
315      /* ----------------------------------------------------- */
316    
317    if(cache->short_description)    if(cache->short_description)
318      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
319          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
320                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
321    
322    return vbox;    return vbox;
323  }  }
324    
325  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
326  static void rot13(char *t) {  static void rot13(char *t) {
327      int braces = 0;
328    
329    while(*t) {    while(*t) {
330      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
331         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
332      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
333              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
334                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
335          else if(((*t >= 'n') && (*t <= 'z')) ||
336                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
337        } else {
338          if(braces > 0 && *t == ']')
339            braces--;
340        }
341    
342      t++;      t++;
343    }    }
# Line 264  static void on_decrypt(GtkWidget *widget Line 363  static void on_decrypt(GtkWidget *widget
363  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
364    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
365    if(cache->hint_is_html)    if(cache->hint_is_html)
366      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
367    
368    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
369    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
370    
371    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
372    rot13(hint);    rot13(hint);
373    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
374        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
375    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
376    free(hint);    free(hint);
377    
378    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
379    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
380      hildon_gtk_widget_set_theme_size(button,
381               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
382    #endif
383    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
384    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
385             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 345  static GtkWidget *cache_wpts(appdata_t * Line 448  static GtkWidget *cache_wpts(appdata_t *
448                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
449    
450      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
451      if(wpt->desc) {      if(wpt->desc)
452        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
453        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));                                  simple_text_widget(wpt->desc), 0,4,
   
 #ifndef USE_MAEMO  
       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,  
454                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
455    
456      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
457      if(wpt->cmt) {      if(wpt->cmt)
458        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
459        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));                                  simple_text_widget(wpt->cmt), 0,4,
 #ifndef USE_MAEMO  
       GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);  
 #else  
       GtkWidget *textview = hildon_text_view_new();  
       hildon_text_view_set_buffer(HILDON_TEXT_VIEW(textview), buffer);  
 #endif  
       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);  
       gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);  
       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);  
   
       gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,  
460                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
461    
462      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
463      if(wpt->next)      if(wpt->next) {
464          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
465        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
466                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
467          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
468        }
469    
470      wpt_row+=4;      wpt_row+=4;
471      wpt = wpt->next;      wpt = wpt->next;
# Line 425  static GtkWidget *cache_tbs(appdata_t *a Line 504  static GtkWidget *cache_tbs(appdata_t *a
504    
505    int tb_row=0;    int tb_row=0;
506    while(tb) {    while(tb) {
507        static const char *tb_type = "track/details.aspx";
508    
509      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
510      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),
511                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
512      if(tb->ref)  
513        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
514        if(tb->ref) {
515          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
516          gtk_table_attach_defaults(GTK_TABLE(table), ref,
517                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
518        }
519    
520      if(tb->name)      if(tb->name)
521        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
522                                  2, 3, tb_row+0, tb_row+1);                                  2, 3, tb_row+0, tb_row+1);
# Line 456  static GtkWidget *cache_tbs(appdata_t *a Line 542  static GtkWidget *cache_tbs(appdata_t *a
542  #endif  #endif
543  }  }
544    
545  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
546    static void on_gclink_clicked(GtkButton *button, gpointer data) {
547      cache_context_t *context = (cache_context_t*)data;
548      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
549      browser_url(context->appdata, url);
550      g_free(url);
551    }
552    #endif
553    
554    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context,
555                                 log_t *log, int is_html) {
556  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
557    /* put this inside a scrolled view */    /* put this inside a scrolled view */
558    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 466  static GtkWidget *cache_logs(appdata_t * Line 562  static GtkWidget *cache_logs(appdata_t *
562    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
563  #endif  #endif
564    
565    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
566    int cnt = 0;    gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
567    #else
568    #define gc_link (FALSE)
569    #endif
570    
571      GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
572    
573    #ifdef ENABLE_BROWSER_INTERFACE
574      if(gc_link) {
575        GtkWidget *but =
576          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
577    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
578      hildon_gtk_widget_set_theme_size(but,
579               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
580    #endif
581        gtk_signal_connect(GTK_OBJECT(but), "clicked",
582                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
583    
584        gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
585      }
586    #endif
587    
588      int logs = gpx_number_of_logs(log);
589      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
590      int log_cnt = 0;
591    
592      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
593    
594    /* add all logs to the vbox */    /* add all logs to the vbox */
595    while(log) {    while(log) {
596      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
597                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
598      gtk_table_attach_defaults(GTK_TABLE(table),  
599                                icon_get_widget(ICON_LOG, log->type),      static const char *finder_type = "profile/";
600                                0, 1, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
601                                              finder_type, log->finder->id);
602    
603        /* if the finder is a button make sure it's the right size and */
604        /* does not exceed the size limits */
605        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
606    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
607          hildon_gtk_widget_set_theme_size(finder,
608                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
609    #endif
610    
611          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
612                                  PANGO_ELLIPSIZE_END);
613        } else
614          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
615    
616        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
617    
618        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
619                  icon_get_widget(ICON_LOG, log->type));
620    
621      char date_str[32];      char date_str[32];
622      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 485  static GtkWidget *cache_logs(appdata_t * Line 626  static GtkWidget *cache_logs(appdata_t *
626      } else      } else
627        strcpy(date_str, "---");        strcpy(date_str, "---");
628    
629      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);  
630    
631      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);  
632    
633        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
634                                  2*log_cnt, 2*log_cnt+1);
635    
636      if(log->text) {      if(log->text) {
637        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
638                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
639                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
640                                    1, 2, 2*log_cnt, 2*log_cnt+1);
641        }
642    
643        if(log_cnt < logs-1) {
644          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
645    
646          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
647                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
648    
649          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
650      }      }
651    
652      log = log->next;      log = log->next;
653      cnt+=4;      log_cnt++;
654    }    }
655    
656      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
657    
658  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
659    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
660                                          table);                                          vbox);
661    return scrolled_window;    return scrolled_window;
662  #else  #else
663    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
664                                           table);                                           vbox);
665    return pannable_area;    return pannable_area;
666  #endif  #endif
667  }  }
# Line 543  static void on_notebook_page_change(GtkN Line 695  static void on_notebook_page_change(GtkN
695    
696    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
697    /* 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 */
698    /* 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. */
699    /* seems to work ... */    /* seems to work ... */
700    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
701      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
702    }    } else if(strcasecmp(name, _("TBs")) == 0) {
703        gtk_widget_queue_resize(w);
704    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
705  #ifdef USE_MAEMO  #ifdef USE_MAEMO
706      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
707                                            context->appdata);                                            context->appdata);
# Line 569  static void on_notebook_destroy(GtkWidge Line 721  static void on_notebook_destroy(GtkWidge
721    
722    printf("destroying notebook\n");    printf("destroying notebook\n");
723    
724      /* cancel a pending gcvote request */
725      if(context->gcvote_request) {
726        gcvote_request_free(context->gcvote_request);
727        context->gcvote_request = NULL;
728      }
729    
730    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
731    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
732    
# Line 580  static void on_notebook_destroy(GtkWidge Line 738  static void on_notebook_destroy(GtkWidge
738    free(user_data);    free(user_data);
739  }  }
740    
741    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
742    #define CUSTOM_NOTEBOOK
743    #endif
744    
745    static GtkWidget *notebook_new(void) {
746    #ifdef CUSTOM_NOTEBOOK
747      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
748    
749      GtkWidget *notebook =  gtk_notebook_new();
750    
751      /* prevents user from accidentially touching the breadcrumb trail */
752      /* (looks ugly on fremantle as it isn't themed) */
753      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
754    
755      /* solution for fremantle: we use a row of ordinary buttons instead */
756      /* of regular tabs */
757    
758      /* hide the regular tabs */
759      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
760    
761      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
762    
763      /* store a reference to the notebook in the vbox */
764      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
765    
766      /* create a hbox for the buttons */
767      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
768      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
769      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
770    
771      return vbox;
772    #else
773      return gtk_notebook_new();
774    #endif
775    }
776    
777    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
778      GtkNotebook *nb =
779        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
780    
781      /* get previously selected page */
782      gint page = gtk_notebook_get_current_page(nb);
783      char *id_str = g_strdup_printf("button_%d", page);
784      gtk_toggle_button_set_active(
785         GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), id_str)), FALSE);
786      g_free(id_str);
787    
788      page = (gint)g_object_get_data(G_OBJECT(button), "page");
789      gtk_notebook_set_current_page(nb, page);
790    }
791    
792    static void notebook_append_page(GtkWidget *notebook,
793                                     GtkWidget *page, char *label) {
794    #ifdef CUSTOM_NOTEBOOK
795      GtkNotebook *nb =
796        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
797    
798      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
799    
800      GtkWidget *button = gtk_toggle_button_new_with_label(label);
801      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
802    
803      /* select button for page 0 by default */
804      if(!page_num)
805        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
806    
807      gtk_signal_connect(GTK_OBJECT(button), "clicked",
808               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
809    
810      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
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      char *id_str = g_strdup_printf("button_%d", page_num);
818      g_object_set_data(G_OBJECT(notebook), id_str, (gpointer)button);
819      g_free(id_str);
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 596  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 665  void cache_dialog(appdata_t *appdata, ca Line 914  void cache_dialog(appdata_t *appdata, ca
914    
915  #else  #else
916  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
917    static void on_cache_destroy (GtkWidget *widget, appdata_t *appdata) {
918      appdata->cur_cache = NULL;
919    
920      /* restore cur_view */
921      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
922    }
923    
924  void cache_dialog(appdata_t *appdata, cache_t *cache) {  void cache_dialog(appdata_t *appdata, cache_t *cache) {
925    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
926    
927    gtk_window_set_title(GTK_WINDOW(window), cache->name);    /* store last "cur_view" in window */
928      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
929    
930      appdata->cur_cache = cache;
931      char *title = g_strdup_printf("%s - GPXView", cache->name);
932      gtk_window_set_title(GTK_WINDOW(window), title);
933      g_free(title);
934    
935    /* create cache visualization widget */    /* create cache visualization widget */
936    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_view = cache_view(appdata, cache);
937                      cache_view(appdata, cache));    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
938    
939      hildon_window_set_app_menu(HILDON_WINDOW(window),
940                                 menu_create(appdata, MENU_CACHE));
941    
942      g_signal_connect(G_OBJECT(window), "destroy",
943                       G_CALLBACK(on_cache_destroy), appdata);
944    
945    gtk_widget_show_all(window);    gtk_widget_show_all(window);
946  }  }
Legend:
Removed from v.1  
changed lines
  Added in v.166