xed-encodings-dialog: Clean up code styling
This commit is contained in:
parent
41162911b2
commit
c801604a2c
|
@ -84,7 +84,8 @@ xed_encodings_dialog_class_init (XedEncodingsDialogClass *klass)
|
||||||
g_type_class_add_private (object_class, sizeof (XedEncodingsDialogPrivate));
|
g_type_class_add_private (object_class, sizeof (XedEncodingsDialogPrivate));
|
||||||
}
|
}
|
||||||
|
|
||||||
enum {
|
enum
|
||||||
|
{
|
||||||
COLUMN_NAME,
|
COLUMN_NAME,
|
||||||
COLUMN_CHARSET,
|
COLUMN_CHARSET,
|
||||||
N_COLUMNS
|
N_COLUMNS
|
||||||
|
@ -108,9 +109,7 @@ available_selection_changed_callback (GtkTreeSelection *selection,
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
count = 0;
|
count = 0;
|
||||||
gtk_tree_selection_selected_foreach (selection,
|
gtk_tree_selection_selected_foreach (selection, count_selected_items_func, &count);
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
@ -122,9 +121,7 @@ displayed_selection_changed_callback (GtkTreeSelection *selection,
|
||||||
int count;
|
int count;
|
||||||
|
|
||||||
count = 0;
|
count = 0;
|
||||||
gtk_tree_selection_selected_foreach (selection,
|
gtk_tree_selection_selected_foreach (selection, count_selected_items_func, &count);
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
@ -164,10 +161,9 @@ update_shown_in_menu_tree_model (GtkListStore *store,
|
||||||
|
|
||||||
gtk_list_store_append (store, &iter);
|
gtk_list_store_append (store, &iter);
|
||||||
gtk_list_store_set (store, &iter,
|
gtk_list_store_set (store, &iter,
|
||||||
COLUMN_CHARSET,
|
COLUMN_CHARSET, xed_encoding_get_charset (enc),
|
||||||
xed_encoding_get_charset (enc),
|
COLUMN_NAME, xed_encoding_get_name (enc),
|
||||||
COLUMN_NAME,
|
-1);
|
||||||
xed_encoding_get_name (enc), -1);
|
|
||||||
|
|
||||||
list = g_slist_next (list);
|
list = g_slist_next (list);
|
||||||
}
|
}
|
||||||
|
@ -184,16 +180,13 @@ add_button_clicked_callback (GtkWidget *button,
|
||||||
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;
|
encodings = NULL;
|
||||||
gtk_tree_selection_selected_foreach (selection,
|
gtk_tree_selection_selected_foreach (selection, get_selected_encodings_func, &encodings);
|
||||||
get_selected_encodings_func,
|
|
||||||
&encodings);
|
|
||||||
|
|
||||||
tmp = encodings;
|
tmp = encodings;
|
||||||
while (tmp != NULL)
|
while (tmp != NULL)
|
||||||
{
|
{
|
||||||
if (g_slist_find (dialog->priv->show_in_menu_list, tmp->data) == 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,
|
dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list, tmp->data);
|
||||||
tmp->data);
|
|
||||||
|
|
||||||
tmp = g_slist_next (tmp);
|
tmp = g_slist_next (tmp);
|
||||||
}
|
}
|
||||||
|
@ -215,15 +208,12 @@ remove_button_clicked_callback (GtkWidget *button,
|
||||||
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;
|
encodings = NULL;
|
||||||
gtk_tree_selection_selected_foreach (selection,
|
gtk_tree_selection_selected_foreach (selection, get_selected_encodings_func, &encodings);
|
||||||
get_selected_encodings_func,
|
|
||||||
&encodings);
|
|
||||||
|
|
||||||
tmp = encodings;
|
tmp = encodings;
|
||||||
while (tmp != NULL)
|
while (tmp != NULL)
|
||||||
{
|
{
|
||||||
dialog->priv->show_in_menu_list = g_slist_remove (dialog->priv->show_in_menu_list,
|
dialog->priv->show_in_menu_list = g_slist_remove (dialog->priv->show_in_menu_list, tmp->data);
|
||||||
tmp->data);
|
|
||||||
|
|
||||||
tmp = g_slist_next (tmp);
|
tmp = g_slist_next (tmp);
|
||||||
}
|
}
|
||||||
|
@ -251,17 +241,13 @@ init_shown_in_menu_tree_model (XedEncodingsDialog *dialog)
|
||||||
|
|
||||||
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,
|
dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list, tmp->data);
|
||||||
tmp->data);
|
|
||||||
|
|
||||||
gtk_list_store_append (dialog->priv->displayed_liststore,
|
gtk_list_store_append (dialog->priv->displayed_liststore, &iter);
|
||||||
&iter);
|
gtk_list_store_set (dialog->priv->displayed_liststore, &iter,
|
||||||
gtk_list_store_set (dialog->priv->displayed_liststore,
|
COLUMN_CHARSET, xed_encoding_get_charset (enc),
|
||||||
&iter,
|
COLUMN_NAME, xed_encoding_get_name (enc),
|
||||||
COLUMN_CHARSET,
|
-1);
|
||||||
xed_encoding_get_charset (enc),
|
|
||||||
COLUMN_NAME,
|
|
||||||
xed_encoding_get_name (enc), -1);
|
|
||||||
|
|
||||||
tmp = g_slist_next (tmp);
|
tmp = g_slist_next (tmp);
|
||||||
}
|
}
|
||||||
|
@ -310,12 +296,9 @@ xed_encodings_dialog_init (XedEncodingsDialog *dlg)
|
||||||
dlg->priv = XED_ENCODINGS_DIALOG_GET_PRIVATE (dlg);
|
dlg->priv = XED_ENCODINGS_DIALOG_GET_PRIVATE (dlg);
|
||||||
|
|
||||||
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
|
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
|
||||||
GTK_STOCK_CANCEL,
|
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
||||||
GTK_RESPONSE_CANCEL,
|
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
||||||
GTK_STOCK_OK,
|
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
|
||||||
GTK_RESPONSE_OK,
|
|
||||||
GTK_STOCK_HELP,
|
|
||||||
GTK_RESPONSE_HELP,
|
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings"));
|
gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings"));
|
||||||
|
@ -323,19 +306,13 @@ xed_encodings_dialog_init (XedEncodingsDialog *dlg)
|
||||||
|
|
||||||
/* HIG defaults */
|
/* HIG defaults */
|
||||||
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
|
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);
|
||||||
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
|
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), 2); /* 2 * 5 + 2 = 12 */
|
||||||
2); /* 2 * 5 + 2 = 12 */
|
gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 5);
|
||||||
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_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dlg))), 6);
|
||||||
|
|
||||||
gtk_dialog_set_default_response (GTK_DIALOG (dlg),
|
gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
|
||||||
GTK_RESPONSE_OK);
|
|
||||||
|
|
||||||
g_signal_connect (dlg,
|
g_signal_connect (dlg, "response", G_CALLBACK (response_handler), dlg);
|
||||||
"response",
|
|
||||||
G_CALLBACK (response_handler),
|
|
||||||
dlg);
|
|
||||||
|
|
||||||
file = xed_dirs_get_ui_file ("xed-encodings-dialog.ui");
|
file = xed_dirs_get_ui_file ("xed-encodings-dialog.ui");
|
||||||
ret = xed_utils_get_ui_objects (file,
|
ret = xed_utils_get_ui_objects (file,
|
||||||
|
@ -353,40 +330,28 @@ xed_encodings_dialog_init (XedEncodingsDialog *dlg)
|
||||||
{
|
{
|
||||||
gtk_widget_show (error_widget);
|
gtk_widget_show (error_widget);
|
||||||
|
|
||||||
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
|
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), error_widget, TRUE, TRUE, 0);
|
||||||
error_widget,
|
|
||||||
TRUE, TRUE, 0);
|
|
||||||
gtk_container_set_border_width (GTK_CONTAINER (error_widget), 5);
|
gtk_container_set_border_width (GTK_CONTAINER (error_widget), 5);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
|
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), content, TRUE, TRUE, 0);
|
||||||
content, TRUE, TRUE, 0);
|
|
||||||
g_object_unref (content);
|
g_object_unref (content);
|
||||||
gtk_container_set_border_width (GTK_CONTAINER (content), 5);
|
gtk_container_set_border_width (GTK_CONTAINER (content), 5);
|
||||||
|
|
||||||
g_signal_connect (dlg->priv->add_button,
|
g_signal_connect (dlg->priv->add_button, "clicked", G_CALLBACK (add_button_clicked_callback), dlg);
|
||||||
"clicked",
|
g_signal_connect (dlg->priv->remove_button, "clicked", G_CALLBACK (remove_button_clicked_callback), dlg);
|
||||||
G_CALLBACK (add_button_clicked_callback),
|
|
||||||
dlg);
|
|
||||||
g_signal_connect (dlg->priv->remove_button,
|
|
||||||
"clicked",
|
|
||||||
G_CALLBACK (remove_button_clicked_callback),
|
|
||||||
dlg);
|
|
||||||
|
|
||||||
/* Tree view of available encodings */
|
/* Tree view of available encodings */
|
||||||
dlg->priv->available_liststore = gtk_list_store_new (N_COLUMNS,
|
dlg->priv->available_liststore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
|
||||||
G_TYPE_STRING,
|
|
||||||
G_TYPE_STRING);
|
|
||||||
|
|
||||||
cell_renderer = gtk_cell_renderer_text_new ();
|
cell_renderer = gtk_cell_renderer_text_new ();
|
||||||
column = gtk_tree_view_column_new_with_attributes (_("_Description"),
|
column = gtk_tree_view_column_new_with_attributes (_("_Description"),
|
||||||
cell_renderer,
|
cell_renderer,
|
||||||
"text", COLUMN_NAME,
|
"text", COLUMN_NAME,
|
||||||
NULL);
|
NULL);
|
||||||
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview),
|
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview), column);
|
||||||
column);
|
|
||||||
gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME);
|
gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME);
|
||||||
|
|
||||||
cell_renderer = gtk_cell_renderer_text_new ();
|
cell_renderer = gtk_cell_renderer_text_new ();
|
||||||
|
@ -395,59 +360,45 @@ xed_encodings_dialog_init (XedEncodingsDialog *dlg)
|
||||||
"text",
|
"text",
|
||||||
COLUMN_CHARSET,
|
COLUMN_CHARSET,
|
||||||
NULL);
|
NULL);
|
||||||
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview),
|
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->available_treeview), column);
|
||||||
column);
|
|
||||||
gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET);
|
gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET);
|
||||||
|
|
||||||
/* Add the data */
|
/* Add the data */
|
||||||
i = 0;
|
i = 0;
|
||||||
while ((enc = xed_encoding_get_from_index (i)) != NULL)
|
while ((enc = xed_encoding_get_from_index (i)) != NULL)
|
||||||
{
|
{
|
||||||
gtk_list_store_append (dlg->priv->available_liststore,
|
gtk_list_store_append (dlg->priv->available_liststore, &parent_iter);
|
||||||
&parent_iter);
|
gtk_list_store_set (dlg->priv->available_liststore, &parent_iter,
|
||||||
gtk_list_store_set (dlg->priv->available_liststore,
|
COLUMN_CHARSET, xed_encoding_get_charset (enc),
|
||||||
&parent_iter,
|
COLUMN_NAME, xed_encoding_get_name (enc),
|
||||||
COLUMN_CHARSET,
|
-1);
|
||||||
xed_encoding_get_charset (enc),
|
|
||||||
COLUMN_NAME,
|
|
||||||
xed_encoding_get_name (enc), -1);
|
|
||||||
|
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sort model */
|
/* Sort model */
|
||||||
sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->available_liststore));
|
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),
|
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), COLUMN_NAME, GTK_SORT_ASCENDING);
|
||||||
COLUMN_NAME,
|
|
||||||
GTK_SORT_ASCENDING);
|
|
||||||
|
|
||||||
gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->available_treeview),
|
gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->available_treeview), sort_model);
|
||||||
sort_model);
|
|
||||||
g_object_unref (G_OBJECT (dlg->priv->available_liststore));
|
g_object_unref (G_OBJECT (dlg->priv->available_liststore));
|
||||||
g_object_unref (G_OBJECT (sort_model));
|
g_object_unref (G_OBJECT (sort_model));
|
||||||
|
|
||||||
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->available_treeview));
|
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->available_treeview));
|
||||||
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
|
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_SELECTION_MULTIPLE);
|
||||||
GTK_SELECTION_MULTIPLE);
|
|
||||||
|
|
||||||
available_selection_changed_callback (selection, dlg);
|
available_selection_changed_callback (selection, dlg);
|
||||||
g_signal_connect (selection,
|
g_signal_connect (selection, "changed", G_CALLBACK (available_selection_changed_callback), dlg);
|
||||||
"changed",
|
|
||||||
G_CALLBACK (available_selection_changed_callback),
|
|
||||||
dlg);
|
|
||||||
|
|
||||||
/* Tree view of selected encodings */
|
/* Tree view of selected encodings */
|
||||||
dlg->priv->displayed_liststore = gtk_list_store_new (N_COLUMNS,
|
dlg->priv->displayed_liststore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
|
||||||
G_TYPE_STRING,
|
|
||||||
G_TYPE_STRING);
|
|
||||||
|
|
||||||
cell_renderer = gtk_cell_renderer_text_new ();
|
cell_renderer = gtk_cell_renderer_text_new ();
|
||||||
column = gtk_tree_view_column_new_with_attributes (_("_Description"),
|
column = gtk_tree_view_column_new_with_attributes (_("_Description"),
|
||||||
cell_renderer,
|
cell_renderer,
|
||||||
"text", COLUMN_NAME,
|
"text", COLUMN_NAME,
|
||||||
NULL);
|
NULL);
|
||||||
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview),
|
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview), column);
|
||||||
column);
|
|
||||||
gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME);
|
gtk_tree_view_column_set_sort_column_id (column, COLUMN_NAME);
|
||||||
|
|
||||||
cell_renderer = gtk_cell_renderer_text_new ();
|
cell_renderer = gtk_cell_renderer_text_new ();
|
||||||
|
@ -456,8 +407,7 @@ xed_encodings_dialog_init (XedEncodingsDialog *dlg)
|
||||||
"text",
|
"text",
|
||||||
COLUMN_CHARSET,
|
COLUMN_CHARSET,
|
||||||
NULL);
|
NULL);
|
||||||
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview),
|
gtk_tree_view_append_column (GTK_TREE_VIEW (dlg->priv->displayed_treeview), column);
|
||||||
column);
|
|
||||||
gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET);
|
gtk_tree_view_column_set_sort_column_id (column, COLUMN_CHARSET);
|
||||||
|
|
||||||
/* Add the data */
|
/* Add the data */
|
||||||
|
@ -466,24 +416,17 @@ xed_encodings_dialog_init (XedEncodingsDialog *dlg)
|
||||||
/* Sort model */
|
/* Sort model */
|
||||||
sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->displayed_liststore));
|
sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dlg->priv->displayed_liststore));
|
||||||
|
|
||||||
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
|
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model), COLUMN_NAME, GTK_SORT_ASCENDING);
|
||||||
(sort_model), COLUMN_NAME,
|
|
||||||
GTK_SORT_ASCENDING);
|
|
||||||
|
|
||||||
gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->displayed_treeview),
|
gtk_tree_view_set_model (GTK_TREE_VIEW (dlg->priv->displayed_treeview), sort_model);
|
||||||
sort_model);
|
|
||||||
g_object_unref (G_OBJECT (sort_model));
|
g_object_unref (G_OBJECT (sort_model));
|
||||||
g_object_unref (G_OBJECT (dlg->priv->displayed_liststore));
|
g_object_unref (G_OBJECT (dlg->priv->displayed_liststore));
|
||||||
|
|
||||||
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->displayed_treeview));
|
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->displayed_treeview));
|
||||||
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
|
gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_SELECTION_MULTIPLE);
|
||||||
GTK_SELECTION_MULTIPLE);
|
|
||||||
|
|
||||||
displayed_selection_changed_callback (selection, dlg);
|
displayed_selection_changed_callback (selection, dlg);
|
||||||
g_signal_connect (selection,
|
g_signal_connect (selection, "changed", G_CALLBACK (displayed_selection_changed_callback), dlg);
|
||||||
"changed",
|
|
||||||
G_CALLBACK (displayed_selection_changed_callback),
|
|
||||||
dlg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GtkWidget *
|
GtkWidget *
|
||||||
|
|
Loading…
Reference in New Issue