Wip: new region panel

Still missing:
- restart session notification
- login screen mode

panels/region/Makefile.am

@@ -18,14 +18,14 @@ libregion_la_SOURCES =	\
 	$(BUILT_SOURCES) \
 	cc-region-panel.c \
 	cc-region-panel.h \
-	gnome-region-panel-formats.c \
-	gnome-region-panel-formats.h \
-	gnome-region-panel-lang.c \
-	gnome-region-panel-lang.h \
-	gnome-region-panel-system.c \
-	gnome-region-panel-system.h \
-	gnome-region-panel-input.c \
-	gnome-region-panel-input.h \
+	cc-format-chooser.c \
+	cc-format-chooser.h \
+	cc-input-options.c \
+	cc-input-options.h \
+	cc-input-chooser.c \
+	cc-input-chooser.h \
+	cc-ibus-utils.c	\
+	cc-ibus-utils.h \
 	$(NULL)
 
 libregion_la_LIBADD = $(PANEL_LIBS) $(REGION_PANEL_LIBS) $(builddir)/../common/liblanguage.la

panels/region/cc-format-chooser.c

+/*
+ * Copyright (C) 2013 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 2 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
+ */
+
+#define _GNU_SOURCE
+#include <config.h>
+#include "cc-format-chooser.h"
+
+#include <locale.h>
+#include <langinfo.h>
+#include <string.h>
+#include <glib/gi18n.h>
+
+#include "egg-list-box/egg-list-box.h"
+
+#include "cc-common-language.h"
+
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+#include <libgnome-desktop/gnome-languages.h>
+
+
+typedef struct {
+        GtkWidget *dialog;
+        GtkWidget *no_results;
+        GtkWidget *more_item;
+        GtkWidget *filter_entry;
+        GtkWidget *list;
+        GtkWidget *scrolledwindow;
+        GtkWidget *full_date;
+        GtkWidget *medium_date;
+        GtkWidget *short_date;
+        GtkWidget *time;
+        GtkWidget *number;
+        GtkWidget *measurement;
+        GtkWidget *paper;
+        gboolean adding;
+        gboolean showing_extra;
+        gchar *region;
+} CcFormatChooserPrivate;
+
+#define GET_PRIVATE(chooser) ((CcFormatChooserPrivate *) g_object_get_data (G_OBJECT (chooser), "private"))
+
+static void
+display_date (GtkWidget *label, GDateTime *dt, const gchar *format)
+{
+        gchar *s;
+        s = g_date_time_format (dt, format);
+        s = g_strstrip (s);
+        gtk_label_set_text (GTK_LABEL (label), s);
+        g_free (s);
+}
+
+static void
+update_format_examples (GtkDialog *chooser)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+        gchar *locale;
+        GDateTime *dt;
+        gchar *s;
+        const gchar *fmt;
+        GtkPaperSize *paper;
+
+        locale = g_strdup (setlocale (LC_TIME, NULL));
+        setlocale (LC_TIME, priv->region);
+
+        dt = g_date_time_new_now_local ();
+        display_date (priv->full_date, dt, "%A %e %B %Y");
+        display_date (priv->medium_date, dt, "%e %b %Y");
+        display_date (priv->short_date, dt, "%x");
+        display_date (priv->time, dt, "%X");
+
+        setlocale (LC_TIME, locale);
+        g_free (locale);
+
+        locale = g_strdup (setlocale (LC_NUMERIC, NULL));
+        setlocale (LC_NUMERIC, priv->region);
+
+        s = g_strdup_printf ("%'.2f", 123456789.00);
+        gtk_label_set_text (GTK_LABEL (priv->number), s);
+        g_free (s);
+
+        setlocale (LC_NUMERIC, locale);
+        g_free (locale);
+
+#if 0
+        locale = g_strdup (setlocale (LC_MONETARY, NULL));
+        setlocale (LC_MONETARY, priv->region);
+
+        num_info = localeconv ();
+        if (num_info != NULL) {
+                gtk_label_set_text (GTK_LABEL (priv->currency), num_info->currency_symbol);
+        }
+
+        setlocale (LC_MONETARY, locale);
+        g_free (locale);
+#endif
+
+#ifdef LC_MEASUREMENT
+        locale = g_strdup (setlocale (LC_MEASUREMENT, NULL));
+        setlocale (LC_MEASUREMENT, priv->region);
+
+        fmt = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT);
+        if (fmt && *fmt == 2)
+                gtk_label_set_text (GTK_LABEL (priv->measurement), _("Imperial"));
+        else
+                gtk_label_set_text (GTK_LABEL (priv->measurement), _("Metric"));
+
+        setlocale (LC_MEASUREMENT, locale);
+        g_free (locale);
+#endif
+
+#ifdef LC_PAPER
+        locale = g_strdup (setlocale (LC_PAPER, NULL));
+        setlocale (LC_PAPER, priv->region);
+
+        paper = gtk_paper_size_new (gtk_paper_size_get_default ());
+        gtk_label_set_text (GTK_LABEL (priv->paper), gtk_paper_size_get_display_name (paper));
+        gtk_paper_size_free (paper);
+
+        setlocale (LC_PAPER, locale);
+        g_free (locale);
+#endif
+}
+
+static void
+set_locale_id (GtkDialog   *chooser,
+               const gchar *locale_id)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+        GList *children, *l;
+
+        children = gtk_container_get_children (GTK_CONTAINER (priv->list));
+        for (l = children; l; l = l->next) {
+                GtkWidget *row = l->data;
+                GtkWidget *check = g_object_get_data (G_OBJECT (row), "check");
+                const gchar *region = g_object_get_data (G_OBJECT (row), "locale-id");
+                if (check == NULL || region == NULL)
+                        continue;
+
+                if (strcmp (locale_id, region) == 0) {
+                        gboolean is_extra;
+
+                        /* mark as selected */
+                        gtk_image_set_from_icon_name (GTK_IMAGE (check), "object-select-symbolic", GTK_ICON_SIZE_MENU);
+
+                        /* make sure this row is shown */
+                        is_extra = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (row), "is-extra"));
+                        if (!priv->showing_extra && is_extra) {
+                                g_object_set_data (G_OBJECT (row), "is-extra", GINT_TO_POINTER (FALSE));
+                                egg_list_box_refilter (EGG_LIST_BOX (priv->list));
+                        }
+
+                } else {
+                        /* mark as unselected */
+                        gtk_image_clear (GTK_IMAGE (check));
+                        g_object_set (check, "icon-size", GTK_ICON_SIZE_MENU, NULL);
+                }
+        }
+        g_list_free (children);
+
+        g_free (priv->region);
+        priv->region = g_strdup (locale_id);
+
+        update_format_examples (chooser);
+}
+
+static gint
+sort_regions (gconstpointer a,
+              gconstpointer b,
+              gpointer      data)
+{
+        const gchar *la;
+        const gchar *lb;
+        gboolean iea;
+        gboolean ieb;
+
+        if (g_object_get_data (G_OBJECT (a), "locale-id") == NULL) {
+                return 1;
+        }
+        if (g_object_get_data (G_OBJECT (b), "locale-id") == NULL) {
+                return -1;
+        }
+
+        la = g_object_get_data (G_OBJECT (a), "locale-name");
+        lb = g_object_get_data (G_OBJECT (b), "locale-name");
+
+        iea = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (a), "is-extra"));
+        ieb = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (b), "is-extra"));
+
+        if (iea != ieb) {
+                return ieb - iea;
+        } else {
+                return strcmp (la, lb);
+        }
+}
+
+static GtkWidget *
+padded_label_new (char *text, gboolean narrow)
+{
+        GtkWidget *widget;
+
+        widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+        gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+        gtk_widget_set_margin_top (widget, 10);
+        gtk_widget_set_margin_bottom (widget, 10);
+        gtk_widget_set_margin_left (widget, narrow ? 10 : 80);
+        gtk_widget_set_margin_right (widget, narrow ? 10 : 80);
+        gtk_box_pack_start (GTK_BOX (widget), gtk_label_new (text), FALSE, FALSE, 0);
+
+        return widget;
+}
+
+static GtkWidget *
+region_widget_new (const gchar *locale_id,
+                   gboolean     is_extra)
+{
+        gchar *locale_name;
+        GtkWidget *widget;
+        GtkWidget *check;
+
+        locale_name = gnome_get_region_from_name (locale_id, locale_id);
+
+        widget = padded_label_new (locale_name, is_extra);
+
+        check = gtk_image_new ();
+        g_object_set (check, "icon-size", GTK_ICON_SIZE_MENU, NULL);
+        gtk_box_pack_start (GTK_BOX (widget), check, FALSE, FALSE, 0);
+
+        g_object_set_data (G_OBJECT (widget), "check", check);
+        g_object_set_data_full (G_OBJECT (widget), "locale-id", g_strdup (locale_id), g_free);
+        g_object_set_data_full (G_OBJECT (widget), "locale-name", g_strdup (locale_name), g_free);
+        g_object_set_data (G_OBJECT (widget), "is-extra", GUINT_TO_POINTER (is_extra));
+
+        g_free (locale_name);
+
+        return widget;
+}
+
+static GtkWidget *
+more_widget_new (void)
+{
+        GtkWidget *widget;
+
+        widget = padded_label_new ("…", FALSE);
+        gtk_widget_set_tooltip_text (widget, _("More…"));
+        return widget;
+}
+
+static GtkWidget *
+no_results_widget_new (void)
+{
+        GtkWidget *widget;
+
+        widget = padded_label_new (_("No regions found"), TRUE);
+        gtk_widget_set_sensitive (widget, FALSE);
+        return widget;
+}
+
+static void
+add_regions (GtkDialog   *chooser,
+             gchar      **locale_ids,
+             GHashTable  *initial)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+
+        priv->adding = TRUE;
+
+        while (*locale_ids) {
+                gchar *locale_id;
+                gboolean is_initial;
+                GtkWidget *widget;
+
+                locale_id = *locale_ids;
+                locale_ids ++;
+
+                if (!cc_common_language_has_font (locale_id))
+                        continue;
+
+                is_initial = (g_hash_table_lookup (initial, locale_id) != NULL);
+                widget = region_widget_new (locale_id, !is_initial);
+                gtk_container_add (GTK_CONTAINER (priv->list), widget);
+        }
+
+        gtk_container_add (GTK_CONTAINER (priv->list), priv->more_item);
+        gtk_container_add (GTK_CONTAINER (priv->list), priv->no_results);
+
+        gtk_widget_show_all (priv->list);
+
+        priv->adding = FALSE;
+}
+
+static void
+add_all_regions (GtkDialog *chooser)
+{
+        gchar **locale_ids;
+        GHashTable *initial;
+
+        locale_ids = gnome_get_all_language_names ();
+        initial = cc_common_language_get_initial_languages ();
+        add_regions (chooser, locale_ids, initial);
+}
+
+static gboolean
+region_visible (GtkWidget *child,
+                gpointer   user_data)
+{
+        GtkDialog *chooser = user_data;
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+        gchar *locale_name;
+        const gchar *filter_contents;
+        gboolean is_extra;
+
+        if (child == priv->more_item)
+                return !priv->showing_extra;
+
+        /* We hide this in the after-refilter handler below. */
+        if (child == priv->no_results)
+                return TRUE;
+
+        is_extra = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (child), "is-extra"));
+        locale_name = g_object_get_data (G_OBJECT (child), "locale-name");
+
+        filter_contents = gtk_entry_get_text (GTK_ENTRY (priv->filter_entry));
+        if (*filter_contents && strcasestr (locale_name, filter_contents) == NULL)
+        return FALSE;
+
+        if (!priv->showing_extra && is_extra)
+                return FALSE;
+
+        return TRUE;
+}
+
+static void
+show_more (GtkDialog *chooser)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+        GtkWidget *widget;
+        gint width, height;
+
+        gtk_window_get_size (GTK_WINDOW (chooser), &width, &height);
+        gtk_widget_set_size_request (GTK_WIDGET (chooser), width, height);
+        gtk_window_set_resizable (GTK_WINDOW (chooser), TRUE);
+
+        widget = priv->scrolledwindow;
+        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
+                                        GTK_POLICY_NEVER,
+                                        GTK_POLICY_AUTOMATIC);
+
+        gtk_widget_show (priv->filter_entry);
+        gtk_widget_grab_focus (priv->filter_entry);
+
+        priv->showing_extra = TRUE;
+
+        egg_list_box_refilter (EGG_LIST_BOX (priv->list));
+}
+
+static void
+child_activated (EggListBox  *box,
+                 GtkWidget   *child,
+                 GtkDialog   *chooser)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+        gchar *new_locale_id;
+
+        if (priv->adding)
+                return;
+
+        if (child == NULL)
+                return;
+        else if (child == priv->no_results)
+                return;
+        else if (child == priv->more_item)
+                show_more (chooser);
+        else {
+                new_locale_id = g_object_get_data (G_OBJECT (child), "locale-id");
+                set_locale_id (chooser, new_locale_id);
+        }
+}
+
+typedef struct {
+        gint count;
+        GtkWidget *ignore;
+} CountChildrenData;
+
+static void
+count_visible_children (GtkWidget *widget,
+                        gpointer   user_data)
+{
+        CountChildrenData *data = user_data;
+        if (widget!= data->ignore &&
+            gtk_widget_get_child_visible (widget) &&
+            gtk_widget_get_visible (widget))
+                data->count++;
+}
+
+static void
+end_refilter (EggListBox *list_box,
+              gpointer    user_data)
+{
+        GtkDialog *chooser = user_data;
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+        CountChildrenData data = { 0 };
+
+        data.ignore = priv->no_results;
+        gtk_container_foreach (GTK_CONTAINER (list_box),
+                               count_visible_children, &data);
+
+        gtk_widget_set_visible (priv->no_results, (data.count == 0));
+}
+
+static void
+cc_format_chooser_private_free (gpointer data)
+{
+        g_free (data);
+}
+
+#define WID(name) ((GtkWidget *) gtk_builder_get_object (builder, name))
+
+GtkWidget *
+cc_format_chooser_new (GtkWidget *parent)
+{
+        GtkBuilder *builder;
+        GtkWidget *chooser;
+        CcFormatChooserPrivate *priv;
+        GError *error = NULL;
+
+        builder = gtk_builder_new ();
+        gtk_builder_add_from_resource (builder, "/org/gnome/control-center/region/format-chooser.ui", &error);
+        if (error) {
+                g_warning ("failed to load format chooser: %s", error->message);
+                g_error_free (error);
+                return NULL;
+        }
+
+        chooser = WID ("dialog");
+        priv = g_new0 (CcFormatChooserPrivate, 1);
+        g_object_set_data_full (G_OBJECT (chooser), "private", priv, cc_format_chooser_private_free);
+
+        priv->filter_entry = WID ("region-filter-entry");
+        priv->list = WID ("region-list");
+        priv->scrolledwindow = WID ("region-scrolledwindow");
+        priv->more_item = more_widget_new ();
+        priv->no_results = no_results_widget_new ();
+
+        priv->full_date = WID ("full-date-format");
+        priv->medium_date = WID ("medium-date-format");
+        priv->short_date = WID ("short-date-format");
+        priv->time = WID ("time-format");
+        priv->number = WID ("number-format");
+        priv->measurement = WID ("measurement-format");
+        priv->paper = WID ("paper-format");
+
+        egg_list_box_set_adjustment (EGG_LIST_BOX (priv->list),
+                                     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scrolledwindow)));
+
+        egg_list_box_set_sort_func (EGG_LIST_BOX (priv->list),
+                                    sort_regions, chooser, NULL);
+        egg_list_box_set_filter_func (EGG_LIST_BOX (priv->list),
+                                      region_visible, chooser, NULL);
+        egg_list_box_set_selection_mode (EGG_LIST_BOX (priv->list),
+                                         GTK_SELECTION_NONE);
+
+        add_all_regions (GTK_DIALOG (chooser));
+
+        g_signal_connect_swapped (priv->filter_entry, "changed",
+                                  G_CALLBACK (egg_list_box_refilter),
+                                  priv->list);
+
+        g_signal_connect (priv->list, "child-activated",
+                          G_CALLBACK (child_activated), chooser);
+
+        g_signal_connect_after (priv->list, "refilter",
+                                G_CALLBACK (end_refilter), chooser);
+
+        egg_list_box_refilter (EGG_LIST_BOX (priv->list));
+
+        gtk_window_set_transient_for (GTK_WINDOW (chooser), GTK_WINDOW (parent));
+
+        return chooser;
+}
+
+void
+cc_format_chooser_clear_filter (GtkWidget *chooser)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+
+        gtk_entry_set_text (GTK_ENTRY (priv->filter_entry), "");
+}
+
+const gchar *
+cc_format_chooser_get_region (GtkWidget *chooser)
+{
+        CcFormatChooserPrivate *priv = GET_PRIVATE (chooser);
+
+        return priv->region;
+}
+
+void
+cc_format_chooser_set_region (GtkWidget   *chooser,
+                              const gchar *region)
+{
+        set_locale_id (GTK_DIALOG (chooser), region);
+}

panels/region/cc-format-chooser.h

+/*
+ * Copyright (C) 2013 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 2 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
+ */
+
+#ifndef __CC_FORMAT_CHOOSER_H__
+#define __CC_FORMAT_CHOOSER_H__
+
+#include <gtk/gtk.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+GtkWidget   *cc_format_chooser_new          (GtkWidget   *parent);
+void         cc_format_chooser_clear_filter (GtkWidget   *chooser);
+const gchar *cc_format_chooser_get_region   (GtkWidget   *chooser);
+void         cc_format_chooser_set_region   (GtkWidget   *chooser,
+                                             const gchar *region);
+
+G_END_DECLS
+
+#endif /* __CC_FORMAT_CHOOSER_H__ */

panels/region/cc-ibus-utils.c

+/*
+ * Copyright (C) 2013 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 2 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.
+ */
+
+#include <config.h>
+
+#ifdef HAVE_IBUS
+#include "cc-ibus-utils.h"
+
+gchar *
+engine_get_display_name (IBusEngineDesc *engine_desc)