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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-07-11 17:42:49 +0300 (Wed, 11 Jul 2007)
New Revision: 12722

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
Log:
2007-07-11  Lucas Rocha  <lucas.rocha at nokia.com>

	* libhildondesktop/hildon-desktop-popup-menu.c: reduce 4px on scroll
	buttons height to make it fit the screen.
	* src/hd-applications-menu.c: added arrows inside scroll buttons.
	Several naming fixes in order to make the theming work.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-11 14:40:33 UTC (rev 12721)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-07-11 14:42:49 UTC (rev 12722)
@@ -1,5 +1,12 @@
 2007-07-11  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* libhildondesktop/hildon-desktop-popup-menu.c: reduce 4px on scroll
+	buttons height to make it fit the screen.
+	* src/hd-applications-menu.c: added arrows inside scroll buttons.
+	Several naming fixes in order to make the theming work.
+
+2007-07-11  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* src/Makefile.am: fix build errors.
 
 2007-07-11  Moises Martinez  <moises.martinez at nokia.com>

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-07-11 14:40:33 UTC (rev 12721)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-popup-menu.c	2007-07-11 14:42:49 UTC (rev 12722)
@@ -807,7 +807,7 @@
 
   gtk_widget_set_size_request (menu->priv->box_buttons, 
 		  	       item_width, 
-			       menu->priv->item_height);
+			       menu->priv->item_height - 4);
 
   menu->priv->n_items++;
 

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-07-11 14:40:33 UTC (rev 12721)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-07-11 14:42:49 UTC (rev 12722)
@@ -72,12 +72,12 @@
 #define HD_APPS_MENU_POPUP_WINDOW_NAME    "hildon-apps-menu"
 #define HD_APPS_MENU_CAT_MENU_NAME        "hildon-apps-menu-pane1"
 #define HD_APPS_MENU_CAT_MENU_ITEM_NAME   "hildon-apps-menu-pane1-item"
-#define HD_APPS_MENU_CAT_BUTTON_UP_NAME   ""
-#define HD_APPS_MENU_CAT_BUTTON_DOWN_NAME ""
+#define HD_APPS_MENU_CAT_BUTTON_UP_NAME   "hildon-apps-menu-pane1-button"
+#define HD_APPS_MENU_CAT_BUTTON_DOWN_NAME "hildon-apps-menu-pane1-button"
 #define HD_APPS_MENU_APP_MENU_NAME        "hildon-apps-menu-pane2"
 #define HD_APPS_MENU_APP_MENU_ITEM_NAME   "hildon-apps-menu-pane2-item"
-#define HD_APPS_MENU_APP_BUTTON_UP_NAME   ""
-#define HD_APPS_MENU_APP_BUTTON_DOWN_NAME ""
+#define HD_APPS_MENU_APP_BUTTON_UP_NAME   "hildon-apps-menu-pane2-button"
+#define HD_APPS_MENU_APP_BUTTON_DOWN_NAME "hildon-apps-menu-pane2-button"
 
 #define OTHERS_MENU_ICON_NAME  "qgn_grid_tasknavigator_others"
 #define OTHERS_MENU_ICON_SIZE  64
@@ -789,7 +789,7 @@
 {
   HildonDesktopPopupWindow *popup_window;
   const GtkWidget *button_up, *button_down;
-  GtkWidget *box, *alignment;
+  GtkWidget *box, *alignment, *arrow;
   
   g_return_if_fail (button);
 
@@ -834,12 +834,22 @@
   
   button_up =  
     hildon_desktop_popup_menu_get_scroll_button_up (button->priv->menu_categories);
+
+  gtk_widget_set_name (GTK_WIDGET (button_up), HD_APPS_MENU_CAT_BUTTON_UP_NAME);
+
+  arrow = gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (button_up), arrow);
+  gtk_widget_show (arrow);
+  
   button_down =
     hildon_desktop_popup_menu_get_scroll_button_down (button->priv->menu_categories);
 
-  gtk_widget_set_name (GTK_WIDGET (button_up), HD_APPS_MENU_CAT_BUTTON_UP_NAME);
   gtk_widget_set_name (GTK_WIDGET (button_down), HD_APPS_MENU_CAT_BUTTON_DOWN_NAME);
 
+  arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (button_down), arrow);
+  gtk_widget_show (arrow);
+
   button->priv->menu_applications =
     HILDON_DESKTOP_POPUP_MENU (g_object_new (HILDON_DESKTOP_TYPE_POPUP_MENU,
 		  		    	     "item-height", 68,
@@ -859,12 +869,22 @@
 
   button_up = 
     hildon_desktop_popup_menu_get_scroll_button_up (button->priv->menu_applications);
+
+  gtk_widget_set_name (GTK_WIDGET (button_up), HD_APPS_MENU_APP_BUTTON_UP_NAME);
+
+  arrow = gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (button_up), arrow);
+  gtk_widget_show (arrow);
+  
   button_down =
     hildon_desktop_popup_menu_get_scroll_button_down (button->priv->menu_applications);
 
-  gtk_widget_set_name (GTK_WIDGET (button_up), HD_APPS_MENU_APP_BUTTON_UP_NAME);
   gtk_widget_set_name (GTK_WIDGET (button_down), HD_APPS_MENU_APP_BUTTON_DOWN_NAME);
 
+  arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (button_down), arrow);
+  gtk_widget_show (arrow);
+
   g_signal_connect (G_OBJECT (popup_window), 
 		    "key-press-event",
 		    G_CALLBACK (hd_applications_menu_key_press),