--- trunk/src/cache.c 2009/11/05 07:00:52 160 +++ trunk/src/cache.c 2009/11/05 15:12:37 163 @@ -591,8 +591,7 @@ #define gc_link (FALSE) #endif - GtkWidget *table = gtk_table_new(4*gpx_number_of_logs(log)+(gc_link?1:0), 3, FALSE); - int cnt = 0; + GtkWidget *vbox = gtk_vbox_new(FALSE, 6); #ifdef ENABLE_BROWSER_INTERFACE if(gc_link) { @@ -604,26 +603,21 @@ gtk_signal_connect(GTK_OBJECT(but), "clicked", GTK_SIGNAL_FUNC(on_gclink_clicked), context); - gtk_table_attach_defaults(GTK_TABLE(table), but, 0, 3, 0, 1); - cnt++; + gtk_box_pack_start_defaults(GTK_BOX(vbox), but); } #endif /* add all logs to the vbox */ while(log) { - gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), - 0, 3, cnt+0, cnt+1); -#if 0 - static const char *log_type = "seek/log.aspx"; - GtkWidget *log_but = - link_icon_button_by_id(appdata, icon_get_widget(ICON_LOG, log->type), - log_type, log->id); - gtk_table_attach(GTK_TABLE(table), log_but, - 0, 1, cnt+1, cnt+2, FALSE, FALSE, 0, 0); -#else - gtk_table_attach_defaults(GTK_TABLE(table), - icon_get_widget(ICON_LOG, log->type), 0, 1, cnt+1, cnt+2); -#endif + + GtkWidget *frame = gtk_frame_new(NULL); + + GtkWidget *ivbox = gtk_vbox_new(FALSE, 2); + + GtkWidget *ihbox = gtk_hbox_new(TRUE, 2); + + gtk_box_pack_start_defaults(GTK_BOX(ihbox), + icon_get_widget(ICON_LOG, log->type)); char date_str[32]; if(log->day && log->month && log->year) { @@ -633,37 +627,38 @@ } else strcpy(date_str, "---"); - gtk_table_attach_defaults(GTK_TABLE(table), gtk_label_new(date_str), - 1, 2, cnt+1, cnt+2); + gtk_box_pack_start_defaults(GTK_BOX(ihbox), gtk_label_new(date_str)); 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); - - gtk_table_attach_defaults(GTK_TABLE(table), gtk_hseparator_new(), - 0, 3, cnt+2, cnt+3); + gtk_box_pack_start_defaults(GTK_BOX(ihbox), finder); + gtk_box_pack_start_defaults(GTK_BOX(ivbox), ihbox); + if(log->text) { - 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), html_view(appdata, log->text, - is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL), - 0, 3, cnt+3, cnt+4); + is_html?HTML_HTML:HTML_CUSTOM_MARKUP, FALSE, NULL, NULL)); } + gtk_container_add(GTK_CONTAINER(frame), ivbox); + gtk_box_pack_start_defaults(GTK_BOX(vbox), frame); + log = log->next; - cnt+=4; } #ifndef USE_PANNABLE_AREA gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), - table); + vbox); return scrolled_window; #else hildon_pannable_area_add_with_viewport(HILDON_PANNABLE_AREA(pannable_area), - table); + vbox); return pannable_area; #endif }