applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: Move gdm-languages to common/

Browse source 
Move gdm-languages and some of the helper functions to common/,
so that we can share it with the region panel.
This commit is contained in:
Bastien Nocera 2011-01-24 18:09:00 +00:00
parent e82bb15537
commit 930540ea28
12 changed files with 490 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -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

1
panels/Makefile.am
View file

@ -1,4 +1,5 @@
SUBDIRS= \
common \
background \
screen \
power \

374
panels/common/cc-common-language.c Normal file
View file

@ -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

47
panels/common/cc-common-language.h Normal file
View file

@ -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

0
panels/user-accounts/gdm-languages.c → panels/common/gdm-languages.c
View file

0
panels/user-accounts/gdm-languages.h → panels/common/gdm-languages.h
View file

0
panels/user-accounts/locarchive.h → panels/common/locarchive.h
View file

2
panels/region/Makefile.am
View file

@ -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 \

31
panels/region/gnome-region-panel-lang.c Normal file
View file

@ -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"

30
panels/region/gnome-region-panel-lang.h Normal file
View file

@ -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 */

5
panels/user-accounts/Makefile.am
View file

@ -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 = \

31
panels/user-accounts/um-language-dialog.c
View file

@ -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);