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 190 by harbaum, Tue Nov 17 10:22:41 2009 UTC
# Line 19  Line 19 
19    
20  #include "gpxview.h"  #include "gpxview.h"
21  #include <math.h>  #include <math.h>
22    #include <string.h>
23    
24  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_description(appdata_t *appdata, cache_t *cache) {
25    return html_view(appdata, cache->long_description,    return html_view(appdata, cache->long_description,
26                     cache->long_is_html, TRUE, cache, NULL);             cache->long_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL);
27  }  }
28    
29  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips  #ifndef USE_MAEMO  // maemos touchscreen doesn't support tooltips
# Line 41  static const char *cache_size_tip[] = { Line 42  static const char *cache_size_tip[] = {
42  #endif  #endif
43    
44  static const char *cache_size_name[] = {  static const char *cache_size_name[] = {
45    "Regular", "Small", "Micro", "Other",    "Regular", "Small", "Micro", "Other", "Not chosen", "Large", "Virtual"
   "Not chosen", "Large", "Virtual"  
46  };  };
47    
48  void bearing_fill_hbox(GtkWidget *hbox,  void bearing_fill_hbox(GtkWidget *hbox,
# Line 51  void bearing_fill_hbox(GtkWidget *hbox, Line 51  void bearing_fill_hbox(GtkWidget *hbox,
51    
52    if(!isnan(pos.lat) && !isnan(pos.lon)) {    if(!isnan(pos.lat) && !isnan(pos.lon)) {
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)),TRUE,FALSE,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          gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL("  "));
60        snprintf(str, sizeof(str), _("%.1f°"),        snprintf(str, sizeof(str), _("%.1f°"),
61                 gpx_pos_get_bearing(refpos, pos));                 gpx_pos_get_bearing(refpos, pos));
62        gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL(str));        gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL(str));
63        gpx_pos_get_distance_str(str, sizeof(str),        gpx_pos_get_distance_str(str, sizeof(str),
64                               refpos, pos, appdata->imperial);                               refpos, pos, appdata->imperial);
65          gtk_box_pack_start_defaults(GTK_BOX(hbox), GTK_LABEL_SMALL("  "));
66        gtk_box_pack_start(GTK_BOX(hbox),        gtk_box_pack_start(GTK_BOX(hbox),
67               gtk_label_attrib(str, SIZE_SMALL, STRIKETHROUGH_NONE),1,0,0);               gtk_label_attrib(str, SIZE_SMALL, STRIKETHROUGH_NONE),TRUE,FALSE,0);
68      } else      } else
69        gtk_box_pack_start(GTK_BOX(hbox),        gtk_box_pack_start(GTK_BOX(hbox),
70                           gtk_label_attrib(_("(no position)"),                           gtk_label_attrib(_("(no position)"),
71                           SIZE_SMALL, STRIKETHROUGH_NONE),1,0,0);                           SIZE_SMALL, STRIKETHROUGH_NONE),TRUE,FALSE,0);
72    } else    } else
73      gtk_box_pack_start(GTK_BOX(hbox),      gtk_box_pack_start(GTK_BOX(hbox),
74             gtk_label_attrib(_("(invalid position in notes)"),             gtk_label_attrib(_("(invalid position in notes)"),
75                              SIZE_SMALL, STRIKETHROUGH_NONE),1,0,0);                              SIZE_SMALL, STRIKETHROUGH_NONE),TRUE,FALSE,0);
76  }  }
77    
78  /* this function sets everthing related to the coordinate. used to */  /* this function sets everything related to the coordinate. used to */
79  /* cope with the user setting a new "note coordinate" */  /* cope with the user setting a new "note coordinate" */
80  void overview_coordinate_update(cache_context_t *context) {  void overview_coordinate_update(cache_context_t *context) {
81    if(!context->notes.modified)    if(!context->notes.modified)
# Line 100  void overview_coordinate_update(cache_co Line 102  void overview_coordinate_update(cache_co
102    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
103  }  }
104    
105  #ifdef ENABLE_BROWSER_INTERFACE  static void gcvote_set(cache_context_t *context, vote_t *vote) {
106  static void on_www_clicked(GtkButton *button, gpointer data) {    if(!vote) return;
107    
108      if(context->quality) {
109        gtk_widget_destroy(context->quality);
110        context->quality = NULL;
111      }
112    
113      if(context->votes) {
114        gtk_widget_destroy(context->votes);
115        context->votes = NULL;
116      }
117    
118      /* update/draw the voting */
119    #ifndef USE_MAEMO
120      GtkTooltips *tips = gtk_tooltips_new();
121    #endif
122    
123      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
124                                          (vote->votes == 1)?_("vote"):_("votes"));
125      context->votes = GTK_LABEL_SMALL(votes_str);
126      gtk_box_pack_start(GTK_BOX(context->votebox),
127                         context->votes, FALSE, FALSE, 0);
128      g_free(votes_str);
129      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
130      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
131                         FALSE, FALSE, 0);
132    
133    #ifndef USE_MAEMO
134      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
135      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
136      g_free(str);
137    #endif
138    
139      gtk_widget_show_all(context->votebox);
140    
141      g_free(vote);
142    }
143    
144    static void gcvote_callback(vote_t *vote, gpointer data) {
145    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
146    browser_url(context->appdata, context->cache->url);  
147      /* no vote returned: request failed, just cleanup */
148      if(!vote) {
149        printf("gcvote: callback for failed request\n");
150    
151        gcvote_request_free(context->gcvote_request);
152        context->gcvote_request = NULL;
153        return;
154      }
155    
156      printf("gcvote: callback is being called with a %d/%d\n",
157             vote->quality, vote->votes);
158    
159      gcvote_set(context, vote);
160    
161      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
162    
163      gcvote_request_free(context->gcvote_request);
164      context->gcvote_request = NULL;
165    }
166    
167    static void pack_vcentered(GtkWidget *vbox, GtkWidget *child) {
168      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
169      gtk_container_add(GTK_CONTAINER(align), child);
170      gtk_box_pack_start_defaults(GTK_BOX(vbox), align);
171  }  }
 #endif  
