Enlightenment CVS committal Author : moom16 Project : e17 Module : proto
Dir : e17/proto/etk/src/bin Modified Files: etk_menu_test.c Log Message: * More work on the menus =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_menu_test.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_menu_test.c 11 Nov 2005 22:48:48 -0000 1.1 +++ etk_menu_test.c 13 Nov 2005 12:04:05 -0000 1.2 @@ -20,7 +20,8 @@ void etk_test_menu_window_create(void *data) { static Etk_Widget *win = NULL; - Etk_Widget *menu, *menu_item; + Etk_Widget *menu, *menu2, *menu3; + Etk_Widget *menu_item; Etk_Widget *label; Etk_Widget *image; @@ -39,16 +40,51 @@ etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5); etk_container_add(ETK_CONTAINER(win), label); + /* Main Menu */ menu = etk_menu_new(); - menu_item = etk_menu_item_new_with_label(_("Menu Item Test")); + + menu_item = etk_menu_item_new_with_label(_("Open")); image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/open.png"); etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); - etk_menu_append(ETK_MENU(menu), ETK_MENU_ITEM(menu_item)); - etk_widget_show(menu_item); + etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item)); + + menu_item = etk_menu_item_new_with_label(_("Close")); + image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/close.png"); + etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); + etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item)); + + menu_item = etk_menu_item_new_with_label(_("Save")); + image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/save.png"); + etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); + etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item)); + + menu_item = etk_menu_item_new_with_label(_("Menu Item Test")); + image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png"); + etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); + etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item)); + + /* Sub menu 1 */ + menu2 = etk_menu_new(); + etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu2)); + + menu_item = etk_menu_item_new_with_label(_("Child Menu Test")); + etk_menu_shell_append(ETK_MENU_SHELL(menu2), ETK_MENU_ITEM(menu_item)); + + menu_item = etk_menu_item_new_with_label(_("Item with image")); + image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png"); + etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image)); + etk_menu_shell_append(ETK_MENU_SHELL(menu2), ETK_MENU_ITEM(menu_item)); + + menu_item = etk_menu_item_new_with_label(_("Item with child")); + etk_menu_shell_append(ETK_MENU_SHELL(menu2), ETK_MENU_ITEM(menu_item)); + + /* Sub menu 2 */ + menu3 = etk_menu_new(); + etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu3)); + + menu_item = etk_menu_item_new_with_label(_("Child Menu Test")); + etk_menu_shell_append(ETK_MENU_SHELL(menu3), ETK_MENU_ITEM(menu_item)); - menu_item = etk_menu_item_new_with_label(_("Test 2")); - etk_menu_append(ETK_MENU(menu), ETK_MENU_ITEM(menu_item)); - etk_widget_show(menu_item); etk_signal_connect("mouse_down", ETK_OBJECT(win), ETK_CALLBACK(_etk_test_menu_window_down_cb), menu); ------------------------------------------------------- SF.Net email is sponsored by: Tame your development challenges with Apache's Geronimo App Server. Download it for free - -and be entered to win a 42" plasma tv or your very own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs