[Xfce4-commits] <thunar:nick/1.8> Use klass for filling enum combo boxes.
Nick Schermer
noreply at xfce.org
Sun Aug 4 21:52:06 CEST 2013
Updating branch refs/heads/nick/1.8
to 80143edb6b5ab64080fa74421fc2ccf060a5b92c (commit)
from 7131fd765af059a0b37beaff2cddb00314870c39 (commit)
commit 80143edb6b5ab64080fa74421fc2ccf060a5b92c
Author: Nick Schermer <nick at xfce.org>
Date: Sun Aug 4 00:28:45 2013 +0200
Use klass for filling enum combo boxes.
thunar/thunar-enum-types.c | 24 ++++++++++++------------
thunar/thunar-preferences-dialog.c | 31 ++++++++++++++-----------------
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/thunar/thunar-enum-types.c b/thunar/thunar-enum-types.c
index 92dcf09..52f1096 100644
--- a/thunar/thunar-enum-types.c
+++ b/thunar/thunar-enum-types.c
@@ -120,14 +120,14 @@ thunar_icon_size_get_type (void)
{
static const GEnumValue values[] =
{
- { THUNAR_ICON_SIZE_SMALLEST, "THUNAR_ICON_SIZE_SMALLEST", "smallest", },
- { THUNAR_ICON_SIZE_SMALLER, "THUNAR_ICON_SIZE_SMALLER", "smaller", },
- { THUNAR_ICON_SIZE_SMALL, "THUNAR_ICON_SIZE_SMALL", "small", },
- { THUNAR_ICON_SIZE_NORMAL, "THUNAR_ICON_SIZE_NORMAL", "normal", },
- { THUNAR_ICON_SIZE_LARGE, "THUNAR_ICON_SIZE_LARGE", "large", },
- { THUNAR_ICON_SIZE_LARGER, "THUNAR_ICON_SIZE_LARGER", "larger", },
- { THUNAR_ICON_SIZE_LARGEST, "THUNAR_ICON_SIZE_LARGEST", "largest", },
- { 0, NULL, NULL, },
+ { THUNAR_ICON_SIZE_SMALLEST, "THUNAR_ICON_SIZE_SMALLEST", N_("Very Small"), },
+ { THUNAR_ICON_SIZE_SMALLER, "THUNAR_ICON_SIZE_SMALLER", N_("Smaller"), },
+ { THUNAR_ICON_SIZE_SMALL, "THUNAR_ICON_SIZE_SMALL", N_("Small"), },
+ { THUNAR_ICON_SIZE_NORMAL, "THUNAR_ICON_SIZE_NORMAL", N_("Normal"), },
+ { THUNAR_ICON_SIZE_LARGE, "THUNAR_ICON_SIZE_LARGE", N_("Large"), },
+ { THUNAR_ICON_SIZE_LARGER, "THUNAR_ICON_SIZE_LARGER", N_("Larger"), },
+ { THUNAR_ICON_SIZE_LARGEST, "THUNAR_ICON_SIZE_LARGEST", N_("Very Large"), },
+ { 0, NULL, NULL, },
};
type = g_enum_register_static (I_("ThunarIconSize"), values);
@@ -200,10 +200,10 @@ thunar_thumbnail_mode_get_type (void)
{
static const GEnumValue values[] =
{
- { THUNAR_THUMBNAIL_MODE_NEVER, "THUNAR_THUMBNAIL_MODE_NEVER", "never", },
- { THUNAR_THUMBNAIL_MODE_ONLY_LOCAL, "THUNAR_THUMBNAIL_MODE_ONLY_LOCAL", "only-local", },
- { THUNAR_THUMBNAIL_MODE_ALWAYS, "THUNAR_THUMBNAIL_MODE_ALWAYS", "always", },
- { 0, NULL, NULL, },
+ { THUNAR_THUMBNAIL_MODE_NEVER, "THUNAR_THUMBNAIL_MODE_NEVER", N_("Never"), },
+ { THUNAR_THUMBNAIL_MODE_ONLY_LOCAL, "THUNAR_THUMBNAIL_MODE_ONLY_LOCAL", N_("Local Files Only"), },
+ { THUNAR_THUMBNAIL_MODE_ALWAYS, "THUNAR_THUMBNAIL_MODE_ALWAYS", N_("Always"), },
+ { 0, NULL, NULL, },
};
type = g_enum_register_static (I_("ThunarThumbnailMode"), values);
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
index 162b902..bdede48 100644
--- a/thunar/thunar-preferences-dialog.c
+++ b/thunar/thunar-preferences-dialog.c
@@ -215,6 +215,8 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
GtkWidget *vbox;
gchar *path;
gchar *date;
+ guint n;
+ GEnumClass *klass;
/* grab a reference on the preferences */
dialog->preferences = thunar_preferences_get ();
@@ -284,9 +286,10 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_widget_show (label);
combo = gtk_combo_box_text_new ();
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Never"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Local Files Only"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Always"));
+ klass = g_type_class_ref (THUNAR_TYPE_THUMBNAIL_MODE);
+ for (n = 0; n < klass->n_values; ++n)
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(klass->values[n].value_nick));
+ g_type_class_unref (klass);
exo_mutual_binding_new_full (G_OBJECT (dialog->preferences), "misc-thumbnail-mode", G_OBJECT (combo), "active",
transform_thumbnail_mode_to_index, transform_thumbnail_index_to_mode, NULL, NULL);
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
@@ -387,13 +390,10 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_widget_show (label);
combo = gtk_combo_box_text_new ();
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Very Small"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Smaller"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Small"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Normal"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Large"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Larger"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Very Large"));
+ klass = g_type_class_ref (THUNAR_TYPE_ICON_SIZE);
+ for (n = 0; n < klass->n_values; ++n)
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(klass->values[n].value_nick));
+ g_type_class_unref (klass);
exo_mutual_binding_new_full (G_OBJECT (dialog->preferences), "shortcuts-icon-size", G_OBJECT (combo), "active",
transform_icon_size_to_index, transform_index_to_icon_size, NULL, NULL);
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
@@ -429,13 +429,10 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
gtk_widget_show (label);
combo = gtk_combo_box_text_new ();
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Very Small"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Smaller"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Small"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Normal"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Large"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Larger"));
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Very Large"));
+ klass = g_type_class_ref (THUNAR_TYPE_ICON_SIZE);
+ for (n = 0; n < klass->n_values; ++n)
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(klass->values[n].value_nick));
+ g_type_class_unref (klass);
exo_mutual_binding_new_full (G_OBJECT (dialog->preferences), "tree-icon-size", G_OBJECT (combo), "active",
transform_icon_size_to_index, transform_index_to_icon_size, NULL, NULL);
gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
More information about the Xfce4-commits
mailing list