]> git.tdb.fi Git - ext/subsurface.git/blobdiff - info.c
Separate out the UI from the program logic
[ext/subsurface.git] / info.c
diff --git a/info.c b/info.c
index dc3a95bde4c06e67e90a5e1ad3e0547731240d08..9e061970d808ba14bb18d9c259de638781b0c0af 100644 (file)
--- a/info.c
+++ b/info.c
@@ -1,22 +1,27 @@
+/* info.c */
+/* creates the UI for the info frame - 
+ * controlled through the following interfaces:
+ * 
+ * void flush_dive_info_changes(struct dive *dive)
+ * void show_dive_info(struct dive *dive)
+ *
+ * called from gtk-ui:
+ * GtkWidget *extended_dive_info_widget(void)
+ */
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
 #include "dive.h"
 #include "display.h"
+#include "display-gtk.h"
+#include "divelist.h"
 
-static GtkWidget *divedate, *divetime, *depth, *duration, *temperature;
-static GtkTextBuffer *location, *notes;
+static GtkEntry *location, *buddy, *divemaster;
+static GtkTextBuffer *notes;
 static int location_changed = 1, notes_changed = 1;
-static struct dive *buffered_dive;
-
-static const char *weekday(int wday)
-{
-       static const char wday_array[7][4] = {
-               "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-       };
-       return wday_array[wday];
-}
+static int divemaster_changed = 1, buddy_changed = 1;
 
 static char *get_text(GtkTextBuffer *buffer)
 {
@@ -28,16 +33,24 @@ static char *get_text(GtkTextBuffer *buffer)
        return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 }
 
-void flush_dive_info_changes(void)
+void flush_dive_info_changes(struct dive *dive)
 {
-       struct dive *dive = buffered_dive;
-
        if (!dive)
                return;
 
        if (location_changed) {
                g_free(dive->location);
-               dive->location = get_text(location);
+               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) {
@@ -46,118 +59,95 @@ void flush_dive_info_changes(void)
        }
 }
 
-void update_dive_info(struct dive *dive)
+#define SET_TEXT_ENTRY(x) \
+       gtk_entry_set_text(x, dive && dive->x ? dive->x : "")
+
+void show_dive_info(struct dive *dive)
 {
        struct tm *tm;
+       const char *text;
        char buffer[80];
-       char *text;
-
-       flush_dive_info_changes();
-       buffered_dive = dive;
-
-       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",
-               weekday(tm->tm_wday),
-               tm->tm_mon+1, tm->tm_mday, tm->tm_year+1900);
-       gtk_label_set_text(GTK_LABEL(divedate), 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);
-
-       snprintf(buffer, sizeof(buffer),
-               "%d ft",
-               to_feet(dive->maxdepth));
-       gtk_label_set_text(GTK_LABEL(depth), buffer);
-
-       snprintf(buffer, sizeof(buffer),
-               "%d min",
-               dive->duration.seconds / 60);
-       gtk_label_set_text(GTK_LABEL(duration), buffer);
-
-       *buffer = 0;
-       if (dive->watertemp.mkelvin)
-               snprintf(buffer, sizeof(buffer),
-                       "%d C",
-                       to_C(dive->watertemp));
-       gtk_label_set_text(GTK_LABEL(temperature), buffer);
-
-       text = dive->location ? : "";
-       gtk_text_buffer_set_text(location, text, -1);
-       text = dive->notes ? : "";
-       gtk_text_buffer_set_text(notes, text, -1);
-}
-
-static GtkWidget *info_label(GtkWidget *box, const char *str)
-{
-       GtkWidget *label = gtk_label_new(str);
-       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-       gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
-       return label;
+       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);
+
+       SET_TEXT_ENTRY(divemaster);
+       SET_TEXT_ENTRY(buddy);
+       SET_TEXT_ENTRY(location);
+       gtk_text_buffer_set_text(notes, dive && dive->notes ? dive->notes : "", -1);
 }
 
-GtkWidget *dive_info_frame(void)
+static GtkEntry *text_entry(GtkWidget *box, const char *label)
 {
-       GtkWidget *frame;
-       GtkWidget *hbox;
-
-       frame = gtk_frame_new("Dive info");
-       gtk_widget_show(frame);
+       GtkWidget *entry;
+       GtkWidget *frame = gtk_frame_new(label);
 
-       hbox = gtk_hbox_new(TRUE, 5);
-       gtk_container_set_border_width(GTK_CONTAINER(hbox), 3);
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
 
-       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");
+       entry = gtk_entry_new();
+       gtk_container_add(GTK_CONTAINER(frame), entry);
 
-       return frame;
+       return GTK_ENTRY(entry);
 }
 
-static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand)
+static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
 {
-       GtkWidget *view;
+       GtkWidget *view, *vbox;
        GtkTextBuffer *buffer;
-
        GtkWidget *frame = gtk_frame_new(label);
 
-       gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
+       gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
+       box = gtk_hbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(frame), box);
+       vbox = gtk_vbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(box), vbox);
+
+       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);
 
-       view = gtk_text_view_new ();
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
-       gtk_container_add(GTK_CONTAINER(frame), view);
+       gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
        return buffer;
 }
 
-GtkWidget *extended_dive_info_frame(void)
+GtkWidget *extended_dive_info_widget(void)
 {
-       GtkWidget *frame;
-       GtkWidget *vbox;
+       GtkWidget *vbox, *hbox;
+       vbox = gtk_vbox_new(FALSE, 6);
 
-       frame = gtk_frame_new("Extended dive info");
-       gtk_widget_show(frame);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+       location = text_entry(vbox, "Location");
 
-       vbox = gtk_vbox_new(FALSE, 5);
-       gtk_container_add(GTK_CONTAINER(frame), vbox);
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
 
-       location = text_entry(vbox, "Location", FALSE);
-       notes = text_entry(vbox, "Notes", TRUE);
+       divemaster = text_entry(hbox, "Divemaster");
+       buddy = text_entry(hbox, "Buddy");
 
-       /* Add extended info here: name, description, yadda yadda */
-       update_dive_info(current_dive);
-       return frame;
+       notes = text_view(vbox, "Notes");
+       return vbox;
 }