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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-08-16 11:47:21 +0300 (Thu, 16 Aug 2007)
New Revision: 13226

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
   projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
Log:
2007-08-16  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hd-switcher-menu.c, src/hd-applications-menu.c: correctly set
	widget name for separators in order to make them themable.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-16 08:41:52 UTC (rev 13225)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-16 08:47:21 UTC (rev 13226)
@@ -1,5 +1,10 @@
 2007-08-16  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hd-switcher-menu.c, src/hd-applications-menu.c: correctly set
+	widget name for separators in order to make them themable.
+
+2007-08-16  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/hd-switcher-menu.c (hd_switcher_menu_check_content,
 	hd_switcher_menu_constructor): correctly set notification extra 
 	pane height in order to avoid having an empty pane flicking besides

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-08-16 08:41:52 UTC (rev 13225)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-08-16 08:47:21 UTC (rev 13226)
@@ -667,6 +667,12 @@
     {
       /* Separator */
       menu_item = gtk_separator_menu_item_new ();
+
+      if (level > 0)
+        gtk_widget_set_name (GTK_WIDGET (menu_item), HD_APPS_MENU_APP_MENU_ITEM_NAME);
+      else
+        gtk_widget_set_name (GTK_WIDGET (menu_item), HD_APPS_MENU_CAT_MENU_ITEM_NAME);
+ 
       gtk_widget_set_size_request (GTK_WIDGET (menu_item), -1, 1);
     }
     else if (level > 0)
@@ -753,6 +759,11 @@
 
 	gtk_widget_set_size_request (GTK_WIDGET (separator), -1, 1);
 
+        if (level > 0)
+          gtk_widget_set_name (GTK_WIDGET (menu_item), HD_APPS_MENU_APP_MENU_ITEM_NAME);
+        else
+          gtk_widget_set_name (GTK_WIDGET (menu_item), HD_APPS_MENU_CAT_MENU_ITEM_NAME);
+
         menu_items = g_list_prepend (menu_items, separator);
       }
       else

Modified: projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-16 08:41:52 UTC (rev 13225)
+++ projects/haf/trunk/hildon-desktop/src/hd-switcher-menu.c	2007-08-16 08:47:21 UTC (rev 13226)
@@ -279,7 +279,7 @@
 }	
 
 static GtkWidget *
-hd_switcher_menu_create_separator ()
+hd_switcher_menu_create_separator (gboolean is_application_menu)
 {
   GtkWidget *separator;
 
@@ -287,6 +287,11 @@
 
   gtk_widget_set_size_request (separator, -1, 1);
 
+  if (is_application_menu)
+    gtk_widget_set_name (separator, HD_SWITCHER_MENU_APP_MENU_ITEM_NAME);
+  else
+    gtk_widget_set_name (separator, HD_SWITCHER_MENU_NOT_MENU_ITEM_NAME);
+	  
   return separator;
 }
 
@@ -657,7 +662,7 @@
     
     hildon_desktop_popup_menu_add_item
       (switcher->priv->menu_notifications,
-      GTK_MENU_ITEM (hd_switcher_menu_create_separator ()));
+      GTK_MENU_ITEM (hd_switcher_menu_create_separator (FALSE)));
 
     menu_item = hd_switcher_menu_item_new_from_notification_group
       (ngroup->notifications, icon, summary, ngroup->dbus_callback, TRUE);
@@ -1668,7 +1673,7 @@
         if (first_item)
           hildon_desktop_popup_menu_add_item
             (switcher->priv->menu_notifications,
-            GTK_MENU_ITEM (hd_switcher_menu_create_separator ()));
+            GTK_MENU_ITEM (hd_switcher_menu_create_separator (FALSE)));
 
         menu_item =
           hd_switcher_menu_item_new_from_notification
@@ -1743,7 +1748,7 @@
 
     if (l == apps)
     {
-      separator = hd_switcher_menu_create_separator ();
+      separator = hd_switcher_menu_create_separator (TRUE);
 
       hildon_desktop_popup_menu_add_item
        (switcher->priv->menu_applications, GTK_MENU_ITEM (separator));
@@ -1776,7 +1781,7 @@
     /* Append the separator for this app*/
     if (l->next != NULL)
     {
-      separator = hd_switcher_menu_create_separator ();
+      separator = hd_switcher_menu_create_separator (TRUE);
 
       hildon_desktop_popup_menu_add_item
         (switcher->priv->menu_applications, GTK_MENU_ITEM (separator));