[maemo-commits] [maemo-commits] r12842 - in projects/haf/trunk/hildon-plugins-settings: . src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-07-25 17:31:47 +0300 (Wed, 25 Jul 2007)
New Revision: 12842

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
Log:
2007-07-25  Moises Martinez  <moises.martinez at nokia.com>

        * src/hildon-plugin-cell-renderer-button.c:
        (hildon_plugin_cell_renderer_button_constructor):
        - "Organise button is localized".
        * src/hildon-plugin-settings-dialog.[ch]:
        (hildon_plugin_settings_dialog_rename_tab):
        - new method for having different name for tabs
        * src/hildon-plugin-settings.c: (execute):
        - Fixed localization of tabs. Fixes: NB#64281
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-07-25 13:05:35 UTC (rev 12841)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-07-25 14:31:47 UTC (rev 12842)
@@ -1,3 +1,14 @@
+2007-07-25  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hildon-plugin-cell-renderer-button.c:
+	(hildon_plugin_cell_renderer_button_constructor):
+	- "Organise button is localized".
+	* src/hildon-plugin-settings-dialog.[ch]:
+	(hildon_plugin_settings_dialog_rename_tab):
+	- new method for having different name for tabs
+	* src/hildon-plugin-settings.c: (execute):
+	- Fixed localization of tabs. Fixes: NB#64281
+
 2007-07-18  Moises Martinez  <moises.martinez at nokia.com>
 
 	* src/hildon-plugin-settings.c: (execute):

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c	2007-07-25 13:05:35 UTC (rev 12841)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-cell-renderer-button.c	2007-07-25 14:31:47 UTC (rev 12842)
@@ -29,7 +29,10 @@
 #include <gtk/gtkwindow.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkdialog.h>
+#include <glib/gi18n.h>
 
+#define CELL_RENDERER_ORGANISE _("tncpa_bv_tnsb_organise")
+
 static void hildon_plugin_cell_renderer_button_get_property  (GObject                    *object,
 						    	      guint                       param_id,
 						    	      GValue                     *value,
@@ -246,7 +249,7 @@
                                                                                    params);
 
   g_object_set (object, 
-		"text", "Organize", 
+		"text", CELL_RENDERER_ORGANISE, 
 		/*"size", 9*20,*/
 		/*"ellipsize", PANGO_ELLIPSIZE_END,*/
 		NULL);

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-07-25 13:05:35 UTC (rev 12841)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.c	2007-07-25 14:31:47 UTC (rev 12842)
@@ -1163,3 +1163,33 @@
   g_list_free (renderers);
 }
 
+void 
+hildon_plugin_settings_dialog_rename_tab (HildonPluginSettingsDialog *settings,
+					  const gchar *container_name,
+					  const gchar *new_name)
+{
+  GList *container_tab = NULL;
+
+  if (!container_name || !new_name)
+    return;	  
+
+  container_tab =
+    g_list_find_custom (settings->priv->tabs,
+                        container_name,
+                        (GCompareFunc)hildon_plugin_settings_dialog_compare_tab);
+  
+  if (!container_tab)
+    return;
+
+  HPSDTab *tab = (HPSDTab *)container_tab->data;
+
+  if (tab->tw)
+  { g_debug ("hello %s %s",container_name, _(new_name));
+    GtkWidget *page = gtk_widget_get_parent (GTK_WIDGET (tab->tw));
+
+    gtk_notebook_set_tab_label (GTK_NOTEBOOK (settings->priv->notebook),
+		    		page,
+				gtk_label_new (_(new_name)));
+  }
+}
+

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h	2007-07-25 13:05:35 UTC (rev 12841)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings-dialog.h	2007-07-25 14:31:47 UTC (rev 12842)
@@ -127,6 +127,11 @@
                                                   gpointer func_data,
                                                   GtkDestroyNotify destroy);
 
+void
+hildon_plugin_settings_dialog_rename_tab (HildonPluginSettingsDialog *settings,
+                                          const gchar *container_name,
+                                          const gchar *new_name);
+
 G_END_DECLS
 
 #endif/*__HILDON_PLUGIN_SETTINGS_DIALOG_H__*/

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-07-25 13:05:35 UTC (rev 12841)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-07-25 14:31:47 UTC (rev 12842)
@@ -290,6 +290,14 @@
 
   _sb_update_flag (sbtm);
 
+  hildon_plugin_settings_dialog_rename_tab (HILDON_PLUGIN_SETTINGS_DIALOG (dialog),
+		             		    "Statusbar",
+					    "tncpa_ti_tnsb_statusbar");
+
+  hildon_plugin_settings_dialog_rename_tab (HILDON_PLUGIN_SETTINGS_DIALOG (dialog),
+		             		    "Tasknavigator",
+					    "tncpa_ti_tnsb_tasknavigator");
+
   conn = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 
   if (!error)