Reinstate the main window title

[ext/subsurface.git] / info.c

diff --git a/info.c b/info.c
index 14ede0b8348c509f5f5f33d8708756817af80462..c1779cc452ac6a96fab304eb7adfbf5aeb5846ab 100644 (file)
--- a/info.c
+++ b/info.c
@@ -7,21 +7,11 @@
 #include "display.h"
 #include "divelist.h"
 
-static GtkWidget *info_frame;
-static GtkWidget *divedate, *divetime, *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)
-{
-       static const char wday_array[7][4] = {
-               "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-       };
-       return wday_array[wday];
-}
-
 static char *get_text(GtkTextBuffer *buffer)
 {
        GtkTextIter start;
@@ -58,129 +48,39 @@ void flush_dive_info_changes(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;
-       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",
-               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);
-
-       switch (output_units.length) {
-       case METERS:
-               snprintf(buffer, sizeof(buffer),
-                       "%.1f m",
-                       dive->maxdepth.mm / 1000.0);
-               break;
-       case FEET:
-               snprintf(buffer, sizeof(buffer),
-                       "%d ft",
-                       to_feet(dive->maxdepth));
-               break;
-       }
-       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) {
-               switch (output_units.temperature) {
-               case CELSIUS:
-                       snprintf(buffer, sizeof(buffer),
-                               "%d C",
-                               to_C(dive->watertemp));
-                       break;
-               case FAHRENHEIT:
-                       snprintf(buffer, sizeof(buffer),
-                               "%d F",
-                               to_F(dive->watertemp));
-                       break;
-               case KELVIN:
-                       snprintf(buffer, sizeof(buffer),
-                               "%d K",
-                               to_K(dive->watertemp));
-                       break;
-               }
+       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);
        }
-       gtk_label_set_text(GTK_LABEL(temperature), buffer);
-
-       text = dive->location ? : "";
-       gtk_entry_set_text(location, text);
-
-       text = dive->divemaster ? : "";
-       gtk_entry_set_text(divemaster, text);
-
-       text = dive->buddy ? : "";
-       gtk_entry_set_text(buddy, 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->notes ? : "";
-       gtk_text_buffer_set_text(notes, text, -1);
-}
-
-static GtkWidget *info_label(GtkWidget *box, const char *str, GtkJustification jtype)
-{
-       GtkWidget *label = gtk_label_new(str);
-       gtk_label_set_justify(GTK_LABEL(label), jtype);
-       gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
-       return label;
-}
-
-GtkWidget *dive_info_frame(void)
-{
-       GtkWidget *frame;
-       GtkWidget *hbox;
-       GtkWidget *vbox;
-
-       frame = gtk_frame_new("Dive info");
-       info_frame = frame;
-       gtk_widget_show(frame);
-
-       vbox = gtk_vbox_new(FALSE, 6);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox), 3);
-       gtk_container_add(GTK_CONTAINER(frame), vbox);
-
-       hbox = gtk_hbox_new(FALSE, 16);
-       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);
-
-       return frame;
+       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);
 }
 
 static GtkEntry *text_entry(GtkWidget *box, const char *label)
@@ -238,8 +138,5 @@ GtkWidget *extended_dive_info_widget(void)
        buddy = text_entry(hbox, "Buddy");
 
        notes = text_view(vbox, "Notes");
-
-       /* Add extended info here: name, description, yadda yadda */
-       show_dive_info(current_dive);
        return vbox;
 }