Open File works. I refactored the code and introduced a new type. I never used it...

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index 99bf3f04118d39cb36c8c948d8b5616d4aa856ce..94dcd34858b11f687d8f8807e888a50254990fc8 100644 (file)
--- a/info.c
+++ b/info.c
@@ -5,6 +5,7 @@
 
 #include "dive.h"
 #include "display.h"
+#include "divelist.h"
 
 static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
 static GtkEntry *location;
@@ -119,15 +120,15 @@ GtkWidget *dive_info_frame(void)
        frame = gtk_frame_new("Dive info");
        gtk_widget_show(frame);
 
-       vbox = gtk_vbox_new(TRUE, 5);
+       vbox = gtk_vbox_new(TRUE, 6);
        gtk_container_set_border_width(GTK_CONTAINER(vbox), 3);
        gtk_container_add(GTK_CONTAINER(frame), vbox);
 
-       hbox = gtk_hbox_new(TRUE, 5);
+       hbox = gtk_hbox_new(TRUE, 6);
        gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
        gtk_container_add(GTK_CONTAINER(vbox), hbox);
 
-       hbox2 = gtk_hbox_new(FALSE, 0);
+       hbox2 = gtk_hbox_new(FALSE, 6);
        gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3);
        gtk_container_add(GTK_CONTAINER(vbox), hbox2);
 
@@ -167,10 +168,12 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label, gboolean expa
        gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
 
        GtkWidget* scrolled_window = gtk_scrolled_window_new (0, 0);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
        gtk_widget_show(scrolled_window);
 
        view = gtk_text_view_new ();
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
        gtk_container_add(GTK_CONTAINER(scrolled_window), view);
 
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
@@ -179,21 +182,17 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label, gboolean expa
        return buffer;
 }
 
-GtkWidget *extended_dive_info_frame(void)
+GtkWidget *extended_dive_info_widget(void)
 {
-       GtkWidget *frame;
        GtkWidget *vbox;
 
-       frame = gtk_frame_new("Extended dive info");
-       gtk_widget_show(frame);
-
-       vbox = gtk_vbox_new(FALSE, 5);
-       gtk_container_add(GTK_CONTAINER(frame), vbox);
+       vbox = gtk_vbox_new(FALSE, 6);
 
        location = text_entry(vbox, "Location");
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
        notes = text_view(vbox, "Notes", TRUE);
 
        /* Add extended info here: name, description, yadda yadda */
        update_dive_info(current_dive);
-       return frame;
+       return vbox;
 }