GNOME.org
 

[gnome-initial-setup] language: Rebrand gis-language-chooser as cc-language-chooser

commit 58df00b3e42d8c542367642fbbe1cd82c027b0a9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Mar 15 18:27:19 2013 -0400

    language: Rebrand gis-language-chooser as cc-language-chooser
    
    gnome-control-center will be the upstream for this widget, so
    it makes sense to rebrand it.

 gnome-initial-setup/pages/language/Makefile.am     |    2 +-
 ...is-language-chooser.c => cc-language-chooser.c} |   98 ++++++++++----------
 .../pages/language/cc-language-chooser.h           |   66 +++++++++++++
 .../pages/language/gis-language-chooser.h          |   66 -------------
 .../pages/language/gis-language-page.c             |    8 +-
 .../pages/language/gis-language-page.ui            |    2 +-
 ...gis-language-chooser.ui => language-chooser.ui} |    0
 .../pages/language/language.gresource.xml          |    4 +-
 8 files changed, 124 insertions(+), 122 deletions(-)
---
diff --git a/gnome-initial-setup/pages/language/Makefile.am b/gnome-initial-setup/pages/language/Makefile.am
index ed15e7e..3e18392 100644
--- a/gnome-initial-setup/pages/language/Makefile.am
+++ b/gnome-initial-setup/pages/language/Makefile.am
@@ -20,7 +20,7 @@ BUILT_SOURCES += language-resources.c language-resources.h
 libgislanguage_la_SOURCES =                            \
        cc-common-language.c cc-common-language.h       \
        cc-util.c cc-util.h                             \
-       gis-language-chooser.c gis-language-chooser.h   \
+       cc-language-chooser.c cc-language-chooser.h     \
        gis-language-page.c gis-language-page.h         \
        $(BUILT_SOURCES)
 
diff --git a/gnome-initial-setup/pages/language/gis-language-chooser.c 
b/gnome-initial-setup/pages/language/cc-language-chooser.c
similarity index 82%
rename from gnome-initial-setup/pages/language/gis-language-chooser.c
rename to gnome-initial-setup/pages/language/cc-language-chooser.c
index 4d2aa2b..cd65ff8 100644
--- a/gnome-initial-setup/pages/language/gis-language-chooser.c
+++ b/gnome-initial-setup/pages/language/cc-language-chooser.c
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "gis-language-chooser.h"
+#include "cc-language-chooser.h"
 
 #include <locale.h>
 #include <glib/gi18n.h>
@@ -41,9 +41,9 @@
 
 #include <egg-list-box.h>
 
-G_DEFINE_TYPE (GisLanguageChooser, gis_language_chooser, GTK_TYPE_BIN);
+G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, GTK_TYPE_BIN);
 
