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 157 by harbaum, Tue Nov 3 20:20:39 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 155  static GtkWidget *cache_overview(cache_c Line 155  static GtkWidget *cache_overview(cache_c
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    
157      static const char *owner_type = "profile/";      static const char *owner_type = "profile/";
     /* todo: small!!! */  
158      gtk_box_pack_start_defaults(GTK_BOX(ivbox),      gtk_box_pack_start_defaults(GTK_BOX(ivbox),
159                  link_button_by_id(appdata, cache->owner->name,                  link_button_by_id(appdata, cache->owner->name,
160                                    owner_type, cache->owner->id));                                    owner_type, cache->owner->id));
161      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);
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);
# Line 171  static GtkWidget *cache_overview(cache_c Line 173  static GtkWidget *cache_overview(cache_c
173      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
174                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),                    icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),
175                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
176      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,0,1,  
177                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      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 187  static GtkWidget *cache_overview(cache_c Line 191  static GtkWidget *cache_overview(cache_c
191      gtk_box_pack_start(GTK_BOX(ivbox),      gtk_box_pack_start(GTK_BOX(ivbox),
192                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),                         icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),
193                         FALSE, FALSE, 0);                         FALSE, FALSE, 0);
194      gtk_table_attach(GTK_TABLE(table), ivbox, 2,3,1,2,      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
195                       GTK_EXPAND | GTK_FILL, 0, GTK_FILL, 0);      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 220  static GtkWidget *cache_overview(cache_c Line 253  static GtkWidget *cache_overview(cache_c
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    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
256      /* gcvote if present and possible */
257    
258      gcvote_get(appdata, cache->url);
259    
260      /* ----------------------------------------------------- */
261    
262    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);    gtk_box_pack_start(GTK_BOX(vbox), table, 0,0,0);
263    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);
264    
265      /* ----------------------------------------------------- */
266    
267    if(cache->short_description)    if(cache->short_description)
268      gtk_box_pack_start_defaults(GTK_BOX(vbox),      gtk_box_pack_start_defaults(GTK_BOX(vbox),
269          html_view(appdata, cache->short_description,          html_view(appdata, cache->short_description,
270                    cache->short_is_html, TRUE, cache, NULL));            cache->short_is_html?HTML_HTML:HTML_PLAIN_TEXT, TRUE, cache, NULL));
271    
272    return vbox;    return vbox;
273  }  }
# Line 273  static void on_decrypt(GtkWidget *widget Line 313  static void on_decrypt(GtkWidget *widget
313  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {  static GtkWidget *cache_hint(appdata_t *appdata, cache_t *cache) {
314    /* encrypting/decrypting html is nothing we want to do */    /* encrypting/decrypting html is nothing we want to do */
315    if(cache->hint_is_html)    if(cache->hint_is_html)
316      return html_view(appdata, cache->hint, TRUE, TRUE, NULL, NULL);      return html_view(appdata, cache->hint, HTML_HTML, TRUE, NULL, NULL);
317    
318    /* we can now be sure that we are talking about pain text */    /* we can now be sure that we are talking about pain text */
319    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
320    
321    char *hint = strdup(cache->hint);    char *hint = strdup(cache->hint);
322    rot13(hint);    rot13(hint);
323    GtkWidget *view = html_view(appdata, hint, FALSE, TRUE, NULL, NULL);    GtkWidget *view =
324        html_view(appdata, hint, HTML_PLAIN_TEXT, TRUE, NULL, NULL);
325    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);    gtk_box_pack_start_defaults(GTK_BOX(vbox), view);
326    free(hint);    free(hint);
327    
# Line 522  static GtkWidget *cache_logs(appdata_t * Line 563  static GtkWidget *cache_logs(appdata_t *
563    while(log) {    while(log) {
564      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
565                                0, 3, cnt+0, cnt+1);                                0, 3, cnt+0, cnt+1);
566    #if 0
567        static const char *log_type = "seek/log.aspx";
568        GtkWidget *log_but =
569          link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),
570                                 log_type, log->id);
571        gtk_table_attach(GTK_TABLE(table), log_but,
572                         0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);
573    #else
574      gtk_table_attach_defaults(GTK_TABLE(table),      gtk_table_attach_defaults(GTK_TABLE(table),
575                                icon_get_widget(ICON_LOG, log->type),                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);
576                                0, 1, cnt+1, cnt+2);  #endif
577    
578      char date_str[32];      char date_str[32];
579      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 549  static GtkWidget *cache_logs(appdata_t * Line 598  static GtkWidget *cache_logs(appdata_t *
598    
599      if(log->text) {      if(log->text) {
600        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
601                  html_view(appdata, log->text, is_html, FALSE, NULL, NULL),          html_view(appdata, log->text,
602                  0, 3, cnt+3, cnt+4);                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
603                                    0, 3, cnt+3, cnt+4);
604      }      }
605    
606      log = log->next;      log = log->next;
607      cnt+=4;      cnt+=4;
608    }    }
Legend:
Removed from v.137  
changed lines
  Added in v.157