X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=aa38c053ecaefd74482a0ee6d46c98fc6c3b7b89;hb=79a866f5b4d51efc15286059ac7e4322b6008eb3;hp=5cfe7286cb32ad406d945a8865c4019fd8bb1ac1;hpb=4564d67953af9bfa8086c457b26e3b66f1c2718d;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index 5cfe728..aa38c05 100644 --- a/info.c +++ b/info.c @@ -1,3 +1,13 @@ +/* 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 #include #include @@ -5,26 +15,14 @@ #include "dive.h" #include "display.h" +#include "display-gtk.h" #include "divelist.h" -static GtkWidget *info_frame; -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] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" - }; - return wday_array[wday]; -} - static char *get_text(GtkTextBuffer *buffer) { GtkTextIter start; @@ -35,45 +33,70 @@ static char *get_text(GtkTextBuffer *buffer) return gtk_text_buffer_get_text(buffer, &start, &end, FALSE); } +/* old is NULL or a valid string, new is a valid string + * NOTW: NULL and "" need to be treated as "unchanged" */ +static int text_changed(char *old, char *new) +{ + return ((old && strcmp(old,new)) || + (!old && strcmp("",new))); +} + void flush_dive_info_changes(struct dive *dive) { + char *old_text; + int changed = 0; + if (!dive) return; if (location_changed) { - g_free(dive->location); + old_text = dive->location; dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1); + if (text_changed(old_text,dive->location)) + changed = 1; + if (old_text) + g_free(old_text); } if (divemaster_changed) { - g_free(dive->divemaster); + old_text = dive->divemaster; dive->divemaster = gtk_editable_get_chars(GTK_EDITABLE(divemaster), 0, -1); + if (text_changed(old_text,dive->divemaster)) + changed = 1; + if (old_text) + g_free(old_text); } if (buddy_changed) { - g_free(dive->buddy); + old_text = dive->buddy; dive->buddy = gtk_editable_get_chars(GTK_EDITABLE(buddy), 0, -1); + if (text_changed(old_text,dive->buddy)) + changed = 1; + if (old_text) + g_free(old_text); } if (notes_changed) { - g_free(dive->notes); + old_text = dive->notes; dive->notes = get_text(notes); + if (text_changed(old_text,dive->notes)) + changed = 1; + if (old_text) + g_free(old_text); } + if (changed) + mark_divelist_changed(TRUE); } +#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; - if (!dive) { - 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); text = dive->location; @@ -91,114 +114,13 @@ void show_dive_info(struct dive *dive) } text = buffer; if (!dive->number) - text += 10; /* Skip the "Dive #0 - " part */ + 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, - tm->tm_hour, tm->tm_min); - gtk_frame_set_label(GTK_FRAME(info_frame), 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; - } - } - 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->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); - - 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), "%s",buffer); - gtk_label_set_markup(GTK_LABEL(airconsumption), markup); + 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) @@ -229,7 +151,6 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label) 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); @@ -256,8 +177,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; }