From 71306fa224a9647e0ecf96e36417b053ff7461ca Mon Sep 17 00:00:00 2001 From: JosephMcc Date: Sun, 11 Dec 2016 20:43:00 -0800 Subject: [PATCH] xed-encodings-combo-box: Clean up code styling --- xed/xed-encodings-combo-box.c | 543 ++++++++++++++++------------------ 1 file changed, 261 insertions(+), 282 deletions(-) diff --git a/xed/xed-encodings-combo-box.c b/xed/xed-encodings-combo-box.c index 08637f3..f9cf161 100644 --- a/xed/xed-encodings-combo-box.c +++ b/xed/xed-encodings-combo-box.c @@ -17,14 +17,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, + * Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. */ - + /* - * Modified by the xed Team, 2003-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, 2003-2005. See the AUTHORS file for a + * list of people on the xed Team. + * See the ChangeLog files for a list of changes. * * $Id: xed-encodings-combo-box.c 6112 2008-01-23 08:26:24Z sfre $ */ @@ -42,392 +42,374 @@ #define ENCODING_KEY "Enconding" -#define XED_ENCODINGS_COMBO_BOX_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \ - XED_TYPE_ENCODINGS_COMBO_BOX, \ - XedEncodingsComboBoxPrivate)) +#define XED_ENCODINGS_COMBO_BOX_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \ + XED_TYPE_ENCODINGS_COMBO_BOX, \ + XedEncodingsComboBoxPrivate)) struct _XedEncodingsComboBoxPrivate { - GtkListStore *store; - glong changed_id; + GtkListStore *store; + glong changed_id; - guint activated_item; + guint activated_item; - guint save_mode : 1; + guint save_mode : 1; }; enum { - NAME_COLUMN, - ENCODING_COLUMN, - ADD_COLUMN, - N_COLUMNS + NAME_COLUMN, + ENCODING_COLUMN, + ADD_COLUMN, + N_COLUMNS }; /* Properties */ enum { - PROP_0, - PROP_SAVE_MODE + PROP_0, + PROP_SAVE_MODE }; G_DEFINE_TYPE(XedEncodingsComboBox, xed_encodings_combo_box, GTK_TYPE_COMBO_BOX) -static void update_menu (XedEncodingsComboBox *combo_box); +static void update_menu (XedEncodingsComboBox *combo_box); static void xed_encodings_combo_box_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { - XedEncodingsComboBox *combo; + XedEncodingsComboBox *combo; - combo = XED_ENCODINGS_COMBO_BOX (object); + combo = XED_ENCODINGS_COMBO_BOX (object); - switch (prop_id) - { - case PROP_SAVE_MODE: - combo->priv->save_mode = g_value_get_boolean (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + switch (prop_id) + { + case PROP_SAVE_MODE: + combo->priv->save_mode = g_value_get_boolean (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void xed_encodings_combo_box_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) + guint prop_id, + GValue *value, + GParamSpec *pspec) { - XedEncodingsComboBox *combo; + XedEncodingsComboBox *combo; - combo = XED_ENCODINGS_COMBO_BOX (object); + combo = XED_ENCODINGS_COMBO_BOX (object); - switch (prop_id) - { - case PROP_SAVE_MODE: - g_value_set_boolean (value, combo->priv->save_mode); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + switch (prop_id) + { + case PROP_SAVE_MODE: + g_value_set_boolean (value, combo->priv->save_mode); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void xed_encodings_combo_box_dispose (GObject *object) { - XedEncodingsComboBox *combo = XED_ENCODINGS_COMBO_BOX (object); + XedEncodingsComboBox *combo = XED_ENCODINGS_COMBO_BOX (object); - if (combo->priv->store != NULL) - { - g_object_unref (combo->priv->store); - combo->priv->store = NULL; - } + if (combo->priv->store != NULL) + { + g_object_unref (combo->priv->store); + combo->priv->store = NULL; + } - G_OBJECT_CLASS (xed_encodings_combo_box_parent_class)->dispose (object); + G_OBJECT_CLASS (xed_encodings_combo_box_parent_class)->dispose (object); } static void xed_encodings_combo_box_class_init (XedEncodingsComboBoxClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->set_property = xed_encodings_combo_box_set_property; - object_class->get_property = xed_encodings_combo_box_get_property; - object_class->dispose = xed_encodings_combo_box_dispose; + object_class->set_property = xed_encodings_combo_box_set_property; + object_class->get_property = xed_encodings_combo_box_get_property; + object_class->dispose = xed_encodings_combo_box_dispose; - g_object_class_install_property (object_class, - PROP_SAVE_MODE, - g_param_spec_boolean ("save-mode", - "Save Mode", - "Save Mode", - FALSE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (object_class, + PROP_SAVE_MODE, + g_param_spec_boolean ("save-mode", + "Save Mode", + "Save Mode", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + G_PARAM_STATIC_STRINGS)); - g_type_class_add_private (object_class, sizeof (XedEncodingsComboBoxPrivate)); + g_type_class_add_private (object_class, sizeof (XedEncodingsComboBoxPrivate)); } static void -dialog_response_cb (GtkDialog *dialog, - gint response_id, +dialog_response_cb (GtkDialog *dialog, + gint response_id, XedEncodingsComboBox *menu) { - if (response_id == GTK_RESPONSE_OK) - { - update_menu (menu); - } + if (response_id == GTK_RESPONSE_OK) + { + update_menu (menu); + } - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void add_or_remove (XedEncodingsComboBox *menu, - GtkTreeModel *model) + GtkTreeModel *model) { - GtkTreeIter iter; - gboolean add_item = FALSE; + GtkTreeIter iter; + gboolean add_item = FALSE; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (menu), &iter)) - { - gtk_tree_model_get (model, &iter, - ADD_COLUMN, &add_item, - -1); - } + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (menu), &iter)) + { + gtk_tree_model_get (model, &iter, ADD_COLUMN, &add_item, -1); + } - if (!add_item) - { - menu->priv->activated_item = gtk_combo_box_get_active (GTK_COMBO_BOX (menu)); - } - else - { - GtkWidget *dialog; + if (!add_item) + { + menu->priv->activated_item = gtk_combo_box_get_active (GTK_COMBO_BOX (menu)); + } + else + { + GtkWidget *dialog; - GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menu)); + GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menu)); - if (!gtk_widget_is_toplevel (toplevel)) - toplevel = NULL; + if (!gtk_widget_is_toplevel (toplevel)) + { + toplevel = NULL; + } - g_signal_handler_block (menu, menu->priv->changed_id); - gtk_combo_box_set_active (GTK_COMBO_BOX (menu), - menu->priv->activated_item); - g_signal_handler_unblock (menu, menu->priv->changed_id); + g_signal_handler_block (menu, menu->priv->changed_id); + gtk_combo_box_set_active (GTK_COMBO_BOX (menu), menu->priv->activated_item); + g_signal_handler_unblock (menu, menu->priv->changed_id); - dialog = xed_encodings_dialog_new(); + dialog = xed_encodings_dialog_new(); - if (toplevel != NULL) - { - GtkWindowGroup *wg; + if (toplevel != NULL) + { + GtkWindowGroup *wg; - gtk_window_set_transient_for (GTK_WINDOW (dialog), - GTK_WINDOW (toplevel)); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); - wg = gtk_window_get_group (GTK_WINDOW (toplevel)); - if (wg == NULL) - { - wg = gtk_window_group_new (); - gtk_window_group_add_window (wg, - GTK_WINDOW (toplevel)); - } + wg = gtk_window_get_group (GTK_WINDOW (toplevel)); + if (wg == NULL) + { + wg = gtk_window_group_new (); + gtk_window_group_add_window (wg, GTK_WINDOW (toplevel)); + } - gtk_window_group_add_window (wg, - GTK_WINDOW (dialog)); - } + gtk_window_group_add_window (wg, GTK_WINDOW (dialog)); + } - gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); - g_signal_connect (dialog, - "response", - G_CALLBACK (dialog_response_cb), - menu); + g_signal_connect (dialog, "response", G_CALLBACK (dialog_response_cb), menu); - gtk_widget_show (dialog); - } + gtk_widget_show (dialog); + } } static gboolean -separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) +separator_func (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { - gchar *str; - gboolean ret; + gchar *str; + gboolean ret; - gtk_tree_model_get (model, iter, NAME_COLUMN, &str, -1); - ret = (str == NULL || *str == '\0'); - g_free (str); + gtk_tree_model_get (model, iter, NAME_COLUMN, &str, -1); + ret = (str == NULL || *str == '\0'); + g_free (str); - return ret; + return ret; } static void update_menu (XedEncodingsComboBox *menu) { - GtkListStore *store; - GtkTreeIter iter; - GSList *encodings, *l; - gchar *str; - const XedEncoding *utf8_encoding; - const XedEncoding *current_encoding; + GtkListStore *store; + GtkTreeIter iter; + GSList *encodings, *l; + gchar *str; + const XedEncoding *utf8_encoding; + const XedEncoding *current_encoding; - store = menu->priv->store; + store = menu->priv->store; - /* Unset the previous model */ - g_signal_handler_block (menu, menu->priv->changed_id); - gtk_list_store_clear (store); - gtk_combo_box_set_model (GTK_COMBO_BOX (menu), - NULL); + /* Unset the previous model */ + g_signal_handler_block (menu, menu->priv->changed_id); + gtk_list_store_clear (store); + gtk_combo_box_set_model (GTK_COMBO_BOX (menu), NULL); - utf8_encoding = xed_encoding_get_utf8 (); - current_encoding = xed_encoding_get_current (); + utf8_encoding = xed_encoding_get_utf8 (); + current_encoding = xed_encoding_get_current (); - if (!menu->priv->save_mode) - { - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - NAME_COLUMN, _("Automatically Detected"), - ENCODING_COLUMN, NULL, - ADD_COLUMN, FALSE, - -1); + if (!menu->priv->save_mode) + { + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + NAME_COLUMN, _("Automatically Detected"), + ENCODING_COLUMN, NULL, + ADD_COLUMN, FALSE, + -1); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - NAME_COLUMN, "", - ENCODING_COLUMN, NULL, - ADD_COLUMN, FALSE, - -1); - } + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + NAME_COLUMN, "", + ENCODING_COLUMN, NULL, + ADD_COLUMN, FALSE, + -1); + } - if (current_encoding != utf8_encoding) - str = xed_encoding_to_string (utf8_encoding); - else - str = g_strdup_printf (_("Current Locale (%s)"), - xed_encoding_get_charset (utf8_encoding)); + if (current_encoding != utf8_encoding) + { + str = xed_encoding_to_string (utf8_encoding); + } + else + { + str = g_strdup_printf (_("Current Locale (%s)"), xed_encoding_get_charset (utf8_encoding)); + } - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - NAME_COLUMN, str, - ENCODING_COLUMN, utf8_encoding, - ADD_COLUMN, FALSE, - -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + NAME_COLUMN, str, + ENCODING_COLUMN, utf8_encoding, + ADD_COLUMN, FALSE, + -1); - g_free (str); + g_free (str); - if ((utf8_encoding != current_encoding) && - (current_encoding != NULL)) - { - str = g_strdup_printf (_("Current Locale (%s)"), - xed_encoding_get_charset (current_encoding)); + if ((utf8_encoding != current_encoding) && (current_encoding != NULL)) + { + str = g_strdup_printf (_("Current Locale (%s)"), xed_encoding_get_charset (current_encoding)); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - NAME_COLUMN, str, - ENCODING_COLUMN, current_encoding, - ADD_COLUMN, FALSE, - -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + NAME_COLUMN, str, + ENCODING_COLUMN, current_encoding, + ADD_COLUMN, FALSE, + -1); - g_free (str); - } + g_free (str); + } - encodings = xed_prefs_manager_get_shown_in_menu_encodings (); + encodings = xed_prefs_manager_get_shown_in_menu_encodings (); - for (l = encodings; l != NULL; l = g_slist_next (l)) - { - const XedEncoding *enc = (const XedEncoding *)l->data; + for (l = encodings; l != NULL; l = g_slist_next (l)) + { + const XedEncoding *enc = (const XedEncoding *)l->data; - if ((enc != current_encoding) && - (enc != utf8_encoding) && - (enc != NULL)) - { - str = xed_encoding_to_string (enc); + if ((enc != current_encoding) && (enc != utf8_encoding) && (enc != NULL)) + { + str = xed_encoding_to_string (enc); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - NAME_COLUMN, str, - ENCODING_COLUMN, enc, - ADD_COLUMN, FALSE, - -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + NAME_COLUMN, str, + ENCODING_COLUMN, enc, + ADD_COLUMN, FALSE, + -1); - g_free (str); - } - } + g_free (str); + } + } - g_slist_free (encodings); + g_slist_free (encodings); - if (xed_prefs_manager_shown_in_menu_encodings_can_set ()) - { - gtk_list_store_append (store, &iter); - /* separator */ - gtk_list_store_set (store, &iter, - NAME_COLUMN, "", - ENCODING_COLUMN, NULL, - ADD_COLUMN, FALSE, - -1); + if (xed_prefs_manager_shown_in_menu_encodings_can_set ()) + { + gtk_list_store_append (store, &iter); + /* separator */ + gtk_list_store_set (store, &iter, + NAME_COLUMN, "", + ENCODING_COLUMN, NULL, + ADD_COLUMN, FALSE, + -1); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, - NAME_COLUMN, _("Add or Remove..."), - ENCODING_COLUMN, NULL, - ADD_COLUMN, TRUE, - -1); - } + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, + NAME_COLUMN, _("Add or Remove..."), + ENCODING_COLUMN, NULL, + ADD_COLUMN, TRUE, + -1); + } - /* set the model back */ - gtk_combo_box_set_model (GTK_COMBO_BOX (menu), - GTK_TREE_MODEL (menu->priv->store)); - gtk_combo_box_set_active (GTK_COMBO_BOX (menu), 0); + /* set the model back */ + gtk_combo_box_set_model (GTK_COMBO_BOX (menu), GTK_TREE_MODEL (menu->priv->store)); + gtk_combo_box_set_active (GTK_COMBO_BOX (menu), 0); - g_signal_handler_unblock (menu, menu->priv->changed_id); + g_signal_handler_unblock (menu, menu->priv->changed_id); } static void xed_encodings_combo_box_init (XedEncodingsComboBox *menu) { - GtkCellRenderer *text_renderer; + GtkCellRenderer *text_renderer; - menu->priv = XED_ENCODINGS_COMBO_BOX_GET_PRIVATE (menu); + menu->priv = XED_ENCODINGS_COMBO_BOX_GET_PRIVATE (menu); - menu->priv->store = gtk_list_store_new (N_COLUMNS, - G_TYPE_STRING, - G_TYPE_POINTER, - G_TYPE_BOOLEAN); + menu->priv->store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN); - /* Setup up the cells */ - text_renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (menu), - text_renderer, TRUE); + /* Setup up the cells */ + text_renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (menu), text_renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (menu), - text_renderer, - "text", - NAME_COLUMN, - NULL); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (menu), + text_renderer, + "text", + NAME_COLUMN, + NULL); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (menu), - separator_func, NULL, - NULL); + gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (menu), separator_func, NULL, NULL); - menu->priv->changed_id = g_signal_connect (menu, "changed", - G_CALLBACK (add_or_remove), - menu->priv->store); + menu->priv->changed_id = g_signal_connect (menu, "changed", G_CALLBACK (add_or_remove), menu->priv->store); - update_menu (menu); + update_menu (menu); } GtkWidget * xed_encodings_combo_box_new (gboolean save_mode) { - return g_object_new (XED_TYPE_ENCODINGS_COMBO_BOX, - "save_mode", save_mode, - NULL); + return g_object_new (XED_TYPE_ENCODINGS_COMBO_BOX, + "save_mode", save_mode, + NULL); } const XedEncoding * xed_encodings_combo_box_get_selected_encoding (XedEncodingsComboBox *menu) { - GtkTreeIter iter; + GtkTreeIter iter; - g_return_val_if_fail (XED_IS_ENCODINGS_COMBO_BOX (menu), NULL); + g_return_val_if_fail (XED_IS_ENCODINGS_COMBO_BOX (menu), NULL); - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (menu), &iter)) - { - const XedEncoding *ret; - GtkTreeModel *model; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (menu), &iter)) + { + const XedEncoding *ret; + GtkTreeModel *model; - model = gtk_combo_box_get_model (GTK_COMBO_BOX (menu)); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (menu)); - gtk_tree_model_get (model, &iter, - ENCODING_COLUMN, &ret, - -1); + gtk_tree_model_get (model, &iter, ENCODING_COLUMN, &ret, -1); - return ret; - } + return ret; + } - return NULL; + return NULL; } /** @@ -437,33 +419,30 @@ xed_encodings_combo_box_get_selected_encoding (XedEncodingsComboBox *menu) **/ void xed_encodings_combo_box_set_selected_encoding (XedEncodingsComboBox *menu, - const XedEncoding *encoding) + const XedEncoding *encoding) { - GtkTreeIter iter; - GtkTreeModel *model; - gboolean b; - g_return_if_fail (XED_IS_ENCODINGS_COMBO_BOX (menu)); - g_return_if_fail (GTK_IS_COMBO_BOX (menu)); + GtkTreeIter iter; + GtkTreeModel *model; + gboolean b; + g_return_if_fail (XED_IS_ENCODINGS_COMBO_BOX (menu)); + g_return_if_fail (GTK_IS_COMBO_BOX (menu)); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (menu)); - b = gtk_tree_model_get_iter_first (model, &iter); + model = gtk_combo_box_get_model (GTK_COMBO_BOX (menu)); + b = gtk_tree_model_get_iter_first (model, &iter); - while (b) - { - const XedEncoding *enc; + while (b) + { + const XedEncoding *enc; - gtk_tree_model_get (model, &iter, - ENCODING_COLUMN, &enc, - -1); + gtk_tree_model_get (model, &iter, ENCODING_COLUMN, &enc, -1); - if (enc == encoding) - { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (menu), - &iter); + if (enc == encoding) + { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (menu), &iter); - return; - } + return; + } - b = gtk_tree_model_iter_next (model, &iter); - } + b = gtk_tree_model_iter_next (model, &iter); + } }