172    
173  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
174    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
175    GtkWidget *table, *tip;    GtkWidget *colbox, *tip;
176    char str[64];    char str[64];
177  #ifndef USE_MAEMO  #ifndef USE_MAEMO
178    GtkTooltips *tips = gtk_tooltips_new();    GtkTooltips *tips = gtk_tooltips_new();
# Line 117  static GtkWidget *cache_overview(cache_c Line 180  static GtkWidget *cache_overview(cache_c
180    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
181    cache_t *cache = context->cache;    cache_t *cache = context->cache;
182    
183    vbox = gtk_vbox_new(FALSE, 0);    vbox = gtk_vbox_new(FALSE, 4);
184    
185      /* hbox containing the four columns of cache details */
186      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);
187    
188    table =  gtk_table_new(3,4, FALSE);    /* vbox containing leftmost column (icon and container) */
189      colbox = gtk_vbox_new(FALSE, 0);
190    
191    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
192      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_box_pack_start_defaults(GTK_BOX(colbox),
193        tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1);  
194    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
195        tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type));
196    #else
197        tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type));
198    #endif
199    
200  #ifndef USE_MAEMO  #ifndef USE_MAEMO
201      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
202  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 206  static GtkWidget *cache_overview(cache_c
206    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
207      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
208      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
209      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
210      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
211          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
212      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
213                           FALSE, FALSE, 0);
214    
215        pack_vcentered(colbox, ivbox);
216  #ifndef USE_MAEMO  #ifndef USE_MAEMO
217      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
218  #endif  #endif
219    }    }
220    
221      gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
222      colbox = gtk_vbox_new(FALSE, 0);
223    
224    /* ----------------------- id ---------------------------- */    /* ----------------------- id ---------------------------- */
225    if(cache->id) {    if(cache->id) {
226      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
227        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
228      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
229                                            cache->id, context->cache->url,
230  #ifdef ENABLE_BROWSER_INTERFACE                                          SIZE_BIG, strike);
231      if(!cache->url)      pack_vcentered(colbox, lbl);
 #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  
   
     gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);  
232    }    }
233    
234    /* --------------- box containing owner info ------------- */    /* --------------- box containing owner info ------------- */
235    if(cache->owner) {    if(cache->owner) {
236      ivbox = gtk_vbox_new(FALSE, 0);      gtk_box_pack_start_defaults(GTK_BOX(colbox), GTK_LABEL_SMALL(_("by")));
237      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));  
238      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));      static const char *owner_type = "profile/";
239      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      pack_vcentered(colbox,
240                    link_button_by_id(appdata, cache->owner->name,
241                                      owner_type, cache->owner->id));
242    }    }
243    
244      gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
245    
246      /* ----------- vbox containing all ratings ---------- */
247      colbox = gtk_vbox_new(FALSE, 0);
248    
249    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
250    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
251      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
252      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
253                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
254      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
255         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
256      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
257                           FALSE, FALSE, 0);
258    
259        pack_vcentered(colbox, ivbox);
260  #ifndef USE_MAEMO  #ifndef USE_MAEMO
261      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
262      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 266  static GtkWidget *cache_overview(cache_c
266    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
267    if(cache->terrain != 0) {    if(cache->terrain != 0) {
268      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
269      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
270      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
271        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
272      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
273                           FALSE, FALSE, 0);
274        pack_vcentered(colbox, ivbox);
275  #ifndef USE_MAEMO  #ifndef USE_MAEMO
276      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
277      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
278  #endif  #endif
279    }    }
280    
281      /* --------------------- GCVote ------------------------ */
282      if(!appdata->disable_gcvote) {
283        vote_t *vote = gcvote_restore(appdata, cache);
284    
285        context->gcvote_request =
286          gcvote_request(appdata, gcvote_callback, cache->url, context);
287    
288        context->votebox = gtk_vbox_new(FALSE, 0);
289        pack_vcentered(colbox, context->votebox);
290    
291        /* fill with vote if present on disk (will also free vote) */
292        if(vote)
293          gcvote_set(context, vote);
294      }
295    
296      gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
297    
298      /* ----------------------------------------------------- */
299    
300    
301    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
302    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
303      colbox = gtk_vbox_new(FALSE, 0);
304    
305    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
306    
307    ivbox = gtk_vbox_new(FALSE, 0);    ivbox = gtk_vbox_new(FALSE, 0);
# Line 209  static GtkWidget *cache_overview(cache_c Line 309  static GtkWidget *cache_overview(cache_c
309                    STRIKETHROUGH:STRIKETHROUGH_NONE;                    STRIKETHROUGH:STRIKETHROUGH_NONE;
310    
311    /* the original coordinate is being displayed */    /* the original coordinate is being displayed */
312    gtk_box_pack_start_defaults(GTK_BOX(ivbox),    gtk_box_pack_start(GTK_BOX(ivbox),
313         context->pos_lat_label = pos_lat(cache->pos.lat, SIZE_BIG, strike));         context->pos_lat_label = pos_lat(cache->pos.lat, SIZE_BIG, strike), FALSE, FALSE, 0);
314    gtk_box_pack_start_defaults(GTK_BOX(ivbox),    gtk_box_pack_start(GTK_BOX(ivbox),
315         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike), FALSE, FALSE, 0);
316    
317      pack_vcentered(colbox, ivbox);
318    
319    /* but calculations may be done with respect to the overriden one */    /* but calculations may be done with respect to the overriden one */
320    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
321      context->bearing_hbox = gtk_hbox_new(FALSE, 0);      context->bearing_hbox = gtk_hbox_new(FALSE, 0);
322      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,
323                        gpx_cache_pos(cache));                        gpx_cache_pos(cache));
324      gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);      pack_vcentered(colbox, context->bearing_hbox);
325    }    }
326    
327    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_box_pack_start_defaults(GTK_BOX(ihbox), colbox);
328    
329    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
330    
331    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), ihbox, FALSE, FALSE, 0);
332    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);
333    
334      /* ----------------------------------------------------- */
335    
336    if(cache->short_description)    if(cache->short_description)
337      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
338          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
339                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
340    
341    return vbox;    return vbox;
342  }  }
343    
344  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
345  static void rot13(char *t) {  static void rot13(char *t) {
346      int braces = 0;
347    
348    while(*t) {    while(*t) {
349      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
350         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
351      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
352              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
353                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
354          else if(((*t >= 'n') && (*t <= 'z')) ||
355                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
356        } else {
357          if(braces > 0 && *t == ']')
358            braces--;
359        }
360    
361      t++;      t++;
362    }    }
# Line 269  static void on_decrypt(GtkWidget *widget Line 382  static void on_decrypt(GtkWidget *widget
382  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
383    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
384    if(cache->hint_is_html)    if(cache->hint_is_html)
385      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
386    
387    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
388    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
389    
390    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
391    rot13(hint);    rot13(hint);
392    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
393        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
394    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
395    free(hint);    free(hint);
396    
397    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
398    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
399      hildon_gtk_widget_set_theme_size(button,
400               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
401    #endif
402    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
403    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
404             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 334  static GtkWidget *cache_wpts(appdata_t * Line 451  static GtkWidget *cache_wpts(appdata_t *
451                        pos_lon(wpt->pos.lon, SIZE_BIG, STRIKETHROUGH_NONE),                        pos_lon(wpt->pos.lon, SIZE_BIG, STRIKETHROUGH_NONE),
452                        2,3, wpt_row, wpt_row+1);                        2,3, wpt_row, wpt_row+1);
453    
454      ihbox = gtk_hbox_new(FALSE, 0);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
455      gtk_box_pack_start(GTK_BOX(ihbox), gtk_image_new_from_pixbuf(        ihbox = gtk_hbox_new(FALSE, 0);
456          gtk_box_pack_start(GTK_BOX(ihbox), gtk_image_new_from_pixbuf(
457                             icon_bearing(*refpos, wpt->pos)),1,0,0);                             icon_bearing(*refpos, wpt->pos)),1,0,0);
458      gtk_box_pack_start_defaults(GTK_BOX(ihbox),        snprintf(str, sizeof(str), _("%.1f°"),
459            GTK_LABEL_SMALL((char*)pos_get_bearing_str(*refpos, wpt->pos)));                 gpx_pos_get_bearing(*refpos, wpt->pos));
460      snprintf(str, sizeof(str), _("%.1f°"),        gtk_box_pack_start_defaults(GTK_BOX(ihbox), GTK_LABEL_SMALL(str));
            gpx_pos_get_bearing(*refpos, wpt->pos));  
     gtk_box_pack_start_defaults(GTK_BOX(ihbox), GTK_LABEL_SMALL(str));  
     gpx_pos_get_distance_str(str, sizeof(str),  
                              *refpos, wpt->pos, appdata->imperial);  
     gtk_box_pack_start(GTK_BOX(ihbox), GTK_LABEL_SMALL(str),1,0,0);  
   
     gtk_table_attach_defaults(GTK_TABLE(table), ihbox, 3,4,  
                               wpt_row+0, wpt_row+1);  
   
     /* ------------------ description ------------------------- */  
     if(wpt->desc) {  
       GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);  
       gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));  
   
 #ifndef USE_HILDON_TEXT_VIEW  
       GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);  
 #else  
       GtkWidget *textview = hildon_text_view_new();  
       hildon_text_view_set_buffer(HILDON_TEXT_VIEW(textview), buffer);  
 #endif  
