hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Move menus in menus.cfg to simple files (preserving backward compatibility). 

SVN revision: 30251
This commit is contained in:
Kim Woelders 2007-06-05 11:41:23 +00:00
parent 6b2557d9b8
commit 53a3b85ac5
18 changed files with 241 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
config/Makefile.am
View File

@ -1,14 +1,16 @@
SUBDIRS = pix
configdatadir = $(ENLIGHTENMENT_ROOT)/config
configdir = $(ENLIGHTENMENT_ROOT)/config
config_DATA = \
definitions \
actionclasses.cfg bindings.cfg matches.cfg menus.cfg \
e16keyedit.db \
fonts.cfg-xft_example
configdata_DATA = \
actionclasses.cfg \
bindings.cfg \
definitions \
matches.cfg \
menus.cfg \
e16keyedit.db \
fonts.cfg-xft_example
menudir = $(ENLIGHTENMENT_ROOT)/config/menus
menu_DATA = \
desktop.menu enlightenment.menu maintenance.menu settings.menu \
winops.menu winops_groups.menu winops_layer.menu \
winops_misc.menu winops_opacity.menu winops_size.menu
EXTRA_DIST = $(configdata_DATA) strings.c
EXTRA_DIST = $(config_DATA) $(menu_DATA) strings.c

6
config/actionclasses.cfg
View File

@ -69,7 +69,7 @@ __ACLASS __BGN
__TOOLTIP_ACTION_TEXT "Show the Window Options menu."
__EVENT __MOUSE_PRESS
__BUTTON 3
__ACTION __A_SHOW_MENU "WINOPS_MENU"
__ACTION __A_SHOW_MENU "winops.menu"
__NEXT_ACTION
__TOOLTIP_ACTION_TEXT "Shade/Unshade this window."
__EVENT __DOUBLE_CLICK
@ -265,7 +265,7 @@ __ACLASS __BGN
__ALLOW_ANY_MODIFIER_KEYS __ON
__EVENT __MOUSE_PRESS
__ALLOW_ANY_BUTTON __ON
__ACTION __A_SHOW_MENU "WINOPS_MENU"
__ACTION __A_SHOW_MENU "winops.menu"
__END
@ -282,7 +282,7 @@ __ACLASS __BGN
__TOOLTIP_ACTION_TEXT "Show the Window Options menu."
__EVENT __MOUSE_PRESS
__BUTTON 3
__ACTION __A_SHOW_MENU "WINOPS_MENU"
__ACTION __A_SHOW_MENU "winops.menu"
__END
__ACLASS __BGN

20
config/bindings.cfg
View File

@ -39,7 +39,7 @@ MouseDown AS 1 wop = mo ptr
MouseDouble A 1 wop * shade
MouseDown A 2 wop * sz ptr
MouseDouble A 2 wop * th available
MouseDown A 3 menus show WINOPS_MENU
MouseDown A 3 menus show winops.menu
# May be used to control opacity with mouse
#MouseDown A 4 wop * focused_opacity +10
#MouseDown A 5 wop * focused_opacity -10
@ -51,13 +51,13 @@ MouseDown A 3 menus show WINOPS_MENU
Aclass DESKBINDINGS normal
Tooltip Clicking your mouse on the desktop will perform
Tooltip the following actions
MouseDown - 1 menus show APPS_SUBMENU
MouseDown - 1 menus show file.menu
Tooltip Display User Menus
MouseDown C 1 menus show ROOT_2
MouseDown C 1 menus show enlightenment.menu
Tooltip Display Enlightenment Menu
MouseDown 4 1 menus show CONFIG_SUBMENU
MouseDown 4 1 menus show settings.menu
Tooltip Display Settings Menu
MouseDown - 2 menus show ROOT_2
MouseDown - 2 menus show enlightenment.menu
Tooltip Display Enlightenment Menu
MouseDown A 2 menus show windowlist
Tooltip Display Task List 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 menus show CONFIG_SUBMENU
MouseDown - 3 menus show settings.menu
Tooltip Display Settings Menu
MouseDown * 4 desk prev
Tooltip Go Back a Desktop
@ -110,11 +110,11 @@ KeyDown CA i wop * iconify
KeyDown CA r wop * shade
KeyDown CA f wop * fullscreen
KeyDown CA m wop * ts conservative
KeyDown CA w menus show WINOPS_MENU
KeyDown CA w menus show winops.menu
KeyDown A Return wop * zoom
KeyDown CS F1 menus show APPS_SUBMENU
KeyDown CS F2 menus show ROOT_2
KeyDown CS F3 menus show CONFIG_SUBMENU
KeyDown CS F1 menus show file.menu
KeyDown CS F2 menus show enlightenment.menu
KeyDown CS F3 menus show settings.menu
KeyDown CS F4 menus show windowlist
# The previously "unchangable" keybindings
KeyDown CA a button_show all

