X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=9abbbec400e58efff5b11cdc9044e933e68f04f9;hb=09174367294c399265954a9e2770427e5ee251ba;hp=dc3a95bde4c06e67e90a5e1ad3e0547731240d08;hpb=8042246df6f7673873e02f5255029370b1f42e3c;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index dc3a95b..9abbbec 100644
--- a/info.c
+++ b/info.c
@@ -1,12 +1,14 @@
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
 #include "dive.h"
 #include "display.h"
 
-static GtkWidget *divedate, *divetime, *depth, *duration, *temperature;
-static GtkTextBuffer *location, *notes;
+static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
+static GtkEntry *location;
+static GtkTextBuffer *notes;
 static int location_changed = 1, notes_changed = 1;
 static struct dive *buffered_dive;
 
@@ -37,7 +39,7 @@ void flush_dive_info_changes(void)
 
 	if (location_changed) {
 		g_free(dive->location);
-		dive->location = get_text(location);
+		dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1);
 	}
 
 	if (notes_changed) {
@@ -93,15 +95,17 @@ void update_dive_info(struct dive *dive)
 	gtk_label_set_text(GTK_LABEL(temperature), buffer);
 
 	text = dive->location ? : "";
-	gtk_text_buffer_set_text(location, text, -1);
+	gtk_entry_set_text(location, text);
+	gtk_label_set_text(GTK_LABEL(locationnote), text);
+
 	text = dive->notes ? : "";
 	gtk_text_buffer_set_text(notes, text, -1);
 }
 
-static GtkWidget *info_label(GtkWidget *box, const char *str)
+static GtkWidget *info_label(GtkWidget *box, const char *str, GtkJustification jtype)
 {
 	GtkWidget *label = gtk_label_new(str);
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
+	gtk_label_set_justify(GTK_LABEL(label), jtype);
 	gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
 	return label;
 }
@@ -109,25 +113,51 @@ static GtkWidget *info_label(GtkWidget *box, const char *str)
 GtkWidget *dive_info_frame(void)
 {
 	GtkWidget *frame;
-	GtkWidget *hbox;
+	GtkWidget *hbox, *hbox2;
+	GtkWidget *vbox;
 
 	frame = gtk_frame_new("Dive info");
 	gtk_widget_show(frame);
 
+	vbox = gtk_vbox_new(TRUE, 5);
+	gtk_container_set_border_width(GTK_CONTAINER(vbox), 3);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+
 	hbox = gtk_hbox_new(TRUE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
-	gtk_container_add(GTK_CONTAINER(frame), hbox);
+	gtk_container_add(GTK_CONTAINER(vbox), hbox);
 
-	divedate = info_label(hbox, "date");
-	divetime = info_label(hbox, "time");
-	depth = info_label(hbox, "depth");
-	duration = info_label(hbox, "duration");
-	temperature = info_label(hbox, "temperature");
+	hbox2 = gtk_hbox_new(FALSE, 0);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3);
+	gtk_container_add(GTK_CONTAINER(vbox), hbox2);
+
+	divedate = info_label(hbox, "date", GTK_JUSTIFY_RIGHT);
+	divetime = info_label(hbox, "time", GTK_JUSTIFY_RIGHT);
+	depth = info_label(hbox, "depth", GTK_JUSTIFY_RIGHT);
+	duration = info_label(hbox, "duration", GTK_JUSTIFY_RIGHT);
+	temperature = info_label(hbox, "temperature", GTK_JUSTIFY_RIGHT);
+
+	locationnote = info_label(hbox2, "location", GTK_JUSTIFY_LEFT);
+	gtk_label_set_width_chars(GTK_LABEL(locationnote), 80);
 
 	return frame;
 }
 
-static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand)
+static GtkEntry *text_entry(GtkWidget *box, const char *label)
+{
+	GtkWidget *entry;
+
+	GtkWidget *frame = gtk_frame_new(label);
+
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
+
+	entry = gtk_entry_new ();
+	gtk_container_add(GTK_CONTAINER(frame), entry);
+
+	return GTK_ENTRY(entry);
+}
+
+static GtkTextBuffer *text_view(GtkWidget *box, const char *label, gboolean expand)
 {
 	GtkWidget *view;
 	GtkTextBuffer *buffer;
@@ -136,10 +166,18 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp
 
 	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));
 
-	gtk_container_add(GTK_CONTAINER(frame), view);
+	gtk_container_add(GTK_CONTAINER(frame), scrolled_window);
 	return buffer;
 }
 
@@ -154,8 +192,8 @@ GtkWidget *extended_dive_info_frame(void)
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
-	location = text_entry(vbox, "Location", FALSE);
-	notes = text_entry(vbox, "Notes", TRUE);
+	location = text_entry(vbox, "Location");
+	notes = text_view(vbox, "Notes", TRUE);
 
 	/* Add extended info here: name, description, yadda yadda */
 	update_dive_info(current_dive);