oh main menu is much nicer now - compact. better organised.

SVN revision: 26696
This commit is contained in:
Carsten Haitzler 2006-10-19 14:35:13 +00:00
parent 51f9024547
commit 2d6e2acf4b
2 changed files with 26 additions and 25 deletions

2
TODO
View File

@ -63,8 +63,6 @@ Some of the things (in very short form) that need to be done to E17...
* menus need to be able to limit max width (especialyl windows and lost
windows menus) optionally.
* about enlightenment and about theme could go into an "enlightenment"
submenu item to remove 1 menu item from the main menu
* app menus should prune out menu submenus if the submenus only contain menus
and no actual app desktop files (just a menus tree and nothing useful)
* client list menu could do with work on ordering, using separators to demark

View File

@ -137,16 +137,39 @@ e_int_menus_main_new(void)
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("About Enlightenment"));
e_menu_item_label_set(mi, _("Enlightenment"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/e");
e_object_free_attach_func_set(E_OBJECT(subm), _e_int_menus_items_del_hook);
e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("About"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/e");
e_menu_item_callback_set(mi, _e_int_menus_main_about, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("About This Theme"));
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Theme"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/themes");
e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
mi = e_menu_item_new(subm);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Restart"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/reset");
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Exit"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/exit");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
subm = e_int_menus_config_new();
dat->config = subm;
mi = e_menu_item_new(m);
@ -157,26 +180,6 @@ e_int_menus_main_new(void)
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Advanced"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/advanced");
e_object_free_attach_func_set(E_OBJECT(subm), _e_int_menus_items_del_hook);
e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Restart Enlightenment"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/reset");
e_menu_item_callback_set(mi, _e_int_menus_main_restart, NULL);
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Exit Enlightenment"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/exit");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
subm = e_int_menus_sys_new();
dat->sys = subm;
mi = e_menu_item_new(m);