7
config/desktop.menu Normal file
View File

@ -0,0 +1,7 @@
"Desktop Operations" "ROOT" "DESKTOP_SUBMENU"
"Backgrounds" NULL menu BACKGROUNDS_MENU
"Cleanup Desktop" NULL "desk arrange"
"Goto Next Desktop" NULL "desk next"
"Goto Previous Desktop" NULL "desk prev"
"Create New Iconbox" NULL "ibox new"
"Create Systray" NULL "ibox new _ST_"

4
config/e16keyedit.db
View File

@ -89,8 +89,8 @@
"Remember Window Stickyness", 0, "wop * snap sticky"
"Remember Window Shadedness", 0, "wop * snap shade"
"Show Root Menu", 0, "menus show ROOT_2"
"Show Winops Menu", 0, "menus show WINOPS_MENU"
"Show Root Menu", 0, "menus show enlightenment.menu"
"Show Winops Menu", 0, "menus show winops.menu"
"Show Named Menu", 1, "menus show "
"Goto Linear Area", 0, NULL

11
config/enlightenment.menu Normal file
View File

@ -0,0 +1,11 @@
"Enlightenment" "ROOT" "ROOT_2"
"User Menus" NULL menu file.menu
"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"
"About Enlightenment" NULL about
"About this theme" NULL exec "edox $ETHEME/ABOUT"
"Restart Enlightenment" NULL exit restart
"Log Out" NULL exit logout

10
config/maintenance.menu Normal file
View File

@ -0,0 +1,10 @@
"Maintenance" "ROOT" "MAINT_SUBMENU"
"Purge config file cache" NULL exec "sh $EROOT/scripts/e_cache_clean config"
"Purge pager background cache" NULL exec "sh $EROOT/scripts/e_cache_clean pager"
"Purge background selector cache" NULL exec "sh $EROOT/scripts/e_cache_clean bgsel"
"Purge all caches" NULL exec "sh $EROOT/scripts/e_cache_clean all"
"Query config file cache usage" NULL exec "sh $EROOT/scripts/e_cache_query config"
"Query pager background cache usage" NULL exec "sh $EROOT/scripts/e_cache_query pager"
"Query background selector cache usage" NULL exec "sh $EROOT/scripts/e_cache_query bgsel"
"Query all cache usage" NULL exec "sh $EROOT/scripts/e_cache_query all"
"Regenerate Menus" NULL exec "perl $EROOT/scripts/e_gen_menu"

164
config/menus.cfg
View File

@ -2,170 +2,8 @@
__E_CFG_VERSION 0
BEGIN_NEW_FILE_MENU("APPS_SUBMENU", "ROOT", ECONFDIR"/menus/file.menu")
END_MENU
/* recursively scan $HOME/.enlightenment/backgrounds and build menu if images
/* recursively scan $HOME/.e16/backgrounds and build menu if images
* are there */
BEGIN_NEW_DIRSCAN_MENU("BACKGROUNDS_MENU", "ROOT_IMAGE", ECONFDIR"/backgrounds")
ADD_MENU_TITLE("Backgrounds")
END_MENU
BEGIN_NEW_MENU("DESKTOP_SUBMENU", "ROOT")
ADD_MENU_TITLE("Desktop Operations")
ADD_MENU_SUBMENU_TEXT_ITEM("Backgrounds", "BACKGROUNDS_MENU")
ADD_MENU_TEXT_ITEM("Cleanup Desktop", __A_CMD, "desk arrange")
ADD_MENU_TEXT_ITEM("Goto Next Desktop", __A_CMD, "desk next")
ADD_MENU_TEXT_ITEM("Goto Previous Desktop", __A_CMD, "desk prev")
ADD_MENU_TEXT_ITEM("Create New Iconbox", __A_CMD, "ibox new")
ADD_MENU_TEXT_ITEM("Create Systray", __A_CMD, "ibox new _ST_")
END_MENU
BEGIN_NEW_MENU("MAINT_SUBMENU", "ROOT")
ADD_MENU_TITLE("Maintenance")
ADD_MENU_TEXT_ITEM("Purge config file cache", __A_EXEC, E_SCRIPTS_DIR"e_cache_clean config")
ADD_MENU_TEXT_ITEM("Purge pager background cache", __A_EXEC, E_SCRIPTS_DIR"e_cache_clean pager")
ADD_MENU_TEXT_ITEM("Purge background selector cache", __A_EXEC, E_SCRIPTS_DIR"e_cache_clean bgsel")
ADD_MENU_TEXT_ITEM("Purge all caches", __A_EXEC, E_SCRIPTS_DIR"e_cache_clean all")
ADD_MENU_TEXT_ITEM("Query config file cache usage", __A_EXEC, E_SCRIPTS_DIR"e_cache_query config")
ADD_MENU_TEXT_ITEM("Query pager background cache usage", __A_EXEC, E_SCRIPTS_DIR"e_cache_query pager")
ADD_MENU_TEXT_ITEM("Query background selector cache usage", __A_EXEC, E_SCRIPTS_DIR"e_cache_query bgsel")
ADD_MENU_TEXT_ITEM("Query all cache usage", __A_EXEC, E_SCRIPTS_DIR"e_cache_query all")
ADD_MENU_TEXT_ITEM("Regenerate Menus", __A_EXEC, E_SCRIPTS_DIR"e_gen_menu")
END_MENU
/* dont need this anymore - will have a scritp soon to do it all
BEGIN_NEW_GNOME_MENU("GNOME_SUBMENU", "ROOT", "/usr/share/gnome/apps")
END_MENU
BEGIN_NEW_GNOME_MENU("GNOME_USER_SUBMENU", "ROOT", HOME_DIR"/.gnome/apps")
END_MENU
*/
BEGIN_NEW_THEMES_MENU("THEMES_SUBMENU", "ROOT")
END_MENU
BEGIN_NEW_MENU("CONFIG_SUBMENU", "ROOT")
ADD_MENU_TITLE("Settings")
ADD_MENU_TEXT_ITEM("Enlightenment Settings ...", __A_CMD, "misc cfg")
ADD_MENU_TEXT_ITEM("Focus Settings ...", __A_CMD, "focus cfg")
ADD_MENU_TEXT_ITEM("Move & Resize Settings ...", __A_CMD, "misc cfg moveresize")
ADD_MENU_TEXT_ITEM("Window Placement Settings ...", __A_CMD, "misc cfg placement")
ADD_MENU_TEXT_ITEM("Multiple Desktop Settings ...", __A_CMD, "desk cfg")
ADD_MENU_TEXT_ITEM("Virtual Desktop Settings ...", __A_CMD, "area cfg")
ADD_MENU_TEXT_ITEM("Pager Settings ...", __A_CMD, "pager cfg")
ADD_MENU_TEXT_ITEM("Menu Settings ...", __A_CMD, "menus cfg")
ADD_MENU_TEXT_ITEM("Autoraise Settings ...", __A_CMD, "misc cfg autoraise")
ADD_MENU_TEXT_ITEM("Tooltip Settings ...", __A_CMD, "tooltips cfg")
ADD_MENU_TEXT_ITEM("Audio Settings ...", __A_CMD, "sound cfg")
ADD_MENU_TEXT_ITEM("Group Settings ...", __A_CMD, "groups cfg group_defaults")
ADD_MENU_TEXT_ITEM("Remember Settings ...", __A_CMD, "misc cfg remember");
ADD_MENU_TEXT_ITEM("Special FX Settings ...", __A_CMD, "fx cfg")
ADD_MENU_TEXT_ITEM("Desktop Background Settings ...", __A_CMD, "bg cfg")
ADD_MENU_TEXT_ITEM("Theme Transparency Settings ...", __A_CMD, "trans cfg")
ADD_MENU_TEXT_ITEM("Composite Settings ...", __A_CMD, "cm cfg");
ADD_MENU_TEXT_ITEM("Session Settings ...", __A_CMD, "misc cfg session");
ADD_MENU_TEXT_ITEM("Miscellaneous Settings ...", __A_CMD, "misc cfg misc");
END_MENU
BEGIN_NEW_MENU("ROOT_2", "ROOT")
ADD_MENU_TITLE("Enlightenment")
ADD_MENU_SUBMENU_TEXT_ITEM("User Menus", "APPS_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Desktop", "DESKTOP_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Settings", "CONFIG_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Themes", "THEMES_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Maintenance", "MAINT_SUBMENU")
ADD_MENU_TEXT_ITEM("Help", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $EROOT"/E-docs")
ADD_MENU_TEXT_ITEM("About Enlightenment", __A_CMD, "about")
ADD_MENU_TEXT_ITEM("About this theme", __A_EXEC, ENLIGHTENMENT_BIN"/edox" $ETHEME"/ABOUT")
ADD_MENU_TEXT_ITEM("Restart Enlightenment", __A_CMD, "exit restart")
ADD_MENU_TEXT_ITEM("Log Out", __A_CMD, "exit logout")
END_MENU
BEGIN_NEW_MENU("WINOPS_H", "EMPTY")
ADD_MENU_TEXT_ITEM("Max Height Toggle", __A_CMD, "wop * th conservative")
ADD_MENU_TEXT_ITEM("Available Max Height Toggle", __A_CMD, "wop * th available")
ADD_MENU_TEXT_ITEM("Absolute Max Height Toggle", __A_CMD, "wop * th absolute")
END_MENU
BEGIN_NEW_MENU("WINOPS_W", "EMPTY")
ADD_MENU_TEXT_ITEM("Max Width Toggle", __A_CMD, "wop * tw conservative")
ADD_MENU_TEXT_ITEM("Available Max Width Toggle", __A_CMD, "wop * tw available")
ADD_MENU_TEXT_ITEM("Absolute Max Width Toggle", __A_CMD, "wop * tw absolute")
END_MENU
BEGIN_NEW_MENU("WINOPS_WH", "EMPTY")
ADD_MENU_TEXT_ITEM("Max Size Toggle", __A_CMD, "wop * ts conservative")
ADD_MENU_TEXT_ITEM("Available Max Size Toggle", __A_CMD, "wop * ts available")
ADD_MENU_TEXT_ITEM("Absolute Max Size Toggle", __A_CMD, "wop * ts absolute")
ADD_MENU_TEXT_ITEM("Span Xinerama Screens", __A_CMD, "wop * ts xinerama")
END_MENU
BEGIN_NEW_MENU("WINOPS_SIZE", "EMPTY")
ADD_MENU_SUBMENU_TEXT_ITEM("Height", "WINOPS_H")
ADD_MENU_SUBMENU_TEXT_ITEM("Width", "WINOPS_W")
ADD_MENU_SUBMENU_TEXT_ITEM("Size", "WINOPS_WH")
ADD_MENU_TEXT_ITEM("Fullscreen/Normal", __A_CMD, "wop * full")
ADD_MENU_TEXT_ITEM("Zoom/Unzoom", __A_CMD, "wop * zoom")
END_MENU
BEGIN_NEW_MENU("WINOPS_LAYER", "EMPTY")
ADD_MENU_TEXT_ITEM("Below", __A_CMD, "wop * la 2")
ADD_MENU_TEXT_ITEM("Normal", __A_CMD, "wop * la 4")
ADD_MENU_TEXT_ITEM("Above", __A_CMD, "wop * la 6")
ADD_MENU_TEXT_ITEM("On Top", __A_CMD, "wop * la 8")
END_MENU
BEGIN_NEW_MENU("WINOPS_OPACITY", "EMPTY")
ADD_MENU_TEXT_ITEM("20%", __A_CMD, "wop * op 20")
ADD_MENU_TEXT_ITEM("40%", __A_CMD, "wop * op 40")
ADD_MENU_TEXT_ITEM("60%", __A_CMD, "wop * op 60")
ADD_MENU_TEXT_ITEM("80%", __A_CMD, "wop * op 80")
ADD_MENU_TEXT_ITEM("100%", __A_CMD, "wop * op 100")
ADD_MENU_TEXT_ITEM("Focused opacity 100%",__A_CMD, "wop * focused_opacity 100")
ADD_MENU_TEXT_ITEM("Focused opacity follows unfocused",__A_CMD, "wop * focused_opacity 0")
ADD_MENU_TEXT_ITEM("Toggle Fading", __A_CMD, "wop * fade")
ADD_MENU_TEXT_ITEM("Toggle Shadows", __A_CMD, "wop * shadow")
END_MENU
BEGIN_NEW_MENU("WINOPS_MISC", "EMPTY")
ADD_MENU_TEXT_ITEM("Toggle Skip Window Lists", __A_CMD, "wop * skiplists")
ADD_MENU_TEXT_ITEM("Toggle Fixed Position", __A_CMD, "wop * no_user_move")
ADD_MENU_TEXT_ITEM("Toggle Fixed Size", __A_CMD, "wop * no_user_size")
ADD_MENU_TEXT_ITEM("Toggle Never Focus", __A_CMD, "wop * no_wm_focus")
ADD_MENU_TEXT_ITEM("Toggle Click to Focus", __A_CMD, "wop * focusclick")
ADD_MENU_TEXT_ITEM("Toggle Never Use Area", __A_CMD, "wop * never_use_area")
ADD_MENU_TEXT_ITEM("Toggle Button Grabs", __A_CMD, "wop * no_button_grabs")
END_MENU
BEGIN_NEW_BORDERS_MENU("WINOPS_BORDERS", "EMPTY")
END_MENU
BEGIN_NEW_MENU("WINOPS_GROUP", "EMPTY")
ADD_MENU_TEXT_ITEM("Configure this window's group(s)", __A_CMD, "groups cfg group")
ADD_MENU_TEXT_ITEM("Start a new group", __A_CMD, "gop * start")
ADD_MENU_TEXT_ITEM("Add this window to the current group", __A_CMD, "gop * add");
ADD_MENU_TEXT_ITEM("Select group to add this window to", __A_CMD, "groups cfg add")
ADD_MENU_TEXT_ITEM("Remove this window from a group", __A_CMD, "groups cfg del")
ADD_MENU_TEXT_ITEM("Destroy a group this window belongs to", __A_CMD, "groups cfg break")
/*ADD_MENU_TEXT_ITEM("Show/Hide this window's group(s)", __A_CMD, "gop * showhide")*/
END_MENU
BEGIN_NEW_MENU("WINOPS_MENU", "EMPTY")
ADD_MENU_TITLE("Window Options")
ADD_MENU_TEXT_ITEM("Close", __A_CMD, "wop * close")
ADD_MENU_TEXT_ITEM("Annihilate", __A_CMD, "wop * kill")
ADD_MENU_TEXT_ITEM("Iconify", __A_CMD, "wop * iconify")
ADD_MENU_TEXT_ITEM("Raise", __A_CMD, "wop * raise")
ADD_MENU_TEXT_ITEM("Lower", __A_CMD, "wop * lower")
ADD_MENU_TEXT_ITEM("Shade/Unshade", __A_CMD, "wop * shade")
ADD_MENU_TEXT_ITEM("Stick/Unstick", __A_CMD, "wop * stick")
ADD_MENU_TEXT_ITEM("Remember...", __A_CMD, "wop * snap dialog")
ADD_MENU_SUBMENU_TEXT_ITEM("Window Size", "WINOPS_SIZE")
ADD_MENU_SUBMENU_TEXT_ITEM("Set Stacking", "WINOPS_LAYER")
ADD_MENU_SUBMENU_TEXT_ITEM("Set Border Style", "WINOPS_BORDERS")
ADD_MENU_SUBMENU_TEXT_ITEM("Window Groups", "WINOPS_GROUP")
ADD_MENU_SUBMENU_TEXT_ITEM("Opacity", "WINOPS_OPACITY")
ADD_MENU_SUBMENU_TEXT_ITEM("Miscellaneous", "WINOPS_MISC")
/*ADD_MENU_SUBMENU_TEXT_ITEM("Remember State", "WINOPS_SNAP")*/
END_MENU

