X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=11107b1ca91c461eb41245bea72032238305f8fe;hb=4891fa812f04da1f46075433d28fa0f33145e125;hp=9cb048b808fbba20b8ed5b1daa0bfc4a700abaa8;hpb=067506038a5fea72e60680513d768f89722671fd;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index 9cb048b..11107b1 100644 --- a/info.c +++ b/info.c @@ -1,24 +1,26 @@ +/* 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 #include +#include #include "dive.h" #include "display.h" +#include "display-gtk.h" #include "divelist.h" -static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote; -static GtkEntry *location; +static GtkComboBoxEntry *location, *buddy, *divemaster; static GtkTextBuffer *notes; -static int location_changed = 1, notes_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) { @@ -30,187 +32,252 @@ static char *get_text(GtkTextBuffer *buffer) return gtk_text_buffer_get_text(buffer, &start, &end, FALSE); } -void flush_dive_info_changes(struct dive *dive) +/* 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(const char *old, const char *new) { - if (!dive) - return; - - if (location_changed) { - g_free(dive->location); - dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1); - } + return ((old && strcmp(old,new)) || + (!old && strcmp("",new))); +} - if (notes_changed) { - g_free(dive->notes); - dive->notes = get_text(notes); - } +static char *get_combo_box_entry_text(GtkComboBoxEntry *combo_box, char **textp) +{ + char *old = *textp; + const gchar *new; + GtkEntry *entry; + + entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box))); + new = gtk_entry_get_text(entry); + while (isspace(*new)) + new++; + if (!text_changed(old,new)) + return NULL; + free(old); + *textp = strdup(new); + return *textp; } -void show_dive_info(struct dive *dive) + +void flush_dive_info_changes(struct dive *dive) { - struct tm *tm; - char buffer[80]; - char *text; + char *old_text, *new_text; + int changed = 0; - 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), ""); + if (!dive) return; + + new_text = get_combo_box_entry_text(location, &dive->location); + if (new_text) { + add_location(new_text); + changed = 1; } - 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; + new_text = get_combo_box_entry_text(divemaster, &dive->divemaster); + if (new_text) { + add_people(new_text); + changed = 1; } - 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; - } + + new_text = get_combo_box_entry_text(buddy, &dive->buddy); + if (new_text) { + add_people(new_text); + changed = 1; } - gtk_label_set_text(GTK_LABEL(temperature), buffer); - text = dive->location ? : ""; - gtk_entry_set_text(location, text); - gtk_label_set_text(GTK_LABEL(locationnote), text); + 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); - text = dive->notes ? : ""; - gtk_text_buffer_set_text(notes, text, -1); + if (changed) + mark_divelist_changed(TRUE); } -static GtkWidget *info_label(GtkWidget *box, const char *str, GtkJustification jtype) +static void set_combo_box_entry_text(GtkComboBoxEntry *combo_box, const char *text) { - 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; + GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box))); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), -1); + if (!*text) + gtk_entry_set_text(entry, " "); + gtk_entry_set_text(entry, text); } -GtkWidget *dive_info_frame(void) -{ - GtkWidget *frame; - GtkWidget *hbox, *hbox2; - GtkWidget *vbox; - - frame = gtk_frame_new("Dive info"); - gtk_widget_show(frame); - - vbox = gtk_vbox_new(TRUE, 6); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 3); - gtk_container_add(GTK_CONTAINER(frame), vbox); - - hbox = gtk_hbox_new(TRUE, 6); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 3); - gtk_container_add(GTK_CONTAINER(vbox), hbox); - - hbox2 = gtk_hbox_new(FALSE, 6); - gtk_container_set_border_width(GTK_CONTAINER(hbox2), 3); - gtk_container_add(GTK_CONTAINER(vbox), hbox2); +#define SET_TEXT_ENTRY(x) \ + set_combo_box_entry_text(x, dive && dive->x ? dive->x : "") - 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); - - locationnote = info_label(hbox2, "location", GTK_JUSTIFY_LEFT); - gtk_label_set_width_chars(GTK_LABEL(locationnote), 80); +void show_dive_info(struct dive *dive) +{ + struct tm *tm; + const char *text; + char buffer[80]; - return frame; + /* dive number and location (or lacking that, the date) go in the window title */ + tm = gmtime(&dive->when); + 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); } -static GtkEntry *text_entry(GtkWidget *box, const char *label) +static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListStore *completions) { - GtkWidget *entry; - + GtkEntry *entry; + GtkWidget *combo_box; GtkWidget *frame = gtk_frame_new(label); + GtkEntryCompletion *completion; gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0); - entry = gtk_entry_new (); - gtk_container_add(GTK_CONTAINER(frame), entry); + combo_box = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(completions), 0); + gtk_container_add(GTK_CONTAINER(frame), combo_box); + + entry = GTK_ENTRY(GTK_BIN(combo_box)->child); - return GTK_ENTRY(entry); + completion = gtk_entry_completion_new(); + gtk_entry_completion_set_text_column(completion, 0); + gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(completions)); + gtk_entry_completion_set_inline_completion(completion, TRUE); + gtk_entry_completion_set_inline_selection(completion, TRUE); + gtk_entry_completion_set_popup_single_match(completion, FALSE); + gtk_entry_set_completion(entry, completion); + + return GTK_COMBO_BOX_ENTRY(combo_box); } -static GtkTextBuffer *text_view(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); + 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 (); + 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); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_container_add(GTK_CONTAINER(frame), scrolled_window); + gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); return buffer; } -GtkWidget *extended_dive_info_widget(void) +static enum { + MATCH_EXACT, + MATCH_PREPEND, + MATCH_AFTER +} found_string_entry; +static GtkTreeIter string_entry_location; + +static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +{ + const char *string = data; + char *entry; + int cmp; + + gtk_tree_model_get(model, iter, 0, &entry, -1); + cmp = strcmp(entry, string); + + /* Stop. The entry is bigger than the new one */ + if (cmp > 0) + return TRUE; + + /* Exact match */ + if (!cmp) { + found_string_entry = MATCH_EXACT; + return TRUE; + } + + string_entry_location = *iter; + found_string_entry = MATCH_AFTER; + return FALSE; +} + +static int match_list(GtkListStore *list, const char *string) { - GtkWidget *vbox; + found_string_entry = MATCH_PREPEND; + gtk_tree_model_foreach(GTK_TREE_MODEL(list), match_string_entry, (void *)string); + return found_string_entry; +} + +static GtkListStore *location_list, *people_list; + +static void add_string_list_entry(const char *string, GtkListStore *list) +{ + GtkTreeIter *iter, loc; + + if (!string || !*string) + return; + switch (match_list(list, string)) { + case MATCH_EXACT: + return; + case MATCH_PREPEND: + iter = NULL; + break; + case MATCH_AFTER: + iter = &string_entry_location; + break; + } + gtk_list_store_insert_after(list, &loc, iter); + gtk_list_store_set(list, &loc, 0, string, -1); +} + +void add_people(const char *string) +{ + add_string_list_entry(string, people_list); +} + +void add_location(const char *string) +{ + add_string_list_entry(string, location_list); +} + +GtkWidget *extended_dive_info_widget(void) +{ + GtkWidget *vbox, *hbox; vbox = gtk_vbox_new(FALSE, 6); - location = text_entry(vbox, "Location"); + people_list = gtk_list_store_new(1, G_TYPE_STRING); + location_list = gtk_list_store_new(1, G_TYPE_STRING); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); - notes = text_view(vbox, "Notes", TRUE); + location = text_entry(vbox, "Location", location_list); + + hbox = gtk_hbox_new(FALSE, 3); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + + divemaster = text_entry(hbox, "Divemaster", people_list); + buddy = text_entry(hbox, "Buddy", people_list); - /* Add extended info here: name, description, yadda yadda */ - show_dive_info(current_dive); + notes = text_view(vbox, "Notes"); return vbox; }