Diff of /trunk/src/cache.c

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

revision 6 by harbaum, Wed Jun 24 19:20:21 2009 UTC revision 138 by harbaum, Tue Oct 20 13:25:04 2009 UTC
# 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    gtk_widget_show_all(context->bearing_hbox);      bearing_fill_hbox(context->bearing_hbox, context->appdata,
98  }                        *get_pos(context->appdata), notes_get_pos(context));
99    
100  #ifdef ENABLE_BROWSER_INTERFACE    gtk_widget_show_all(context->bearing_hbox);
 static void on_www_clicked(GtkButton *button, gpointer data) {  
   cache_context_t *context = (cache_context_t*)data;  
   browser_url(context->appdata, context->cache->url);  
101  }  }
 #endif  
102    
103  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
104    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 119  static GtkWidget *cache_overview(cache_c Line 115  static GtkWidget *cache_overview(cache_c
115    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
116    
117    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
118      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
119        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,
120                 GTK_FILL, 0, GTK_FILL, 0);
121  #ifndef USE_MAEMO  #ifndef USE_MAEMO
122      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
123  #endif  #endif
# Line 130  static GtkWidget *cache_overview(cache_c Line 127  static GtkWidget *cache_overview(cache_c
127    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
128      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
129      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
130      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
131      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
132          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
133      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
134                           FALSE, FALSE, 0);
135        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
136                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
137  #ifndef USE_MAEMO  #ifndef USE_MAEMO
138      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
139  #endif  #endif
# Line 143  static GtkWidget *cache_overview(cache_c Line 143  static GtkWidget *cache_overview(cache_c
143    if(cache->id) {    if(cache->id) {
144      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
145        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
146      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
147                                            cache->id, context->cache->url,
148  #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  
   
149      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);
150    }    }
151    
# Line 166  static GtkWidget *cache_overview(cache_c Line 153  static GtkWidget *cache_overview(cache_c
153    if(cache->owner) {    if(cache->owner) {
154      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
155      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
156      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
157      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
158        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
159                    link_button_by_id(appdata, cache->owner->name,
160                                      owner_type, cache->owner->id));
161        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
162    }    }
163    
164    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
165    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
166      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
167      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
168                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
169      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
170         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
171      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
172                           FALSE, FALSE, 0);
173        gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,0,1,
174                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
175  #ifndef USE_MAEMO  #ifndef USE_MAEMO
176      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
177      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 181  static GtkWidget *cache_overview(cache_c
181    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
182    if(cache->terrain != 0) {    if(cache->terrain != 0) {
183      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
184      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
185      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
186        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
187      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
188                           FALSE, FALSE, 0);
189        gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,1,2,
190                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
191  #ifndef USE_MAEMO  #ifndef USE_MAEMO
192      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
193      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 212  static GtkWidget *cache_overview(cache_c Line 209  static GtkWidget *cache_overview(cache_c
209         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));         context->pos_lon_label = pos_lon(cache->pos.lon, SIZE_BIG, strike));
210    
211    /* but calculations may be done with respect to the overriden one */    /* but calculations may be done with respect to the overriden one */
212    context->bearing_hbox = gtk_hbox_new(FALSE, 0);    if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon)) {
213    bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,      context->bearing_hbox = gtk_hbox_new(FALSE, 0);
214                      gpx_cache_pos(cache));      bearing_fill_hbox(context->bearing_hbox, appdata, *refpos,
215    gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);                        gpx_cache_pos(cache));
216        gtk_box_pack_start_defaults(GTK_BOX(ivbox), context->bearing_hbox);
217      }
218    
219    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);
220    
# Line 234  static GtkWidget *cache_overview(cache_c Line 233  static GtkWidget *cache_overview(cache_c
233    
234  /* slow but short, we don't need performance here ... */  /* slow but short, we don't need performance here ... */
235  static void rot13(char *t) {  static void rot13(char *t) {
236      int braces = 0;
237    
238    while(*t) {    while(*t) {
239      if(((*t >= 'a') && (*t < 'n')) ||      if(!braces) {
240         ((*t >= 'A') && (*t < 'N'))) *t += 13;        if(*t == '[')
241      else if(((*t >= 'n') && (*t <= 'z')) ||          braces++;
242              ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;        else if(((*t >= 'a') && (*t < 'n')) ||
243                  ((*t >= 'A') && (*t < 'N'))) *t += 13;
244          else if(((*t >= 'n') && (*t <= 'z')) ||
245                  ((*t >= 'N') && (*t <= 'Z'))) *t -= 13;
246        } else {
247          if(braces > 0 && *t == ']')
248            braces--;
249        }
250    
251      t++;      t++;
252    }    }
# Line 276  static GtkWidget *cache_hint(appdata_t * Line 284  static GtkWidget *cache_hint(appdata_t *
284    free(hint);    free(hint);
285    
286    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));    GtkWidget *button = gtk_button_new_with_label(_("Encrypt/Decrypt"));
287    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
288      hildon_gtk_widget_set_theme_size(button,
289               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
290    #endif
291    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
292    gtk_signal_connect(GTK_OBJECT(button), "clicked",    gtk_signal_connect(GTK_OBJECT(button), "clicked",
293             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 349  static GtkWidget *cache_wpts(appdata_t * Line 360  static GtkWidget *cache_wpts(appdata_t *
360        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
361        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));
362    
363  #ifndef USE_MAEMO  #ifndef USE_HILDON_TEXT_VIEW
364        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);
365  #else  #else
366        GtkWidget *textview = hildon_text_view_new();        GtkWidget *textview = hildon_text_view_new();
# Line 368  static GtkWidget *cache_wpts(appdata_t * Line 379  static GtkWidget *cache_wpts(appdata_t *
379      if(wpt->cmt) {      if(wpt->cmt) {
380        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
381        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));
382  #ifndef USE_MAEMO  #ifndef USE_HILDON_TEXT_VIEW
383        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);        GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);
384  #else  #else
385        GtkWidget *textview = hildon_text_view_new();        GtkWidget *textview = hildon_text_view_new();
# Line 425  static GtkWidget *cache_tbs(appdata_t *a Line 436  static GtkWidget *cache_tbs(appdata_t *a
436    
437    int tb_row=0;    int tb_row=0;
438    while(tb) {    while(tb) {
439        static const char *tb_type = "track/details.aspx";
440    
441      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
442      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),
443                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
444      if(tb->ref)  
445        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
446        if(tb->ref) {
447          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
448          gtk_table_attach_defaults(GTK_TABLE(table), ref,
449                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
450        }
451    
452      if(tb->name)      if(tb->name)
453        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
454                                  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 474  static GtkWidget *cache_tbs(appdata_t *a
474  #endif  #endif
475  }  }
476    
477  static GtkWidget *cache_logs(appdata_t *appdata, log_t *log, int is_html) {  #ifdef ENABLE_BROWSER_INTERFACE
478    static void on_gclink_clicked(GtkButton *button, gpointer data) {
479      cache_context_t *context = (cache_context_t*)data;
480      char *url = g_strdup_printf("http://www.geocaching.com/seek/log.aspx?wp=%s", context->cache->id);
481      browser_url(context->appdata, url);
482      g_free(url);
483    }
484    #endif
485    
486    static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context, log_t *log, int is_html) {
487  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
488    /* put this inside a scrolled view */    /* put this inside a scrolled view */
489    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 493  static GtkWidget *cache_logs(appdata_t *
493    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *pannable_area = hildon_pannable_area_new();
494  #endif  #endif
495    
496    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log), 3, FALSE);  #ifdef ENABLE_BROWSER_INTERFACE
497      gboolean gc_link = strncmp(context->cache->id, "GC", 2) == 0;
498    #else
499    #define gc_link (FALSE)
500    #endif
501    
502      GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log)+(gc_link?1:0), 3, FALSE);
503    int cnt = 0;    int cnt = 0;
504    
505    #ifdef ENABLE_BROWSER_INTERFACE
506      if(gc_link) {
507        GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));
508    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
509      hildon_gtk_widget_set_theme_size(but,
510               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
511    #endif
512        gtk_signal_connect(GTK_OBJECT(but), "clicked",
513                           GTK_SIGNAL_FUNC(on_gclink_clicked), context);
514    
515        gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);
516        cnt++;
517      }
518    #endif
519    
520    /* add all logs to the vbox */    /* add all logs to the vbox */
521    while(log) {    while(log) {
522      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
523                                0, 3, cnt+0, cnt+1);                                0, 3, cnt+0, cnt+1);
524    #if 0
525        static const char *log_type = "seek/log.aspx";
526        GtkWidget *log_but =
527          link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),
528                                 log_type, log->id);
529        gtk_table_attach(GTK_TABLE(table), log_but,
530                         0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
531    #else
532      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach_defaults(GTK_TABLE(table),
533                                icon_get_widget(ICON_LOG, log->type),                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);
534                                0, 1, cnt+1, cnt+2);  #endif
535    
536      char date_str[32];      char date_str[32];
537      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 488  static GtkWidget *cache_logs(appdata_t * Line 544  static GtkWidget *cache_logs(appdata_t *
544      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),
545                                1, 2, cnt+1, cnt+2);                                1, 2, cnt+1, cnt+2);
546    
547      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      static const char *finder_type = "profile/";
548                                2, 3, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
549                                              finder_type, log->finder->id);
550    
551        gtk_table_attach(GTK_TABLE(table), finder,
552                         2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
553    
554      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
555                                0, 3, cnt+2, cnt+3);                                0, 3, cnt+2, cnt+3);
556    
# Line 543  static void on_notebook_page_change(GtkN Line 604  static void on_notebook_page_change(GtkN
604    
605    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
606    /* 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 */
607    /* 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. */
608    /* seems to work ... */    /* seems to work ... */
609    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
610      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
611    }    } else if(strcasecmp(name, _("TBs")) == 0) {
612        gtk_widget_queue_resize(w);
613    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
614  #ifdef USE_MAEMO  #ifdef USE_MAEMO
615      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
616                                            context->appdata);                                            context->appdata);
# Line 597  GtkWidget *cache_view(appdata_t *appdata Line 658  GtkWidget *cache_view(appdata_t *appdata
658  #endif  #endif
659    
660    notebook =  gtk_notebook_new();    notebook =  gtk_notebook_new();
661    
662  #ifdef USE_MAEMO  #ifdef USE_MAEMO
663  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
664    /* prevents user from accidentially touching the breadcrumb trail */    /* prevents user from accidentially touching the breadcrumb trail */
# Line 617  GtkWidget *cache_view(appdata_t *appdata Line 679  GtkWidget *cache_view(appdata_t *appdata
679    
680    if(cache->log)    if(cache->log)
681      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
682             cache_logs(appdata, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
683             gtk_label_new(_("Logs")));             gtk_label_new(_("Logs")));
684    
685    if(cache->wpt)    if(cache->wpt)
# Line 665  void cache_dialog(appdata_t *appdata, ca Line 727  void cache_dialog(appdata_t *appdata, ca
727    
728  #else  #else
729  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
730    static void on_cache_destroy (GtkWidget *widget, appdata_t *appdata) {
731      appdata->cur_cache = NULL;
732    
733      /* restore cur_view */
734      appdata->cur_view = g_object_get_data(G_OBJECT(widget), "cur_view");
735    }
736    
737  void cache_dialog(appdata_t *appdata, cache_t *cache) {  void cache_dialog(appdata_t *appdata, cache_t *cache) {
738    GtkWidget *window = hildon_stackable_window_new();    GtkWidget *window = hildon_stackable_window_new();
739    
740    char *title = g_strdup_printf("GPXView - %s", cache->name);    /* store last "cur_view" in window */
741      g_object_set_data(G_OBJECT(window), "cur_view", appdata->cur_view);
742    
743      appdata->cur_cache = cache;
744      char *title = g_strdup_printf("%s - GPXView", cache->name);
745    gtk_window_set_title(GTK_WINDOW(window), title);    gtk_window_set_title(GTK_WINDOW(window), title);
746    g_free(title);    g_free(title);
747    
748    /* create cache visualization widget */    /* create cache visualization widget */
749    gtk_container_add(GTK_CONTAINER(window),    appdata->cur_view = cache_view(appdata, cache);
750                      cache_view(appdata, cache));    gtk_container_add(GTK_CONTAINER(window), appdata->cur_view);
751    
752    hildon_window_set_app_menu(HILDON_WINDOW(window),    hildon_window_set_app_menu(HILDON_WINDOW(window),
753                               menu_create(appdata, MENU_CACHE));                               menu_create(appdata, MENU_CACHE));
754    
755      g_signal_connect(G_OBJECT(window), "destroy",
756                       G_CALLBACK(on_cache_destroy), appdata);
757    
758    gtk_widget_show_all(window);    gtk_widget_show_all(window);
759  }  }
760  #endif // USE_STACKABLE_WINDOW  #endif // USE_STACKABLE_WINDOW
Legend:
Removed from v.6  
changed lines
  Added in v.138