Apply patch to add symbol list icons from Jean-François Wauthy

(thanks). Also thanks to KDevelop for the icons.
Add list of projects to THANKS.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1728 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -5,6 +5,17 @@
    Rename ui_close_buttons_toggle() ui_document_buttons_update().
    Move app->sensitive_buttons to ui_utils.c for easier maintenance,
    rename to document_buttons.
+ * configure.in, src/treeviews.c, src/treeviews.h,
+   src/symbols.c, THANKS, Makefile.am, icons, icons/16x16,
+   icons/16x16/classviewer-member.png, icons/16x16/classviewer-var.png,
+   icons/16x16/classviewer-namespace.png,
+   icons/16x16/classviewer-method.png, icons/16x16/Makefile.am,
+   icons/16x16/classviewer-macro.png, icons/16x16/classviewer-other.png,
+   icons/16x16/classviewer-struct.png,
+   icons/16x16/classviewer-class.png, icons/Makefile.am:
+   Apply patch to add symbol list icons from Jean-François Wauthy
+   (thanks). Also thanks to KDevelop for the icons.
+   Add list of projects to THANKS.
 
 
 2007-07-19  Nick Treleaven  <nick.treleaven@btinternet.com>

Makefile.am

 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tagmanager scintilla src plugins po doc
+SUBDIRS = tagmanager scintilla src plugins icons po doc
 
 WIN32_BUILD_FILES = \
 	geany_private.rc \

THANKS

 What's this file about?
 -----------------------
 This file lists all external people that have contributed to this project.
+If any contributors are missing, please email the developers - see the AUTHORS file.
 
 
 Testers and contributors:
---------------------------
+-------------------------
 These people have contributed to Geany by testing the software,
 reporting problems, sending patches and making useful suggestions.
 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - heavy testing
@@ -33,9 +34,10 @@ Dave Moore <wrex006(at)gmail(dot)com> - code navigation patch
 François Cami <francois.cami(at)free(dot)fr>, Guillaume Duviol - tab replacement patch
 Alexander Rodin <rodin(dot)alexander(at)gmail(dot)com> - class builder patch
 Shiv <shivakumar(dot)gn(at)gmail(dot)com> - Sun Studio compiler compatibility patch
+Jean-François Wauthy <pollux(at)xfce(dot)org> - Symbol list icons patch
 
 Translators:
-----------------------------------
+------------
 These people have translated Geany to foreign languages.
 Yura Semashko <yurand2(at)gmail(dot)com> - be_BY
 Dilyan Rusev <dilyanrusev(at)gmail(dot)com> - bg
@@ -57,3 +59,12 @@ brahmann_ <brahmann(at)lifec0re(dot)org(dot)ru> - ru_RU
 Clytie Siddall <clytie(at)riverland(dot)net(dot)au> - vi_VN
 Dormouse Young <dormouse.young(at)gmail(dot)com> - zh_CN
 KoViCH <kovich.ian(at)gmail(dot)com> - zh_TW
+
+Projects:
+---------
+GTK/GLib
+Scintilla
+Tagmanager
+CTags
+Anjuta (tagmanager)
+KDevelop (symbol list icons)

configure.in

@@ -178,6 +178,8 @@ AC_SUBST(GEANY_DATA_DIR)
 
 AC_OUTPUT([
 Makefile
+icons/Makefile
+icons/16x16/Makefile
 tagmanager/Makefile
 tagmanager/include/Makefile
 scintilla/Makefile

icons/16x16/Makefile.am

+iconsdir = $(datadir)/icons/hicolor/16x16/apps
+icons_DATA =  	                                    			\
+	classviewer-class.png						\
+	classviewer-macro.png						\
+	classviewer-member.png						\
+	classviewer-method.png						\
+	classviewer-namespace.png					\
+	classviewer-other.png						\
+	classviewer-struct.png						\
+	classviewer-var.png						
+		
+EXTRA_DIST = 								\
+	$(icons_DATA)

icons/Makefile.am

+SUBDIRS = 								\
+	16x16
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+	@-if test -z "$(DESTDIR)"; then					\
+		echo "Updating Gtk icon cache.";			\
+		$(gtk_update_icon_cache);				\
+	else								\
+		echo "*** Icon cache not updated. Remember to run:";	\
+		echo "***";						\
+		echo "***   $(gtk_update_icon_cache)";			\
+		echo "***";						\
+	fi
+

src/treeviews.c

@@ -69,13 +69,24 @@ static gboolean on_treeviews_button_press_event(GtkWidget *widget, GdkEventButto
 /* the prepare_* functions are document-related, but I think they fit better here than in document.c */
 static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store)
 {
-	GtkCellRenderer *renderer;
+	GtkCellRenderer *text_renderer, *icon_renderer;
 	GtkTreeViewColumn *column;
 	GtkTreeSelection *select;
 	PangoFontDescription *pfd;
 
-	renderer = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(_("Symbols"), renderer, "text", 0, NULL);
+	text_renderer = gtk_cell_renderer_text_new();
+	icon_renderer = gtk_cell_renderer_pixbuf_new();
+    column = gtk_tree_view_column_new();
+
+    gtk_tree_view_column_pack_start(column, icon_renderer, FALSE);
+  	gtk_tree_view_column_set_attributes(column, icon_renderer, "pixbuf", SYMBOLS_COLUMN_ICON, NULL);
+  	g_object_set(icon_renderer, "xalign", 0.0, NULL);
+
+  	gtk_tree_view_column_pack_start(column, text_renderer, TRUE);
+  	gtk_tree_view_column_set_attributes(column, text_renderer, "text", SYMBOLS_COLUMN_NAME, NULL);
+  	g_object_set(text_renderer, "yalign", 0.5, NULL);
+  	gtk_tree_view_column_set_title(column, _("Symbols"));
+
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
 
@@ -144,7 +155,7 @@ void treeviews_update_tag_list(gint idx, gboolean update)
 	{	// updating the tag list in the left tag window
 		if (doc_list[idx].tag_tree == NULL)
 		{
-			doc_list[idx].tag_store = gtk_tree_store_new(1, G_TYPE_STRING);
+			doc_list[idx].tag_store = gtk_tree_store_new(SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING);
 			doc_list[idx].tag_tree = gtk_tree_view_new();
 			prepare_taglist(doc_list[idx].tag_tree, doc_list[idx].tag_store);
 			gtk_widget_show(doc_list[idx].tag_tree);
@@ -476,7 +487,7 @@ static gboolean on_taglist_tree_selection_changed(GtkTreeSelection *selection)
 
 	if (gtk_tree_selection_get_selected(selection, &model, &iter))
 	{
-		gtk_tree_model_get(model, &iter, 0, &string, -1);
+		gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_NAME, &string, -1);
 		if (NZV(string))
 		{
 			gint idx = document_get_cur_idx();

src/treeviews.h

@@ -35,6 +35,12 @@ struct SidebarTreeviews
 	GtkWidget		*popup_openfiles;
 } tv;
 
+enum
+{
+	SYMBOLS_COLUMN_ICON,
+	SYMBOLS_COLUMN_NAME,
+	SYMBOLS_N_COLUMNS,
+};
 
 void treeviews_update_tag_list(gint idx, gboolean update);