Diff of /trunk/src/cache.c

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

revision 160 by harbaum, Thu Nov 5 07:00:52 2009 UTC revision 176 by harbaum, Wed Nov 11 20:21:55 2009 UTC
# Line 178  static GtkWidget *cache_overview(cache_c Line 178  static GtkWidget *cache_overview(cache_c
178    
179    if(cache->type != CACHE_TYPE_UNKNOWN) {    if(cache->type != CACHE_TYPE_UNKNOWN) {
180      gtk_table_attach(GTK_TABLE(table),      gtk_table_attach(GTK_TABLE(table),
181               tip = icon_get_widget(ICON_CACHE_TYPE, cache->type), 0,1,0,1,  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
182               GTK_FILL, 0, GTK_FILL, 0);               tip = icon_get_widget(ICON_CACHE_TYPE_2X, cache->type),
183    #else
184                 tip = icon_get_widget(ICON_CACHE_TYPE_1_5X, cache->type),
185    #endif
186                         0,1,0,1, GTK_FILL, 0, GTK_FILL, 0);
187  #ifndef USE_MAEMO  #ifndef USE_MAEMO
188      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);      gtk_tooltips_set_tip(tips, tip, _(cache_type_tip[cache->type]), NULL);
189  #endif  #endif
# Line 263  static GtkWidget *cache_overview(cache_c Line 267  static GtkWidget *cache_overview(cache_c
267    }    }
268    
269    /* --------------------- GCVote ------------------------ */    /* --------------------- GCVote ------------------------ */
270      if(!appdata->disable_gcvote) {
271    vote_t *vote = gcvote_restore(appdata, cache);      vote_t *vote = gcvote_restore(appdata, cache);
272    
273        context->gcvote_request =
274          gcvote_request(appdata, gcvote_callback, cache->url, context);
275    
276    context->gcvote_request =      context->votebox = gtk_vbox_new(FALSE, 0);
277      gcvote_request(appdata, gcvote_callback, cache->url, context);      GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
278        gtk_container_add(GTK_CONTAINER(align), context->votebox);
279        gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);
280    
281    context->votebox = gtk_vbox_new(FALSE, 0);      /* fill with vote if present on disk (will also free vote) */
282    GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);      if(vote)
283    gtk_container_add(GTK_CONTAINER(align), context->votebox);        gcvote_set(context, vote);
   gtk_box_pack_start_defaults(GTK_BOX(ratebox), align);  
   
   /* fill with vote if present on disk (will also free vote) */  
   if(vote)  
     gcvote_set(context, vote);  
284    
285    gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);      gtk_table_attach_defaults(GTK_TABLE(table), ratebox, 2,3,0,2);
286      }
287    
288    /* ----------------------------------------------------- */    /* ----------------------------------------------------- */
289    
# Line 448  static GtkWidget *cache_wpts(appdata_t * Line 453  static GtkWidget *cache_wpts(appdata_t *
453                                wpt_row+0, wpt_row+1);                                wpt_row+0, wpt_row+1);
454    
455      /* ------------------ description ------------------------- */      /* ------------------ description ------------------------- */
456      if(wpt->desc) {      if(wpt->desc)
457        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
458        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,  
459                                  wpt_row+1, wpt_row+2);                                  wpt_row+1, wpt_row+2);
     }  
460    
461      /* ------------------ comment ------------------------- */      /* ------------------ comment ------------------------- */
462      if(wpt->cmt) {      if(wpt->cmt)
463        GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);        gtk_table_attach_defaults(GTK_TABLE(table),
464        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,  
465                                  wpt_row+2, wpt_row+3);                                  wpt_row+2, wpt_row+3);
     }  
