[geany/geany] 935c38: Merge pull request #509 from techee/child_icon + followup

12 Jun 2015


      Branch:      refs/heads/master
Author:      Colomban Wendling ban@herbesfolles.org
Committer:   Colomban Wendling ban@herbesfolles.org
Date:        Fri, 12 Jun 2015 17:06:41 UTC
Commit:      935c389f285e52fb690dc6d743c90ad3f26d0b49
             https://github.com/geany/geany/commit/935c389f285e52fb690dc6d743c90ad3f26d0b...
Log Message:
-----------
Merge pull request #509 from techee/child_icon + followup
Cache symbol tree icons
Modified Paths:
--------------
    src/symbols.c
Modified: src/symbols.c
313 lines changed, 165 insertions(+), 148 deletions(-)
===================================================================
@@ -96,6 +96,15 @@ static TagFileInfo tag_file_info[GTF_MAX] =
static GPtrArray *top_level_iter_names = NULL;
+static GdkPixbuf *class_icon = NULL;
+static GdkPixbuf *macro_icon = NULL;
+static GdkPixbuf *member_icon = NULL;
+static GdkPixbuf *method_icon = NULL;
+static GdkPixbuf *namespace_icon = NULL;
+static GdkPixbuf *other_icon = NULL;
+static GdkPixbuf *struct_icon = NULL;
+static GdkPixbuf *var_icon = NULL;
+
 static struct
 {
    GtkWidget *expand_all;
@@ -108,7 +117,6 @@ static struct
 }
 symbol_menu;
-
 static void html_tags_loaded(void);
 static void load_user_tags(filetype_id ft_id);
@@ -558,13 +566,7 @@ tag_list_add_groups(GtkTreeStore *tree_store, ...)
    for (; iter = va_arg(args, GtkTreeIter*), iter != NULL;)
    {
    	gchar *title = va_arg(args, gchar*);
-		gchar *icon_name = va_arg(args, gchar *);
-		GdkPixbuf *icon = NULL;
-
-		if (icon_name)
-		{
-			icon = get_tag_icon(icon_name);
-		}
+		GdkPixbuf *icon = va_arg(args, gchar *);
g_assert(title != NULL);
    	g_ptr_array_add(top_level_iter_names, title);
@@ -572,11 +574,8 @@ tag_list_add_groups(GtkTreeStore *tree_store, ...)
    	if (!find_toplevel_iter(tree_store, iter, title))
    		gtk_tree_store_append(tree_store, iter, NULL);
-		if (G_IS_OBJECT(icon))
-		{
+		if (icon)
    		gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, -1);
-			g_object_unref(icon);
-		}
    	gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1);
    }
    va_end(args);
@@ -621,30 +620,30 @@ static void add_top_level_items(GeanyDocument *doc)
    			&tv_iters.tag_namespace, _("Module"), NULL,
    			&tv_iters.tag_type, _("Types"), NULL,
    			&tv_iters.tag_macro, _("Type constructors"), NULL,
-				&tv_iters.tag_function, _("Functions"), "classviewer-method",
+				&tv_iters.tag_function, _("Functions"), method_icon,
    			NULL);
    		break;
    	case GEANY_FILETYPES_COBOL:
    		tag_list_add_groups(tag_store,
-				&tv_iters.tag_class, _("Program"), "classviewer-class",
-				&tv_iters.tag_function, _("File"), "classviewer-method",
-				&tv_iters.tag_namespace, _("Sections"), "classviewer-namespace",
-				&tv_iters.tag_macro, _("Paragraph"), "classviewer-other",
-				&tv_iters.tag_struct, _("Group"), "classviewer-struct",
-				&tv_iters.tag_variable, _("Data"), "classviewer-var",
+				&tv_iters.tag_class, _("Program"), class_icon,
+				&tv_iters.tag_function, _("File"), method_icon,
+				&tv_iters.tag_namespace, _("Sections"), namespace_icon,
+				&tv_iters.tag_macro, _("Paragraph"), other_icon,
+				&tv_iters.tag_struct, _("Group"), struct_icon,
+				&tv_iters.tag_variable, _("Data"), var_icon,
    			NULL);
    		break;
    	case GEANY_FILETYPES_CONF:
    		tag_list_add_groups(tag_store,
-				&tv_iters.tag_namespace, _("Sections"), "classviewer-other",
-				&tv_iters.tag_macro, _("Keys"), "classviewer-var",
+				&tv_iters.tag_namespace, _("Sections"), other_icon,
+				&tv_iters.tag_macro, _("Keys"), var_icon,
    			NULL);
    		break;
    	case GEANY_FILETYPES_NSIS:
    		tag_list_add_groups(tag_store,
-				&tv_iters.tag_namespace, _("Sections"), "classviewer-other",
-				&tv_iters.tag_function, _("Functions"), "classviewer-method",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
+				&tv_iters.tag_namespace, _("Sections"), other_icon,
+				&tv_iters.tag_function, _("Functions"), method_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
    			NULL);
    		break;
    	case GEANY_FILETYPES_LATEX:
@@ -664,8 +663,8 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_MATLAB:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_struct), _("Structures"), "classviewer-struct",
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_struct), _("Structures"), struct_icon,
    			NULL);
    		break;
    	}
@@ -681,7 +680,7 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_R:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
+				&(tv_iters.tag_function), _("Functions"), method_icon,
    			&(tv_iters.tag_other), _("Other"), NULL,
    			NULL);
    		break;
@@ -689,42 +688,42 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_RUST:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Modules"), "classviewer-namespace",
-				&(tv_iters.tag_struct), _("Structures"), "classviewer-struct",
-				&(tv_iters.tag_interface), _("Traits"), "classviewer-class",
-				&(tv_iters.tag_class), _("Implementations"), "classviewer-class",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_type), _("Typedefs / Enums"), "classviewer-struct",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_macro), _("Macros"), "classviewer-macro",
-				&(tv_iters.tag_member), _("Methods"), "classviewer-member",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Modules"), namespace_icon,
+				&(tv_iters.tag_struct), _("Structures"), struct_icon,
+				&(tv_iters.tag_interface), _("Traits"), class_icon,
+				&(tv_iters.tag_class), _("Implementations"), class_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_type), _("Typedefs / Enums"), struct_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_macro), _("Macros"), macro_icon,
+				&(tv_iters.tag_member), _("Methods"), member_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_GO:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Package"), "classviewer-namespace",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_struct), _("Structs"), "classviewer-struct",
-				&(tv_iters.tag_type), _("Types"), "classviewer-struct",
-				&(tv_iters.tag_macro), _("Constants"), "classviewer-macro",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_member), _("Members"), "classviewer-member",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Package"), namespace_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_struct), _("Structs"), struct_icon,
+				&(tv_iters.tag_type), _("Types"), struct_icon,
+				&(tv_iters.tag_macro), _("Constants"), macro_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_member), _("Members"), member_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_PERL:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Package"), "classviewer-namespace",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
+				&(tv_iters.tag_namespace), _("Package"), namespace_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
    			&(tv_iters.tag_macro), _("Labels"), NULL,
    			&(tv_iters.tag_type), _("Constants"), NULL,
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
@@ -732,13 +731,13 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_ZEPHIR:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Namespaces"), "classviewer-namespace",
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_macro), _("Constants"), "classviewer-macro",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_struct), _("Traits"), "classviewer-struct",
+				&(tv_iters.tag_namespace), _("Namespaces"), namespace_icon,
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_macro), _("Constants"), macro_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_struct), _("Traits"), struct_icon,
    			NULL);
    		break;
    	}
@@ -756,9 +755,9 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_CSS:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_variable), _("ID Selectors"), "classviewer-var",
-				&(tv_iters.tag_struct), _("Type Selectors"), "classviewer-struct", NULL);
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_variable), _("ID Selectors"), var_icon,
+				&(tv_iters.tag_struct), _("Type Selectors"), struct_icon, NULL);
    		break;
    	}
    	case GEANY_FILETYPES_REST:
