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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-23 16:06:35 +0300 (Wed, 23 May 2007)
New Revision: 11777

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
Log:
2007-05-22  Moises Martinez  <moises.martinez at nokia.com>

        * src/hn-app-switcher.c:
        - Show items in junk dialog of application killer. Fixes: NB54712
	* ChangeLog updated.




Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 12:20:27 UTC (rev 11776)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-23 13:06:35 UTC (rev 11777)
@@ -1,5 +1,10 @@
 2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
 
+	* src/hn-app-switcher.c:
+	- Show items in junk dialog of application killer. Fixes: NB54712
+
+2007-05-22  Moises Martinez  <moises.martinez at nokia.com>
+
 	* src/hd-switcher-menu-item.c:
 	- Reverting to GtkMenuItem. Image shows but behavior not consistent
 	enough.

Modified: projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-05-23 12:20:27 UTC (rev 11776)
+++ projects/haf/trunk/hildon-desktop/src/hn-app-switcher.c	2007-05-23 13:06:35 UTC (rev 11777)
@@ -125,6 +125,14 @@
 #define TOOLTIP_SHOW_TIMEOUT 500
 #define TOOLTIP_HIDE_TIMEOUT 1500
 
+#define _KE(a) dgettext("ke-recv", a)
+#define HD_CAD_TITLE            _KE("memr_ti_close_applications")
+#define HD_CAD_LABEL_OPENING    _KE("memr_ia_close_applications_opening")
+#define HD_CAD_LABEL_SWITCHING  _KE("memr_ia_close_applications_switching")
+#define HD_CAD_LABEL_APP_LIST   _KE("memr_ia_close_applications_application_list")
+#define HD_CAD_OK               _KE("memr_bd_close_applications_ok")
+#define HD_CAD_CANCEL           _KE("memr_bd_close_applications_cancel")
+
 enum 
 {
   AS_PROP_NITEMS=1,
@@ -1232,18 +1240,17 @@
   GtkWidget *check;
   GtkRequisition req;
   
-  items = NULL;
   check = NULL;
   req.height = 0;
-
+  
   /* Creating the UI */
-  dialog = gtk_dialog_new_with_buttons ("Title"/*FIXME: HN_CAD_TITLE*/,
+  dialog = gtk_dialog_new_with_buttons (HD_CAD_TITLE,
                                         NULL,
                                         GTK_DIALOG_MODAL
                                         | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        "Ok"/*FIXME: HN_CAD_OK*/,
+                                        HD_CAD_OK,
                                         GTK_RESPONSE_ACCEPT,
-                                        "Cancel"/*FIXME: HN_CAD_CANCEL*/,
+                                        HD_CAD_CANCEL,
                                         GTK_RESPONSE_CANCEL,
                                         NULL);                                        
 
@@ -1264,14 +1271,14 @@
 
   vbox = GTK_WIDGET(g_object_new(GTK_TYPE_VBOX, NULL));
 
-  label = gtk_label_new ("label_app_list"/*FIXME: HN_CAD_LABEL_APP_LIST*/);
+  label = gtk_label_new (HD_CAD_LABEL_APP_LIST);
 
   /* Align to top-right */
   gtk_misc_set_alignment (GTK_MISC(label), 1, 0);
 
   gtk_container_add (GTK_CONTAINER(hbox), label);
   gtk_container_add (GTK_CONTAINER(hbox), vbox);
-
+  g_debug ("there should be items %p", items);
   /* Collect open applications */
   for (l = items; l; l = l->next)
   {
@@ -1282,7 +1289,7 @@
     GtkIconTheme *icon_theme;
     HDWMWatchableApp *app;
     HDWMCADItem *item = (HDWMCADItem *) l->data;
-
+    g_debug ("item --> %p",l->data);
     if (item->win == NULL)
       continue;
 
@@ -1336,10 +1343,10 @@
   switch (action)
   {
     case CAD_ACTION_OPENING:
-      label = gtk_label_new ("opening");
+      label = gtk_label_new (HD_CAD_LABEL_OPENING);
       break;
     case CAD_ACTION_SWITCHING:
-      label = gtk_label_new ("switching");
+      label = gtk_label_new (HD_CAD_LABEL_SWITCHING);
       break;
     default:
       label = gtk_label_new("Unlikely internal error happened, but feel free "