20
config/settings.menu Normal file
View File

@ -0,0 +1,20 @@
"Settings" "ROOT" "CONFIG_SUBMENU"
"Enlightenment Settings ..." NULL "misc cfg"
"Focus Settings ..." NULL "focus cfg"
"Move & Resize Settings ..." NULL "misc cfg moveresize"
"Window Placement Settings ..." NULL "misc cfg placement"
"Multiple Desktop Settings ..." NULL "desk cfg"
"Virtual Desktop Settings ..." NULL "area cfg"
"Pager Settings ..." NULL "pager cfg"
"Menu Settings ..." NULL "menus cfg"
"Autoraise Settings ..." NULL "misc cfg autoraise"
"Tooltip Settings ..." NULL "tooltips cfg"
"Audio Settings ..." NULL "sound cfg"
"Group Settings ..." NULL "groups cfg group_defaults"
"Remember Settings ..." NULL "misc cfg remember"
"Special FX Settings ..." NULL "fx cfg"
"Desktop Background Settings ..." NULL "bg cfg"
"Theme Transparency Settings ..." NULL "trans cfg"
"Composite Settings ..." NULL "cm cfg"
"Session Settings ..." NULL "misc cfg session"
"Miscellaneous Settings ..." NULL "misc cfg misc"

119
config/strings.c
View File