@@ -787,107 +786,107 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_RUBY:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Modules"), "classviewer-namespace",
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_member), _("Singletons"), "classviewer-struct",
-				&(tv_iters.tag_function), _("Methods"), "classviewer-method",
+				&(tv_iters.tag_namespace), _("Modules"), namespace_icon,
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_member), _("Singletons"), struct_icon,
+				&(tv_iters.tag_function), _("Methods"), method_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_TCL:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Namespaces"), "classviewer-namespace",
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_member), _("Methods"), "classviewer-method",
-				&(tv_iters.tag_function), _("Procedures"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Namespaces"), namespace_icon,
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_member), _("Methods"), method_icon,
+				&(tv_iters.tag_function), _("Procedures"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_PYTHON:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_member), _("Methods"), "classviewer-macro",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_externvar), _("Imports"), "classviewer-namespace",
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_member), _("Methods"), macro_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_externvar), _("Imports"), namespace_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_VHDL:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Package"), "classviewer-namespace",
-				&(tv_iters.tag_class), _("Entities"), "classviewer-class",
-				&(tv_iters.tag_struct), _("Architectures"), "classviewer-struct",
-				&(tv_iters.tag_type), _("Types"), "classviewer-other",
-				&(tv_iters.tag_function), _("Functions / Procedures"), "classviewer-method",
-				&(tv_iters.tag_variable), _("Variables / Signals"), "classviewer-var",
-				&(tv_iters.tag_member), _("Processes / Blocks / Components"), "classviewer-member",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Package"), namespace_icon,
+				&(tv_iters.tag_class), _("Entities"), class_icon,
+				&(tv_iters.tag_struct), _("Architectures"), struct_icon,
+				&(tv_iters.tag_type), _("Types"), other_icon,
+				&(tv_iters.tag_function), _("Functions / Procedures"), method_icon,
+				&(tv_iters.tag_variable), _("Variables / Signals"), var_icon,
+				&(tv_iters.tag_member), _("Processes / Blocks / Components"), member_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_VERILOG:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_type), _("Events"), "classviewer-macro",
-				&(tv_iters.tag_class), _("Modules"), "classviewer-class",
-				&(tv_iters.tag_function), _("Functions / Tasks"), "classviewer-method",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_type), _("Events"), macro_icon,
+				&(tv_iters.tag_class), _("Modules"), class_icon,
+				&(tv_iters.tag_function), _("Functions / Tasks"), method_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_JAVA:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Package"), "classviewer-namespace",
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_function), _("Methods"), "classviewer-method",
-				&(tv_iters.tag_member), _("Members"), "classviewer-member",
-				&(tv_iters.tag_type), _("Enums"), "classviewer-struct",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Package"), namespace_icon,
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_function), _("Methods"), method_icon,
+				&(tv_iters.tag_member), _("Members"), member_icon,
+				&(tv_iters.tag_type), _("Enums"), struct_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_AS:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Package"), "classviewer-namespace",
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_member), _("Properties"), "classviewer-member",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_macro), _("Constants"), "classviewer-macro",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Package"), namespace_icon,
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_member), _("Properties"), member_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_macro), _("Constants"), macro_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_HAXE:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_function), _("Methods"), "classviewer-method",
-				&(tv_iters.tag_type), _("Types"), "classviewer-macro",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_function), _("Methods"), method_icon,
+				&(tv_iters.tag_type), _("Types"), macro_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_BASIC:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_macro), _("Constants"), "classviewer-macro",
-				&(tv_iters.tag_struct), _("Types"), "classviewer-namespace",
-				&(tv_iters.tag_namespace), _("Labels"), "classviewer-member",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_macro), _("Constants"), macro_icon,
+				&(tv_iters.tag_struct), _("Types"), namespace_icon,
+				&(tv_iters.tag_namespace), _("Labels"), member_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
@@ -895,46 +894,46 @@ static void add_top_level_items(GeanyDocument *doc)
    	case GEANY_FILETYPES_FORTRAN:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Module"), "classviewer-class",
-				&(tv_iters.tag_struct), _("Programs"), "classviewer-class",
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_function), _("Functions / Subroutines"), "classviewer-method",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_class), _("Types"), "classviewer-class",
-				&(tv_iters.tag_member), _("Components"), "classviewer-member",
-				&(tv_iters.tag_macro), _("Blocks"), "classviewer-member",
-				&(tv_iters.tag_type), _("Enums"), "classviewer-struct",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
+				&(tv_iters.tag_namespace), _("Module"), class_icon,
+				&(tv_iters.tag_struct), _("Programs"), class_icon,
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_function), _("Functions / Subroutines"), method_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_class), _("Types"), class_icon,
+				&(tv_iters.tag_member), _("Components"), member_icon,
+				&(tv_iters.tag_macro), _("Blocks"), member_icon,
+				&(tv_iters.tag_type), _("Enums"), struct_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_ASM:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_namespace), _("Labels"), "classviewer-namespace",
-				&(tv_iters.tag_function), _("Macros"), "classviewer-method",
-				&(tv_iters.tag_macro), _("Defines"), "classviewer-macro",
-				&(tv_iters.tag_struct), _("Types"), "classviewer-struct",
+				&(tv_iters.tag_namespace), _("Labels"), namespace_icon,
+				&(tv_iters.tag_function), _("Macros"), method_icon,
+				&(tv_iters.tag_macro), _("Defines"), macro_icon,
+				&(tv_iters.tag_struct), _("Types"), struct_icon,
    			NULL);
    		break;
    	}
    	case GEANY_FILETYPES_MAKE:
    		tag_list_add_groups(tag_store,
-				&tv_iters.tag_function, _("Targets"), "classviewer-method",
-				&tv_iters.tag_macro, _("Macros"), "classviewer-macro",
+				&tv_iters.tag_function, _("Targets"), method_icon,
+				&tv_iters.tag_macro, _("Macros"), macro_icon,
    			NULL);
    		break;
    	case GEANY_FILETYPES_SQL:
    	{
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_namespace), _("Procedures"), "classviewer-namespace",
-				&(tv_iters.tag_struct), _("Indexes"), "classviewer-struct",
-				&(tv_iters.tag_class), _("Tables"), "classviewer-class",
-				&(tv_iters.tag_macro), _("Triggers"), "classviewer-macro",
-				&(tv_iters.tag_member), _("Views"), "classviewer-var",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other",
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_namespace), _("Procedures"), namespace_icon,
+				&(tv_iters.tag_struct), _("Indexes"), struct_icon,
+				&(tv_iters.tag_class), _("Tables"), class_icon,
+				&(tv_iters.tag_macro), _("Triggers"), macro_icon,
+				&(tv_iters.tag_member), _("Views"), var_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon,
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
    			NULL);
    		break;
    	}
