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 159 by harbaum, Wed Nov 4 20:28:54 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    
103  #ifdef ENABLE_BROWSER_INTERFACE  static void gcvote_set(cache_context_t *context, vote_t *vote) {
104  static void on_www_clicked(GtkButton *button, gpointer data) {    if(!vote) return;
105    
106      if(context->quality) {
107        gtk_widget_destroy(context->quality);
108        context->quality = NULL;
109      }
110    
111      if(context->votes) {
112        gtk_widget_destroy(context->votes);
113        context->votes = NULL;
114      }
115    
116      /* update/draw the voting */
117    #ifndef USE_MAEMO
118      GtkTooltips *tips = gtk_tooltips_new();
119    #endif
120    
121      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
122                                          (vote->votes == 1)?_("vote"):_("votes"));
123      context->votes = GTK_LABEL_SMALL(votes_str);
124      gtk_box_pack_start(GTK_BOX(context->votebox),
125                         context->votes, FALSE, FALSE, 0);
126      g_free(votes_str);
127      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
128      gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
129                         FALSE, FALSE, 0);
130    
131    #ifndef USE_MAEMO
132      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
133      gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
134      g_free(str);
135    #endif
136    
137      gtk_widget_show_all(context->votebox);
138    
139      g_free(vote);
140    }
141    
142    static void gcvote_callback(vote_t *vote, gpointer data) {
143    cache_context_t *context = (cache_context_t*)data;    cache_context_t *context = (cache_context_t*)data;
144    browser_url(context->appdata, context->cache->url);  
145      /* no vote returned: request failed, just cleanup */
146      if(!vote) {
147        printf("gcvote callback for failed request\n");
148    
149        gcvote_request_free(context->gcvote_request);
150        context->gcvote_request = NULL;
151        return;
152      }
153    
154      printf("gcvote callback is being called with a %d/%d\n",
155             vote->quality, vote->votes);
156    
157      gcvote_set(context, vote);
158    
159      gcvote_save(context->appdata, context->cache, &context->gcvote_request->mem);
160    
161      gcvote_request_free(context->gcvote_request);
162      context->gcvote_request = NULL;
163  }  }
 #endif  