@ -71,8 +71,10 @@ _("Display Group Menu"),
_("Display Settings Menu"),
_("Go Back a Desktop"),
_("Go Forward a Desktop"),
/* matches.cfg */
/* menus.cfg */
_("Backgrounds"),
/* desktop.menu */
_("Desktop Operations"),
_("Backgrounds"),
_("Cleanup Desktop"),
@ -80,6 +82,19 @@ _("Goto Next Desktop"),
_("Goto Previous Desktop"),
_("Create New Iconbox"),
_("Create Systray"),
/* enlightenment.menu */
_("Enlightenment"),
_("User Menus"),
_("Desktop"),
_("Settings"),
_("Themes"),
_("Maintenance"),
_("Help"),
_("About Enlightenment"),
_("About this theme"),
_("Restart Enlightenment"),
_("Log Out"),
/* maintenance.menu */
_("Maintenance"),
_("Purge config file cache"),
_("Purge pager background cache"),
@ -90,6 +105,7 @@ _("Query pager background cache usage"),
_("Query background selector cache usage"),
_("Query all cache usage"),
_("Regenerate Menus"),
/* settings.menu */
_("Settings"),
_("Enlightenment Settings ..."),
_("Focus Settings ..."),
@ -110,59 +126,7 @@ _("Theme Transparency Settings ..."),
_("Composite Settings ..."),
_("Session Settings ..."),
_("Miscellaneous Settings ..."),
_("Enlightenment"),
_("User Menus"),
_("Desktop"),
_("Settings"),
_("Themes"),
_("Maintenance"),
_("Help"),
_("About Enlightenment"),
_("About this theme"),
_("Restart Enlightenment"),
_("Log Out"),
_("Max Height Toggle"),
_("Available Max Height Toggle"),
_("Absolute Max Height Toggle"),
_("Max Width Toggle"),
_("Available Max Width Toggle"),
_("Absolute Max Width Toggle"),
_("Max Size Toggle"),
_("Available Max Size Toggle"),
_("Absolute Max Size Toggle"),
_("Span Xinerama Screens"),
_("Height"),
_("Width"),
_("Size"),
_("Fullscreen/Normal"),
_("Zoom/Unzoom"),
_("Below"),
_("Normal"),
_("Above"),
_("On Top"),
_("20%"),
_("40%"),
_("60%"),
_("80%"),
_("100%"),
_("Focused opacity 100%"),
_("Focused opacity follows unfocused"),
_("Toggle Fading"),
_("Toggle Shadows"),
_("Toggle Skip Window Lists"),
_("Toggle Fixed Position"),
_("Toggle Fixed Size"),
_("Toggle Never Focus"),
_("Toggle Click to Focus"),
_("Toggle Never Use Area"),
_("Toggle Button Grabs"),
_("Configure this window's group(s)"),
_("Start a new group"),
_("Add this window to the current group"),
_("Select group to add this window to"),
_("Remove this window from a group"),
_("Destroy a group this window belongs to"),
_("Show/Hide this window's group(s)"),
/* winops.menu */
_("Window Options"),
_("Close"),
_("Annihilate"),
@ -178,7 +142,54 @@ _("Set Border Style"),
_("Window Groups"),
_("Opacity"),
_("Miscellaneous"),
_("Remember State"),
/* winops_groups.menu */
_("Groups"),
_("Configure this window's group(s)"),
_("Start a new group"),
_("Add this window to the current group"),
_("Select group to add this window to"),
_("Remove this window from a group"),
_("Destroy a group this window belongs to"),
/* winops_layer.menu */
_("Stacking"),
_("Below"),
_("Normal"),
_("Above"),
_("On Top"),
/* winops_misc.menu */
_("Miscellaneous"),
_("Toggle Skip Window Lists"),
_("Toggle Fixed Position"),
_("Toggle Fixed Size"),
_("Toggle Never Focus"),
_("Toggle Click to Focus"),
_("Toggle Never Use Area"),
_("Toggle Button Grabs"),
/* winops_opacity.menu */
_("Opacity"),
_("20%"),
_("40%"),
_("60%"),
_("80%"),
_("100%"),
_("Focused opacity 100%"),
_("Focused opacity follows unfocused"),
_("Toggle Fading"),
_("Toggle Shadows"),
/* winops_size.menu */
_("Size"),
_("Max Size Toggle"),
_("Available Max Size Toggle"),
_("Absolute Max Size Toggle"),
_("Span Xinerama Screens"),
_("Max Height Toggle"),
_("Available Max Height Toggle"),
_("Absolute Max Height Toggle"),
_("Max Width Toggle"),
_("Available Max Width Toggle"),
_("Absolute Max Width Toggle"),
_("Fullscreen/Normal"),
_("Zoom/Unzoom"),
_("User Menus"),
_("User Application List"),

