From c801604a2c23ef2a716956a679285f85c24cfcca Mon Sep 17 00:00:00 2001 From: JosephMcc Date: Sun, 11 Dec 2016 19:52:18 -0800 Subject: [PATCH] xed-encodings-dialog: Clean up code styling --- xed/dialogs/xed-encodings-dialog.c | 577 +++++++++++++---------------- 1 file changed, 260 insertions(+), 317 deletions(-) diff --git a/xed/dialogs/xed-encodings-dialog.c b/xed/dialogs/xed-encodings-dialog.c index a92c11e..e4d505a 100755 --- a/xed/dialogs/xed-encodings-dialog.c +++ b/xed/dialogs/xed-encodings-dialog.c @@ -2,7 +2,7 @@ * xed-encodings-dialog.c * This file is part of xed * - * Copyright (C) 2002-2005 Paolo Maggi + * Copyright (C) 2002-2005 Paolo Maggi * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,14 +16,14 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. */ /* - * Modified by the xed Team, 2002-2005. See the AUTHORS file for a - * list of people on the xed Team. - * See the ChangeLog files for a list of changes. + * Modified by the xed Team, 2002-2005. See the AUTHORS file for a + * list of people on the xed Team. + * See the ChangeLog files for a list of changes. * * $Id$ */ @@ -47,19 +47,19 @@ #include "xed-dirs.h" #define XED_ENCODINGS_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \ - XED_TYPE_ENCODINGS_DIALOG, \ - XedEncodingsDialogPrivate)) + XED_TYPE_ENCODINGS_DIALOG, \ + XedEncodingsDialogPrivate)) struct _XedEncodingsDialogPrivate { - GtkListStore *available_liststore; - GtkListStore *displayed_liststore; - GtkWidget *available_treeview; - GtkWidget *displayed_treeview; - GtkWidget *add_button; - GtkWidget *remove_button; + GtkListStore *available_liststore; + GtkListStore *displayed_liststore; + GtkWidget *available_treeview; + GtkWidget *displayed_treeview; + GtkWidget *add_button; + GtkWidget *remove_button; - GSList *show_in_menu_list; + GSList *show_in_menu_list; }; G_DEFINE_TYPE(XedEncodingsDialog, xed_encodings_dialog, GTK_TYPE_DIALOG) @@ -67,432 +67,375 @@ G_DEFINE_TYPE(XedEncodingsDialog, xed_encodings_dialog, GTK_TYPE_DIALOG) static void xed_encodings_dialog_finalize (GObject *object) { - XedEncodingsDialogPrivate *priv = XED_ENCODINGS_DIALOG (object)->priv; + XedEncodingsDialogPrivate *priv = XED_ENCODINGS_DIALOG (object)->priv; - g_slist_free (priv->show_in_menu_list); + g_slist_free (priv->show_in_menu_list); - G_OBJECT_CLASS (xed_encodings_dialog_parent_class)->finalize (object); + G_OBJECT_CLASS (xed_encodings_dialog_parent_class)->finalize (object); } static void xed_encodings_dialog_class_init (XedEncodingsDialogClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = xed_encodings_dialog_finalize; + object_class->finalize = xed_encodings_dialog_finalize; - g_type_class_add_private (object_class, sizeof (XedEncodingsDialogPrivate)); + g_type_class_add_private (object_class, sizeof (XedEncodingsDialogPrivate)); } -enum { - COLUMN_NAME, - COLUMN_CHARSET, - N_COLUMNS +enum +{ + COLUMN_NAME, + COLUMN_CHARSET, + N_COLUMNS }; static void count_selected_items_func (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) { - int *count = data; + int *count = data; - *count += 1; + *count += 1; } static void -available_selection_changed_callback (GtkTreeSelection *selection, - XedEncodingsDialog *dialogs) +available_selection_changed_callback (GtkTreeSelection *selection, + XedEncodingsDialog *dialogs) { - int count; + int count; - count = 0; - gtk_tree_selection_selected_foreach (selection, - count_selected_items_func, - &count); + count = 0; + gtk_tree_selection_selected_foreach (selection, count_selected_items_func, &count); - gtk_widget_set_sensitive (dialogs->priv->add_button, count > 0); + gtk_widget_set_sensitive (dialogs->priv->add_button, count > 0); } static void -displayed_selection_changed_callback (GtkTreeSelection *selection, - XedEncodingsDialog *dialogs) +displayed_selection_changed_callback (GtkTreeSelection *selection, + XedEncodingsDialog *dialogs) { - int count; + int count; - count = 0; - gtk_tree_selection_selected_foreach (selection, - count_selected_items_func, - &count); + count = 0; + gtk_tree_selection_selected_foreach (selection, count_selected_items_func, &count); - gtk_widget_set_sensitive (dialogs->priv->remove_button, count > 0); + gtk_widget_set_sensitive (dialogs->priv->remove_button, count > 0); } static void get_selected_encodings_func (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) { - GSList **list = data; - gchar *charset; - const XedEncoding *enc; + GSList **list = data; + gchar *charset; + const XedEncoding *enc; - charset = NULL; - gtk_tree_model_get (model, iter, COLUMN_CHARSET, &charset, -1); + charset = NULL; + gtk_tree_model_get (model, iter, COLUMN_CHARSET, &charset, -1); - enc = xed_encoding_get_from_charset (charset); - g_free (charset); + enc = xed_encoding_get_from_charset (charset); + g_free (charset); - *list = g_slist_prepend (*list, (gpointer)enc); + *list = g_slist_prepend (*list, (gpointer)enc); } static void update_shown_in_menu_tree_model (GtkListStore *store, - GSList *list) + GSList *list) { - GtkTreeIter iter; + GtkTreeIter iter; - gtk_list_store_clear (store); + gtk_list_store_clear (store); - while (list != NULL) - { - const XedEncoding *enc; + while (list != NULL) + { + const XedEncoding *enc; - enc = (const XedEncoding*) list->data; + enc = (const XedEncoding*) list->data; - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - COLUMN_CHARSET, - xed_encoding_get_charset (enc), - COLUMN_NAME, - xed_encoding_get_name (enc), -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + COLUMN_CHARSET, xed_encoding_get_charset (enc), + COLUMN_NAME, xed_encoding_get_name (enc), + -1); - list = g_slist_next (list); - } + list = g_slist_next (list); + } } static void -add_button_clicked_callback (GtkWidget *button, - XedEncodingsDialog *dialog) +add_button_clicked_callback (GtkWidget *button, + XedEncodingsDialog *dialog) { - GtkTreeSelection *selection; - GSList *encodings; - GSList *tmp; + GtkTreeSelection *selection; + GSList *encodings; + GSList *tmp; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->available_treeview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->available_treeview)); - encodings = NULL; - gtk_tree_selection_selected_foreach (selection, - get_selected_encodings_func, - &encodings); + encodings = NULL; + gtk_tree_selection_selected_foreach (selection, get_selected_encodings_func, &encodings); - tmp = encodings; - while (tmp != NULL) - { - if (g_slist_find (dialog->priv->show_in_menu_list, tmp->data) == NULL) - dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list, - tmp->data); + tmp = encodings; + while (tmp != NULL) + { + if (g_slist_find (dialog->priv->show_in_menu_list, tmp->data) == NULL) + dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list, tmp->data); - tmp = g_slist_next (tmp); - } + tmp = g_slist_next (tmp); + } - g_slist_free (encodings); + g_slist_free (encodings); - update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->displayed_liststore), - dialog->priv->show_in_menu_list); + update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->displayed_liststore), + dialog->priv->show_in_menu_list); } static void -remove_button_clicked_callback (GtkWidget *button, - XedEncodingsDialog *dialog) +remove_button_clicked_callback (GtkWidget *button, + XedEncodingsDialog *dialog) { - GtkTreeSelection *selection; - GSList *encodings; - GSList *tmp; + GtkTreeSelection *selection; + GSList *encodings; + GSList *tmp; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->displayed_treeview)); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->displayed_treeview)); - encodings = NULL; - gtk_tree_selection_selected_foreach (selection, - get_selected_encodings_func, - &encodings); + encodings = NULL; + gtk_tree_selection_selected_foreach (selection, get_selected_encodings_func, &encodings); - tmp = encodings; - while (tmp != NULL) - { - dialog->priv->show_in_menu_list = g_slist_remove (dialog->priv->show_in_menu_list, - tmp->data); + tmp = encodings; + while (tmp != NULL) + { + dialog->priv->show_in_menu_list = g_slist_remove (dialog->priv->show_in_menu_list, tmp->data); - tmp = g_slist_next (tmp); - } + tmp = g_slist_next (tmp); + } - g_slist_free (encodings); + g_slist_free (encodings); - update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->displayed_liststore), - dialog->priv->show_in_menu_list); + update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->displayed_liststore), + dialog->priv->show_in_menu_list); } static void init_shown_in_menu_tree_model (XedEncodingsDialog *dialog) { - GtkTreeIter iter; - GSList *list, *tmp; + GtkTreeIter iter; + GSList *list, *tmp; - /* add data to the list store */ - list = xed_prefs_manager_get_shown_in_menu_encodings (); + /* add data to the list store */ + list = xed_prefs_manager_get_shown_in_menu_encodings (); - tmp = list; + tmp = list; - while (tmp != NULL) - { - const XedEncoding *enc; + while (tmp != NULL) + { + const XedEncoding *enc; - enc = (const XedEncoding *) tmp->data; + enc = (const XedEncoding *) tmp->data; - dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list, - tmp->data); + dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list, tmp->data); - gtk_list_store_append (dialog->priv->displayed_liststore, - &iter); - gtk_list_store_set (dialog->priv->displayed_liststore, - &iter, - COLUMN_CHARSET, - xed_encoding_get_charset (enc), - COLUMN_NAME, - xed_encoding_get_name (enc), -1); + gtk_list_store_append (dialog->priv->displayed_liststore, &iter); + gtk_list_store_set (dialog->priv->displayed_liststore, &iter, + COLUMN_CHARSET, xed_encoding_get_charset (enc), + COLUMN_NAME, xed_encoding_get_name (enc), + -1); - tmp = g_slist_next (tmp); - } + tmp = g_slist_next (tmp); + } - g_slist_free (list); + g_slist_free (list); } -static void -response_handler (GtkDialog *dialog, - gint response_id, +static void +response_handler (GtkDialog *dialog, + gint response_id, XedEncodingsDialog *dlg) { - if (response_id == GTK_RESPONSE_HELP) - { - xed_help_display (GTK_WINDOW (dialog), "xed", NULL); - g_signal_stop_emission_by_name (dialog, "response"); - return; - } + if (response_id == GTK_RESPONSE_HELP) + { + xed_help_display (GTK_WINDOW (dialog), "xed", NULL); + g_signal_stop_emission_by_name (dialog, "response"); + return; + } - if (response_id == GTK_RESPONSE_OK) - { - g_return_if_fail (xed_prefs_manager_shown_in_menu_encodings_can_set ()); - xed_prefs_manager_set_shown_in_menu_encodings (dlg->priv->show_in_menu_list); - } + if (response_id == GTK_RESPONSE_OK) + { + g_return_if_fail (xed_prefs_manager_shown_in_menu_encodings_can_set ()); + xed_prefs_manager_set_shown_in_menu_encodings (dlg->priv->show_in_menu_list); + } } static void xed_encodings_dialog_init (XedEncodingsDialog *dlg) { - GtkWidget *content; - GtkCellRenderer *cell_renderer; - GtkTreeModel *sort_model; - GtkTreeViewColumn *column; - GtkTreeIter parent_iter; - GtkTreeSelection *selection; - const XedEncoding *enc; - GtkWidget *error_widget; - int i; - gboolean ret; - gchar *file; - gchar *root_objects[] = { - "encodings-dialog-contents", - NULL - }; + GtkWidget *content; + GtkCellRenderer *cell_renderer; + GtkTreeModel *sort_model; + GtkTreeViewColumn *column; + GtkTreeIter parent_iter; + GtkTreeSelection *selection; + const XedEncoding *enc; + GtkWidget *error_widget; + int i; + gboolean ret; + gchar *file; + gchar *root_objects[] = { + "encodings-dialog-contents", + NULL + }; - dlg->priv = XED_ENCODINGS_DIALOG_GET_PRIVATE (dlg); - - gtk_dialog_add_buttons (GTK_DIALOG (dlg), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, - GTK_RESPONSE_OK, - GTK_STOCK_HELP, - GTK_RESPONSE_HELP, - NULL); + dlg->priv = XED_ENCODINGS_DIALOG_GET_PRIVATE (dlg); - gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings")); - gtk_window_set_default_size (GTK_WINDOW (dlg), 650, 400); - - /* HIG defaults */ - gtk_container_set_border_width (GTK_CONTAINER (dlg), 5); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), - 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), - 5); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 6); + gtk_dialog_add_buttons (GTK_DIALOG (dlg), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_OK, + GTK_STOCK_HELP, GTK_RESPONSE_HELP, + NULL); - gtk_dialog_set_default_response (GTK_DIALOG (dlg), - GTK_RESPONSE_OK); + gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings")); + gtk_window_set_default_size (GTK_WINDOW (dlg), 650, 400); - g_signal_connect (dlg, - "response", - G_CALLBACK (response_handler), - dlg); + /* HIG defaults */ + gtk_container_set_border_width (GTK_CONTAINER (dlg), 5); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), 2); /* 2 * 5 + 2 = 12 */ + gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 5); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 6); - file = xed_dirs_get_ui_file ("xed-encodings-dialog.ui"); - ret = xed_utils_get_ui_objects (file, - root_objects, - &error_widget, - "encodings-dialog-contents", &content, - "add-button", &dlg->priv->add_button, - "remove-button", &dlg->priv->remove_button, - "available-treeview", &dlg->priv->available_treeview, - "displayed-treeview", &dlg->priv->displayed_treeview, - NULL); - g_free (file); + gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK); - if (!ret) - { - gtk_widget_show (error_widget); + g_signal_connect (dlg, "response", G_CALLBACK (response_handler), dlg); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), - error_widget, - TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (error_widget), 5); + file = xed_dirs_get_ui_file ("xed-encodings-dialog.ui"); + ret = xed_utils_get_ui_objects (file, + root_objects, + &error_widget, + "encodings-dialog-contents", &content, + "add-button", &dlg->priv->add_button, + "remove-button", &dlg->priv->remove_button, + "available-treeview", &dlg->priv->available_treeview, + "displayed-treeview", &dlg->priv->displayed_treeview, + NULL); + g_free (file); - return; - } + if (!ret) + { + gtk_widget_show (error_widget); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), - content, TRUE, TRUE, 0); - g_object_unref (content); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), error_widget, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (error_widget), 5); - g_signal_connect (dlg->priv->add_button, - "clicked", - G_CALLBACK (add_button_clicked_callback), - dlg); - g_signal_connect (dlg->priv->remove_button, - "clicked", - G_CALLBACK (remove_button_clicked_callback), - dlg); + return; + } - /* Tree view of available encodings */ - dlg->priv->available_liststore = gtk_list_store_new (N_COLUMNS, - G_TYPE_STRING, - G_TYPE_STRING); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), content, TRUE, TRUE, 0); + g_object_unref (content); + gtk_container_set_border_width (GTK_CONTAINER (content), 5); - cell_renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("_Description"), - cell_renderer, - "text", COLUMN_NAME, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview), - column); - gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME); + g_signal_connect (dlg->priv->add_button, "clicked", G_CALLBACK (add_button_clicked_callback), dlg); + g_signal_connect (dlg->priv->remove_button, "clicked", G_CALLBACK (remove_button_clicked_callback), dlg); - cell_renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("_Encoding"), - cell_renderer, - "text", - COLUMN_CHARSET, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview), - column); - gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET); + /* Tree view of available encodings */ + dlg->priv->available_liststore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); - /* Add the data */ - i = 0; - while ((enc = xed_encoding_get_from_index (i)) != NULL) - { - gtk_list_store_append (dlg->priv->available_liststore, - &parent_iter); - gtk_list_store_set (dlg->priv->available_liststore, - &parent_iter, - COLUMN_CHARSET, - xed_encoding_get_charset (enc), - COLUMN_NAME, - xed_encoding_get_name (enc), -1); + cell_renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("_Description"), + cell_renderer, + "text", COLUMN_NAME, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview), column); + gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME); - ++i; - } + cell_renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("_Encoding"), + cell_renderer, + "text", + COLUMN_CHARSET, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview), column); + gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET); - /* Sort model */ - sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->available_liststore)); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), - COLUMN_NAME, - GTK_SORT_ASCENDING); + /* Add the data */ + i = 0; + while ((enc = xed_encoding_get_from_index (i)) != NULL) + { + gtk_list_store_append (dlg->priv->available_liststore, &parent_iter); + gtk_list_store_set (dlg->priv->available_liststore, &parent_iter, + COLUMN_CHARSET, xed_encoding_get_charset (enc), + COLUMN_NAME, xed_encoding_get_name (enc), + -1); - gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->available_treeview), - sort_model); - g_object_unref (G_OBJECT (dlg->priv->available_liststore)); - g_object_unref (G_OBJECT (sort_model)); + ++i; + } - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->available_treeview)); - gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), - GTK_SELECTION_MULTIPLE); + /* Sort model */ + sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->available_liststore)); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), COLUMN_NAME, GTK_SORT_ASCENDING); - available_selection_changed_callback (selection, dlg); - g_signal_connect (selection, - "changed", - G_CALLBACK (available_selection_changed_callback), - dlg); + gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->available_treeview), sort_model); + g_object_unref (G_OBJECT (dlg->priv->available_liststore)); + g_object_unref (G_OBJECT (sort_model)); - /* Tree view of selected encodings */ - dlg->priv->displayed_liststore = gtk_list_store_new (N_COLUMNS, - G_TYPE_STRING, - G_TYPE_STRING); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->available_treeview)); + gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_SELECTION_MULTIPLE); - cell_renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("_Description"), - cell_renderer, - "text", COLUMN_NAME, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview), - column); - gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME); + available_selection_changed_callback (selection, dlg); + g_signal_connect (selection, "changed", G_CALLBACK (available_selection_changed_callback), dlg); - cell_renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("_Encoding"), - cell_renderer, - "text", - COLUMN_CHARSET, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview), - column); - gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET); + /* Tree view of selected encodings */ + dlg->priv->displayed_liststore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); - /* Add the data */ - init_shown_in_menu_tree_model (dlg); + cell_renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("_Description"), + cell_renderer, + "text", COLUMN_NAME, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview), column); + gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME); - /* Sort model */ - sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->displayed_liststore)); + cell_renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("_Encoding"), + cell_renderer, + "text", + COLUMN_CHARSET, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview), column); + gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE - (sort_model), COLUMN_NAME, - GTK_SORT_ASCENDING); + /* Add the data */ + init_shown_in_menu_tree_model (dlg); - gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->displayed_treeview), - sort_model); - g_object_unref (G_OBJECT (sort_model)); - g_object_unref (G_OBJECT (dlg->priv->displayed_liststore)); + /* Sort model */ + sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->displayed_liststore)); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->displayed_treeview)); - gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), - GTK_SELECTION_MULTIPLE); + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), COLUMN_NAME, GTK_SORT_ASCENDING); - displayed_selection_changed_callback (selection, dlg); - g_signal_connect (selection, - "changed", - G_CALLBACK (displayed_selection_changed_callback), - dlg); + gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->displayed_treeview), sort_model); + g_object_unref (G_OBJECT (sort_model)); + g_object_unref (G_OBJECT (dlg->priv->displayed_liststore)); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->displayed_treeview)); + gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_SELECTION_MULTIPLE); + + displayed_selection_changed_callback (selection, dlg); + g_signal_connect (selection, "changed", G_CALLBACK (displayed_selection_changed_callback), dlg); } GtkWidget * xed_encodings_dialog_new (void) { - GtkWidget *dlg; + GtkWidget *dlg; - dlg = GTK_WIDGET (g_object_new (XED_TYPE_ENCODINGS_DIALOG, NULL)); + dlg = GTK_WIDGET (g_object_new (XED_TYPE_ENCODINGS_DIALOG, NULL)); - return dlg; + return dlg; }