466    
467      /* --------------------- seperator -------------------------*/      /* --------------------- seperator -------------------------*/
468      if(wpt->next)      if(wpt->next) {
469          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+2, 8);
470        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,        gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), 0,4,
471                                  wpt_row+3, wpt_row+4);                                  wpt_row+3, wpt_row+4);
472          gtk_table_set_row_spacing(GTK_TABLE(table), wpt_row+3, 8);
473        }
474    
475      wpt_row+=4;      wpt_row+=4;
476      wpt = wpt->next;      wpt = wpt->next;
# Line 575  static void on_gclink_clicked(GtkButton Line 556  static void on_gclink_clicked(GtkButton
556  }  }
557  #endif  #endif
558    
559  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,
560                                 log_t *log, int is_html) {
561  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
562    /* put this inside a scrolled view */    /* put this inside a scrolled view */
563    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);    GtkWidget *scrolled_window = gtk_scrolled_window_new(NULL, NULL);
# Line 591  static GtkWidget *cache_logs(appdata_t * Line 573  static GtkWidget *cache_logs(appdata_t *
573  #define gc_link (FALSE)  #define gc_link (FALSE)
574  #endif  #endif
575    
576    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;  
577    
578  #ifdef ENABLE_BROWSER_INTERFACE  #ifdef ENABLE_BROWSER_INTERFACE
579    if(gc_link) {    if(gc_link) {
580      GtkWidget *but = gtk_button_new_with_label(_("Post a new log entry for this geocache"));      GtkWidget *but =
581          gtk_button_new_with_label(_("Post a new log entry for this geocache"));
582  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
583    hildon_gtk_widget_set_theme_size(but,    hildon_gtk_widget_set_theme_size(but,
584             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));             (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
# Line 604  static GtkWidget *cache_logs(appdata_t * Line 586  static GtkWidget *cache_logs(appdata_t *
586      gtk_signal_connect(GTK_OBJECT(but), "clicked",      gtk_signal_connect(GTK_OBJECT(but), "clicked",
587                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);                         GTK_SIGNAL_FUNC(on_gclink_clicked), context);
588    
589      gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1);      gtk_box_pack_start_defaults(GTK_BOX(vbox), but);
     cnt++;  
590    }    }
591  #endif  #endif
592    
593      int logs = gpx_number_of_logs(log);
594      GtkWidget *table = gtk_table_new(2*logs-1, 2,FALSE);
595      int log_cnt = 0;
596    
597      gtk_table_set_col_spacing(GTK_TABLE(table), 0, 8);
598    
599    /* add all logs to the vbox */    /* add all logs to the vbox */
600    while(log) {    while(log) {
601      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      GtkWidget *ivbox = gtk_vbox_new(FALSE, 2);
602                                0, 3, cnt+0, cnt+1);      GtkWidget *ihbox = gtk_hbox_new(FALSE, 2);
603  #if 0  
604      static const char *log_type = "seek/log.aspx";      static const char *finder_type = "profile/";
605      GtkWidget *log_but =      GtkWidget *finder = link_button_by_id(appdata, log->finder->name,
606        link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type),                                            finder_type, log->finder->id);
607                               log_type, log->id);  
608      gtk_table_attach(GTK_TABLE(table), log_but,      /* if the finder is a button make sure it's the right size and */
609                       0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0);      /* does not exceed the size limits */
610  #else      if(GTK_WIDGET_TYPE(finder) == GTK_TYPE_BUTTON) {
611      gtk_table_attach_defaults(GTK_TABLE(table),  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
612                icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2);        hildon_gtk_widget_set_theme_size(finder,
613  #endif                     (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH));
614    #endif
615    
616          gtk_label_set_ellipsize(GTK_LABEL(gtk_bin_get_child(GTK_BIN(finder))),
617                                  PANGO_ELLIPSIZE_END);
618        } else
619          gtk_label_set_ellipsize(GTK_LABEL(finder), PANGO_ELLIPSIZE_END);
620    
621        gtk_box_pack_start(GTK_BOX(ivbox), finder, FALSE, FALSE, 0);
622    
623        gtk_box_pack_start_defaults(GTK_BOX(ihbox),
624                  icon_get_widget(ICON_LOG, log->type));
625    
626      char date_str[32];      char date_str[32];
627      if(log->day && log->month && log->year) {      if(log->day && log->month && log->year) {
# Line 633  static GtkWidget *cache_logs(appdata_t * Line 631  static GtkWidget *cache_logs(appdata_t *
631      } else      } else
632        strcpy(date_str, "---");        strcpy(date_str, "---");
633    
634      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);  
   
     static const char *finder_type = "profile/";  
     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);  
635    
636      gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),      gtk_box_pack_start(GTK_BOX(ivbox), ihbox, FALSE, FALSE, 0);
                               0, 3, cnt+2, cnt+3);  