5
config/strings.pl
View File

@ -60,6 +60,11 @@ sub x() {
$t = "$1";
print "_($t),\n";
}
# *.menu
if (/^"([^"]+)"/) {
print "_(\"$1\"),\n";
}
}
# From e_gen_menu

15
config/winops.menu Normal file
View File

@ -0,0 +1,15 @@
"Window Options" "EMPTY" "WINOPS_MENU"
"Close" NULL "wop * close"
"Annihilate" NULL "wop * kill"
"Iconify" NULL "wop * iconify"
"Raise" NULL "wop * raise"
"Lower" NULL "wop * lower"
"Shade/Unshade" NULL "wop * shade"
"Stick/Unstick" NULL "wop * stick"
"Remember..." NULL "wop * snap dialog"
"Window Size" NULL menu winops_size.menu
"Set Stacking" NULL menu winops_layer.menu
"Set Border Style" NULL menu borders
"Window Groups" NULL menu winops_group.menu
"Opacity" NULL menu winops_opacity.menu
"Miscellaneous" NULL menu winops_misc.menu

8
config/winops_groups.menu Normal file
View File

@ -0,0 +1,8 @@
"Groups" "EMPTY"
"Configure this window's group(s)" NULL "groups cfg group"
"Start a new group" NULL "gop * start"
"Add this window to the current group" NULL "gop * add"
"Select group to add this window to" NULL "groups cfg add"
"Remove this window from a group" NULL "groups cfg del"
"Destroy a group this window belongs to" NULL "groups cfg break"
#"Show/Hide this window's group(s)" NULL "gop * showhide"

