#include "divelist.h"
static GtkWidget *info_frame;
-static GtkWidget *divedate, *divetime, *depth, *duration, *temperature;
+static GtkWidget *depth, *duration, *temperature, *airconsumption;
static GtkEntry *location, *buddy, *divemaster;
static GtkTextBuffer *notes;
static int location_changed = 1, notes_changed = 1;
static int divemaster_changed = 1, buddy_changed = 1;
+#define EMPTY_AIRCONSUMPTION " \n "
+#define AIRCON_WIDTH 20
+
static const char *weekday(int wday)
{
static const char wday_array[7][4] = {
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), "");
+ gtk_label_set_text(GTK_LABEL(airconsumption), EMPTY_AIRCONSUMPTION);
+ gtk_label_set_width_chars(GTK_LABEL(airconsumption), AIRCON_WIDTH);
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:
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);
}
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);
+ airconsumption = info_label(hbox, "air", GTK_JUSTIFY_RIGHT);
+ gtk_misc_set_alignment(GTK_MISC(airconsumption), 1.0, 0.5);
+ gtk_label_set_width_chars(GTK_LABEL(airconsumption), AIRCON_WIDTH);
return frame;
}
+void update_air_info(char *buffer)
+{
+ char markup[120];
+
+ snprintf(markup, sizeof(markup), "<span font=\"8\">%s</span>",buffer);
+ gtk_label_set_markup(GTK_LABEL(airconsumption), markup);
+}
+
static GtkEntry *text_entry(GtkWidget *box, const char *label)
{
GtkWidget *entry;