Diff of /trunk/src/cache.c

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

revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC revision 138 by harbaum, Tue Oct 20 13:25:04 2009 UTC
# Line 100  void overview_coordinate_update(cache_co Line 100  void overview_coordinate_update(cache_co
100    gtk_widget_show_all(context->bearing_hbox);    gtk_widget_show_all(context->bearing_hbox);
101  }  }
102    
 #ifdef ENABLE_BROWSER_INTERFACE  
 static void on_www_clicked(GtkButton *button, gpointer data) {  
   cache_context_t *context = (cache_context_t*)data;  
   browser_url(context->appdata, context->cache->url);  
 }  
 #endif  
   
103  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
104    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
105    GtkWidget *table, *tip;    GtkWidget *table, *tip;
# Line 122  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 133  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 146  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_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 168  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 189  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 421  static GtkWidget *cache_wpts(appdata_t * Line 416  static GtkWidget *cache_wpts(appdata_t *
416  #endif  #endif
417  }  }
418    
 #ifdef ENABLE_BROWSER_INTERFACE  
 static void on_tbref_clicked(GtkButton *button, gpointer data) {  
   appdata_t *appdata = (appdata_t *)data;  
   
   unsigned int id = (unsigned int)g_object_get_data(G_OBJECT(button), "id");  
   if(id) {  
     printf("clicked tb id %u\n", id);  
     char *url =  
       g_strdup_printf("http://www.geocaching.com/track/details.aspx?id=%u", id);  
     browser_url(appdata, url);  
     g_free(url);  
   }  
 }  
 #endif  
   
419  static GtkWidget *cache_tbs(appdata_t *appdata, tb_t *tb) {  static GtkWidget *cache_tbs(appdata_t *appdata, tb_t *tb) {
420    pos_t *refpos = NULL;    pos_t *refpos = NULL;
421    
# Line 456  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    
445    
446      if(tb->ref) {      if(tb->ref) {
447  #ifdef ENABLE_BROWSER_INTERFACE        GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
       GtkWidget *ref = gtk_button_new_with_label(tb->ref);  
 #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  
       hildon_gtk_widget_set_theme_size(ref,  
                                        (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));  
 #endif  
       g_object_set_data(G_OBJECT(ref), "id", (gpointer)tb->id);  
       gtk_signal_connect(GTK_OBJECT(ref), "clicked",  
                        GTK_SIGNAL_FUNC(on_tbref_clicked), appdata);  
 #else  
       GtkWidget *ref = GTK_LABEL_BIG(tb->ref);  
 #endif  
448        gtk_table_attach_defaults(GTK_TABLE(table), ref,        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      }      }
# Line 549  static GtkWidget *cache_logs(appdata_t * Line 521  static GtkWidget *cache_logs(appdata_t *
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 564  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 619  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);
Legend:
Removed from v.133  
changed lines
  Added in v.138