From 000a883ed8c60d447c9b9bdb316ac6ebbdb20a42 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Tue, 28 Apr 2009 19:35:10 +0000
Subject: [PATCH] Revert "removal" of settings menu. In stead include stuff
 from the middle mouse menu.

SVN revision: 40449
---
 config/bindings.cfg       |  6 +++---
 config/enlightenment.menu |  2 +-
 config/settings.menu      | 10 +++++++++-
 config/strings.c          | 12 ++++++++++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/config/bindings.cfg b/config/bindings.cfg
index 3b2f6258..82d237c0 100644
--- a/config/bindings.cfg
+++ b/config/bindings.cfg
@@ -55,7 +55,7 @@ MouseDown   -  1 menus show file.menu
 Tooltip Display User Menus
 MouseDown   C  1 menus show enlightenment.menu
 Tooltip Display Enlightenment Menu
-MouseDown   4  1 cfg
+MouseDown   4  1 menus show settings.menu
 Tooltip Display Settings Menu
 MouseDown   -  2 menus show enlightenment.menu
 Tooltip Display Enlightenment Menu
@@ -65,7 +65,7 @@ MouseDown   C  2 menus show deskmenu
 Tooltip Display Desktop Menu
 MouseDown   S  2 menus show groupmenu
 Tooltip Display Group Menu
-MouseDown   -  3 cfg
+MouseDown   -  3 menus show settings.menu
 Tooltip Display Settings Menu
 MouseDown   *  4 desk prev
 Tooltip Go Back a Desktop
@@ -112,7 +112,7 @@ KeyDown    A   Return wop * zoom
 #KeyDown   CS        s wop * size kbd
 KeyDown   CS       F1 menus show file.menu
 KeyDown   CS       F2 menus show enlightenment.menu
-KeyDown   CS       F3 cfg
+KeyDown   CS       F3 menus show settings.menu
 KeyDown   CS       F4 menus show windowlist
 # The previously "unchangable" keybindings
 KeyDown   CA        a button_show all
diff --git a/config/enlightenment.menu b/config/enlightenment.menu
index 4fc9b59a..f32ede30 100644
--- a/config/enlightenment.menu
+++ b/config/enlightenment.menu
@@ -1,7 +1,7 @@
 "Enlightenment" "ROOT"
 "User Menus"		NULL menu file.menu
+"Settings"		NULL cfg
 "Desktop"		NULL menu desktop.menu
-"Settings"		NULL menu settings.menu
 "Themes"		NULL menu themes
 "Maintenance"		NULL menu maintenance.menu
 "Help"			NULL exec "edox $EROOT/E-docs"
diff --git a/config/settings.menu b/config/settings.menu
index 42e49605..b9a0edf0 100644
--- a/config/settings.menu
+++ b/config/settings.menu
@@ -1,2 +1,10 @@
 "Settings" "ROOT"
-"Enlightenment Settings ..."	NULL "cfg"
+"Settings"		NULL cfg
+"Desktop"		NULL menu desktop.menu
+"Themes"		NULL menu themes
+"Maintenance"		NULL menu maintenance.menu
+"Help"			NULL exec "edox $EROOT/E-docs"
+"About Enlightenment"	NULL about
+"About this theme"	NULL exec "edox $ETHEME/ABOUT"
+"Restart"		NULL "exit restart"
+"Log Out"		NULL "exit logout"
diff --git a/config/strings.c b/config/strings.c
index 6337efd9..f4156f8a 100644
--- a/config/strings.c
+++ b/config/strings.c
@@ -88,8 +88,8 @@ _("Show Magnifier"),
 /* enlightenment.menu */
 _("Enlightenment"),
 _("User Menus"),
-_("Desktop"),
 _("Settings"),
+_("Desktop"),
 _("Themes"),
 _("Maintenance"),
 _("Help"),
@@ -110,7 +110,15 @@ _("Query all cache usage"),
 _("Regenerate Menus"),
 /* settings.menu */
 _("Settings"),
-_("Enlightenment Settings ..."),
+_("Settings"),
+_("Desktop"),
+_("Themes"),
+_("Maintenance"),
+_("Help"),
+_("About Enlightenment"),
+_("About this theme"),
+_("Restart"),
+_("Log Out"),
 /* winops.menu */
 _("Window Options"),
 _("Close"),