HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor add_tree_tags() from symbols_recreate_tag_list().

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/symbol-tree@3038 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-10-02 15:48:50 +00:00
parent 5a12103f0a
commit 2fc2107cb8
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@
(gnocci-man) to show methods as children of classes in the symbol (gnocci-man) to show methods as children of classes in the symbol
list, and for other tag types to group children by their parents list, and for other tag types to group children by their parents
(thanks; 2083110). (thanks; 2083110).
* src/symbols.c:
Refactor add_tree_tags() from symbols_recreate_tag_list().
2008-10-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-10-01 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

67
src/symbols.c
View File

@ -841,43 +841,18 @@ static void hide_empty_rows(GtkTreeStore *store)
} }
gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode) static void add_tree_tags(GtkTreeStore *tree_store, const GList *tags, filetype_id ft_id)
{ {
GList *tmp, *skipped = NULL; GList *tmp, *skipped = NULL;
const GList *tags;
GtkTreeIter iter; GtkTreeIter iter;
static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME;
filetype_id ft_id;
gint num_parents = 0, do_skipped = FALSE, num_skipped = 0; gint num_parents = 0, do_skipped = FALSE, num_skipped = 0;
GHashTable *parent_hash; GHashTable *parent_hash;
const gchar *separator; const gchar *separator = symbols_get_context_separator(ft_id);
g_return_val_if_fail(doc != NULL, FALSE);
ft_id = FILETYPE_ID(doc->file_type);
separator = symbols_get_context_separator(ft_id);
if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS)
sort_mode = prev_sort_mode;
else
prev_sort_mode = sort_mode;
tags = get_tag_list(doc, tm_tag_max_t, sort_mode);
if (doc->tm_file == NULL || tags == NULL)
return FALSE;
/* Make sure the model stays with us after the tree view unrefs it */
g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store));
/* Detach model from view */
gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL);
/* Clear all contents */
gtk_tree_store_clear(doc->priv->tag_store);
/* Create a hash table to keep track of parents */ /* Create a hash table to keep track of parents */
parent_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, parent_hash = g_hash_table_new_full(g_str_hash, g_str_equal, NULL,
g_free); g_free);
init_tag_list(doc);
for (tmp = (GList*)tags; tmp && num_skipped < 20;) for (tmp = (GList*)tags; tmp && num_skipped < 20;)
{ {
gchar buf[100] = "", buf2[100] = ""; gchar buf[100] = "", buf2[100] = "";
@ -1003,7 +978,7 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode)
if (!parent_icon) if (!parent_icon)
parent_icon = parent; parent_icon = parent;
gtk_tree_model_get(GTK_TREE_MODEL(doc->priv->tag_store), parent_icon, gtk_tree_model_get(GTK_TREE_MODEL(tree_store), parent_icon,
SYMBOLS_COLUMN_ICON, &icon, -1); SYMBOLS_COLUMN_ICON, &icon, -1);
if (add_child) if (add_child)
{ {
@ -1043,8 +1018,8 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode)
} }
g_snprintf(buf, sizeof(buf), "%s [%d]", final_name, symbol->line); g_snprintf(buf, sizeof(buf), "%s [%d]", final_name, symbol->line);
gtk_tree_store_append(doc->priv->tag_store, child, parent); gtk_tree_store_append(tree_store, child, parent);
gtk_tree_store_set(doc->priv->tag_store, child, gtk_tree_store_set(tree_store, child,
SYMBOLS_COLUMN_ICON, icon, SYMBOLS_COLUMN_ICON, icon,
SYMBOLS_COLUMN_NAME, buf, SYMBOLS_COLUMN_NAME, buf,
SYMBOLS_COLUMN_LINE, symbol->line, -1); SYMBOLS_COLUMN_LINE, symbol->line, -1);
@ -1069,9 +1044,39 @@ gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode)
else else
tmp = g_list_next(tmp); tmp = g_list_next(tmp);
} }
g_hash_table_destroy(parent_hash);
}
gboolean symbols_recreate_tag_list(GeanyDocument *doc, gint sort_mode)
{
const GList *tags;
static gint prev_sort_mode = SYMBOLS_SORT_BY_NAME;
g_return_val_if_fail(doc != NULL, FALSE);
if (sort_mode == SYMBOLS_SORT_USE_PREVIOUS)
sort_mode = prev_sort_mode;
else
prev_sort_mode = sort_mode;
tags = get_tag_list(doc, tm_tag_max_t, sort_mode);
if (doc->tm_file == NULL || tags == NULL)
return FALSE;
/* Make sure the model stays with us after the tree view unrefs it */
g_object_ref(GTK_TREE_MODEL(doc->priv->tag_store));
/* Detach model from view */
gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), NULL);
/* Clear all contents */
gtk_tree_store_clear(doc->priv->tag_store);
/* add grandparent type iters */
init_tag_list(doc);
add_tree_tags(doc->priv->tag_store, tags, FILETYPE_ID(doc->file_type));
hide_empty_rows(doc->priv->tag_store); hide_empty_rows(doc->priv->tag_store);
g_hash_table_destroy(parent_hash);
/* Re-attach model to view */ /* Re-attach model to view */
gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree), gtk_tree_view_set_model(GTK_TREE_VIEW(doc->priv->tag_tree),