Diff of /trunk/src/cache.c

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

revision 158 by harbaum, Wed Nov 4 14:54:52 2009 UTC revision 166 by harbaum, Sun Nov 8 20:34:22 2009 UTC
# 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_callback(vote_t *vote, gpointer data) {  static void gcvote_set(cache_context_t *context, vote_t *vote) {
104    cache_context_t *context = (cache_context_t*)data;    if(!vote) return;
   
   /* no vote returned: request failed, just cleanup */  
   if(!vote) {  
     printf("gcvote callback for failed request\n");  
   
     gcvote_request_free(context->gcvote_request);  
     context->gcvote_request = NULL;  
     return FALSE;  
   }  
105    
106    printf("gcvote callback is being called with a %d/%d\n",    if(context->quality) {
107           vote->quality, vote->votes);      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 */    /* update/draw the voting */
   if(!context->quality) {  
117  #ifndef USE_MAEMO  #ifndef USE_MAEMO
118      GtkTooltips *tips = gtk_tooltips_new();    GtkTooltips *tips = gtk_tooltips_new();
119  #endif  #endif
120    
121      GtkWidget *ivbox = gtk_vbox_new(FALSE, 0);    char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,
   
     char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,  
122                                        (vote->votes == 1)?_("vote"):_("votes"));                                        (vote->votes == 1)?_("vote"):_("votes"));
123      context->votes = GTK_LABEL_SMALL(votes_str);    context->votes = GTK_LABEL_SMALL(votes_str);
124      gtk_box_pack_start(GTK_BOX(ivbox), context->votes, FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(context->votebox),
125      g_free(votes_str);                       context->votes, FALSE, FALSE, 0);
126      context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));    g_free(votes_str);
127      gtk_box_pack_start(GTK_BOX(ivbox), context->quality,    context->quality = icon_get_widget(ICON_STARS, (int)(vote->quality*2-2));
128                                 FALSE, FALSE, 0);    gtk_box_pack_start(GTK_BOX(context->votebox), context->quality,
129                         FALSE, FALSE, 0);
130      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);  
     gtk_container_add(GTK_CONTAINER(align), ivbox);  
     gtk_box_pack_start_defaults(GTK_BOX(context->ratebox), align);  
131  #ifndef USE_MAEMO  #ifndef USE_MAEMO
132      char *str = g_strdup_printf(_("Quality: %d"), vote->quality);    char *str = g_strdup_printf(_("Quality: %d"), vote->quality);
133      gtk_tooltips_set_tip(tips, ivbox, str, NULL);    gtk_tooltips_set_tip(tips, context->votebox, str, NULL);
134      g_free(str);    g_free(str);
135  #endif  #endif
136    
137      gtk_widget_show_all(context->votebox);
138    
139      gtk_widget_show_all(context->ratebox);    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);      gcvote_request_free(context->gcvote_request);
150      context->gcvote_request = NULL;      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) {
# Line 210  static GtkWidget *cache_overview(cache_c Line 224  static GtkWidget *cache_overview(cache_c
224    }    }
225    
226    /* ----------- vbox containing all ratings ---------- */    /* ----------- vbox containing all ratings ---------- */
227    GtkWidget *ratebox = context->ratebox = gtk_vbox_new(FALSE, 0);    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) {
# Line 249  static GtkWidget *cache_overview(cache_c Line 263  static GtkWidget *cache_overview(cache_c
263    }    }
264    
265    /* --------------------- GCVote ------------------------ */    /* --------------------- GCVote ------------------------ */
266    /* gcvote if present and possible */  
267      vote_t *vote = gcvote_restore(appdata, cache);
268    
269    context->gcvote_request =    context->gcvote_request =
270      gcvote_request(appdata, gcvote_callback, cache->url, context);      gcvote_request(appdata, gcvote_callback, cache->url, context);
271    
272  #if 0    context->votebox = gtk_vbox_new(FALSE, 0);
273    vote_t *vote = gcvote_get(appdata, cache->url);    GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
274    if(vote) {    gtk_container_add(GTK_CONTAINER(align), context->votebox);
275      ivbox = gtk_vbox_new(FALSE, 0);    gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
276    
277      char *votes_str = g_strdup_printf(_("Quality (%d %s):"), vote->votes,    /* fill with vote if present on disk (will also free vote) */
278                                        (vote->votes == 1)?_("vote"):_("votes"));    if(vote)
279      gtk_box_pack_start(GTK_BOX(ivbox), GTK_LABEL_SMALL(votes_str),      gcvote_set(context, vote);
                        FALSE, FALSE, 0);  
     g_free(votes_str);  
     gtk_box_pack_start(GTK_BOX(ivbox),  
          icon_get_widget(ICON_STARS, (int)(vote->quality*2-2)), FALSE, FALSE, 0);  
   
     GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);  
     gtk_container_add(GTK_CONTAINER(align), ivbox);  
     gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);  
 #ifndef USE_MAEMO  
     sprintf(str, _("Quality: %d"), vote->quality);  
     gtk_tooltips_set_tip(tips, ivbox, str, NULL);  
 #endif  
   
     gcvote_free(vote);  
   }  
 #endif  
