#include <string.h>
#include <stdlib.h>
#include <time.h>
+#include <ctype.h>
#include "dive.h"
#include "display.h"
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)
{
/* 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) {
- char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(location));
- old_text = dive->location;
- dive->location = new_text;
- 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) {
- char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(divemaster));
- old_text = dive->divemaster;
- dive->divemaster = new_text;
- 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) {
- char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(buddy));
- old_text = dive->buddy;
- dive->buddy = new_text;
- 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(combo_box)->child);
+ 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);
}
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);
return buffer;
}
-static int found_string_entry;
+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);
- if (strcmp(entry, string))
- return FALSE;
- found_string_entry = 1;
- return TRUE;
+ 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 = 0;
+ found_string_entry = MATCH_PREPEND;
gtk_tree_model_foreach(GTK_TREE_MODEL(list), match_string_entry, (void *)string);
return found_string_entry;
}
static void add_string_list_entry(const char *string, GtkListStore *list)
{
- GtkTreeIter iter;
+ GtkTreeIter *iter, loc;
if (!string || !*string)
return;
- if (match_list(list, string))
+ switch (match_list(list, string)) {
+ case MATCH_EXACT:
return;
-
- /* Fixme! Check for duplicates! */
- gtk_list_store_append(list, &iter);
- gtk_list_store_set(list, &iter, 0, string, -1);
+ 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)
projects / ext / subsurface.git / blobdiff