menus: Eliminate enlightenment.menu

It is almost identical to settings.menu so let's just not have both.

config/Makefile.am

@@ -10,7 +10,7 @@ tconf_DATA = \
 
 menudir = $(pkgdatadir)/menus
 menu_DATA = \
-	desktop.menu enlightenment.menu maintenance.menu settings.menu \
+	desktop.menu maintenance.menu settings.menu \
 	winops.menu winops_groups.menu winops_layer.menu \
 	winops_misc.menu winops_opacity.menu winops_size.menu
 

config/bindings.cfg

@@ -54,11 +54,11 @@ Tooltip Clicking your mouse on the desktop will perform
 Tooltip the following actions
 MouseDown   -  1 menus show file.menu
 Tooltip Display User menus
-MouseDown   C  1 menus show enlightenment.menu
+MouseDown   C  1 menus show settings.menu
 Tooltip Display Enlightenment menu
 MouseDown   4  1 menus show settings.menu
 Tooltip Display Settings menu
-MouseDown   -  2 menus show enlightenment.menu
+MouseDown   -  2 menus show settings.menu
 Tooltip Display Enlightenment menu
 MouseDown   A  2 menus show windowlist
 Tooltip Display Task List menu
@@ -114,8 +114,7 @@ KeyDown    A   Return wop * zoom
 #KeyDown   CS        m wop * move kbd
 #KeyDown   CS        s wop * size kbd
 KeyDown   CS       F1 menus show file.menu
-KeyDown   CS       F2 menus show enlightenment.menu
+KeyDown   CS       F2 menus show settings.menu
-KeyDown   CS       F3 menus show settings.menu
 KeyDown   CS       F4 menus show windowlist
 # The previously "unchangable" keybindings
 KeyDown   CA        a button_show all

config/e16keyedit.db

@@ -93,7 +93,7 @@
 "Remember Window Stickyness", 0, "wop * snap sticky"
 "Remember Window Shadedness", 0, "wop * snap shade"
 
-"Show Root Menu", 0, "menus show enlightenment.menu"
+"Show Root Menu", 0, "menus show settings.menu"
 "Show Winops Menu", 0, "menus show winops.menu"
 "Show Named Menu", 1, "menus show "
 

config/enlightenment.menu

@@ -1,10 +0,0 @@
-"Enlightenment" "ROOT"
-"User menus"		NULL menu file.menu
-"Settings"		NULL cfg
-"Desktop"		NULL menu desktop.menu
-"Themes"		NULL menu themes
-"Maintenance"		NULL menu maintenance.menu
-"About Enlightenment"	NULL about
-"About this theme"	NULL exec "edox $ETHEME/ABOUT"
-"Restart"		NULL "exit restart"
-"Log out"		NULL "exit logout"

config/strings.c

@@ -83,18 +83,6 @@ const char     *txt[] = {
     _("Create new iconbox"),
     _("Create systray"),
     _("Show magnifier"),
-/* enlightenment.menu */
-    _("Enlightenment"),
-    _("User menus"),
-    _("Settings"),
-    _("Desktop"),
-    _("Themes"),
-    _("Maintenance"),
-    _("Help"),
-    _("About Enlightenment"),
-    _("About this theme"),
-    _("Restart"),
-    _("Log out"),
 /* maintenance.menu */
     _("Maintenance"),
     _("Purge config file cache"),
@@ -112,7 +100,6 @@ const char     *txt[] = {
     _("Desktop"),
     _("Themes"),
     _("Maintenance"),
-    _("Help"),
     _("About Enlightenment"),
     _("About this theme"),
     _("Theme menu"),
@@ -195,4 +182,5 @@ const char     *txt[] = {
     _("Epplets"),
     _("Restart"),
     _("Log out"),
+    _("Help"),
 };

config/strings.py

@@ -34,11 +34,11 @@ def do_line_cfg(line):
         TAT = 1
 
     if TTT == 0 and ttt:
-        print(f'   _("{ttt}"),')
+        print(f'    _("{ttt}"),')
         ttt = ''
 
     if TAT == 0 and tat:
-        print(f'   _("{tat}"),')
+        print(f'    _("{tat}"),')
         tat = ''
 
     # bindings.cfg
@@ -54,27 +54,27 @@ def do_line_cfg(line):
         TDT = 1
 
     if TDT == 0 and tdt:
-        print(f'   _("{tdt}"),')
+        print(f'    _("{tdt}"),')
         tdt = ''
 
     # menus.cfg (obsolete)
     if line.find('ADD_MENU_TITLE') >= 0:
         txt = quote1(line)
-        print(f'   _("{txt}"),')
+        print(f'    _("{txt}"),')
     elif line.find('ADD_MENU_TEXT_ITEM') >= 0 or \
             line.find('ADD_MENU_SUBMENU_TEXT_ITEM') >= 0:
         txt = quote1(line)
-        print(f'   _("{txt}"),')
+        print(f'    _("{txt}"),')
 
 
 def do_line_menu(line):
     # *.menu
     if line.startswith('"'):
         txt = quote1(line)
-        print(f'   _("{txt}"),')
+        print(f'    _("{txt}"),')
 
 
-# From e_gen_menu
+# From e_gen_menu + misc
 sl = [
     'User menus',
     'User application list',
@@ -82,13 +82,15 @@ sl = [
     'Epplets',
     'Restart',
     'Log out',
+
+    'Help',
 ]
 
 #
 # Start
 #
 print('#define _(x) x\n')
-print('const char         *txt[] = {')
+print('const char     *txt[] = {')
 
 
 for arg in sys.argv[1:]:
@@ -105,6 +107,6 @@ for arg in sys.argv[1:]:
 # Other strings.
 print('')
 for str in sl:
-    print(f'   _("{str}"),')
+    print(f'    _("{str}"),')
 
 print('};')

src/menus.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2023 Kim Woelders
+ * Copyright (C) 2004-2024 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -1118,11 +1118,12 @@ MenuFind(const char *name, const char *param)
  * Aliases for "well-known" menus for backward compatibility.
  */
 static const char *const menu_aliases[] = {
+    "enlightenment.menu", "settings.menu",
     "APPS_SUBMENU", "file.menu",
     "CONFIG_SUBMENU", "settings.menu",
     "DESKTOP_SUBMENU", "desktop.menu",
     "MAINT_SUBMENU", "maintenance.menu",
-    "ROOT_2", "enlightenment.menu",
+    "ROOT_2", "settings.menu",
     "WINOPS_MENU", "winops.menu",
 };
 #define N_MENU_ALIASES (E_ARRAY_SIZE(menu_aliases)/2)