-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GIS_TYPE_LANGUAGE_CHOOSER, 
GisLanguageChooserPrivate))
+#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_LANGUAGE_CHOOSER, 
CcLanguageChooserPrivate))
 
 enum {
   PROP_0,
@@ -54,7 +54,7 @@ enum {
 
 static GParamSpec *obj_props[PROP_LAST];
 
-struct _GisLanguageChooserPrivate
+struct _CcLanguageChooserPrivate
 {
   GtkWidget *no_results;
   GtkWidget *more_item;
@@ -156,9 +156,9 @@ sync_checkmark (GtkWidget *child,
 }
 
 static void
-sync_all_checkmarks (GisLanguageChooser *chooser)
+sync_all_checkmarks (CcLanguageChooser *chooser)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
 
   gtk_container_foreach (GTK_CONTAINER (priv->language_list),
                          sync_checkmark, priv->language);
@@ -181,11 +181,11 @@ no_results_widget_new (void)
 }
 
 static void
-add_languages (GisLanguageChooser  *chooser,
+add_languages (CcLanguageChooser  *chooser,
                char               **locale_ids,
                GHashTable          *initial)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
 
   while (*locale_ids) {
     const gchar *locale_id;
@@ -216,7 +216,7 @@ add_languages (GisLanguageChooser  *chooser,
 }
 
 static void
-add_all_languages (GisLanguageChooser *chooser)
+add_all_languages (CcLanguageChooser *chooser)
 {
   char **locale_ids = gnome_get_all_locales ();
   GHashTable *initial = cc_common_language_get_initial_languages ();
@@ -244,8 +244,8 @@ static gboolean
 language_visible (GtkWidget *child,
                   gpointer   user_data)
 {
-  GisLanguageChooser *chooser = user_data;
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooser *chooser = user_data;
+  CcLanguageChooserPrivate *priv = chooser->priv;
   gchar *locale_name = NULL;
   gchar *locale_current_name = NULL;
   gchar *locale_untranslated_name = NULL;
@@ -312,9 +312,9 @@ sort_languages (gconstpointer a,
 
 static void
 filter_changed (GtkEntry        *entry,
-                GisLanguageChooser *chooser)
+                CcLanguageChooser *chooser)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
   gchar *filter_contents = NULL;
 
   g_clear_pointer (&priv->filter_words, g_strfreev);
@@ -331,9 +331,9 @@ filter_changed (GtkEntry        *entry,
 }
 
 static void
-show_more (GisLanguageChooser *chooser)
+show_more (CcLanguageChooser *chooser)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
 
   gtk_widget_show (priv->filter_entry);
   gtk_widget_grab_focus (priv->filter_entry);
@@ -344,10 +344,10 @@ show_more (GisLanguageChooser *chooser)
 }
 
 static void
-set_locale_id (GisLanguageChooser *chooser,
+set_locale_id (CcLanguageChooser *chooser,
                const gchar        *new_locale_id)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
 
   if (g_strcmp0 (priv->language, new_locale_id) == 0)
     return;
@@ -363,7 +363,7 @@ set_locale_id (GisLanguageChooser *chooser,
 static void
 child_activated (EggListBox      *box,
                  GtkWidget       *child,
-                 GisLanguageChooser *chooser)
+                 CcLanguageChooser *chooser)
 {
   if (child == NULL)
     return;
@@ -398,8 +398,8 @@ static void
 end_refilter (EggListBox *list_box,
               gpointer    user_data)
 {
-  GisLanguageChooser *chooser = GIS_LANGUAGE_CHOOSER (user_data);
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (user_data);
+  CcLanguageChooserPrivate *priv = chooser->priv;
 
   CountChildrenData data = { 0 };
 
@@ -431,17 +431,17 @@ update_separator_func (GtkWidget **separator,
 #define WID(name) ((GtkWidget *) gtk_builder_get_object (builder, name))
 
 static void
-gis_language_chooser_constructed (GObject *object)
+cc_language_chooser_constructed (GObject *object)
 {
   GtkBuilder *builder;
-  GisLanguageChooser *chooser = GIS_LANGUAGE_CHOOSER (object);
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
+  CcLanguageChooserPrivate *priv = chooser->priv;
   GError *error = NULL;
 
-  G_OBJECT_CLASS (gis_language_chooser_parent_class)->constructed (object);
+  G_OBJECT_CLASS (cc_language_chooser_parent_class)->constructed (object);
 
   builder = gtk_builder_new ();
-  if (gtk_builder_add_from_resource (builder, "/org/gnome/initial-setup/gis-language-chooser.ui", &error) == 
0) {
+  if (gtk_builder_add_from_resource (builder, "/org/gnome/control-center/language-chooser.ui", &error) == 0) 
{
     g_object_unref (builder);
     g_warning ("failed to load language chooser: %s", error->message);
     g_error_free (error);
@@ -488,19 +488,19 @@ gis_language_chooser_constructed (GObject *object)
 }
 
 static void
-gis_language_chooser_get_property (GObject      *object,
+cc_language_chooser_get_property (GObject      *object,
                                    guint         prop_id,
                                    GValue       *value,
                                    GParamSpec   *pspec)
 {
-  GisLanguageChooser *chooser = GIS_LANGUAGE_CHOOSER (object);
+  CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
   switch (prop_id)
     {
     case PROP_LANGUAGE:
-      g_value_set_string (value, gis_language_chooser_get_language (chooser));
+      g_value_set_string (value, cc_language_chooser_get_language (chooser));
       break;
     case PROP_SHOWING_EXTRA:
-      g_value_set_boolean (value, gis_language_chooser_get_showing_extra (chooser));
+      g_value_set_boolean (value, cc_language_chooser_get_showing_extra (chooser));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -509,16 +509,16 @@ gis_language_chooser_get_property (GObject      *object,
 }
 
 static void
-gis_language_chooser_set_property (GObject      *object,
+cc_language_chooser_set_property (GObject      *object,
                                    guint         prop_id,
                                    const GValue *value,
                                    GParamSpec   *pspec)
 {
-  GisLanguageChooser *chooser = GIS_LANGUAGE_CHOOSER (object);
+  CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
   switch (prop_id)
     {
     case PROP_LANGUAGE:
-      gis_language_chooser_set_language (chooser, g_value_get_string (value));
+      cc_language_chooser_set_language (chooser, g_value_get_string (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -527,25 +527,25 @@ gis_language_chooser_set_property (GObject      *object,
 }
 
 static void
-gis_language_chooser_finalize (GObject *object)
+cc_language_chooser_finalize (GObject *object)
 {
-  GisLanguageChooser *chooser = GIS_LANGUAGE_CHOOSER (object);
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooser *chooser = CC_LANGUAGE_CHOOSER (object);
+  CcLanguageChooserPrivate *priv = chooser->priv;
 
   g_strfreev (priv->filter_words);
 }
 
 static void
-gis_language_chooser_class_init (GisLanguageChooserClass *klass)
+cc_language_chooser_class_init (CcLanguageChooserClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  g_type_class_add_private (object_class, sizeof(GisLanguageChooserPrivate));
+  g_type_class_add_private (object_class, sizeof(CcLanguageChooserPrivate));
 
-  object_class->get_property = gis_language_chooser_get_property;
-  object_class->set_property = gis_language_chooser_set_property;
-  object_class->finalize = gis_language_chooser_finalize;
-  object_class->constructed = gis_language_chooser_constructed;
+  object_class->get_property = cc_language_chooser_get_property;
+  object_class->set_property = cc_language_chooser_set_property;
+  object_class->finalize = cc_language_chooser_finalize;
+  object_class->constructed = cc_language_chooser_constructed;
 
   obj_props[PROP_LANGUAGE] =
     g_param_spec_string ("language", "", "", "",
@@ -559,35 +559,35 @@ gis_language_chooser_class_init (GisLanguageChooserClass *klass)
 }
 
 void
-gis_language_chooser_init (GisLanguageChooser *chooser)
+cc_language_chooser_init (CcLanguageChooser *chooser)
 {
   chooser->priv = GET_PRIVATE (chooser);
 }
 
 void
-gis_language_chooser_clear_filter (GisLanguageChooser *chooser)
+cc_language_chooser_clear_filter (CcLanguageChooser *chooser)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
   gtk_entry_set_text (GTK_ENTRY (priv->filter_entry), "");
 }
 
 const gchar *
-gis_language_chooser_get_language (GisLanguageChooser *chooser)
+cc_language_chooser_get_language (CcLanguageChooser *chooser)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
   return priv->language;
 }
 
 void
-gis_language_chooser_set_language (GisLanguageChooser *chooser,
+cc_language_chooser_set_language (CcLanguageChooser *chooser,
                                    const gchar        *language)
 {
   set_locale_id (chooser, language);
 }
 
 gboolean
-gis_language_chooser_get_showing_extra (GisLanguageChooser *chooser)
+cc_language_chooser_get_showing_extra (CcLanguageChooser *chooser)
 {
-  GisLanguageChooserPrivate *priv = chooser->priv;
+  CcLanguageChooserPrivate *priv = chooser->priv;
   return priv->showing_extra;
 }
diff --git a/gnome-initial-setup/pages/language/cc-language-chooser.h 
b/gnome-initial-setup/pages/language/cc-language-chooser.h
new file mode 100644
index 0000000..ff46165
--- /dev/null
+++ b/gnome-initial-setup/pages/language/cc-language-chooser.h
@@ -0,0 +1,66 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2013 Red Hat
+ *
+ * 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:
+ *     Jasper St. Pierre <jstpierre mecheye net>
+ *     Matthias Clasen <mclasen redhat com>
+ */
+
+#ifndef __CC_LANGUAGE_CHOOSER_H__
+#define __CC_LANGUAGE_CHOOSER_H__
+
+#include <gtk/gtk.h>
+#include <glib-object.h>
+
+#define CC_TYPE_LANGUAGE_CHOOSER            (cc_language_chooser_get_type ())
+#define CC_LANGUAGE_CHOOSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CC_TYPE_LANGUAGE_CHOOSER, 
CcLanguageChooser))
+#define CC_LANGUAGE_CHOOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  CC_TYPE_LANGUAGE_CHOOSER, 
CcLanguageChooserClass))
+#define CC_IS_LANGUAGE_CHOOSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CC_TYPE_LANGUAGE_CHOOSER))
+#define CC_IS_LANGUAGE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  CC_TYPE_LANGUAGE_CHOOSER))
+#define CC_LANGUAGE_CHOOSER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  CC_TYPE_LANGUAGE_CHOOSER, 
CcLanguageChooserClass))
+
+G_BEGIN_DECLS
+
+typedef struct _CcLanguageChooser        CcLanguageChooser;
+typedef struct _CcLanguageChooserClass   CcLanguageChooserClass;
+typedef struct _CcLanguageChooserPrivate CcLanguageChooserPrivate;
+
+struct _CcLanguageChooser
+{
+  GtkBin parent;
+
+  CcLanguageChooserPrivate *priv;
+};
+
+struct _CcLanguageChooserClass
+{
+  GtkBinClass parent_class;
+};
+
+GType cc_language_chooser_get_type (void);
+
+void          cc_language_chooser_clear_filter (CcLanguageChooser *chooser);
+const gchar * cc_language_chooser_get_language (CcLanguageChooser *chooser);
+void          cc_language_chooser_set_language (CcLanguageChooser *chooser,
+                                                 const gchar        *language);
+gboolean      cc_language_chooser_get_showing_extra (CcLanguageChooser *chooser);
+
+G_END_DECLS
+
+#endif /* __CC_LANGUAGE_CHOOSER_H__ */
diff --git a/gnome-initial-setup/pages/language/gis-language-page.c 
b/gnome-initial-setup/pages/language/gis-language-page.c
index 8f551a9..5cbf4c8 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.c
+++ b/gnome-initial-setup/pages/language/gis-language-page.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "language-resources.h"
-#include "gis-language-chooser.h"
+#include "cc-language-chooser.h"
 #include "gis-language-page.h"
 
 #include <locale.h>
@@ -46,11 +46,11 @@ struct _GisLanguagePagePrivate
 #define WID(name) OBJ(GtkWidget*,name)
 
 static void
-language_changed (GisLanguageChooser *chooser,
+language_changed (CcLanguageChooser  *chooser,
                   GParamSpec         *pspec,
                   GisLanguagePage    *page)
 {
-  const char *new_locale_id = gis_language_chooser_get_language (chooser);
+  const char *new_locale_id = cc_language_chooser_get_language (chooser);
   setlocale (LC_MESSAGES, new_locale_id);
   gis_driver_locale_changed (GIS_PAGE (page)->driver);
 }
@@ -61,7 +61,7 @@ gis_language_page_constructed (GObject *object)
   GisLanguagePage *page = GIS_LANGUAGE_PAGE (object);
   GisLanguagePagePrivate *priv = page->priv;
 
-  g_type_ensure (GIS_TYPE_LANGUAGE_CHOOSER);
+  g_type_ensure (CC_TYPE_LANGUAGE_CHOOSER);
 
   G_OBJECT_CLASS (gis_language_page_parent_class)->constructed (object);
 
diff --git a/gnome-initial-setup/pages/language/gis-language-page.ui 
b/gnome-initial-setup/pages/language/gis-language-page.ui
index eec0aee..2951464 100644
--- a/gnome-initial-setup/pages/language/gis-language-page.ui
+++ b/gnome-initial-setup/pages/language/gis-language-page.ui
@@ -8,7 +8,7 @@
     <property name="margin-left">80</property>
     <property name="margin-right">80</property>
     <child>
-      <object class="GisLanguageChooser" id="language-chooser">
+      <object class="CcLanguageChooser" id="language-chooser">
         <property name="visible">True</property>
       </object>
     </child>
diff --git a/gnome-initial-setup/pages/language/gis-language-chooser.ui 
b/gnome-initial-setup/pages/language/language-chooser.ui
similarity index 100%
rename from gnome-initial-setup/pages/language/gis-language-chooser.ui
rename to gnome-initial-setup/pages/language/language-chooser.ui
diff --git a/gnome-initial-setup/pages/language/language.gresource.xml 
b/gnome-initial-setup/pages/language/language.gresource.xml
index 276232b..faa4e29 100644
--- a/gnome-initial-setup/pages/language/language.gresource.xml
+++ b/gnome-initial-setup/pages/language/language.gresource.xml
@@ -2,6 +2,8 @@
 <gresources>
   <gresource prefix="/org/gnome/initial-setup">
     <file preprocess="xml-stripblanks" alias="gis-language-page.ui">gis-language-page.ui</file>
-    <file preprocess="xml-stripblanks" alias="gis-language-chooser.ui">gis-language-chooser.ui</file>
+  </gresource>
+  <gresource prefix="/org/gnome/control-center">
+    <file preprocess="xml-stripblanks" alias="language-chooser.ui">language-chooser.ui</file>
   </gresource>
 </gresources>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]