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

SVN revision: 26696

diff --git a/TODO b/TODO
index 5323214..3d89d41 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 5610529..c86aadd 100644 (file)
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -137,46 +137,49 @@ 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);
    
-   subm = e_int_menus_config_new();
-   dat->config = subm;
-   mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("Configuration"));
-   e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
-   e_menu_item_submenu_set(mi, subm);
-
-   mi = e_menu_item_new(m);
+   mi = e_menu_item_new(subm);
    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_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 Enlightenment"));
+   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);
+   e_menu_item_label_set(mi, _("Configuration"));
+   e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+   e_menu_item_submenu_set(mi, subm);
+
+   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);