Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Config menu accesible from bar
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_main.c 21 Mar 2005 22:23:28 -0000 1.20
+++ e_mod_main.c 21 Mar 2005 22:42:47 -0000 1.21
@@ -262,11 +262,13 @@
_ibar_bar_menu_new(ibb);
/* Add main menu to bar menu */
- /* FIXME
mi = e_menu_item_new(ibb->menu);
- e_menu_item_label_set(mi, "Auto fit icons");
- e_menu_item_submenu_set(mi, ib->config_menu_FIXME);
- */
+ e_menu_item_label_set(mi, "Options");
+ e_menu_item_submenu_set(mi, ib->config_menu_options);
+
+ mi = e_menu_item_new(ibb->menu);
+ e_menu_item_label_set(mi, "Size");
+ e_menu_item_submenu_set(mi, ib->config_menu_size);
mi = e_menu_item_new(ib->config_menu);
e_menu_item_label_set(mi, con->name);
@@ -295,6 +297,8 @@
E_FREE(ib->conf->appdir);
e_app_change_callback_del(_ibar_app_change, ib);
+ e_object_del(E_OBJECT(ib->config_menu_options));
+ e_object_del(E_OBJECT(ib->config_menu_size));
e_object_del(E_OBJECT(ib->config_menu));
evas_list_free(ib->conf->bars);
free(ib->conf);
@@ -702,6 +706,10 @@
E_Menu_Item *mi;
mn = e_menu_new();
+ ib->config_menu = mn;
+
+ mn = e_menu_new();
+ ib->config_menu_options = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Auto fit icons");
@@ -709,8 +717,8 @@
if (ib->conf->width == IBAR_WIDTH_AUTO) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _ibar_bar_cb_width_auto, ib);
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
+ mn = e_menu_new();
+ ib->config_menu_size = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Microscopic");
@@ -789,20 +797,14 @@
if (ib->conf->iconsize == 128) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _ibar_bar_cb_iconsize_gigantic, ib);
-/*
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, "Auto hide");
- e_menu_item_check_set(mi, 1);
- if (ib->conf->autohide == 0) e_menu_item_toggle_set(mi, 1);
-
- mi = e_menu_item_new(mn);
- e_menu_item_separator_set(mi, 1);
-
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, "More Options...");
-*/
-
- ib->config_menu = mn;
+ /* Submenus */
+ mi = e_menu_item_new(ib->config_menu);
+ e_menu_item_label_set(mi, "Options");
+ e_menu_item_submenu_set(mi, ib->config_menu_options);
+
+ mi = e_menu_item_new(ib->config_menu);
+ e_menu_item_label_set(mi, "Size");
+ e_menu_item_submenu_set(mi, ib->config_menu_size);
}
#if 0
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h 19 Mar 2005 12:49:45 -0000 1.8
+++ e_mod_main.h 21 Mar 2005 22:42:47 -0000 1.9
@@ -33,6 +33,8 @@
E_App *apps;
Evas_List *bars;
E_Menu *config_menu;
+ E_Menu *config_menu_options;
+ E_Menu *config_menu_size;
Config *conf;
};
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
