diff --git a/ChangeLog b/ChangeLog index bfb20d967..4029162bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * src/editor.c: Fix crash when trying to add a multiline comment in filetypes which don't support it. + * src/symbols.c, src/treeviews.c, src/treeviews.h: + Revert the change to make symbol sections bold and use some small + indentation when expanders are hidden. 2007-11-20 Enrico Tröger diff --git a/src/symbols.c b/src/symbols.c index 30dfcfd3f..9ad29c285 100644 --- a/src/symbols.c +++ b/src/symbols.c @@ -489,12 +489,11 @@ tag_list_add_groups(GtkTreeStore *tree_store, ...) if (G_IS_OBJECT(icon)) { gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_ICON, icon, - SYMBOLS_COLUMN_NAME, title, SYMBOLS_COLUMN_FONT_WEIGHT, PANGO_WEIGHT_SEMIBOLD, -1); + SYMBOLS_COLUMN_NAME, title, -1); g_object_unref(icon); } else - gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, - SYMBOLS_COLUMN_FONT_WEIGHT, PANGO_WEIGHT_SEMIBOLD, -1); + gtk_tree_store_set(tree_store, iter, SYMBOLS_COLUMN_NAME, title, -1); } va_end(args); } @@ -829,8 +828,7 @@ gboolean symbols_recreate_tag_list(gint idx, gboolean sort_by_name) gtk_tree_store_set(doc_list[idx].tag_store, &iter, SYMBOLS_COLUMN_ICON, icon, SYMBOLS_COLUMN_NAME, buf, - SYMBOLS_COLUMN_LINE, symbol->line, - SYMBOLS_COLUMN_FONT_WEIGHT, PANGO_WEIGHT_NORMAL, -1); + SYMBOLS_COLUMN_LINE, symbol->line, -1); if (G_LIKELY(G_IS_OBJECT(icon))) g_object_unref(icon); diff --git a/src/treeviews.c b/src/treeviews.c index 9c0ca8d25..2a83a78fb 100644 --- a/src/treeviews.c +++ b/src/treeviews.c @@ -103,8 +103,7 @@ static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store) 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, - "weight", SYMBOLS_COLUMN_FONT_WEIGHT, NULL); + 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")); @@ -123,6 +122,8 @@ static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store) #if GTK_CHECK_VERSION(2, 12, 0) gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(tree), prefs.show_symbol_list_expanders); + if (! prefs.show_symbol_list_expanders) + gtk_tree_view_set_level_indentation(GTK_TREE_VIEW(tree), 10); #endif // selection handling @@ -181,7 +182,7 @@ void treeviews_update_tag_list(gint idx, gboolean update) if (doc_list[idx].tag_tree == NULL) { doc_list[idx].tag_store = gtk_tree_store_new( - SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT); + SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT); 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); diff --git a/src/treeviews.h b/src/treeviews.h index c1a10928d..30a70c602 100644 --- a/src/treeviews.h +++ b/src/treeviews.h @@ -42,7 +42,6 @@ enum SYMBOLS_COLUMN_ICON, SYMBOLS_COLUMN_NAME, SYMBOLS_COLUMN_LINE, - SYMBOLS_COLUMN_FONT_WEIGHT, SYMBOLS_N_COLUMNS, };