X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=info.c;h=9b71b659166f6b41dd1474057d6e15531c7a4720;hb=56980579514f2900e43441b483e435b3e3235266;hp=8062eea7a027b41675198ffe05e21db9efab54c3;hpb=bbe7f061891e4410423697cbc9d5f4ab19bcde16;p=ext%2Fsubsurface.git

diff --git a/info.c b/info.c
index 8062eea..9b71b65 100644
--- a/info.c
+++ b/info.c
@@ -18,7 +18,7 @@
 #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;
@@ -50,8 +50,10 @@ void flush_dive_info_changes(struct dive *dive)
 		return;
 
 	if (location_changed) {
+		char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(location));
 		old_text = dive->location;
-		dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1);
+		dive->location = new_text;
+		add_location(new_text);
 		if (text_changed(old_text,dive->location))
 			changed = 1;
 		if (old_text)
@@ -59,8 +61,10 @@ void flush_dive_info_changes(struct dive *dive)
 	}
 
 	if (divemaster_changed) {
+		char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(divemaster));
 		old_text = dive->divemaster;
-		dive->divemaster = gtk_editable_get_chars(GTK_EDITABLE(divemaster), 0, -1);
+		dive->divemaster = new_text;
+		add_people(new_text);
 		if (text_changed(old_text,dive->divemaster))
 			changed = 1;
 		if (old_text)
@@ -68,8 +72,10 @@ void flush_dive_info_changes(struct dive *dive)
 	}
 
 	if (buddy_changed) {
+		char *new_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(buddy));
 		old_text = dive->buddy;
-		dive->buddy = gtk_editable_get_chars(GTK_EDITABLE(buddy), 0, -1);
+		dive->buddy = new_text;
+		add_people(new_text);
 		if (text_changed(old_text,dive->buddy))
 			changed = 1;
 		if (old_text)
@@ -88,8 +94,14 @@ void flush_dive_info_changes(struct dive *dive)
 		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);
+	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,25 +135,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, GtkListStore *completions)
+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);
 
-	if (completions) {
-		GtkEntryCompletion *completion;
-		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_set_completion(GTK_ENTRY(entry), completion);
-	}
+	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_ENTRY(entry);
+	return GTK_COMBO_BOX_ENTRY(combo_box);
 }
 
 static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
@@ -170,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;
 }
@@ -195,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)