Merge branch 'master' into ui-improvements

diff --git a/.gitignore b/.gitignore
index 295ea6b17b04ac60ce1723a762551e5df889ce13..aeb949b3d83246d568ac4907e2c68c3b0893884b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *.o
-/parse
+/divelog

diff --git a/Makefile b/Makefile
index b16d38c7a5cd61145ebc8a9b2c2ff045e3d0d403..8b5fd220f57e9729e98941cee4d6ed51f20e6527 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CFLAGS=-Wall -Wno-pointer-sign -g
 OBJS=main.o dive.o profile.o info.o divelist.o parse-xml.o save-xml.o
 
 divelog: $(OBJS)
-       $(CC) $(LDLAGS) -o divelog $(OBJS) \
+       $(CC) $(LDFLAGS) -o divelog $(OBJS) \
                `xml2-config --libs` \
                `pkg-config --libs gtk+-2.0`
 

diff --git a/info.c b/info.c
index 4275ad6ff7b32c7973059b12dd487e7b1d8657bb..62a72e1405815ba958eac8a1b1e3db4b0f47a4c7 100644 (file)
--- a/info.c
+++ b/info.c
@@ -7,7 +7,8 @@
 #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;
 
@@ -38,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) {
@@ -94,7 +95,7 @@ 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 ? : "";
@@ -142,7 +143,21 @@ GtkWidget *dive_info_frame(void)
        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;
@@ -152,10 +167,12 @@ 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));
@@ -170,8 +187,8 @@ GtkWidget *extended_dive_info_widget(void)
 
        vbox = gtk_vbox_new(FALSE, 5);
 
-       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);

diff --git a/save-xml.c b/save-xml.c
index 9e3640cad84d9cf99e92eabf6d6c1e5369d896d2..5c05723b71e1ebf5df39a0c9f977d6d0f6ccb6e5 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -193,4 +193,5 @@ void save_dives(const char *filename)
        for (i = 0; i < dive_table.nr; i++)
                save_dive(f, get_dive(i));
        fprintf(f, "</dives>\n");
+       fclose(f);
 }