This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository e16.
View the commit online.
commit 7ba2e59d1ecdb0229137ef561cfa8edf67a4c671
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Fri Feb 23 19:15:22 2024 +0100
menus: Eliminate enlightenment.menu
It is almost identical to settings.menu so let's just not have both.
---
config/Makefile.am | 2 +-
config/bindings.cfg | 7 +++----
config/e16keyedit.db | 2 +-
config/enlightenment.menu | 10 ----------
config/strings.c | 14 +-------------
config/strings.py | 4 +++-
src/menus.c | 5 +++--
7 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/config/Makefile.am b/config/Makefile.am
index 92cc95d2..088095e5 100644
--- a/config/Makefile.am
+++ b/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
diff --git a/config/bindings.cfg b/config/bindings.cfg
index aebdbe8f..c765388c 100644
--- a/config/bindings.cfg
+++ b/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 F3 menus show settings.menu
+KeyDown CS F2 menus show settings.menu
KeyDown CS F4 menus show windowlist
# The previously "unchangable" keybindings
KeyDown CA a button_show all
diff --git a/config/e16keyedit.db b/config/e16keyedit.db
index a3e0d5c1..368cbffa 100644
--- a/config/e16keyedit.db
+++ b/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 "
diff --git a/config/enlightenment.menu b/config/enlightenment.menu
deleted file mode 100644
index 89964c8c..00000000
--- a/config/enlightenment.menu
+++ /dev/null
@@ -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"
diff --git a/config/strings.c b/config/strings.c
index e44bf00f..d5401cdc 100644
--- a/config/strings.c
+++ b/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"),
};
diff --git a/config/strings.py b/config/strings.py
index cbce39b1..565aa9e4 100755
--- a/config/strings.py
+++ b/config/strings.py
@@ -74,7 +74,7 @@ def do_line_menu(line):
print(f' _("{txt}"),')
-# From e_gen_menu
+# From e_gen_menu + misc
sl = [
'User menus',
'User application list',
@@ -82,6 +82,8 @@ sl = [
'Epplets',
'Restart',
'Log out',
+
+ 'Help',
]
#
diff --git a/src/menus.c b/src/menus.c
index b2ffef44..347cd8c3 100644
--- a/src/menus.c
+++ b/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)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
