Diff of /trunk/src/cache.c

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

revision 137 by harbaum, Mon Oct 19 18:21:20 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    static void gcvote_set(cache_context_t *context, vote_t *vote) {
104      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;
144    
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    }
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;
167    GtkWidget *table, *tip;    GtkWidget *table, *tip;
# Line 155  static GtkWidget *cache_overview(cache_c Line 217  static GtkWidget *cache_overview(cache_c
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    
219      static const char *owner_type = "profile/";      static const char *owner_type = "profile/";
     /* todo: small!!! */  
220      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start_defaults(GTK_BOX(ivbox),
221                  link_button_by_id(appdata, cache->owner->name,                  link_button_by_id(appdata, cache->owner->name,
222                                    owner_type, cache->owner->id));                                    owner_type, cache->owner->id));
223      gtk_table_attach(GTK_TABLE(table), ivbox, 1,2,1,2, FALSE,FALSE,0,0);      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);
# Line 171  static GtkWidget *cache_overview(cache_c Line 235  static GtkWidget *cache_overview(cache_c
235      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
236                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
237                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
238      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,0,1,  
239                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      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 187  static GtkWidget *cache_overview(cache_c Line 253  static GtkWidget *cache_overview(cache_c
253      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
254                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
255                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
256      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,1,2,      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
257                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      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 224  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 273  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 522  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 549  static GtkWidget *cache_logs(appdata_t * Line 642  static GtkWidget *cache_logs(appdata_t *
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 623  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    
Legend:
Removed from v.137  
changed lines
  Added in v.159