[gnome-initial-setup] gis-assistant: Rebuild the button labels when the locale changes



commit 26b21db72f43a28a683a3ff8c3e1012fd0eb6543
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Nov 14 16:03:09 2012 -0500

    gis-assistant: Rebuild the button labels when the locale changes
    
    This is a follow-up to the previous commit, which causes button
    labels to correctly update when the user chooses a new locale.

 gnome-initial-setup/gis-assistant.c |   11 +++++++++--
 gnome-initial-setup/gis-assistant.h |    2 ++
 gnome-initial-setup/gis-driver.c    |    2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/gnome-initial-setup/gis-assistant.c b/gnome-initial-setup/gis-assistant.c
index 2bab00a..3dd770f 100644
--- a/gnome-initial-setup/gis-assistant.c
+++ b/gnome-initial-setup/gis-assistant.c
@@ -305,6 +305,14 @@ construct_buttons (GisAssistant *assistant,
   g_signal_connect (buttons->back, "clicked", G_CALLBACK (go_backward), assistant);
 }
 
+void
+gis_assistant_locale_changed (GisAssistant *assistant)
+{
+  GisAssistantPrivate *priv = assistant->priv;
+  gtk_button_set_label (GTK_BUTTON (priv->full_buttons.forward), _("_Next"));
+  gtk_button_set_label (GTK_BUTTON (priv->full_buttons.back), _("_Back"));
+}
+
 static void
 gis_assistant_init (GisAssistant *assistant)
 {
@@ -319,12 +327,11 @@ gis_assistant_init (GisAssistant *assistant)
   gtk_box_pack_start (GTK_BOX (priv->main_layout), priv->frame, TRUE, TRUE, 0);
 
   construct_buttons (assistant, &priv->full_buttons);
-  gtk_button_set_label (GTK_BUTTON (priv->full_buttons.forward), _("_Next"));
   gtk_button_set_image (GTK_BUTTON (priv->full_buttons.forward),
                         gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
-  gtk_button_set_label (GTK_BUTTON (priv->full_buttons.back), _("_Back"));
   gtk_button_set_image (GTK_BUTTON (priv->full_buttons.back),
                         gtk_image_new_from_stock (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON));
+  gis_assistant_locale_changed (assistant);
   gtk_box_pack_start (GTK_BOX (priv->main_layout), priv->full_buttons.action_area, FALSE, TRUE, 0);
 
   construct_buttons (assistant, &priv->symbolic_buttons);
diff --git a/gnome-initial-setup/gis-assistant.h b/gnome-initial-setup/gis-assistant.h
index 747d7ef..f5549f9 100644
--- a/gnome-initial-setup/gis-assistant.h
+++ b/gnome-initial-setup/gis-assistant.h
@@ -67,6 +67,8 @@ void      gis_assistant_previous_page     (GisAssistant *assistant);
 void      gis_assistant_destroy_all_pages (GisAssistant *assistant);
 gchar *   gis_assistant_get_title         (GisAssistant *assistant);
 
+void      gis_assistant_locale_changed    (GisAssistant *assistant);
+
 G_END_DECLS
 
 #endif /* __GIS_ASSISTANT_H__ */
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 3090901..00c9663 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -130,7 +130,9 @@ gis_driver_add_page (GisDriver *driver,
 void
 gis_driver_locale_changed (GisDriver *driver)
 {
+  GisDriverPrivate *priv = driver->priv;
   g_idle_add ((GSourceFunc) rebuild_pages, driver);
+  gis_assistant_locale_changed (priv->assistant);
 }
 
 static GType



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]