637    
638        gtk_table_attach_defaults(GTK_TABLE(table), ivbox, 0, 1,
639                                  2*log_cnt, 2*log_cnt+1);
640    
641      if(log->text) {      if(log->text) {
642        gtk_table_attach_defaults(GTK_TABLE(table),        gtk_table_attach_defaults(GTK_TABLE(table),
643          html_view(appdata, log->text,          html_view(appdata, log->text,
644                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),                    is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL),
645                                  0, 3, cnt+3, cnt+4);                                  1, 2, 2*log_cnt, 2*log_cnt+1);
646      }      }
647    
648        if(log_cnt < logs-1) {
649          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt, 8);
650    
651          gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(),
652                                    0, 2, 2*log_cnt+1, 2*log_cnt+2);
653    
654          gtk_table_set_row_spacing(GTK_TABLE(table), 2*log_cnt+1, 8);
655        }
656    
657      log = log->next;      log = log->next;
658      cnt+=4;      log_cnt++;
659    }    }
660    
661      gtk_box_pack_start_defaults(GTK_BOX(vbox), table);
662    
663  #ifndef  USE_PANNABLE_AREA  #ifndef  USE_PANNABLE_AREA
664    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
665                                          table);                                          vbox);
666    return scrolled_window;    return scrolled_window;
667  #else  #else
668    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),    hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area),
669                                           table);                                           vbox);
670    return pannable_area;    return pannable_area;
671  #endif  #endif
672  }  }
# Line 740  static void on_notebook_destroy(GtkWidge Line 743  static void on_notebook_destroy(GtkWidge
743    free(user_data);    free(user_data);
744  }  }
745    
746    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
747    #define CUSTOM_NOTEBOOK
748    #endif
749    
750    static GtkWidget *notebook_new(void) {
751    #ifdef CUSTOM_NOTEBOOK
752      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
753    
754      GtkWidget *notebook =  gtk_notebook_new();
755    
756      /* prevents user from accidentially touching the breadcrumb trail */
757      /* (looks ugly on fremantle as it isn't themed) */
758      //  gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
759    
760      /* solution for fremantle: we use a row of ordinary buttons instead */
761      /* of regular tabs */
762    
763      /* hide the regular tabs */
764      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
765    
766      gtk_box_pack_start_defaults(GTK_BOX(vbox), notebook);
767    
768      /* store a reference to the notebook in the vbox */
769      g_object_set_data(G_OBJECT(vbox), "notebook", (gpointer)notebook);
770    
771      /* create a hbox for the buttons */
772      GtkWidget *hbox = gtk_hbox_new(TRUE, 0);
773      gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
774      g_object_set_data(G_OBJECT(vbox), "hbox", (gpointer)hbox);
775    
776      return vbox;
777    #else
778      return gtk_notebook_new();
779    #endif
780    }
781    
782    static void on_notebook_button_clicked(GtkWidget *button, gpointer data) {
783      GtkNotebook *nb =
784        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(data), "notebook"));
785    
786      gint page = (gint)g_object_get_data(G_OBJECT(button), "page");
787      gtk_notebook_set_current_page(nb, page);
788    }
789    
790    static void notebook_append_page(GtkWidget *notebook,
791                                     GtkWidget *page, char *label) {
792    #ifdef CUSTOM_NOTEBOOK
793      GtkNotebook *nb =
794        GTK_NOTEBOOK(g_object_get_data(G_OBJECT(notebook), "notebook"));
795    
796      gint page_num = gtk_notebook_append_page(nb, page, gtk_label_new(label));
797      GtkWidget *button = NULL;
798    
799      /* select button for page 0 by default */
800      if(!page_num) {
801        button = gtk_radio_button_new_with_label(NULL, label);
802        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
803        g_object_set_data(G_OBJECT(notebook), "group_master", (gpointer)button);
804      } else {
805        GtkWidget *master = g_object_get_data(G_OBJECT(notebook), "group_master");
806        button = gtk_radio_button_new_with_label_from_widget(
807                                     GTK_RADIO_BUTTON(master), label);
808      }
809    
810      gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(button), FALSE);
811      g_object_set_data(G_OBJECT(button), "page", (gpointer)page_num);
812    
813      gtk_signal_connect(GTK_OBJECT(button), "clicked",
814               GTK_SIGNAL_FUNC(on_notebook_button_clicked), notebook);
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      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 756  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.160  
changed lines
  Added in v.176