Diff of /trunk/src/cache.c

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

revision 66 by harbaum, Wed Aug 19 20:03:28 2009 UTC revision 156 by harbaum, Tue Nov 3 13:15:35 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 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_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 169  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      /* ----------- vbox containing all ratings ---------- */
165      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
166    
167    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
168    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
169      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
170      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
171                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
172      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
173         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
174      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
175                           FALSE, FALSE, 0);
176    
177        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
178        gtk_container_add(GTK_CONTAINER(align), ivbox);
179        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
180  #ifndef USE_MAEMO  #ifndef USE_MAEMO
181      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
182      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 186  static GtkWidget *cache_overview(cache_c
186    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
187    if(cache->terrain != 0) {    if(cache->terrain != 0) {
188      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
189      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
190      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
191        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
192      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
193                           FALSE, FALSE, 0);
194        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
195        gtk_container_add(GTK_CONTAINER(align), ivbox);
196        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
197  #ifndef USE_MAEMO  #ifndef USE_MAEMO
198      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
199      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
200  #endif  #endif
201    }    }
202    
203      /* --------------------- GCVote ------------------------ */
204      if(1) {
205        float quality = 2.5;
206        int votes = 2;
207    
208        ivbox = gtk_vbox_new(FALSE, 0);
209    
210        char *votes_str = g_strdup_printf(_("Quality (%d votes):"), votes);
211        gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(votes_str),
212                           FALSE, FALSE, 0);
213        g_free(votes_str);
214        gtk_box_pack_start(GTK_BOX(ivbox),
215             icon_get_widget(ICON_STARS, (int)(quality*2-2)), FALSE, FALSE, 0);
216    
217        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
218        gtk_container_add(GTK_CONTAINER(align), ivbox);
219        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
220    #ifndef USE_MAEMO
221        sprintf(str, _("Quality: %.1f"), quality);
222        gtk_tooltips_set_tip(tips, ivbox, str, NULL);
223    #endif
224      }
225    
226      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
227    
228      /* ----------------------------------------------------- */
229    
230    
231    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
232    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
233    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 224  static GtkWidget *cache_overview(cache_c Line 252  static GtkWidget *cache_overview(cache_c
252    
253    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);    gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 3,4,0,2);
254    
   /* ----------------------------------------------------- */  
   
255    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
256    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);
257    
258      /* ----------------------------------------------------- */
259    
260    if(cache->short_description)    if(cache->short_description)
261      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
262          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
263                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
264    
265    return vbox;    return vbox;
266  }  }
# Line 278  static void on_decrypt(GtkWidget *widget Line 306  static void on_decrypt(GtkWidget *widget
306  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
307    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
308    if(cache->hint_is_html)    if(cache->hint_is_html)
309      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
310    
311    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
312    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
313    
314    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
315    rot13(hint);    rot13(hint);
316    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
317        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
318    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
319    free(hint);    free(hint);
320    
# Line 442  static GtkWidget *cache_tbs(appdata_t *a Line 471  static GtkWidget *cache_tbs(appdata_t *a
471    
472    int tb_row=0;    int tb_row=0;
473    while(tb) {    while(tb) {
474        static const char *tb_type = "track/details.aspx";
475    
476      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
477      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),
478                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
479      if(tb->ref)  
480        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
481        if(tb->ref) {
482          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
483          gtk_table_attach_defaults(GTK_TABLE(table), ref,
484                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
485        }
486    
487      if(tb->name)      if(tb->name)
488        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
489                                  2, 3, tb_row+0, tb_row+1);                                  2, 3, tb_row+0, tb_row+1);
# Line 520  static GtkWidget *cache_logs(appdata_t * Line 556  static GtkWidget *cache_logs(appdata_t *
556    while(log) {    while(log) {
557      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
558                                0, 3, cnt+0, cnt+1);                                0, 3, cnt+0, cnt+1);
559    #if 0
560        static const char *log_type = "seek/log.aspx";
561        GtkWidget *log_but =
562          link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),
563                                 log_type, log->id);
564        gtk_table_attach(GTK_TABLE(table), log_but,
565                         0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
566    #else
567      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach_defaults(GTK_TABLE(table),
568                                icon_get_widget(ICON_LOG, log->type),                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);
569                                0, 1, cnt+1, cnt+2);  #endif
570    
571      char date_str[32];      char date_str[32];
572      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 535  static GtkWidget *cache_logs(appdata_t * Line 579  static GtkWidget *cache_logs(appdata_t *
579      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),
580                                1, 2, cnt+1, cnt+2);                                1, 2, cnt+1, cnt+2);
581    
582      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      static const char *finder_type = "profile/";
583                                2, 3, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
584                                              finder_type, log->finder->id);
585    
586        gtk_table_attach(GTK_TABLE(table), finder,
587                         2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
588    
589      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
590                                0, 3, cnt+2, cnt+3);                                0, 3, cnt+2, cnt+3);
591    
592      if(log->text) {      if(log->text) {
593        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
594                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
595                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
596                                    0, 3, cnt+3, cnt+4);
597      }      }
598    
599      log = log->next;      log = log->next;
600      cnt+=4;      cnt+=4;
601    }    }
# Line 590  static void on_notebook_page_change(GtkN Line 640  static void on_notebook_page_change(GtkN
640    
641    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
642    /* 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 */
643    /* 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. */
644    /* seems to work ... */    /* seems to work ... */
645    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
646      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
647    }    } else if(strcasecmp(name, _("TBs")) == 0) {
648        gtk_widget_queue_resize(w);
649    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
650  #ifdef USE_MAEMO  #ifdef USE_MAEMO
651      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
652                                            context->appdata);                                            context->appdata);
# Line 644  GtkWidget *cache_view(appdata_t *appdata Line 694  GtkWidget *cache_view(appdata_t *appdata
694  #endif  #endif
695    
696    notebook =  gtk_notebook_new();    notebook =  gtk_notebook_new();
697    
698  #ifdef USE_MAEMO  #ifdef USE_MAEMO
699  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
700    /* prevents user from accidentially touching the breadcrumb trail */    /* prevents user from accidentially touching the breadcrumb trail */
Legend:
Removed from v.66  
changed lines
  Added in v.156