164    
165  static GtkWidget *cache_overview(cache_context_t *context) {  static GtkWidget *cache_overview(cache_context_t *context) {
166    GtkWidget *vbox, *ivbox;    GtkWidget *vbox, *ivbox;
# Line 122  static GtkWidget *cache_overview(cache_c Line 177  static GtkWidget *cache_overview(cache_c
177    table =  gtk_table_new(3,4, FALSE);    table =  gtk_table_new(3,4, FALSE);
178    
179    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
180      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
181        tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1);               tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1,
182                 GTK_FILL, 0, GTK_FILL, 0);
183  #ifndef USE_MAEMO  #ifndef USE_MAEMO
184      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
185  #endif  #endif
# Line 133  static GtkWidget *cache_overview(cache_c Line 189  static GtkWidget *cache_overview(cache_c
189    if(cache->container != CACHE_CONT_UNKNOWN) {    if(cache->container != CACHE_CONT_UNKNOWN) {
190      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
191      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));      sprintf(str, _("Size: %s"), _(cache_size_name[cache->container]));
192      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(str));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(str),
193      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
194          icon_get_widget(ICON_CACHE_SIZE, cache->container));      gtk_box_pack_start(GTK_BOX(ivbox),
195      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0,1,1,2);                         icon_get_widget(ICON_CACHE_SIZE, cache->container),
196                           FALSE, FALSE, 0);
197        gtk_table_attach(GTK_TABLE(table), ivbox, 0,1,1,2,
198                         GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);
199  #ifndef USE_MAEMO  #ifndef USE_MAEMO
200      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);      gtk_tooltips_set_tip(tips, ivbox, _(cache_size_tip[cache->container]), NULL);
201  #endif  #endif
# Line 146  static GtkWidget *cache_overview(cache_c Line 205  static GtkWidget *cache_overview(cache_c
205    if(cache->id) {    if(cache->id) {
206      int strike = cache->archived?STRIKETHROUGH_RED:      int strike = cache->archived?STRIKETHROUGH_RED:
207        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);        (!cache->available?STRIKETHROUGH:STRIKETHROUGH_NONE);
208      GtkWidget *lbl = NULL;      GtkWidget *lbl = link_button_attrib(context->appdata,
209                                            cache->id, context->cache->url,
210  #ifdef ENABLE_BROWSER_INTERFACE                                          SIZE_BIG, strike);
     if(!cache->url)  
 #endif  
       lbl = gtk_label_attrib(cache->id, SIZE_BIG, strike);  
 #ifdef ENABLE_BROWSER_INTERFACE  
     else {  
       /* add Go button */  
       lbl = gtk_button_attrib(cache->id, SIZE_BIG, strike);  
       //      gtk_button_set_relief(GTK_BUTTON(button),GTK_RELIEF_NONE);  
       gtk_signal_connect(GTK_OBJECT(lbl), "clicked",  
                          (GtkSignalFunc)on_www_clicked, context);  
     }  
 #endif  
   
211      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);      gtk_table_attach(GTK_TABLE(table), lbl, 1,2,0,1, FALSE, FALSE, 0, 0);
212    }    }
213    
# Line 169  static GtkWidget *cache_overview(cache_c Line 215  static GtkWidget *cache_overview(cache_c
215    if(cache->owner) {    if(cache->owner) {
216      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
217      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("by")));
218      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(cache->owner));  
219      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 1,2,1,2);      static const char *owner_type = "profile/";
220        gtk_box_pack_start_defaults(GTK_BOX(ivbox),
221                    link_button_by_id(appdata, cache->owner->name,
222                                      owner_type, cache->owner->id));
223        gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);
224    }    }
225    
226      /* ----------- vbox containing all ratings ---------- */
227      GtkWidget *ratebox = gtk_vbox_new(FALSE, 0);
228    
229    /* ----------- box containing difficulty rating ---------- */    /* ----------- box containing difficulty rating ---------- */
230    if(cache->difficulty != 0) {    if(cache->difficulty != 0) {
231      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
232      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
233                                  GTK_LABEL_SMALL(_("Difficulty:")));                         GTK_LABEL_SMALL(_("Difficulty:")),
234      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
235         icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
236      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,0,1);                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
237                           FALSE, FALSE, 0);
238    
239        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
240        gtk_container_add(GTK_CONTAINER(align), ivbox);
241        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
242  #ifndef USE_MAEMO  #ifndef USE_MAEMO
243      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);      sprintf(str, _("Difficulty: %.1f"), cache->difficulty);
244      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
# Line 190  static GtkWidget *cache_overview(cache_c Line 248  static GtkWidget *cache_overview(cache_c
248    /* ------------ box containing terrain rating ------------ */    /* ------------ box containing terrain rating ------------ */
249    if(cache->terrain != 0) {    if(cache->terrain != 0) {
250      ivbox = gtk_vbox_new(FALSE, 0);      ivbox = gtk_vbox_new(FALSE, 0);
251      gtk_box_pack_start_defaults(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")));      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(_("Terrain:")),
252      gtk_box_pack_start_defaults(GTK_BOX(ivbox),                         FALSE, FALSE, 0);
253        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)));      gtk_box_pack_start(GTK_BOX(ivbox),
254      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 2,3,1,2);                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
255                           FALSE, FALSE, 0);
256        GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
257        gtk_container_add(GTK_CONTAINER(align), ivbox);
258        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
259  #ifndef USE_MAEMO  #ifndef USE_MAEMO
260      sprintf(str, _("Terrain: %.1f"), cache->terrain);      sprintf(str, _("Terrain: %.1f"), cache->terrain);
261      gtk_tooltips_set_tip(tips, ivbox, str, NULL);      gtk_tooltips_set_tip(tips, ivbox, str, NULL);
262  #endif  #endif
263    }    }
264    
265      /* --------------------- GCVote ------------------------ */
266    
267      context->gcvote_request =
268        gcvote_request(appdata, gcvote_callback, cache->url, context);
269    
270      context->votebox = gtk_vbox_new(FALSE, 0);
271      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
272      gtk_container_add(GTK_CONTAINER(align), context->votebox);
273      gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
274    
275      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
276    
277      /* ----------------------------------------------------- */
278    
279    
280    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
281    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
282    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 229  static GtkWidget *cache_overview(cache_c Line 306  static GtkWidget *cache_overview(cache_c
306    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
307    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);
308    
309      /* ----------------------------------------------------- */
310    
311    if(cache->short_description)    if(cache->short_description)
312      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
313          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
314                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
315    
316    return vbox;    return vbox;
317  }  }
# Line 278  static void on_decrypt(GtkWidget *widget Line 357  static void on_decrypt(GtkWidget *widget
357  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
358    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
359    if(cache->hint_is_html)    if(cache->hint_is_html)
360      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
361    
362    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
363    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
364    
365    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
366    rot13(hint);    rot13(hint);
367    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
368        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
369    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
370    free(hint);    free(hint);
371    
# Line 442  static GtkWidget *cache_tbs(appdata_t *a Line 522  static GtkWidget *cache_tbs(appdata_t *a
522    
523    int tb_row=0;    int tb_row=0;
524    while(tb) {    while(tb) {
525        static const char *tb_type = "track/details.aspx";
526    
527      /* --------------------- icon/ref/name -------------------------*/      /* --------------------- icon/ref/name -------------------------*/
528      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),
529                                0, 1, tb_row+0, tb_row+1);                                0, 1, tb_row+0, tb_row+1);
530      if(tb->ref)  
531        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->ref),  
532        if(tb->ref) {
533          GtkWidget *ref = link_button_by_id(appdata, tb->ref, tb_type, tb->id);
534          gtk_table_attach_defaults(GTK_TABLE(table), ref,
535                                  1, 2, tb_row+0, tb_row+1);                                  1, 2, tb_row+0, tb_row+1);
536        }
537    
538      if(tb->name)      if(tb->name)
539        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),        gtk_table_attach_defaults(GTK_TABLE(table), GTK_LABEL_BIG(tb->name),
540                                  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 607  static GtkWidget *cache_logs(appdata_t *
607    while(log) {    while(log) {
608      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
609                                0, 3, cnt+0, cnt+1);                                0, 3, cnt+0, cnt+1);
610    #if 0
611        static const char *log_type = "seek/log.aspx";
612        GtkWidget *log_but =
613          link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),
614                                 log_type, log->id);
615        gtk_table_attach(GTK_TABLE(table), log_but,
616                         0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
617    #else
618      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach_defaults(GTK_TABLE(table),
619                                icon_get_widget(ICON_LOG, log->type),                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);
620                                0, 1, cnt+1, cnt+2);  #endif
621    
622      char date_str[32];      char date_str[32];
623      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 535  static GtkWidget *cache_logs(appdata_t * Line 630  static GtkWidget *cache_logs(appdata_t *
630      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),
631                                1, 2, cnt+1, cnt+2);                                1, 2, cnt+1, cnt+2);
632    
633      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(log->finder),      static const char *finder_type = "profile/";
634                                2, 3, cnt+1, cnt+2);      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
635                                              finder_type, log->finder->id);
636    
637        gtk_table_attach(GTK_TABLE(table), finder,
638                         2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
639    
640      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
641                                0, 3, cnt+2, cnt+3);                                0, 3, cnt+2, cnt+3);
642    
643      if(log->text) {      if(log->text) {
644        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
645                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
646                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
647                                    0, 3, cnt+3, cnt+4);
648      }      }
649    
650      log = log->next;      log = log->next;
651      cnt+=4;      cnt+=4;
652    }    }
# Line 590  static void on_notebook_page_change(GtkN Line 691  static void on_notebook_page_change(GtkN
691    
692    /* this is a workaround, around some bug in the gtktextwidget or so ... */    /* this is a workaround, around some bug in the gtktextwidget or so ... */
693    /* 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 */
694    /* 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. */
695    /* seems to work ... */    /* seems to work ... */
696    if(strcasecmp(name, _("Logs")) == 0) {    if(strcasecmp(name, _("Logs")) == 0) {
697      gtk_widget_queue_resize(w);      gtk_widget_queue_resize(w);
698    }    } else if(strcasecmp(name, _("TBs")) == 0) {
699        gtk_widget_queue_resize(w);
700    if(strcasecmp(name, _("Goto")) == 0) {    } else if(strcasecmp(name, _("Goto")) == 0) {
701  #ifdef USE_MAEMO  #ifdef USE_MAEMO
702      context->handler_id = gtk_timeout_add(1000, screensaver_update,      context->handler_id = gtk_timeout_add(1000, screensaver_update,
703                                            context->appdata);                                            context->appdata);
# Line 616  static void on_notebook_destroy(GtkWidge Line 717  static void on_notebook_destroy(GtkWidge
717    
718    printf("destroying notebook\n");    printf("destroying notebook\n");
719    
720      /* cancel a pending gcvote request */
721      if(context->gcvote_request) {
722        gcvote_request_free(context->gcvote_request);
723        context->gcvote_request = NULL;
724      }
725    
726    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
727    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
728    
# Line 644  GtkWidget *cache_view(appdata_t *appdata Line 751  GtkWidget *cache_view(appdata_t *appdata
751  #endif  #endif
752    
753    notebook =  gtk_notebook_new();    notebook =  gtk_notebook_new();
754    
755  #ifdef USE_MAEMO  #ifdef USE_MAEMO
756  #if MAEMO_VERSION_MAJOR >= 5  #if MAEMO_VERSION_MAJOR >= 5
757    /* 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.159