AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-02 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

inspector: Sort themes in the various theme combos

Browse Source 
It is nicer if the themes show up in a predictable order,
so sort them alphabetically.
This commit is contained in:
Matthias Clasen 2016-01-07 19:49:17 -05:00
parent ec02f055ed
commit a45b1d1e3c
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/inspector/visual.c
View File

@ -240,6 +240,7 @@ init_theme (GtkInspectorVisual *vis)
GHashTable *t; GHashTable *t;
GHashTableIter iter; GHashTableIter iter;
gchar *theme, *path; gchar *theme, *path;
GList *list, *l;
t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
/* Builtin themes */ /* Builtin themes */
@ -260,9 +261,18 @@ init_theme (GtkInspectorVisual *vis)
fill_gtk (path, t); fill_gtk (path, t);
g_free (path); g_free (path);
list = NULL;
g_hash_table_iter_init (&iter, t); g_hash_table_iter_init (&iter, t);
while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL)) while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL))
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->theme_combo), theme, theme); list = g_list_insert_sorted (list, theme, (GCompareFunc)strcmp);
for (l = list; l; l = l->next)
{
theme = l->data;
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->theme_combo), theme, theme);
}
g_list_free (list);
g_hash_table_destroy (t); g_hash_table_destroy (t);
g_object_bind_property (gtk_settings_get_default (), "gtk-theme-name", g_object_bind_property (gtk_settings_get_default (), "gtk-theme-name",
@ -322,6 +332,7 @@ init_icons (GtkInspectorVisual *vis)
GHashTable *t; GHashTable *t;
GHashTableIter iter; GHashTableIter iter;
gchar *theme, *path; gchar *theme, *path;
GList *list, *l;
t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@ -333,12 +344,19 @@ init_icons (GtkInspectorVisual *vis)
fill_icons (path, t); fill_icons (path, t);
g_free (path); g_free (path);
list = NULL;
g_hash_table_iter_init (&iter, t); g_hash_table_iter_init (&iter, t);
while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL)) while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL))
list = g_list_insert_sorted (list, theme, (GCompareFunc)strcmp);
for (l = list; l; l = l->next)
{ {
theme = l->data;
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->icon_combo), theme, theme); gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->icon_combo), theme, theme);
} }
g_hash_table_destroy (t); g_hash_table_destroy (t);
g_list_free (list);
g_object_bind_property (gtk_settings_get_default (), "gtk-icon-theme-name", g_object_bind_property (gtk_settings_get_default (), "gtk-icon-theme-name",
vis->priv->icon_combo, "active-id", vis->priv->icon_combo, "active-id",
@ -374,6 +392,7 @@ init_cursors (GtkInspectorVisual *vis)
GHashTable *t; GHashTable *t;
GHashTableIter iter; GHashTableIter iter;
gchar *theme, *path; gchar *theme, *path;
GList *list, *l;
t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@ -385,12 +404,19 @@ init_cursors (GtkInspectorVisual *vis)
fill_cursors (path, t); fill_cursors (path, t);
g_free (path); g_free (path);
list = NULL;
g_hash_table_iter_init (&iter, t); g_hash_table_iter_init (&iter, t);
while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL)) while (g_hash_table_iter_next (&iter, (gpointer *)&theme, NULL))
list = g_list_insert_sorted (list, theme, (GCompareFunc)strcmp);
for (l = list; l; l = l->next)
{ {
theme = l->data;
gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->cursor_combo), theme, theme); gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (vis->priv->cursor_combo), theme, theme);
} }
g_hash_table_destroy (t); g_hash_table_destroy (t);
g_list_free (list);
g_object_bind_property (gtk_settings_get_default (), "gtk-cursor-theme-name", g_object_bind_property (gtk_settings_get_default (), "gtk-cursor-theme-name",
vis->priv->cursor_combo, "active-id", vis->priv->cursor_combo, "active-id",