[gnome-control-center] user-accounts: Move more of the treeview setup to common/
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: Move more of the treeview setup to common/
- Date: Tue, 25 Jan 2011 17:09:19 +0000 (UTC)
commit f7f1b4c073784d26c1f15ed1737fe7afd2bab863
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jan 25 17:07:08 2011 +0000
user-accounts: Move more of the treeview setup to common/
Make more of the code common one, so we can re-use it for
the region panel. Show the user's current locale first, as well
as the list of languages used by other users, followed by a separator.
panels/common/cc-common-language.c | 271 +++++++++++------------------
panels/common/cc-common-language.h | 36 ++--
panels/user-accounts/um-language-dialog.c | 113 ++++++++-----
3 files changed, 189 insertions(+), 231 deletions(-)
---
diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
index 7c9308a..d906cea 100644
--- a/panels/common/cc-common-language.c
+++ b/panels/common/cc-common-language.c
@@ -34,51 +34,7 @@
#include "gdm-languages.h"
-#if 0
-struct _UmLanguageDialog {
- GtkWidget *dialog;
- GtkWidget *user_icon;
- GtkWidget *user_name;
- GtkWidget *dialog_combo;
- GtkListStore *dialog_store;
-
- GtkWidget *chooser;
- GtkWidget *chooser_list;
- GtkListStore *chooser_store;
-
- char *language;
-// UmUser *user;
-
- gboolean force_setting;
-};
-#endif
-
-enum {
- LOCALE_COL,
- DISPLAY_LOCALE_COL,
- NUM_COLS
-};
-#if 0
-gchar *
-um_language_chooser_get_language (GtkWidget *chooser)
-{
- GtkTreeView *tv;
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- gchar *lang;
-
- tv = (GtkTreeView *) g_object_get_data (G_OBJECT (chooser), "list");
- selection = gtk_tree_view_get_selection (tv);
- if (gtk_tree_selection_get_selected (selection, &model, &iter))
- gtk_tree_model_get (model, &iter, LOCALE_COL, &lang, -1);
- else
- lang = NULL;
-
- return lang;
-}
-#endif
-gint
+static gint
cc_common_language_sort_languages (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
@@ -86,10 +42,38 @@ cc_common_language_sort_languages (GtkTreeModel *model,
{
char *ca, *cb;
char *la, *lb;
+ gboolean sa, ula;
+ gboolean sb, ulb;
gint result;
- gtk_tree_model_get (model, a, LOCALE_COL, &ca, DISPLAY_LOCALE_COL, &la, -1);
- gtk_tree_model_get (model, b, LOCALE_COL, &cb, DISPLAY_LOCALE_COL, &lb, -1);
+ gtk_tree_model_get (model, a,
+ LOCALE_COL, &ca,
+ DISPLAY_LOCALE_COL, &la,
+ SEPARATOR_COL, &sa,
+ USER_LANGUAGE, &ula,
+ -1);
+ gtk_tree_model_get (model, b,
+ LOCALE_COL, &cb,
+ DISPLAY_LOCALE_COL, &lb,
+ SEPARATOR_COL, &sb,
+ USER_LANGUAGE, &ulb,
+ -1);
+
+ /* Sort before and after separator first */
+ if (sa && sb)
+ return 0;
+ if (sa)
+ return ulb ? 1 : -1;
+ if (sb)
+ return ula ? -1 : 1;
+
+ /* Sort user-languages first */
+ if (ula != ulb) {
+ if (ula)
+ return -1;
+ else
+ return 1;
+ }
if (!ca)
result = 1;
@@ -139,17 +123,6 @@ cc_common_language_get_iter_for_language (GtkTreeModel *model,
return FALSE;
}
-#if 0
-static void
-row_activated (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- GtkWidget *chooser)
-{
- gtk_dialog_response (GTK_DIALOG (chooser), GTK_RESPONSE_OK);
-}
-#endif
-
gboolean
cc_common_language_has_font (const gchar *locale)
{
@@ -209,7 +182,8 @@ cc_common_language_has_font (const gchar *locale)
}
void
-cc_common_language_add_available_languages (GtkListStore *store)
+cc_common_language_add_available_languages (GtkListStore *store,
+ GHashTable *user_langs)
{
char **languages;
int i;
@@ -217,15 +191,20 @@ cc_common_language_add_available_languages (GtkListStore *store)
char *language;
GtkTreeIter iter;
- gtk_list_store_clear (store);
-
languages = gdm_get_all_language_names ();
for (i = 0; languages[i] != NULL; i++) {
- if (!cc_common_language_has_font (languages[i]))
+ name = gdm_normalize_language_name (languages[i]);
+ if (g_hash_table_lookup (user_langs, name) != NULL) {
+ g_free (name);
+ continue;
+ }
+
+ if (!cc_common_language_has_font (languages[i])) {
+ g_free (name);
continue;
+ }
- name = gdm_normalize_language_name (languages[i]);
language = gdm_get_language_from_name (name, NULL);
gtk_list_store_append (store, &iter);
@@ -238,74 +217,6 @@ cc_common_language_add_available_languages (GtkListStore *store)
g_strfreev (languages);
}
-#if 0
-void
-um_add_user_languages (GtkTreeModel *model)
-{
-#if 0
- GHashTable *seen;
- GSList *users, *l;
- UmUser *user;
- const char *lang;
- char *name;
- char *language;
- GtkTreeIter iter;
- UmUserManager *manager;
- GtkListStore *store = GTK_LIST_STORE (model);
-
- gtk_list_store_clear (store);
-
- seen = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
- manager = um_user_manager_ref_default ();
- users = um_user_manager_list_users (manager);
- g_object_unref (manager);
-
- for (l = users; l; l = l->next) {
- user = l->data;
- lang = um_user_get_language (user);
- if (!lang || !cc_common_language_has_font (lang)) {
- continue;
- }
-
- name = gdm_normalize_language_name (lang);
-
- if (g_hash_table_lookup (seen, name)) {
- g_free (name);
- continue;
- }
-
- g_hash_table_insert (seen, name, GINT_TO_POINTER (TRUE));
-
- language = gdm_get_language_from_name (name, NULL);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
-
- g_free (language);
- }
-
- g_slist_free (users);
-
- /* Make sure the current locale is present */
- name = um_get_current_language ();
-
- if (!g_hash_table_lookup (seen, name)) {
- language = gdm_get_language_from_name (name, NULL);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
- g_free (language);
- }
-
- g_free (name);
-
- g_hash_table_destroy (seen);
-
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
-#endif
-}
-#endif
-
gchar *
cc_common_language_get_current_language (void)
{
@@ -321,58 +232,80 @@ cc_common_language_get_current_language (void)
return language;
}
-#if 0
-GtkWidget *
-um_language_chooser_new (void)
+static void
+languages_foreach_cb (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
- GtkBuilder *builder;
- const char *filename;
- GError *error = NULL;
- GtkWidget *chooser;
- GtkWidget *list;
- GtkWidget *button;
- GtkTreeViewColumn *column;
- GtkCellRenderer *cell;
- GtkListStore *store;
-
- builder = gtk_builder_new ();
- filename = UIDIR "/language-chooser.ui";
- if (!g_file_test (filename, G_FILE_TEST_EXISTS))
- filename = "data/language-chooser.ui";
- if (!gtk_builder_add_from_file (builder, filename, &error)) {
- g_warning ("failed to load language chooser: %s", error->message);
- g_error_free (error);
- return NULL;
- }
+ GtkListStore *store = (GtkListStore *) user_data;
+ const char *locale = (const char *) key;
+ const char *display_locale = (const char *) value;
+ GtkTreeIter iter;
+
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ LOCALE_COL, locale,
+ DISPLAY_LOCALE_COL, display_locale,
+ SEPARATOR_COL, FALSE,
+ USER_LANGUAGE, TRUE,
+ -1);
+
+ g_message ("adding '%s' (%s) to the store", display_locale, locale);
+}
- chooser = (GtkWidget *) gtk_builder_get_object (builder, "dialog");
+static gboolean
+separator_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ gboolean is_sep;
- list = (GtkWidget *) gtk_builder_get_object (builder, "language-list");
- g_object_set_data (G_OBJECT (chooser), "list", list);
- g_signal_connect (list, "row-activated",
- G_CALLBACK (row_activated), chooser);
+ gtk_tree_model_get (model, iter,
+ SEPARATOR_COL, &is_sep,
+ -1);
- button = (GtkWidget *) gtk_builder_get_object (builder, "cancel-button");
- button = (GtkWidget *) gtk_builder_get_object (builder, "ok-button");
- gtk_widget_grab_default (button);
+ return is_sep;
+}
+
+void
+cc_common_language_setup_list (GtkWidget *treeview,
+ GHashTable *initial)
+{
+ GtkCellRenderer *cell;
+ GtkTreeViewColumn *column;
+ GtkListStore *store;
cell = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (NULL, cell, "text", DISPLAY_LOCALE_COL, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
- store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+ store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
- sort_languages, NULL, NULL);
+ cc_common_language_sort_languages, NULL, NULL);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
GTK_SORT_ASCENDING);
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (treeview),
+ separator_func,
+ NULL, NULL);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
- gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (store));
- add_available_languages (store);
+ /* Add languages from the initial hashtable */
+ g_hash_table_foreach (initial, (GHFunc) languages_foreach_cb, store);
- g_object_unref (builder);
+ /* Add separator if we had any languages added */
+ if (initial != NULL &&
+ g_hash_table_size (initial) > 0) {
+ GtkTreeIter iter;
- return chooser;
+ gtk_list_store_append (GTK_LIST_STORE (store), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (store), &iter,
+ LOCALE_COL, NULL,
+ DISPLAY_LOCALE_COL, "Don't show",
+ SEPARATOR_COL, TRUE,
+ USER_LANGUAGE, FALSE,
+ -1);
+ }
}
-#endif
diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
index 2cccf87..09b6043 100644
--- a/panels/common/cc-common-language.h
+++ b/panels/common/cc-common-language.h
@@ -26,24 +26,24 @@
G_BEGIN_DECLS
-#if 0
-void um_add_user_languages (GtkTreeModel *model);
-gchar *um_get_current_language (void);
-
-GtkWidget *um_language_chooser_new (void);
-gchar *um_language_chooser_get_language (GtkWidget *chooser);
-#endif
-
-gint cc_common_language_sort_languages (GtkTreeModel *model,
- GtkTreeIter *a,
- GtkTreeIter *b,
- gpointer data);
-gboolean cc_common_language_get_iter_for_language (GtkTreeModel *model,
- const gchar *lang,
- GtkTreeIter *iter);
-void cc_common_language_add_available_languages (GtkListStore *store);
-gboolean cc_common_language_has_font (const gchar *locale);
-gchar *cc_common_language_get_current_language (void);
+enum {
+ LOCALE_COL,
+ DISPLAY_LOCALE_COL,
+ SEPARATOR_COL,
+ USER_LANGUAGE,
+ NUM_COLS
+};
+
+gboolean cc_common_language_get_iter_for_language (GtkTreeModel *model,
+ const gchar *lang,
+ GtkTreeIter *iter);
+void cc_common_language_add_available_languages (GtkListStore *store,
+ GHashTable *user_langs);
+gboolean cc_common_language_has_font (const gchar *locale);
+gchar *cc_common_language_get_current_language (void);
+
+void cc_common_language_setup_list (GtkWidget *treeview,
+ GHashTable *initial);
G_END_DECLS
diff --git a/panels/user-accounts/um-language-dialog.c b/panels/user-accounts/um-language-dialog.c
index f1ee69a..c1192aa 100644
--- a/panels/user-accounts/um-language-dialog.c
+++ b/panels/user-accounts/um-language-dialog.c
@@ -53,12 +53,6 @@ struct _UmLanguageDialog {
gboolean force_setting;
};
-enum {
- LOCALE_COL,
- DISPLAY_LOCALE_COL,
- NUM_COLS
-};
-
gchar *
um_language_chooser_get_language (GtkWidget *chooser)
{
@@ -87,28 +81,25 @@ row_activated (GtkTreeView *tree_view,
gtk_dialog_response (GTK_DIALOG (chooser), GTK_RESPONSE_OK);
}
-void
-um_add_user_languages (GtkTreeModel *model)
+static GHashTable *
+new_ht_for_user_languages (void)
{
- GHashTable *seen;
+ GHashTable *ht;
+ UmUserManager *manager;
GSList *users, *l;
UmUser *user;
- const char *lang;
char *name;
- char *language;
- GtkTreeIter iter;
- UmUserManager *manager;
- GtkListStore *store = GTK_LIST_STORE (model);
- gtk_list_store_clear (store);
-
- seen = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
manager = um_user_manager_ref_default ();
users = um_user_manager_list_users (manager);
g_object_unref (manager);
for (l = users; l; l = l->next) {
+ const char *lang;
+ char *language;
+
user = l->data;
lang = um_user_get_language (user);
if (!lang || !cc_common_language_has_font (lang)) {
@@ -116,39 +107,78 @@ um_add_user_languages (GtkTreeModel *model)
}
name = gdm_normalize_language_name (lang);
-
- if (g_hash_table_lookup (seen, name)) {
+ if (g_hash_table_lookup (ht, name) != NULL) {
g_free (name);
continue;
}
- g_hash_table_insert (seen, name, GINT_TO_POINTER (TRUE));
-
language = gdm_get_language_from_name (name, NULL);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
- g_free (language);
+ g_hash_table_insert (ht, name, language);
}
g_slist_free (users);
/* Make sure the current locale is present */
name = cc_common_language_get_current_language ();
-
- if (!g_hash_table_lookup (seen, name)) {
+ if (g_hash_table_lookup (ht, name) == NULL) {
+ char *language;
language = gdm_get_language_from_name (name, NULL);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
- g_free (language);
+ g_hash_table_insert (ht, name, language);
}
+ g_free (name);
+
+ return ht;
+}
+static void
+languages_foreach_cb (gpointer key,
+ gpointer value,
+ gpointer user_data)
+{
+ GtkListStore *store = (GtkListStore *) user_data;
+ const char *locale = (const char *) key;
+ const char *display_locale = (const char *) value;
+ GtkTreeIter iter;
+
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter,
+ LOCALE_COL, locale,
+ DISPLAY_LOCALE_COL, display_locale,
+ -1);
+}
+
+
+void
+um_add_user_languages (GtkTreeModel *model)
+{
+ char *name;
+ GtkTreeIter iter;
+ GtkListStore *store = GTK_LIST_STORE (model);
+ GHashTable *user_langs;
+ const char *display;
+
+ gtk_list_store_clear (store);
+
+ user_langs = new_ht_for_user_languages ();
+
+ /* Add the current locale first */
+ name = cc_common_language_get_current_language ();
+ display = g_hash_table_lookup (user_langs, name);
+
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set (store, &iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, display, -1);
+ g_hash_table_remove (user_langs, name);
g_free (name);
- g_hash_table_destroy (seen);
+ /* The rest of the languages */
+ g_hash_table_foreach (user_langs, (GHFunc) languages_foreach_cb, store);
+ /* And now the "Other..." selection */
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, LOCALE_COL, NULL, DISPLAY_LOCALE_COL, _("Other..."), -1);
+
+ g_hash_table_destroy (user_langs);
}
GtkWidget *
@@ -160,9 +190,8 @@ um_language_chooser_new (void)
GtkWidget *chooser;
GtkWidget *list;
GtkWidget *button;
- GtkTreeViewColumn *column;
- GtkCellRenderer *cell;
- GtkListStore *store;
+ GtkTreeModel *model;
+ GHashTable *user_langs;
builder = gtk_builder_new ();
filename = UIDIR "/language-chooser.ui";
@@ -185,19 +214,15 @@ um_language_chooser_new (void)
button = (GtkWidget *) gtk_builder_get_object (builder, "ok-button");
gtk_widget_grab_default (button);
- cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (NULL, cell, "text", DISPLAY_LOCALE_COL, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
- store = gtk_list_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
- gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
- cc_common_language_sort_languages, NULL, NULL);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
- GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
- GTK_SORT_ASCENDING);
+ /* Add user languages */
+ user_langs = new_ht_for_user_languages ();
+ cc_common_language_setup_list (list, user_langs);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (list));
- gtk_tree_view_set_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (store));
+ /* Add the other languages */
+ cc_common_language_add_available_languages (GTK_LIST_STORE (model), user_langs);
- cc_common_language_add_available_languages (store);
+ g_hash_table_destroy (user_langs);
g_object_unref (builder);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
