Diff of /trunk/src/cache.c

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

revision 163 by harbaum, Thu Nov 5 15:12:37 2009 UTC revision 167 by harbaum, Mon Nov 9 07:50:37 2009 UTC
# Line 263  static GtkWidget *cache_overview(cache_c Line 263  static GtkWidget *cache_overview(cache_c
263    }    }
264    
265    /* --------------------- GCVote ------------------------ */    /* --------------------- GCVote ------------------------ */
266      if(!appdata->disable_gcvote) {
267    vote_t *vote = gcvote_restore(appdata, cache);      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    context->votebox = gtk_vbox_new(FALSE, 0);      context->votebox = gtk_vbox_new(FALSE, 0);
273    GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
274    gtk_container_add(GTK_CONTAINER(align), context->votebox);      gtk_container_add(GTK_CONTAINER(align), context->votebox);
275    gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);      gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
276    
277    /* fill with vote if present on disk (will also free vote) */      /* fill with vote if present on disk (will also free vote) */
278    if(vote)      if(vote)
279      gcvote_set(context, vote);        gcvote_set(context, vote);
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      }
283    
284    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
285    
# Line 448  static GtkWidget *cache_wpts(appdata_t * Line 449  static GtkWidget *cache_wpts(appdata_t *
449                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
450    
451      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
452      if(wpt->desc) {      if(wpt->desc)
453        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
454        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,  
455                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
456    
457      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
458      if(wpt->cmt) {      if(wpt->cmt)
459        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
460        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,  
461                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
462    
463      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
464      if(wpt->next)      if(wpt->next) {
465          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
466        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
467                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
468          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
469        }
470    
471      wpt_row+=4;      wpt_row+=4;
472      wpt = wpt->next;      wpt = wpt->next;
# Line 575  static void on_gclink_clicked(GtkButton Line 552  static void on_gclink_clicked(GtkButton
552  }  }
553  #endif  #endif
554    
555  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,
556                                 log_t *log, int is_html) {
557  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
558    /* put this inside a scrolled view */    /* put this inside a scrolled view */
559    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 595  static GtkWidget *cache_logs(appdata_t * Line 573  static GtkWidget *cache_logs(appdata_t *
573    
574  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
575    if(gc_link) {    if(gc_link) {
576      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
577          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
578  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
579    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
580             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 606  static GtkWidget *cache_logs(appdata_t * Line 585  static GtkWidget *cache_logs(appdata_t *
585      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
586    }    }
587  #endif  #endif
588    
589      int logs = gpx_number_of_logs(log);
590      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
591      int log_cnt = 0;
592    
593      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
594    
595    /* add all logs to the vbox */    /* add all logs to the vbox */
596    while(log) {    while(log) {
597        GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
598        GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
599    
600      GtkWidget *frame = gtk_frame_new(NULL);      static const char *finder_type = "profile/";
601        GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
602                                              finder_type, log->finder->id);
603    
604      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);      /* if the finder is a button make sure it's the right size and */
605        /* does not exceed the size limits */
606        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
607    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
608          hildon_gtk_widget_set_theme_size(finder,
609                       (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
610    #endif
611    
612      GtkWidget *ihbox = gtk_hbox_new(TRUE, 2);        gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
613                                  PANGO_ELLIPSIZE_END);
614        } else
615          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
616    
617        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
618    
619      gtk_box_pack_start_defaults(GTK_BOX(ihbox),      gtk_box_pack_start_defaults(GTK_BOX(ihbox),
620                icon_get_widget(ICON_LOG, log->type));                icon_get_widget(ICON_LOG, log->type));
# Line 629  static GtkWidget *cache_logs(appdata_t * Line 629  static GtkWidget *cache_logs(appdata_t *
629    
630      gtk_box_pack_start_defaults(GTK_BOX(ihbox), gtk_label_new(date_str));      gtk_box_pack_start_defaults(GTK_BOX(ihbox), gtk_label_new(date_str));
631    
632      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_box_pack_start_defaults(GTK_BOX(ihbox), finder);  
633    
634      gtk_box_pack_start_defaults(GTK_BOX(ivbox), ihbox);      gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
635                                  2*log_cnt, 2*log_cnt+1);
636    
637      if(log->text) {      if(log->text) {
638        /* ---- */        gtk_table_attach_defaults(GTK_TABLE(table),
       gtk_box_pack_start_defaults(GTK_BOX(ivbox), gtk_hseparator_new());  
   
       gtk_box_pack_start_defaults(GTK_BOX(ivbox),  
639          html_view(appdata, log->text,          html_view(appdata, log->text,
640                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL));                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
641                                    1, 2, 2*log_cnt, 2*log_cnt+1);
642        }
643    
644        if(log_cnt < logs-1) {
645          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
646    
647          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
648                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
649    
650          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
651      }      }
   
     gtk_container_add(GTK_CONTAINER(frame), ivbox);  
     gtk_box_pack_start_defaults(GTK_BOX(vbox), frame);  
652    
653      log = log->next;      log = log->next;
654        log_cnt++;
655    }    }
656    
657      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
658    
659  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
660    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
661                                          vbox);                                          vbox);
# Line 735  static void on_notebook_destroy(GtkWidge Line 739  static void on_notebook_destroy(GtkWidge
739    free(user_data);    free(user_data);
740  }  }
741    
742    #if 1 // defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
743    #define CUSTOM_NOTEBOOK
744    #endif
745    
746    static GtkWidget *notebook_new(void) {
747    #ifdef CUSTOM_NOTEBOOK
748      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
749    
750      GtkWidget *notebook =  gtk_notebook_new();
751    
752      /* prevents user from accidentially touching the breadcrumb trail */
753      /* (looks ugly on fremantle as it isn't themed) */
754      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
755    
756      /* solution for fremantle: we use a row of ordinary buttons instead */
757      /* of regular tabs */
758    
759      /* hide the regular tabs */
760      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
761    
762      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
763    
764      /* store a reference to the notebook in the vbox */
765      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
766    
767      /* create a hbox for the buttons */
768      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
769      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
770      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
771    
772      return vbox;
773    #else
774      return gtk_notebook_new();
775    #endif
776    }
777    
778    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
779      GtkNotebook *nb =
780        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
781    
782      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
783      gtk_notebook_set_current_page(nb, page);
784    }
785    
786    static void notebook_append_page(GtkWidget *notebook,
787                                     GtkWidget *page, char *label) {
788    #ifdef CUSTOM_NOTEBOOK
789      GtkNotebook *nb =
790        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
791    
792      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
793      GtkWidget *button = NULL;
794    
795      /* select button for page 0 by default */
796      if(!page_num) {
797        button = gtk_radio_button_new_with_label(NULL, label);
798        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
799        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
800      } else {
801        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
802        button = gtk_radio_button_new_with_label_from_widget(
803                                     GTK_RADIO_BUTTON(master), label);
804      }
805    
806      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
807      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
808    
809      gtk_signal_connect(GTK_OBJECT(button), "clicked",
810               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
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      gtk_box_pack_start_defaults(
818         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
819         button);
820    
821    #else
822      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
823    #endif
824    }
825    
826    static GObject *notebook_object(GtkWidget *notebook) {
827    #ifdef CUSTOM_NOTEBOOK
828      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
829    #else
830      return G_OBJECT(notebook);
831    #endif
832    }
833    
834  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
835    GtkWidget *notebook;    GtkWidget *notebook;
836    
# Line 751  GtkWidget *cache_view(appdata_t *appdata Line 847  GtkWidget *cache_view(appdata_t *appdata
847  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
848  #endif  #endif
849    
850    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  
851    
852    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
853         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
854    
855    if(cache->long_description)    if(cache->long_description)
856      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
857             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
858    
859    if(cache->hint)    if(cache->hint)
860      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
861             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
862    
863    if(cache->log)    if(cache->log)
864      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
865       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
866             gtk_label_new(_("Logs")));             _("Logs"));
867    
868    if(cache->wpt)    if(cache->wpt)
869      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
870               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
871    
872    if(cache->tb)    if(cache->tb)
873      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
874               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
875    
876    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
877             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
878    
879    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
880             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
881    
882    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
883             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
884    
885    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
886             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
887    
888    return notebook;    return notebook;
Legend:
Removed from v.163  
changed lines
  Added in v.167