Diff of /trunk/src/cache.c

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

revision 164 by harbaum, Thu Nov 5 15:12:37 2009 UTC revision 165 by harbaum, Sun Nov 8 20:32:55 2009 UTC
# Line 448  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 575  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 595  static GtkWidget *cache_logs(appdata_t * Line 572  static GtkWidget *cache_logs(appdata_t *
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 606  static GtkWidget *cache_logs(appdata_t * Line 584  static GtkWidget *cache_logs(appdata_t *
584      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
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        GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
597        GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
598    
599      GtkWidget *frame = gtk_frame_new(NULL);      static const char *finder_type = "profile/";
600        GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
601                                              finder_type, log->finder->id);
602    
603      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);      /* if the finder is a button make sure it's the right size and */
604        /* does not exceed the size limits */
605        if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
606    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
607          hildon_gtk_widget_set_theme_size(finder,
608                       (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      GtkWidget *ihbox = gtk_hbox_new(TRUE, 2);      gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
617    
618      gtk_box_pack_start_defaults(GTK_BOX(ihbox),      gtk_box_pack_start_defaults(GTK_BOX(ihbox),
619                icon_get_widget(ICON_LOG, log->type));                icon_get_widget(ICON_LOG, log->type));
# Line 629  static GtkWidget *cache_logs(appdata_t * Line 628  static GtkWidget *cache_logs(appdata_t *
628    
629      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));
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_box_pack_start_defaults(GTK_BOX(ihbox), finder);  
632    
633      gtk_box_pack_start_defaults(GTK_BOX(ivbox), ihbox);      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_box_pack_start_defaults(GTK_BOX(ivbox), gtk_hseparator_new());  
   
       gtk_box_pack_start_defaults(GTK_BOX(ivbox),  
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                                    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      }      }
   
     gtk_container_add(GTK_CONTAINER(frame), ivbox);  
     gtk_box_pack_start_defaults(GTK_BOX(vbox), frame);  
651    
652      log = log->next;      log = log->next;
653        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                                          vbox);                                          vbox);
# 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     //  gtk_widget_set_state(button, GTK_STATE_ACTIVE);   // or: SELECTED, ACTIVE
792     //  gtk_widget_show_all(button);
793    }
794    
795    
796    static void notebook_append_page(GtkWidget *notebook,
797                                     GtkWidget *page, char *label) {
798    #ifdef CUSTOM_NOTEBOOK
799      GtkNotebook *nb =
800        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
801    
802      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
803    
804      GtkWidget *button = gtk_toggle_button_new_with_label(label);
805      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
806    
807      /* select button for page 0 by default */
808      if(!page_num)
809        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
810    
811      gtk_signal_connect(GTK_OBJECT(button), "clicked",
812               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
813    
814      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
815    
816    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
817      hildon_gtk_widget_set_theme_size(button,
818               (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
819    #endif
820    
821      char *id_str = g_strdup_printf("button_%d", page_num);
822      g_object_set_data(G_OBJECT(notebook), id_str, (gpointer)button);
823      g_free(id_str);
824    
825      gtk_box_pack_start_defaults(
826         GTK_BOX(g_object_get_data(G_OBJECT(notebook), "hbox")),
827         button);
828    
829    #else
830      gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, gtk_label_new(label));
831    #endif
832    }
833    
834    static GObject *notebook_object(GtkWidget *notebook) {
835    #ifdef CUSTOM_NOTEBOOK
836      return G_OBJECT(g_object_get_data(G_OBJECT(notebook), "notebook"));
837    #else
838      return G_OBJECT(notebook);
839    #endif
840    }
841    
842  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {  GtkWidget *cache_view(appdata_t *appdata, cache_t *cache) {
843    GtkWidget *notebook;    GtkWidget *notebook;
844    
# Line 751  GtkWidget *cache_view(appdata_t *appdata Line 855  GtkWidget *cache_view(appdata_t *appdata
855  #define TAB_WPTS   _("Waypoints")  #define TAB_WPTS   _("Waypoints")
856  #endif  #endif
857    
858    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  
859    
860    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
861         cache_overview(cache_context), gtk_label_new(_("Main")));         cache_overview(cache_context), _("Main"));
862    
863    if(cache->long_description)    if(cache->long_description)
864      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
865             cache_description(appdata, cache), gtk_label_new(TAB_DESC));             cache_description(appdata, cache), TAB_DESC);
866    
867    if(cache->hint)    if(cache->hint)
868      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
869             cache_hint(appdata, cache), gtk_label_new(_("Hint")));             cache_hint(appdata, cache), _("Hint"));
870    
871    if(cache->log)    if(cache->log)
872      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
873       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),       cache_logs(appdata, cache_context, cache->log, cache->logs_are_html),
874             gtk_label_new(_("Logs")));             _("Logs"));
875    
876    if(cache->wpt)    if(cache->wpt)
877      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
878               cache_wpts(appdata, cache->wpt), gtk_label_new(TAB_WPTS));               cache_wpts(appdata, cache->wpt), TAB_WPTS);
879    
880    if(cache->tb)    if(cache->tb)
881      gtk_notebook_append_page(GTK_NOTEBOOK(notebook),      notebook_append_page(notebook,
882               cache_tbs(appdata, cache->tb), gtk_label_new(_("TBs")));               cache_tbs(appdata, cache->tb), _("TBs"));
883    
884    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
885             cache_notes(cache_context), gtk_label_new(_("Notes")));             cache_notes(cache_context), _("Notes"));
886    
887    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),    notebook_append_page(notebook,
888             goto_cache(cache_context), gtk_label_new(_("Goto")));             goto_cache(cache_context), _("Goto"));
889    
890    g_signal_connect(G_OBJECT(notebook), "switch-page",    g_signal_connect(notebook_object(notebook), "switch-page",
891             G_CALLBACK(on_notebook_page_change), cache_context);             G_CALLBACK(on_notebook_page_change), cache_context);
892    
893    g_signal_connect(G_OBJECT(notebook), "destroy",    g_signal_connect(notebook_object(notebook), "destroy",
894             G_CALLBACK(on_notebook_destroy), cache_context);             G_CALLBACK(on_notebook_destroy), cache_context);
895    
896    return notebook;    return notebook;
Legend:
Removed from v.164  
changed lines
  Added in v.165