X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=9b71b659166f6b41dd1474057d6e15531c7a4720;hb=5076397df043fb51a776a677fc771fb1a72e6496;hp=fab61cfb57b24a7b0fc8e2767b2345b695754fdf;hpb=8a6b9f4c2f4289c2778dbbc5d5496203440e4f90;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index fab61cf..9b71b65 100644
--- a/info.c
+++ b/info.c
@@ -53,6 +53,7 @@ void flush_dive_info_changes(struct dive *dive)
 		char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(location));
 		old_text = dive->location;
 		dive->location = new_text;
+		add_location(new_text);
 		if (text_changed(old_text,dive->location))
 			changed = 1;
 		if (old_text)
@@ -63,6 +64,7 @@ void flush_dive_info_changes(struct dive *dive)
 		char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(divemaster));
 		old_text = dive->divemaster;
 		dive->divemaster = new_text;
+		add_people(new_text);
 		if (text_changed(old_text,dive->divemaster))
 			changed = 1;
 		if (old_text)
@@ -73,6 +75,7 @@ void flush_dive_info_changes(struct dive *dive)
 		char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(buddy));
 		old_text = dive->buddy;
 		dive->buddy = new_text;
+		add_people(new_text);
 		if (text_changed(old_text,dive->buddy))
 			changed = 1;
 		if (old_text)
@@ -149,6 +152,9 @@ static GtkComboBoxEntry *text_entry(GtkWidget *box, const char *label, GtkListSt
 	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);
@@ -180,23 +186,40 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
 	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;
 }
@@ -205,17 +228,23 @@ static GtkListStore *location_list, *people_list;
 
 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)