@@ -946,26 +945,26 @@ static void add_top_level_items(GeanyDocument *doc)
    				&(tv_iters.tag_namespace), _("Module"), NULL, NULL);
    		else
    			tag_list_add_groups(tag_store,
-					&(tv_iters.tag_namespace), _("Namespaces"), "classviewer-namespace", NULL);
+					&(tv_iters.tag_namespace), _("Namespaces"), namespace_icon, NULL);
tag_list_add_groups(tag_store,
-				&(tv_iters.tag_class), _("Classes"), "classviewer-class",
-				&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
-				&(tv_iters.tag_function), _("Functions"), "classviewer-method",
-				&(tv_iters.tag_member), _("Members"), "classviewer-member",
-				&(tv_iters.tag_struct), _("Structs"), "classviewer-struct",
-				&(tv_iters.tag_type), _("Typedefs / Enums"), "classviewer-struct",
+				&(tv_iters.tag_class), _("Classes"), class_icon,
+				&(tv_iters.tag_interface), _("Interfaces"), struct_icon,
+				&(tv_iters.tag_function), _("Functions"), method_icon,
+				&(tv_iters.tag_member), _("Members"), member_icon,
+				&(tv_iters.tag_struct), _("Structs"), struct_icon,
+				&(tv_iters.tag_type), _("Typedefs / Enums"), struct_icon,
    			NULL);
if (ft_id != GEANY_FILETYPES_D)
    		{
    			tag_list_add_groups(tag_store,
-					&(tv_iters.tag_macro), _("Macros"), "classviewer-macro", NULL);
+					&(tv_iters.tag_macro), _("Macros"), macro_icon, NULL);
    		}
    		tag_list_add_groups(tag_store,
-				&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
-				&(tv_iters.tag_externvar), _("Extern Variables"), "classviewer-var",
-				&(tv_iters.tag_other), _("Other"), "classviewer-other", NULL);
+				&(tv_iters.tag_variable), _("Variables"), var_icon,
+				&(tv_iters.tag_externvar), _("Extern Variables"), var_icon,
+				&(tv_iters.tag_other), _("Other"), other_icon, NULL);
    	}
    }
 }
@@ -1164,7 +1163,7 @@ static GdkPixbuf *get_child_icon(GtkTreeStore *tree_store, GtkTreeIter *parent)
if (parent == &tv_iters.tag_other)
    {
-		return get_tag_icon("classviewer-var");
+		return g_object_ref(var_icon);
    }
    /* copy parent icon */
    gtk_tree_model_get(GTK_TREE_MODEL(tree_store), parent,
@@ -2386,6 +2385,15 @@ void symbols_init(void)
    g_free(f);
g_signal_connect(geany_object, "document-save", G_CALLBACK(on_document_save), NULL);
+
+	class_icon = get_tag_icon("classviewer-class");
+	macro_icon = get_tag_icon("classviewer-macro");
+	member_icon = get_tag_icon("classviewer-member");
+	method_icon = get_tag_icon("classviewer-method");
+	namespace_icon = get_tag_icon("classviewer-namespace");
+	other_icon = get_tag_icon("classviewer-other");
+	struct_icon = get_tag_icon("classviewer-struct");
+	var_icon = get_tag_icon("classviewer-var");
 }
@@ -2393,4 +2401,13 @@ void symbols_finalize(void)
 {
    g_strfreev(html_entities);
    g_strfreev(c_tags_ignore);
+
+	g_object_unref(class_icon);
+	g_object_unref(macro_icon);
+	g_object_unref(member_icon);
+	g_object_unref(method_icon);
+	g_object_unref(namespace_icon);
+	g_object_unref(other_icon);
+	g_object_unref(struct_icon);
+	g_object_unref(var_icon);
 }
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[geany/geany] 935c38: Merge pull request #509 from techee/child_icon + followup