#include "display.h"
static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
-static GtkTextBuffer *location, *notes;
+static GtkEntry *location;
+static GtkTextBuffer *notes;
static int location_changed = 1, notes_changed = 1;
static struct dive *buffered_dive;
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) {
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 ? : "";
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;
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);