[gnome-control-center] user-accounts: Move gdm-languages to common/
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: Move gdm-languages to common/
- Date: Mon, 24 Jan 2011 18:11:01 +0000 (UTC)
commit 930540ea283b46bf4f96ea18fc97ec108c562374
Author: Bastien Nocera <hadess hadess net>
Date: Mon Jan 24 18:09:00 2011 +0000
user-accounts: Move gdm-languages to common/
Move gdm-languages and some of the helper functions to common/,
so that we can share it with the region panel.
configure.ac | 1 +
panels/Makefile.am | 1 +
panels/common/cc-common-language.c | 374 ++++++++++++++++++++++
panels/common/cc-common-language.h | 47 +++
panels/{user-accounts => common}/gdm-languages.c | 0
panels/{user-accounts => common}/gdm-languages.h | 0
panels/{user-accounts => common}/locarchive.h | 0
panels/region/Makefile.am | 2 +
panels/region/gnome-region-panel-lang.c | 31 ++
panels/region/gnome-region-panel-lang.h | 30 ++
panels/user-accounts/Makefile.am | 5 +-
panels/user-accounts/um-language-dialog.c | 31 +--
12 files changed, 490 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6ea8608..395cf3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,6 +331,7 @@ help/Makefile
libgnome-control-center/Makefile
libgnome-control-center/libgnome-control-center.pc
panels/Makefile
+panels/common/Makefile
panels/background/Makefile
panels/background/gnome-background-panel.desktop.in
panels/datetime/Makefile
diff --git a/panels/Makefile.am b/panels/Makefile.am
index 501f5fc..4527efe 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS= \
+ common \
background \
screen \
power \
diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
new file mode 100644
index 0000000..a78c1d7
--- /dev/null
+++ b/panels/common/cc-common-language.c
@@ -0,0 +1,374 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright 2009-2010 Red Hat, Inc,
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by: Matthias Clasen <mclasen redhat com>
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <locale.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <fontconfig/fontconfig.h>
+
+#include "cc-common-language.h"
+
+#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
+cc_common_language_sort_languages (GtkTreeModel *model,
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ gpointer data)
+{
+ char *ca, *cb;
+ char *la, *lb;
+ 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);
+
+ if (!ca)
+ result = 1;
+ else if (!cb)
+ result = -1;
+ else
+ result = strcmp (la, lb);
+
+ g_free (ca);
+ g_free (cb);
+ g_free (la);
+ g_free (lb);
+
+ return result;
+}
+
+#if 0
+gboolean
+um_get_iter_for_language (GtkTreeModel *model,
+ const gchar *lang,
+ GtkTreeIter *iter)
+{
+ char *l;
+ char *name;
+ char *language;
+
+ gtk_tree_model_get_iter_first (model, iter);
+ do {
+ gtk_tree_model_get (model, iter, LOCALE_COL, &l, -1);
+ if (g_strcmp0 (l, lang) == 0) {
+ g_free (l);
+ return TRUE;
+ }
+ g_free (l);
+ } while (gtk_tree_model_iter_next (model, iter));
+
+ name = gdm_normalize_language_name (lang);
+ if (name != NULL) {
+ language = gdm_get_language_from_name (name, NULL);
+
+ gtk_list_store_append (GTK_LIST_STORE (model), iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), iter, LOCALE_COL, name, DISPLAY_LOCALE_COL, language, -1);
+ g_free (name);
+ g_free (language);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+row_activated (GtkTreeView *tree_view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ GtkWidget *chooser)
+{
+ gtk_dialog_response (GTK_DIALOG (chooser), GTK_RESPONSE_OK);
+}
+
+static gboolean
+language_has_font (const gchar *locale)
+{
+ const FcCharSet *charset;
+ FcPattern *pattern;
+ FcObjectSet *object_set;
+ FcFontSet *font_set;
+ gchar *language_code;
+ gboolean is_displayable;
+
+ is_displayable = FALSE;
+ pattern = NULL;
+ object_set = NULL;
+ font_set = NULL;
+
+ if (!gdm_parse_language_name (locale, &language_code, NULL, NULL, NULL))
+ return FALSE;
+
+ charset = FcLangGetCharSet ((FcChar8 *) language_code);
+ if (!charset) {
+ /* fontconfig does not know about this language */
+ is_displayable = TRUE;
+ }
+ else {
+ /* see if any fonts support rendering it */
+ pattern = FcPatternBuild (NULL, FC_LANG, FcTypeString, language_code, NULL);
+
+ if (pattern == NULL)
+ goto done;
+
+ object_set = FcObjectSetCreate ();
+
+ if (object_set == NULL)
+ goto done;
+
+ font_set = FcFontList (NULL, pattern, object_set);
+
+ if (font_set == NULL)
+ goto done;
+
+ is_displayable = (font_set->nfont > 0);
+ }
+
+ done:
+ if (font_set != NULL)
+ FcFontSetDestroy (font_set);
+
+ if (object_set != NULL)
+ FcObjectSetDestroy (object_set);
+
+ if (pattern != NULL)
+ FcPatternDestroy (pattern);
+
+ g_free (language_code);
+
+ return is_displayable;
+}
+
+static void
+add_available_languages (GtkListStore *store)
+{
+ char **languages;
+ int i;
+ char *name;
+ char *language;
+ GtkTreeIter iter;
+
+ gtk_list_store_clear (store);
+
+ languages = gdm_get_all_language_names ();
+
+ for (i = 0; languages[i] != NULL; i++) {
+ if (!language_has_font (languages[i]))
+ continue;
+
+ name = gdm_normalize_language_name (languages[i]);
+ 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 (name);
+ g_free (language);
+ }
+
+ g_strfreev (languages);
+}
+
+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 || !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
+}
+
+gchar *
+um_get_current_language (void)
+{
+ gchar *language;
+ const gchar *locale;
+
+ locale = (const gchar *) setlocale (LC_MESSAGES, NULL);
+ if (locale)
+ language = gdm_normalize_language_name (locale);
+ else
+ language = NULL;
+
+ return language;
+}
+
+GtkWidget *
+um_language_chooser_new (void)
+{
+ 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;
+ }
+
+ chooser = (GtkWidget *) gtk_builder_get_object (builder, "dialog");
+
+ 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);
+
+ button = (GtkWidget *) gtk_builder_get_object (builder, "cancel-button");
+ 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),
+ 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_model (GTK_TREE_VIEW (list), GTK_TREE_MODEL (store));
+
+ add_available_languages (store);
+
+ g_object_unref (builder);
+
+ return chooser;
+}
+
+#endif
diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
new file mode 100644
index 0000000..4351826
--- /dev/null
+++ b/panels/common/cc-common-language.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright 2009-2010 Red Hat, Inc,
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Written by: Matthias Clasen <mclasen redhat com>
+ */
+
+#ifndef __CC_COMMON_LANGUAGE_H__
+#define __CC_COMMON_LANGUAGE_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#if 0
+void um_add_user_languages (GtkTreeModel *model);
+gchar *um_get_current_language (void);
+gboolean um_get_iter_for_language (GtkTreeModel *model,
+ const gchar *lang,
+ GtkTreeIter *iter);
+
+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);
+
+G_END_DECLS
+
+#endif
diff --git a/panels/user-accounts/gdm-languages.c b/panels/common/gdm-languages.c
similarity index 100%
rename from panels/user-accounts/gdm-languages.c
rename to panels/common/gdm-languages.c
diff --git a/panels/user-accounts/gdm-languages.h b/panels/common/gdm-languages.h
similarity index 100%
rename from panels/user-accounts/gdm-languages.h
rename to panels/common/gdm-languages.h
diff --git a/panels/user-accounts/locarchive.h b/panels/common/locarchive.h
similarity index 100%
rename from panels/user-accounts/locarchive.h
rename to panels/common/locarchive.h
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
index 7ca4992..19811c8 100644
--- a/panels/region/Makefile.am
+++ b/panels/region/Makefile.am
@@ -17,6 +17,8 @@ libregion_la_SOURCES = \
region-module.c \
cc-region-panel.c \
cc-region-panel.h \
+ gnome-region-panel-lang.c \
+ gnome-region-panel-lang.h \
gnome-region-panel-xkb.c \
gnome-region-panel-xkbmc.c \
gnome-region-panel-xkblt.c \
diff --git a/panels/region/gnome-region-panel-lang.c b/panels/region/gnome-region-panel-lang.c
new file mode 100644
index 0000000..cd09c9a
--- /dev/null
+++ b/panels/region/gnome-region-panel-lang.c
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2010 Bastien Nocera
+ *
+ * Written by: Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <string.h>
+#include <glib/gi18n.h>
+
+#include "gnome-region-panel-lang.h"
+
+
diff --git a/panels/region/gnome-region-panel-lang.h b/panels/region/gnome-region-panel-lang.h
new file mode 100644
index 0000000..7afe27e
--- /dev/null
+++ b/panels/region/gnome-region-panel-lang.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2010 Bastien Nocera
+ *
+ * Written by: Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GNOME_KEYBOARD_PROPERTY_LANG_H
+#define __GNOME_KEYBOARD_PROPERTY_LANG_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+G_END_DECLS
+#endif /* __GNOME_KEYBOARD_PROPERTY_LANG_H */
diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am
index 398875d..3f01cf0 100644
--- a/panels/user-accounts/Makefile.am
+++ b/panels/user-accounts/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
+ -I$(srcdir)/../common/ \
$(PANEL_CFLAGS) \
$(GNOME_DESKTOP_CFLAGS) \
$(POLKIT_CFLAGS) \
@@ -34,8 +35,6 @@ libuser_accounts_la_CFLAGS = \
$(PANEL_CFLAGS)
libuser_accounts_la_SOURCES = \
- gdm-languages.h \
- gdm-languages.c \
um-account-type.h \
um-account-type.c \
um-user.h \
@@ -84,12 +83,12 @@ libuser_accounts_la_LIBADD = \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(CAPPLET_LIBS) \
+ $(top_builddir)/panels/common/liblanguage.la \
-lcrypt
libuser_accounts_la_LDFLAGS = $(PANEL_LDFLAGS)
EXTRA_DIST = \
- locarchive.h \
fprintd-marshal.list
CLEANFILES = \
diff --git a/panels/user-accounts/um-language-dialog.c b/panels/user-accounts/um-language-dialog.c
index 24fa485..6eee2ee 100644
--- a/panels/user-accounts/um-language-dialog.c
+++ b/panels/user-accounts/um-language-dialog.c
@@ -32,6 +32,7 @@
#include "um-language-dialog.h"
#include "um-user-manager.h"
+#include "cc-common-language.h"
#include "gdm-languages.h"
@@ -77,34 +78,6 @@ um_language_chooser_get_language (GtkWidget *chooser)
return lang;
}
-static gint
-sort_languages (GtkTreeModel *model,
- GtkTreeIter *a,
- GtkTreeIter *b,
- gpointer data)
-{
- char *ca, *cb;
- char *la, *lb;
- 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);
-
- if (!ca)
- result = 1;
- else if (!cb)
- result = -1;
- else
- result = strcmp (la, lb);
-
- g_free (ca);
- g_free (cb);
- g_free (la);
- g_free (lb);
-
- return result;
-}
-
gboolean
um_get_iter_for_language (GtkTreeModel *model,
const gchar *lang,
@@ -353,7 +326,7 @@ um_language_chooser_new (void)
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),
- 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
