Dirk can't count to ten

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index 2cc98f4fd1f81b404ad01cbc9982c9ec2e9fa9c6..e9ecc9f503822920be82f86daa10c21d8ec9eafa 100644 (file)
--- a/info.c
+++ b/info.c
@@ -8,10 +8,11 @@
 #include "divelist.h"
 
 static GtkWidget *info_frame;
-static GtkWidget *divedate, *divetime, *depth, *duration, *temperature;
-static GtkEntry *location;
+static GtkWidget *depth, *duration, *temperature;
+static GtkEntry *location, *buddy, *divemaster;
 static GtkTextBuffer *notes;
 static int location_changed = 1, notes_changed = 1;
+static int divemaster_changed = 1, buddy_changed = 1;
 
 static const char *weekday(int wday)
 {
@@ -41,6 +42,16 @@ void flush_dive_info_changes(struct dive *dive)
                dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1);
        }
 
+       if (divemaster_changed) {
+               g_free(dive->divemaster);
+               dive->divemaster = gtk_editable_get_chars(GTK_EDITABLE(divemaster), 0, -1);
+       }
+
+       if (buddy_changed) {
+               g_free(dive->buddy);
+               dive->buddy = gtk_editable_get_chars(GTK_EDITABLE(buddy), 0, -1);
+       }
+
        if (notes_changed) {
                g_free(dive->notes);
                dive->notes = get_text(notes);
@@ -52,27 +63,40 @@ void show_dive_info(struct dive *dive)
        struct tm *tm;
        char buffer[80];
        char *text;
-       int len;
 
        if (!dive) {
-               gtk_label_set_text(GTK_LABEL(divedate), "no dive");
-               gtk_label_set_text(GTK_LABEL(divetime), "");
                gtk_label_set_text(GTK_LABEL(depth), "");
                gtk_label_set_text(GTK_LABEL(duration), "");
                return;
        }
-
+       /* dive number and location (or lacking that, the date) go in the window title */
        tm = gmtime(&dive->when);
-       snprintf(buffer, sizeof(buffer),
-               "%s %02d/%02d/%04d",
+       text = dive->location;
+       if (!text)
+               text = "";
+       if (*text) {
+               snprintf(buffer, sizeof(buffer), "Dive #%d - %s", dive->number, text);
+       } else {
+               snprintf(buffer, sizeof(buffer), "Dive #%d - %s %02d/%02d/%04d at %d:%02d",
+                       dive->number,
+                       weekday(tm->tm_wday),
+                       tm->tm_mon+1, tm->tm_mday,
+                       tm->tm_year+1900,
+                       tm->tm_hour, tm->tm_min);
+       }
+       text = buffer;
+       if (!dive->number)
+               text += 10;     /* Skip the "Dive #0 - " part */
+       gtk_window_set_title(GTK_WINDOW(main_window), text);
+
+       /* the date goes in the frame label */
+       snprintf(buffer, sizeof(buffer), "%s %02d/%02d/%04d at %d:%02d",
                weekday(tm->tm_wday),
-               tm->tm_mon+1, tm->tm_mday, tm->tm_year+1900);
-       gtk_label_set_text(GTK_LABEL(divedate), buffer);
+               tm->tm_mon+1, tm->tm_mday,
+               tm->tm_year+1900,
+               tm->tm_hour, tm->tm_min);
+       gtk_frame_set_label(GTK_FRAME(info_frame), buffer);
 
-       snprintf(buffer, sizeof(buffer),
-               "%02d:%02d:%02d",
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-       gtk_label_set_text(GTK_LABEL(divetime), buffer);
 
        switch (output_units.length) {
        case METERS:
@@ -118,14 +142,11 @@ void show_dive_info(struct dive *dive)
        text = dive->location ? : "";
        gtk_entry_set_text(location, text);
 
-       text = "Dive Info";
-       if (dive->location && *dive->location)
-               text = dive->location;
-       len = 0;
-       if (dive->number)
-               len = snprintf(buffer, sizeof(buffer), "%d. ", dive->number);
-       snprintf(buffer+len, sizeof(buffer)-len, "%s", text);
-       gtk_frame_set_label(GTK_FRAME(info_frame), buffer);
+       text = dive->divemaster ? : "";
+       gtk_entry_set_text(divemaster, text);
+
+       text = dive->buddy ? : "";
+       gtk_entry_set_text(buddy, text);
 
        text = dive->notes ? : "";
        gtk_text_buffer_set_text(notes, text, -1);
@@ -157,8 +178,6 @@ GtkWidget *dive_info_frame(void)
        gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
 
-       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);
@@ -208,11 +227,18 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
 
 GtkWidget *extended_dive_info_widget(void)
 {
-       GtkWidget *vbox;
+       GtkWidget *vbox, *hbox;
        vbox = gtk_vbox_new(FALSE, 6);
 
-       location = text_entry(vbox, "Location");
        gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+       location = text_entry(vbox, "Location");
+
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
+       divemaster = text_entry(hbox, "Divemaster");
+       buddy = text_entry(hbox, "Buddy");
+
        notes = text_view(vbox, "Notes");
 
        /* Add extended info here: name, description, yadda yadda */