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 statusbar


===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_menu_test.c     20 Nov 2005 10:33:28 -0000      1.4
+++ etk_menu_test.c     20 Nov 2005 16:55:54 -0000      1.5
@@ -8,7 +8,10 @@
 } Etk_Test_Menu_Item_Type;
 
 static void _etk_test_menu_window_down_cb(Etk_Object *object, void 
*event_info, void *data);
-static Etk_Widget *_etk_test_menu_item_new(Etk_Test_Menu_Item_Type item_type, 
const char *label, Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell);
+static Etk_Widget *_etk_test_menu_item_new(Etk_Test_Menu_Item_Type item_type, 
const char *label,
+   Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell, Etk_Widget *statusbar);
+static void _etk_test_menu_item_selected_cb(Etk_Object *object, void *data);
+static void _etk_test_menu_item_deselected_cb(Etk_Object *object, void *data);
 
 /* Creates the window for the menu test */
 void etk_test_menu_window_create(void *data)
@@ -33,30 +36,45 @@
    etk_widget_size_request_set(win, 300, 200);
    
    /****************
-    * Menu Bar
+    * The window
     ****************/
+   vbox = etk_vbox_new(FALSE, 0);
+   etk_container_add(ETK_CONTAINER(win), vbox);
+   
    menu_bar = etk_menu_bar_new();
+   etk_box_pack_start(ETK_BOX(vbox), menu_bar, FALSE, FALSE, 0);
+   
+   label = etk_label_new(_("Click me :)"));
+   etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
+   etk_widget_pass_events_set(label, TRUE);
+   etk_box_pack_start(ETK_BOX(vbox), label, TRUE, TRUE, 0);
+   
+   statusbar = etk_statusbar_new();
+   etk_box_pack_end(ETK_BOX(vbox), statusbar, FALSE, FALSE, 0);
    
+   /****************
+    * Menu Bar
+    ****************/
    /* File Menu */
-   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("File"), 
-1, ETK_MENU_SHELL(menu_bar));
+   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("File"), 
-1, ETK_MENU_SHELL(menu_bar), NULL);
    menu = etk_menu_new();
    etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Open"), 
ETK_STOCK_OPEN, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"), 
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu));
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Open"), 
ETK_STOCK_OPEN, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"), 
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu), statusbar);
    
    /* Edit Menu */
-   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Edit"), 
-1, ETK_MENU_SHELL(menu_bar));
+   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Edit"), 
-1, ETK_MENU_SHELL(menu_bar), NULL);
    menu = etk_menu_new();
    etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"), ETK_STOCK_CUT, 
ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"), 
ETK_STOCK_COPY, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"), 
ETK_STOCK_PASTE, ETK_MENU_SHELL(menu));
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"), ETK_STOCK_CUT, 
ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"), 
ETK_STOCK_COPY, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"), 
ETK_STOCK_PASTE, ETK_MENU_SHELL(menu), statusbar);
    
    /* Help Menu */
-   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Help"), 
-1, ETK_MENU_SHELL(menu_bar));
+   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Help"), 
-1, ETK_MENU_SHELL(menu_bar), NULL);
    menu = etk_menu_new();
    etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("About"), -1, 
ETK_MENU_SHELL(menu));
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("About"), -1, 
ETK_MENU_SHELL(menu), statusbar);
 
    /****************
     * Popup Menu
@@ -64,40 +82,26 @@
    /* Main menu */
    menu = etk_menu_new();
    etk_signal_connect("mouse_down", ETK_OBJECT(win), 
ETK_CALLBACK(_etk_test_menu_window_down_cb), menu);
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Open"), 
ETK_STOCK_OPEN, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"), 
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1, 
ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"), ETK_STOCK_CUT, 
ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"), 
ETK_STOCK_COPY, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"), 
ETK_STOCK_PASTE, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1, 
ETK_MENU_SHELL(menu));
-   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Menu Item 
Test"), -1, ETK_MENU_SHELL(menu));
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Open"), 
ETK_STOCK_OPEN, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"), 
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1, 
ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"), ETK_STOCK_CUT, 
ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"), 
ETK_STOCK_COPY, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"), 
ETK_STOCK_PASTE, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1, 
ETK_MENU_SHELL(menu), statusbar);
+   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Menu Item 
Test"), -1, ETK_MENU_SHELL(menu), statusbar);
    
    /* Sub menu 1 */
    menu = etk_menu_new();
    etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"), 
-1, ETK_MENU_SHELL(menu));
-   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with 
child"), -1, ETK_MENU_SHELL(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with image"), 
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu));
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"), 
-1, ETK_MENU_SHELL(menu), statusbar);
+   menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with 
child"), -1, ETK_MENU_SHELL(menu), statusbar);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with image"), 
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu), statusbar);
    
    /* Sub menu 2 */
    menu = etk_menu_new();
    etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
-   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"), 
-1, ETK_MENU_SHELL(menu));
-   
-   
-   vbox = etk_vbox_new(FALSE, 0);
-   etk_container_add(ETK_CONTAINER(win), vbox);
-   
-   etk_box_pack_start(ETK_BOX(vbox), menu_bar, FALSE, FALSE, 0);
-   
-   label = etk_label_new(_("Click me :)"));
-   etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
-   etk_widget_pass_events_set(label, TRUE);
-   etk_box_pack_start(ETK_BOX(vbox), label, TRUE, TRUE, 0);
-   
-   statusbar = etk_statusbar_new();
-   etk_box_pack_end(ETK_BOX(vbox), statusbar, FALSE, FALSE, 0);
+   _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"), 
-1, ETK_MENU_SHELL(menu), statusbar);
 
    etk_widget_show_all(win);
 }
@@ -109,7 +113,8 @@
 }
 
 /* Creates a new menu item */
-static Etk_Widget *_etk_test_menu_item_new(Etk_Test_Menu_Item_Type item_type, 
const char *label, Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell)
+static Etk_Widget *_etk_test_menu_item_new(Etk_Test_Menu_Item_Type item_type, 
const char *label,
+   Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell, Etk_Widget *statusbar)
 {
    Etk_Widget *menu_item = NULL;
    
@@ -133,5 +138,31 @@
    }
    etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
    
+   etk_signal_connect("selected", ETK_OBJECT(menu_item), 
ETK_CALLBACK(_etk_test_menu_item_selected_cb), statusbar);
+   etk_signal_connect("deselected", ETK_OBJECT(menu_item), 
ETK_CALLBACK(_etk_test_menu_item_deselected_cb), statusbar);
+   
    return menu_item;
 }
+
+/* Called when a menu item is selected */
+static void _etk_test_menu_item_selected_cb(Etk_Object *object, void *data)
+{
+   Etk_Menu_Item *item;
+   Etk_Statusbar *statusbar;
+   
+   if (!(item = ETK_MENU_ITEM(object)) || !(statusbar = ETK_STATUSBAR(data)))
+      return;
+   
+   etk_statusbar_push(statusbar, etk_menu_item_label_get(item), 0);
+}
+
+/* Called when a menu item is deselected */
+static void _etk_test_menu_item_deselected_cb(Etk_Object *object, void *data)
+{
+   Etk_Statusbar *statusbar;
+   
+   if (!(statusbar = ETK_STATUSBAR(data)))
+      return;
+   etk_statusbar_pop(statusbar, 0);
+}
+




-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.  Get Certified Today
Register for a JBoss Training Course.  Free Certification Exam
for All Training Attendees Through End of 2005. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to