mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Keep the people/location lists sorted

Browse source 
This makes the combo box entry drop-down list be a whole lot more useful.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-10-23 10:20:35 +03:00
parent 8a6b9f4c2f
commit f69fa900f6
1 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
info.c
View file

@ -180,23 +180,40 @@ static GtkTextBuffer *text_view(GtkWidget *box, const char *label)
return buffer; 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) static gboolean match_string_entry(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{ {
const char *string = data; const char *string = data;
char *entry; char *entry;
int cmp;
gtk_tree_model_get(model, iter, 0, &entry, -1); gtk_tree_model_get(model, iter, 0, &entry, -1);
if (strcmp(entry, string)) cmp = strcmp(entry, string);
return FALSE;
found_string_entry = 1; /* Stop. The entry is bigger than the new one */
if (cmp > 0)
return TRUE; 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) 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); gtk_tree_model_foreach(GTK_TREE_MODEL(list), match_string_entry, (void *)string);
return found_string_entry; return found_string_entry;
} }
@ -205,17 +222,23 @@ static GtkListStore *location_list, *people_list;
static void add_string_list_entry(const char *string, GtkListStore *list) static void add_string_list_entry(const char *string, GtkListStore *list)
{ {
GtkTreeIter iter; GtkTreeIter *iter, loc;
if (!string || !*string) if (!string || !*string)
return; return;
if (match_list(list, string)) switch (match_list(list, string)) {
case MATCH_EXACT:
return; return;
case MATCH_PREPEND:
/* Fixme! Check for duplicates! */ iter = NULL;
gtk_list_store_append(list, &iter); break;
gtk_list_store_set(list, &iter, 0, string, -1); 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) void add_people(const char *string)