Diff of /trunk/src/cache.c

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

revision 138 by harbaum, Tue Oct 20 13:25:04 2009 UTC revision 163 by harbaum, Thu Nov 5 15:12:37 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 161  static GtkWidget *cache_overview(cache_c Line 223  static GtkWidget *cache_overview(cache_c
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 170  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 186  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      vote_t *vote = gcvote_restore(appdata, cache);
268    
269      context->gcvote_request =
270        gcvote_request(appdata, gcvote_callback, cache->url, context);
271    
272      context->votebox = gtk_vbox_new(FALSE, 0);
273      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
274      gtk_container_add(GTK_CONTAINER(align), context->votebox);
275      gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
276    
277      /* fill with vote if present on disk (will also free vote) */
278      if(vote)
279        gcvote_set(context, vote);
280    
281      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
282    
283      /* ----------------------------------------------------- */
284    
285    
286    /* ----------------- the two coordinates ----------------- */    /* ----------------- the two coordinates ----------------- */
287    /* ----------------- and the heading/distance ------------ */    /* ----------------- and the heading/distance ------------ */
288    pos_t *refpos = get_pos(appdata);    pos_t *refpos = get_pos(appdata);
# Line 223  static GtkWidget *cache_overview(cache_c Line 312  static GtkWidget *cache_overview(cache_c
312    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
313    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);
314    
315      /* ----------------------------------------------------- */
316    
317    if(cache->short_description)    if(cache->short_description)
318      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
319          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
320                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
321    
322    return vbox;    return vbox;
323  }  }
# Line 272  static void on_decrypt(GtkWidget *widget Line 363  static void on_decrypt(GtkWidget *widget
363  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
364    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
365    if(cache->hint_is_html)    if(cache->hint_is_html)
366      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
367    
368    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
369    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
370    
371    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
372    rot13(hint);    rot13(hint);
373    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
374        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
375    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
376    free(hint);    free(hint);
377    
# Line 499  static GtkWidget *cache_logs(appdata_t * Line 591  static GtkWidget *cache_logs(appdata_t *
591  #define gc_link (FALSE)  #define gc_link (FALSE)
592  #endif  #endif
593    
594    GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log)+(gc_link?1:0), 3, FALSE);    GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
   int cnt = 0;  
595    
596  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
597    if(gc_link) {    if(gc_link) {
# Line 512  static GtkWidget *cache_logs(appdata_t * Line 603  static GtkWidget *cache_logs(appdata_t *
603      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
604                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
605    
606      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
     cnt++;  
607    }    }
608  #endif  #endif
609    
610    /* add all logs to the vbox */    /* add all logs to the vbox */
611    while(log) {    while(log) {
612      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),  
613                                0, 3, cnt+0, cnt+1);      GtkWidget *frame = gtk_frame_new(NULL);
614  #if 0  
615      static const char *log_type = "seek/log.aspx";      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
616      GtkWidget *log_but =  
617        link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),      GtkWidget *ihbox = gtk_hbox_new(TRUE, 2);
618                               log_type, log->id);  
619      gtk_table_attach(GTK_TABLE(table), log_but,      gtk_box_pack_start_defaults(GTK_BOX(ihbox),
620                       0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);                icon_get_widget(ICON_LOG, log->type));
 #else  
     gtk_table_attach_defaults(GTK_TABLE(table),  
               icon_get_widget(ICON_LOG, log->type), 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 541  static GtkWidget *cache_logs(appdata_t * Line 627  static GtkWidget *cache_logs(appdata_t *
627      } else      } else
628        strcpy(date_str, "---");        strcpy(date_str, "---");
629    
630      gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str),      gtk_box_pack_start_defaults(GTK_BOX(ihbox), gtk_label_new(date_str));
                               1, 2, cnt+1, cnt+2);  
631    
632      static const char *finder_type = "profile/";      static const char *finder_type = "profile/";
633      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
634                                            finder_type, log->finder->id);                                            finder_type, log->finder->id);
635    
636      gtk_table_attach(GTK_TABLE(table), finder,      gtk_box_pack_start_defaults(GTK_BOX(ihbox), finder);
                      2, 3, cnt+1, cnt+2, FALSE, FALSE, 0, 0);  
   
     gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),  
                               0, 3, cnt+2, cnt+3);  
637    
638        gtk_box_pack_start_defaults(GTK_BOX(ivbox), ihbox);
639    
640      if(log->text) {      if(log->text) {
641        gtk_table_attach_defaults(GTK_TABLE(table),        /* ---- */
642                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),        gtk_box_pack_start_defaults(GTK_BOX(ivbox), gtk_hseparator_new());
643                  0, 3, cnt+3, cnt+4);  
644          gtk_box_pack_start_defaults(GTK_BOX(ivbox),
645            html_view(appdata, log->text,
646                      is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL));
647      }      }
648    
649        gtk_container_add(GTK_CONTAINER(frame), ivbox);
650        gtk_box_pack_start_defaults(GTK_BOX(vbox), frame);
651    
652      log = log->next;      log = log->next;
     cnt+=4;  
653    }    }
654    
655  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
656    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
657                                          table);                                          vbox);
658    return scrolled_window;    return scrolled_window;
659  #else  #else
660    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
661                                           table);                                           vbox);
662    return pannable_area;    return pannable_area;
663  #endif  #endif
664  }  }
# Line 630  static void on_notebook_destroy(GtkWidge Line 718  static void on_notebook_destroy(GtkWidge
718    
719    printf("destroying notebook\n");    printf("destroying notebook\n");
720    
721      /* cancel a pending gcvote request */
722      if(context->gcvote_request) {
723        gcvote_request_free(context->gcvote_request);
724        context->gcvote_request = NULL;
725      }
726    
727    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
728    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
729    
Legend:
Removed from v.138  
changed lines
  Added in v.163