280    
281    gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);    gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
282    
# Line 449  static GtkWidget *cache_wpts(appdata_t * Line 448  static GtkWidget *cache_wpts(appdata_t *
448                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
449    
450      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
451      if(wpt->desc) {      if(wpt->desc)
452        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
453        gtk_text_buffer_set_text(buffer, wpt->desc, strlen(wpt->desc));                                  simple_text_widget(wpt->desc), 0,4,
   
 #ifndef USE_HILDON_TEXT_VIEW  
       GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);  
 #else  
       GtkWidget *textview = hildon_text_view_new();  
       hildon_text_view_set_buffer(HILDON_TEXT_VIEW(textview), buffer);  
 #endif  
   
       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);  
       gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);  
       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);  
   
       gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,  
454                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
455    
456      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
457      if(wpt->cmt) {      if(wpt->cmt)
458        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
459        gtk_text_buffer_set_text(buffer, wpt->cmt, strlen(wpt->cmt));                                  simple_text_widget(wpt->cmt), 0,4,
 #ifndef USE_HILDON_TEXT_VIEW  
       GtkWidget *textview = gtk_text_view_new_with_buffer(buffer);  
 #else  
       GtkWidget *textview = hildon_text_view_new();  
       hildon_text_view_set_buffer(HILDON_TEXT_VIEW(textview), buffer);  
 #endif  
       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);  
       gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);  
       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);  
   
       gtk_table_attach_defaults(GTK_TABLE(table), textview, 0,4,  
460                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
461    
462      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
463      if(wpt->next)      if(wpt->next) {
464          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
465        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
466                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
467          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
468        }
469    
470      wpt_row+=4;      wpt_row+=4;
471      wpt = wpt->next;      wpt = wpt->next;
# Line 576  static void on_gclink_clicked(GtkButton Line 551  static void on_gclink_clicked(GtkButton
551  }  }
552  #endif  #endif
553    
554  static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context, log_t *log, int is_html) {  static GtkWidget *cache_logs(appdata_t *appdata, cache_context_t *context,
555                                 log_t *log, int is_html) {
556  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
557    /* put this inside a scrolled view */    /* put this inside a scrolled view */
558    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 592  static GtkWidget *cache_logs(appdata_t * Line 568  static GtkWidget *cache_logs(appdata_t *
568  #define gc_link (FALSE)  #define gc_link (FALSE)
569  #endif  #endif
570    
571    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;  
572    
573  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
574    if(gc_link) {    if(gc_link) {
575      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
576          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
577  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
578    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
579             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 605  static GtkWidget *cache_logs(appdata_t * Line 581  static GtkWidget *cache_logs(appdata_t *
581      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
582                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
583    
584      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
     cnt++;  
585    }    }
586  #endif  #endif
587    
588      int logs = gpx_number_of_logs(log);
589      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
590      int log_cnt = 0;
591    
592      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
593    
594    /* add all logs to the vbox */    /* add all logs to the vbox */
595    while(log) {    while(log) {
596      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
597                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
598  #if 0  
599      static const char *log_type = "seek/log.aspx";      static const char *finder_type = "profile/";
600      GtkWidget *log_but =      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
601        link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),                                            finder_type, log->finder->id);
602                               log_type, log->id);  
603      gtk_table_attach(GTK_TABLE(table), log_but,      /* if the finder is a button make sure it's the right size and */
604                       0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);      /* does not exceed the size limits */
605  #else      if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
606      gtk_table_attach_defaults(GTK_TABLE(table),  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
607                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);        hildon_gtk_widget_set_theme_size(finder,
608  #endif                     (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
609    #endif
610    
611          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
612                                  PANGO_ELLIPSIZE_END);
613        } else
614          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
615    
616        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
617    
618        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
619                  icon_get_widget(ICON_LOG, log->type));
620    
621      char date_str[32];      char date_str[32];
622      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 634  static GtkWidget *cache_logs(appdata_t * Line 626  static GtkWidget *cache_logs(appdata_t *
626      } else      } else
627        strcpy(date_str, "---");        strcpy(date_str, "---");
628    
629      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);  
630    
631      static const char *finder_type = "profile/";      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
     GtkWidget *finder = link_button_by_id(appdata, log->finder->name,  
                                           finder_type, log->finder->id);  
   
     gtk_table_attach(GTK_TABLE(table), 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);  
632    
633        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
634                                  2*log_cnt, 2*log_cnt+1);
635    
636      if(log->text) {      if(log->text) {
637        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
638          html_view(appdata, log->text,          html_view(appdata, log->text,
639                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
640                                  0, 3, cnt+3, cnt+4);                                  1, 2, 2*log_cnt, 2*log_cnt+1);
641      }      }
642    
643        if(log_cnt < logs-1) {
644          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
645    
646          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
647                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
648    
649          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
650        }
651    
652      log = log->next;      log = log->next;
653      cnt+=4;      log_cnt++;
654    }    }
655    
656      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
657    
658  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
659    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
660                                          table);                                          vbox);
661    return scrolled_window;    return scrolled_window;
662  #else  #else
663    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
664                                           table);                                           vbox);
665    return pannable_area;    return pannable_area;
666  #endif  #endif
667  }  }
# Line 724  static void on_notebook_destroy(GtkWidge Line 721  static void on_notebook_destroy(GtkWidge
721    
722    printf("destroying notebook\n");    printf("destroying notebook\n");
723    
724      /* cancel a pending gcvote request */
725      if(context->gcvote_request) {
726        gcvote_request_free(context->gcvote_request);
727        context->gcvote_request = NULL;
728      }
729    
730    notes_destroy_event(NULL, context);    notes_destroy_event(NULL, context);
731    goto_destroy_event(NULL, context);    goto_destroy_event(NULL, context);
732    
# Line 735  static void on_notebook_destroy(GtkWidge Line 738  static void on_notebook_destroy(GtkWidge
738    free(user_data);    free(user_data);
739  }  }
740    
741    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
742    #define CUSTOM_NOTEBOOK
743    #endif
744    
745    static GtkWidget *notebook_new(void) {
746    #ifdef CUSTOM_NOTEBOOK
747      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
748    
749      GtkWidget *notebook =  gtk_notebook_new();
750    
751      /* prevents user from accidentially touching the breadcrumb trail */
752      /* (looks ugly on fremantle as it isn't themed) */
753      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
754    
755      /* solution for fremantle: we use a row of ordinary buttons instead */
756      /* of regular tabs */
757    
758      /* hide the regular tabs */
759      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
760    
761      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
762    
763      /* store a reference to the notebook in the vbox */
764      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
765    
766      /* create a hbox for the buttons */
767      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
768      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
769      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
770    
771      return vbox;
772    #else
773      return gtk_notebook_new();
774    #endif
775    }
776    
777    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
778      GtkNotebook *nb =
779        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
780    
781      /* get previously selected page */
782      gint page = gtk_notebook_get_current_page(nb);
783      char *id_str = g_strdup_printf("button_%d", page);
784      gtk_toggle_button_set_active(
785         GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), id_str)), FALSE);
786      g_free(id_str);
787    
788      page = (gint)g_object_get_data(G_OBJECT(button), "page");
789      gtk_notebook_set_current_page(nb, page);
790    }
791    
792    static void notebook_append_page(GtkWidget *notebook,
793                                     GtkWidget *page, char *label) {
794    #ifdef CUSTOM_NOTEBOOK
795      GtkNotebook *nb =
796        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
797    
798      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
799    
800      GtkWidget *button = gtk_toggle_button_new_with_label(label);
801      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
802    
803      /* select button for page 0 by default */
804      if(!page_num)
805        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
806    
807      gtk_signal_connect(GTK_OBJECT(button), "clicked",
808               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
809    
810      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
811    
812    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
813      hildon_gtk_widget_set_theme_size(button,
814               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
815    #endif
816    
817      char *id_str = g_strdup_printf("button_%d", page_num);
818      g_object_set_data(G_OBJECT(notebook), id_str, (gpointer)button);
819      g_free(id_str);
820    
821      gtk_box_pack_start_defaults(
822         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
823         button);
824    
825    #else
826      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
827    #endif
828    }
829    
830    static GObject *notebook_object(GtkWidget *notebook) {
831    #ifdef CUSTOM_NOTEBOOK
832      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
833    #else
834      return G_OBJECT(notebook);
835    #endif
836    }
837    
838  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
839    GtkWidget *notebook;    GtkWidget *notebook;
840    
# Line 751  GtkWidget *cache_view(appdata_t *appdata Line 851  GtkWidget *cache_view(appdata_t *appdata
851  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
852  #endif  #endif
853    
854    notebook =  gtk_notebook_new();    notebook = notebook_new();
   
 #ifdef USE_MAEMO  
 #if MAEMO_VERSION_MAJOR >= 5  
   /* prevents user from accidentially touching the breadcrumb trail */  
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);  
 #endif  
 #endif  
855    
856    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
857         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
858    
859    if(cache->long_description)    if(cache->long_description)
860      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
861             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
862    
863    if(cache->hint)    if(cache->hint)
864      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
865             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
866    
867    if(cache->log)    if(cache->log)
868      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
869       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
870             gtk_label_new(_("Logs")));             _("Logs"));
871    
872    if(cache->wpt)    if(cache->wpt)
873      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
874               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
875    
876    if(cache->tb)    if(cache->tb)
877      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
878               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
879    
880    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
881             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
882    
883    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
884             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
885    
886    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
887             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
888    
889    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
890             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
891    
892    return notebook;    return notebook;
Legend:
Removed from v.158  
changed lines
  Added in v.166