5
config/winops_layer.menu Normal file
View File

@ -0,0 +1,5 @@
"Stacking" "EMPTY"
"Below" NULL "wop * la 2"
"Normal" NULL "wop * la 4"
"Above" NULL "wop * la 6"
"On Top" NULL "wop * la 8"

8
config/winops_misc.menu Normal file
View File

@ -0,0 +1,8 @@
"Miscellaneous" "EMPTY"
"Toggle Skip Window Lists" NULL "wop * skiplists"
"Toggle Fixed Position" NULL "wop * no_user_move"
"Toggle Fixed Size" NULL "wop * no_user_size"
"Toggle Never Focus" NULL "wop * no_wm_focus"
"Toggle Click to Focus" NULL "wop * focusclick"
"Toggle Never Use Area" NULL "wop * never_use_area"
"Toggle Button Grabs" NULL "wop * no_button_grabs"

10
config/winops_opacity.menu Normal file
View File

@ -0,0 +1,10 @@
"Opacity" "EMPTY"
"20%" NULL "wop * op 20"
"40%" NULL "wop * op 40"
"60%" NULL "wop * op 60"
"80%" NULL "wop * op 80"
"100%" NULL "wop * op 100"
"Focused opacity 100%" NULL "wop * focused_opacity 100"
"Focused opacity follows unfocused" NULL "wop * focused_opacity 0"
"Toggle Fading" NULL "wop * fade"
"Toggle Shadows" NULL "wop * shadow"

