X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=75b34bb782c85da7fbee0bd8a35e2296b857b75f;hb=e38eb77e30c2d0d06eb61db0cd1bdf3f5e164e8d;hp=e79a80b38193e65b0cdc17d1170bc2aaea83faf5;hpb=d94fb7ca6b4fc17dacd069522d7fad00aa69e088;p=ext%2Fsubsurface.git diff --git a/info.c b/info.c index e79a80b..75b34bb 100644 --- a/info.c +++ b/info.c @@ -12,16 +12,15 @@ #include #include #include +#include #include "dive.h" #include "display.h" #include "display-gtk.h" #include "divelist.h" -static GtkEntry *location, *buddy, *divemaster; +static GtkComboBoxEntry *location, *buddy, *divemaster; static GtkTextBuffer *notes; -static int location_changed = 1, notes_changed = 1; -static int divemaster_changed = 1, buddy_changed = 1; static char *get_text(GtkTextBuffer *buffer) { @@ -35,61 +34,78 @@ static char *get_text(GtkTextBuffer *buffer) /* 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) +static int text_changed(const char *old, const char *new) { return ((old && strcmp(old,new)) || (!old && strcmp("",new))); } +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 flush_dive_info_changes(struct dive *dive) { - char *old_text; + char *old_text, *new_text; int changed = 0; if (!dive) return; - if (location_changed) { - 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); + new_text = get_combo_box_entry_text(location, &dive->location); + if (new_text) { + add_location(new_text); + changed = 1; } - if (divemaster_changed) { - 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); + new_text = get_combo_box_entry_text(divemaster, &dive->divemaster); + if (new_text) { + add_people(new_text); + changed = 1; } - if (buddy_changed) { - 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); + new_text = get_combo_box_entry_text(buddy, &dive->buddy); + if (new_text) { + add_people(new_text); + changed = 1; } - if (notes_changed) { - 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); - } + 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); } +static void set_combo_box_entry_text(GtkComboBoxEntry *combo_box, const char *text) +{ + GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo_box))); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0); + if (!*text) + text = " "; + gtk_entry_set_text(entry, text); +} + #define SET_TEXT_ENTRY(x) \ - gtk_entry_set_text(x, dive && dive->x ? dive->x : "") + set_combo_box_entry_text(x, dive && dive->x ? dive->x : "") void show_dive_info(struct dive *dive) { @@ -123,17 +139,29 @@ void show_dive_info(struct dive *dive) 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); - return GTK_ENTRY(entry); + entry = GTK_ENTRY(GTK_BIN(combo_box)->child); + + 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) @@ -151,7 +179,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); @@ -163,19 +190,93 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label) return buffer; } +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) +{ + 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); + 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); - location = text_entry(vbox, "Location"); + 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"); - buddy = text_entry(hbox, "Buddy"); + divemaster = text_entry(hbox, "Divemaster", people_list); + buddy = text_entry(hbox, "Buddy", people_list); notes = text_view(vbox, "Notes"); return vbox;