461    
462        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);        gpx_pos_get_distance_str(str, sizeof(str),
463        gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);                                 *refpos, wpt->pos, appdata->imperial);
464        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);        gtk_box_pack_start(GTK_BOX(ihbox), GTK_LABEL_SMALL(str),1,0,0);
465    
466          gtk_table_attach_defaults(GTK_TABLE(table), ihbox, 3,4,
467                                    wpt_row+0, wpt_row+1);
468        }
469    
470        gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,      /* ------------------ description ------------------------- */
471        if(wpt->desc)
472          gtk_table_attach_defaults(GTK_TABLE(table),
473                                    simple_text_widget(wpt->desc), 0,4,
474                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
475    
476      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
477      if(wpt->cmt) {      if(wpt->cmt)
478        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
479        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,  
480                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
481    
482      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
483      if(wpt->next)      if(wpt->next) {
484          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
485        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
486                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
487          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
488        }
489    
490      wpt_row+=4;      wpt_row+=4;
491      wpt = wpt->next;      wpt = wpt->next;
# Line 430  static GtkWidget *cache_tbs(appdata_t *a Line 524  static GtkWidget *cache_tbs(appdata_t *a
524    
525    int tb_row=0;    int tb_row=0;
526    while(tb) {    while(tb) {
527        static const char *tb_type = "track/details.aspx";
528    
529      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
530      gtk_table_attach_defaults(GTK_TABLE(table), icon_get_widget(ICON_TB, 0),      GtkWidget *icon = NULL;
531        if((strcasestr(tb->name, "coin") != 0) ||
532           (strcasestr(tb->name, "muenze") != 0) ||
533           (strcasestr(tb->name, "münze") != 0))
534          icon = icon_get_widget(ICON_TB, 1);   /* coin icon */
535        else
536          icon = icon_get_widget(ICON_TB, 0);   /* tb icon */
537    
538        gtk_table_attach_defaults(GTK_TABLE(table), icon,
539                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
540      if(tb->ref)  
541        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),      if(tb->ref) {
542          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
543          gtk_table_attach_defaults(GTK_TABLE(table), ref,
544                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
545        }
546    
547      if(tb->name)      if(tb->name)
548        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
549                                  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 569  static GtkWidget *cache_tbs(appdata_t *a
569  #endif  #endif
570  }  }
571    
572  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
573    static void on_gclink_clicked(GtkButton *button, gpointer data) {
574      cache_context_t *context = (cache_context_t*)data;
575      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
576      browser_url(context->appdata, url);
577      g_free(url);
578    }
579    #endif
580    
581    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context,
582                                 log_t *log, int is_html) {
583  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
584    /* put this inside a scrolled view */    /* put this inside a scrolled view */
585    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 589  static GtkWidget *cache_logs(appdata_t *
589    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
590  #endif  #endif
591    
592    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
593    int cnt = 0;    gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
594    #else
595    #define gc_link (FALSE)
596    #endif
597    
598      GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
599    
600    #ifdef ENABLE_BROWSER_INTERFACE
601      if(gc_link) {
602        GtkWidget *but =
603          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
604    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
605      hildon_gtk_widget_set_theme_size(but,
606               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
607    #endif
608        gtk_signal_connect(GTK_OBJECT(but), "clicked",
609                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
610    
611        gtk_box_pack_start(GTK_BOX(vbox), but, FALSE, FALSE, 0);
612      }
613    #endif
614    
615      int logs = gpx_number_of_logs(log);
616      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
617      int log_cnt = 0;
618    
619      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
620    
621    /* add all logs to the vbox */    /* add all logs to the vbox */
622    while(log) {    while(log) {
623      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
624                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
625      gtk_table_attach_defaults(GTK_TABLE(table),  
626                                icon_get_widget(ICON_LOG, log->type),      static const char *finder_type = "profile/";
627                                0, 1, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
628                                              finder_type, log->finder->id);
629    
630        /* if the finder is a button make sure it's the right size and */
631        /* does not exceed the size limits */
632        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
633    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
634          hildon_gtk_widget_set_theme_size(finder,
635                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
636    #endif
637    
638          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
639                                  PANGO_ELLIPSIZE_END);
640        } else
641          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
642    
643        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
644    
645        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
646                  icon_get_widget(ICON_LOG, log->type));
647    
648      char date_str[32];      char date_str[32];
649      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 490  static GtkWidget *cache_logs(appdata_t * Line 653  static GtkWidget *cache_logs(appdata_t *
653      } else      } else
654        strcpy(date_str, "---");        strcpy(date_str, "---");
655    
656      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));
657                                1, 2, cnt+1, cnt+2);  
658        gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
659    
660      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      gtk_table_attach(GTK_TABLE(table), ivbox, 0, 1,
661                                2, 3, cnt+1, cnt+2);                       2*log_cnt, 2*log_cnt+1, 0, GTK_EXPAND | GTK_FILL, 0, 0);
     gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),  
                               0, 3, cnt+2, cnt+3);  
662    
663      if(log->text) {      if(log->text) {
664        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
665                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
666                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
667                                    1, 2, 2*log_cnt, 2*log_cnt+1);
668        }
669    
670        if(log_cnt < logs-1) {
671          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
672    
673          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
674                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
675    
676          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
677      }      }
678    
679      log = log->next;      log = log->next;
680      cnt+=4;      log_cnt++;
681    }    }
682    
683      gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
684    
685  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
686    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
687                                          table);                                          vbox);
688    return scrolled_window;    return scrolled_window;
689  #else  #else
690    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
691                                           table);                                           vbox);
692    return pannable_area;    return pannable_area;
693  #endif  #endif
694  }  }
# Line 548  static void on_notebook_page_change(GtkN Line 722  static void on_notebook_page_change(GtkN
722    
723    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
724    /* 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 */
725    /* 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. */
726    /* seems to work ... */    /* seems to work ... */
727    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
728      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
729    }    } else if(strcasecmp(name, _("TBs")) == 0) {
730        gtk_widget_queue_resize(w);
731    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
732  #ifdef USE_MAEMO  #ifdef USE_MAEMO
733      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
734                                            context->appdata);                                            context->appdata);
# Line 574  static void on_notebook_destroy(GtkWidge Line 748  static void on_notebook_destroy(GtkWidge
748    
749    printf("destroying notebook\n");    printf("destroying notebook\n");
750    
751      /* cancel a pending gcvote request */
752      if(context->gcvote_request) {
753        gcvote_request_free(context->gcvote_request);
754        context->gcvote_request = NULL;
755      }
756    
757    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
758    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
759    
# Line 585  static void on_notebook_destroy(GtkWidge Line 765  static void on_notebook_destroy(GtkWidge
765    free(user_data);    free(user_data);
766  }  }
767    
768    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
769    #define CUSTOM_NOTEBOOK
770    #endif
771    
772    static GtkWidget *notebook_new(void) {
773    #ifdef CUSTOM_NOTEBOOK
774      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
775    
776      GtkWidget *notebook =  gtk_notebook_new();
777    
778      /* prevents user from accidentially touching the breadcrumb trail */
779      /* (looks ugly on fremantle as it isn't themed) */
780      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
781    
782      /* solution for fremantle: we use a row of ordinary buttons instead */
783      /* of regular tabs */
784    
785      /* hide the regular tabs */
786      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
787    
788      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
789    
790      /* store a reference to the notebook in the vbox */
791      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
792    
793      /* create a hbox for the buttons */
794      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
795      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
796      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
797    
798      return vbox;
799    #else
800      return gtk_notebook_new();
801    #endif
802    }
803    
804    #ifdef CUSTOM_NOTEBOOK
805    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
806      GtkNotebook *nb =
807        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
808    
809      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
810      gtk_notebook_set_current_page(nb, page);
811    }
812    #endif
813    
814    static void notebook_append_page(GtkWidget *notebook,
815                                     GtkWidget *page, char *label) {
816    #ifdef CUSTOM_NOTEBOOK
817      GtkNotebook *nb =
818        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
819    
820      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
821      GtkWidget *button = NULL;
822    
823      /* select button for page 0 by default */
824      if(!page_num) {
825        button = gtk_radio_button_new_with_label(NULL, label);
826        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
827        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
828      } else {
829        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
830        button = gtk_radio_button_new_with_label_from_widget(
831                                     GTK_RADIO_BUTTON(master), label);
832      }
833    
834      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
835      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
836    
837      gtk_signal_connect(GTK_OBJECT(button), "clicked",
838               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
839    
840    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
841      hildon_gtk_widget_set_theme_size(button,
842               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
843    #endif
844    
845      gtk_box_pack_start_defaults(
846         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
847         button);
848    
849    #else
850      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
851    #endif
852    }
853    
854    static GObject *notebook_object(GtkWidget *notebook) {
855    #ifdef CUSTOM_NOTEBOOK
856      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
857    #else
858      return G_OBJECT(notebook);
859    #endif
860    }
861    
862  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
863    GtkWidget *notebook;    GtkWidget *notebook;
864    
# Line 601  GtkWidget *cache_view(appdata_t *appdata Line 875  GtkWidget *cache_view(appdata_t *appdata
875  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
876  #endif  #endif
877    
878    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  
879    
880    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
881         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
882    
883    if(cache->long_description)    if(cache->long_description)
884      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
885             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
886    
887    if(cache->hint)    if(cache->hint)
888      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
889             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
890    
891    if(cache->log)    if(cache->log)
892      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
893             cache_logs(appdata, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
894             gtk_label_new(_("Logs")));             _("Logs"));
895    
896    if(cache->wpt)    if(cache->wpt)
897      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
898               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
899    
900    if(cache->tb)    if(cache->tb)
901      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
902               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
903    
904    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
905             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
906    
907    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
908             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
909    
910    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
911             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
912    
913    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
914             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
915    
916    return notebook;    return notebook;
# Line 684  void cache_dialog(appdata_t *appdata, ca Line 952  void cache_dialog(appdata_t *appdata, ca
952    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);    g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
953    
954    appdata->cur_cache = cache;    appdata->cur_cache = cache;
955    char *title = g_strdup_printf("GPXView - %s", cache->name);    char *title = g_strdup_printf("%s - GPXView", cache->name);
956    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
957    g_free(title);    g_free(title);
958    
Legend:
Removed from v.13  
changed lines
  Added in v.190