16
config/winops_size.menu Normal file
View File

@ -0,0 +1,16 @@
"Size" "EMPTY"
"Max Size Toggle" NULL "wop * ts conservative"
"Available Max Size Toggle" NULL "wop * ts available"
"Absolute Max Size Toggle" NULL "wop * ts absolute"
"Span Xinerama Screens" NULL "wop * ts xinerama"
"Max Height Toggle" NULL "wop * th conservative"
"Available Max Height Toggle" NULL "wop * th available"
"Absolute Max Height Toggle" NULL "wop * th absolute"
"Max Width Toggle" NULL "wop * tw conservative"
"Available Max Width Toggle" NULL "wop * tw available"
"Absolute Max Width Toggle" NULL "wop * tw absolute"
"Fullscreen/Normal" NULL "wop * full"
"Zoom/Unzoom" NULL "wop * zoom"

61
src/menus.c
View File

@ -1097,10 +1097,40 @@ MenuFind(const char *name, const char *param)
return m;
}
/*
* Aliases for "well-known" menus for backward compatibility.
*/
static const char *const menu_aliases[] = {
"APPS_SUBMENU", "file.menu",
"CONFIG_SUBMENU", "settings.menu",
"DESKTOP_SUBMENU", "desktop.menu",
"MAINT_SUBMENU", "maintenance.menu",
"ROOT_2", "enlightenment.menu",
"WINOPS_MENU", "winops.menu",
};
#define N_MENU_ALIASES (sizeof(menu_aliases)/sizeof(char*)/2)
static const char *
_MenuCheckAlias(const char *name)
{
unsigned int i;
for (i = 0; i < N_MENU_ALIASES; i++)
if (!strcmp(name, menu_aliases[2 * i]))
return menu_aliases[2 * i + 1];
return NULL;
}
static void
MenusShowNamed(const char *name, const char *param)
{
Menu *m;
const char *name2;
name2 = _MenuCheckAlias(name);
if (name2)
name = name2;
/* Hide any menus currently up */
if (MenusActive())
@ -1840,33 +1870,6 @@ MenuStyleConfigLoad(FILE * ConfigFile)
return err;
}
/*
* Aliases for "well-known" menus for backward compatibility.
*/
static const char *const menu_aliases[] = {
"APPS_SUBMENU", "file.menu",
"CONFIG_SUBMENU", "settings.menu",
"DESKTOP_SUBMENU", "desktop.menu",
"MAINT_SUBMENU", "maintenance.menu",
"ROOT_2", "enlightenment.menu",
"WINOPS_MENU", "winops.menu",
};
#define N_MENU_ALIASES (sizeof(menu_aliases)/sizeof(char*)/2)
static void
_MenuCheckAlias(Menu * m)
{
unsigned int i;
for (i = 0; i < N_MENU_ALIASES; i++)
{
if (strcmp(m->name, menu_aliases[2 * i]))
continue;
MenuSetAlias(m, menu_aliases[2 * i + 1]);
break;
}
}
int
MenuConfigLoad(FILE * fs)
{
@ -1933,7 +1936,9 @@ MenuConfigLoad(FILE * fs)
m = MenuCreate(s2, NULL, NULL, NULL);
else
MenuSetName(m, s2);
_MenuCheckAlias(m);
params = _MenuCheckAlias(s2);
if (params)
MenuSetAlias(m, params);
break;
case MENU_USE_STYLE:
MenuSetStyle(m, MenuStyleFind(s2));