[maemo-commits] [maemo-commits] r12675 - in projects/haf/trunk/hildon-desktop: . libhildondesktop src

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-07-06 11:24:40 +0300 (Fri, 06 Jul 2007)
New Revision: 12675

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c
   projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.h
   projects/haf/trunk/hildon-desktop/src/hd-app-menu-tree.c
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:

2007-07-06  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/libhildonmenu.c: added LOCALIZED_NAME column
	* src/hd-application-menu.c: use the LOCALIZED_NAME column
	instead of translating locally.
	* src/hd-app-menu-tree.c: use the LOCALIZED_NAME column



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-06 08:15:46 UTC (rev 12674)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-06 08:24:40 UTC (rev 12675)
@@ -1,5 +1,12 @@
 2007-07-06  Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/libhildonmenu.c: added LOCALIZED_NAME column
+	* src/hd-application-menu.c: use the LOCALIZED_NAME column
+	instead of translating locally.
+	* src/hd-app-menu-tree.c: use the LOCALIZED_NAME column
+
+2007-07-06  Johan Bilien  <johan.bilien at nokia.com>
+
 	* configure.ac: 0.0.22
 
 2007-07-05  Moises Martinez  <moises.martinez at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c	2007-07-06 08:15:46 UTC (rev 12674)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.c	2007-07-06 08:24:40 UTC (rev 12675)
@@ -37,6 +37,8 @@
 #include <config.h>
 #endif
 
+#include <glib/gi18n.h>
+
 #include <dirent.h>
 #include <sys/stat.h>
 #include <libxml/xmlreader.h>
@@ -499,6 +501,10 @@
                        &child_iter,
                        TREE_MODEL_NAME,
                        item->name,
+                       TREE_MODEL_LOCALIZED_NAME,
+                       (item->text_domain && *item->text_domain)?
+                         g_strdup (dgettext (item->text_domain, item->name)):
+                         g_strdup (dgettext (GETTEXT_PACKAGE,   item->name)),
                        TREE_MODEL_ICON,
                        app_icon,
                        TREE_MODEL_THUMB_ICON,
@@ -635,6 +641,9 @@
 			gtk_tree_store_set(menu_tree, iterator,
 					TREE_MODEL_NAME,
 					key,
+                                        TREE_MODEL_LOCALIZED_NAME,
+                                        g_strdup (dgettext (GETTEXT_PACKAGE,
+                                                            key)),
 					TREE_MODEL_ICON,
 					folder_icon,
 					TREE_MODEL_THUMB_ICON,
@@ -825,7 +834,8 @@
 
 	contents = gtk_tree_store_new(
 			TREE_MODEL_COLUMNS,
-			G_TYPE_STRING,      /* Name */
+			G_TYPE_STRING,     /* Name */
+			G_TYPE_STRING,     /* Localized name */
 			GDK_TYPE_PIXBUF,   /* Icon */
 			GDK_TYPE_PIXBUF,   /* Thumb Icon */
 			GDK_TYPE_PIXBUF,   /* Icon & expander open emblem */

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.h	2007-07-06 08:15:46 UTC (rev 12674)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/libhildonmenu.h	2007-07-06 08:24:40 UTC (rev 12675)
@@ -68,6 +68,7 @@
 /* TreeModel items */
 enum {
 	TREE_MODEL_NAME = 0,
+	TREE_MODEL_LOCALIZED_NAME,
 	TREE_MODEL_ICON,
 	TREE_MODEL_THUMB_ICON,
 	TREE_MODEL_EMBLEM_EXPANDER_OPEN,

Modified: projects/haf/trunk/hildon-desktop/src/hd-app-menu-tree.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-app-menu-tree.c	2007-07-06 08:15:46 UTC (rev 12674)
+++ projects/haf/trunk/hildon-desktop/src/hd-app-menu-tree.c	2007-07-06 08:24:40 UTC (rev 12675)
@@ -163,7 +163,7 @@
   gtk_tree_view_column_add_attribute (column,
                                       renderer,
                                       "text",
-                                      TREE_MODEL_NAME);
+                                      TREE_MODEL_LOCALIZED_NAME);
 
   gtk_tree_view_append_column (GTK_TREE_VIEW (priv->navigation_pane),
                                column);
@@ -215,7 +215,7 @@
   gtk_tree_view_column_add_attribute (column,
                                       renderer,
                                       "text",
-                                      TREE_MODEL_NAME);
+                                      TREE_MODEL_LOCALIZED_NAME);
 
   gtk_tree_view_append_column (GTK_TREE_VIEW (priv->content_pane),
                                column);

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-07-06 08:15:46 UTC (rev 12674)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-07-06 08:24:40 UTC (rev 12675)
@@ -587,7 +587,7 @@
     item_text_domain = NULL;
      
     gtk_tree_model_get (model, iter,
-		        TREE_MODEL_NAME, &item_name,
+		        TREE_MODEL_LOCALIZED_NAME, &item_name,
 		        TREE_MODEL_ICON, &item_icon,
 		        TREE_MODEL_EXEC, &item_exec,
 		        TREE_MODEL_SERVICE, &item_service,
@@ -611,8 +611,7 @@
       
       hbox = gtk_hbox_new (FALSE, 0);
       
-      label = gtk_label_new ((item_text_domain && *item_text_domain) ?
-      		        dgettext(item_text_domain, item_name) : _(item_name)), 
+      label = gtk_label_new (item_name);
       
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);