Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/config
Modified Files:
Makefile.am actionclasses.cfg control.cfg definitions
menus.cfg strings.c
Added Files:
bindings.cfg
Removed Files:
keybindings.cfg
Log Message:
0.16.8
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 12 Jul 2004 23:48:15 -0000 1.3
+++ Makefile.am 28 Dec 2004 23:46:42 -0000 1.4
@@ -8,10 +8,10 @@
backup-imageclasses.cfg \
backup-textclasses.cfg \
backup-tooltips.cfg \
+bindings.cfg \
definitions \
control.cfg \
icondefs.cfg \
-keybindings.cfg \
menus.cfg
configdatadir = $(ENLIGHTENMENT_ROOT)/config
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/actionclasses.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- actionclasses.cfg 30 Oct 2004 14:24:12 -0000 1.2
+++ actionclasses.cfg 28 Dec 2004 23:46:42 -0000 1.3
@@ -338,3 +338,13 @@
__ACTION __A_STICK
__END
+/* For autoshading borders */
+__ACLASS __BGN
+ __NAME ACTION_AUTOSHADE
+ __TYPE __TYPE_NORMAL
+ __EVENT __MOUSE_ENTER
+ __ACTION __A_SHADE off
+ __NEXT_ACTION
+ __EVENT __MOUSE_LEAVE
+ __ACTION __A_SHADE on
+__END
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/control.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- control.cfg 11 Mar 2004 23:08:12 -0000 1.1
+++ control.cfg 28 Dec 2004 23:46:42 -0000 1.2
@@ -20,9 +20,8 @@
******************************************************************************
* Behavior control section
******************************************************************************
-*/
-__CONTROL __BGN
-/*
+*
+*
* This is by no means all the various things that can be defined here.
* There are TONS of things that can be defined here. Just about anything
* in setup.c can be overridden here. NOTE: you don't have to define
@@ -32,6 +31,8 @@
* eventually live in the user-specific configuration location.
* --Mandrake
*/
+/*
+__CONTROL __BGN
__FOCUS_MODE __SLOPPY
__MOVE_MODE __OPAQUE
__RESIZE_MODE __BOX
@@ -74,6 +75,7 @@
__GROUP_SHADE __ON
__GROUP_MIRROR __ON
__END
+*/
__EXTRAS __BGN
__ICONBOX __BGN
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/definitions,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- definitions 18 Jul 2004 12:27:37 -0000 1.2
+++ definitions 28 Dec 2004 23:46:42 -0000 1.3
@@ -75,6 +75,8 @@
#define __FX 18
#define __ICONBOX 19
#define __EXTRAS 20
+#define __FONTS 21
+
#define __MENU_STYLE 699
#define __BORDER_PART 505
@@ -236,109 +238,123 @@
#define __TYPE_GLOBAL 7
/* possible actions that can be performed */
-#define __A_NONE 0
-#define __A_EXEC 1
-#define __A_ALERT 2
-#define __A_MOVE 3
-#define __A_RESIZE 4
-#define __A_RAISE 5
-#define __A_LOWER 6
-#define __A_EXIT 7
-#define __A_CLEANUP 8
-#define __A_SHOW_MENU 9
-#define __A_HIDE_MENU 10
-#define __A_RESIZE_H 11
-#define __A_RESIZE_V 12
-#define __A_KILL 13
-#define __A_KILL_NASTY 14
-#define __A_DESKTOP_NEXT 15
-#define __A_DESKTOP_PREV 16
-#define __A_DESKTOP_RAISE 17
-#define __A_DESKTOP_LOWER 18
-#define __A_DESKTOP_DRAG 19
-#define __A_STICK 20
-#define __A_DESKTOP_INPLACE 21
-#define __A_DRAG_BUTTON 22
-#define __A_FOCUSMODE_SET 23
-#define __A_MOVEMODE_SET 24
-#define __A_RESIZEMODE_SET 25
-#define __A_SLIDEMODE_SET 26
-#define __A_CLEANUPSLIDE_SET 27
-#define __A_MAPSLIDE_SET 28
-#define __A_SOUND_SET 29
-#define __A_BUTTONMOVE_RESIST_SET 30
-#define __A_DESKTOPBG_TIMEOUT_SET 31
-#define __A_MAPSLIDE_SPEED_SET 32
-#define __A_CLEANUPSLIDE_SPEED_SET 33
-#define __A_DRAGDIR_SET 34
-#define __A_DRAGBAR_ORDER_SET 35
-#define __A_DRAGBAR_WIDTH_SET 36
-#define __A_DRAGBAR_LENGTH_SET 37
-#define __A_DESKSLIDE_SET 38
-#define __A_DESKSLIDE_SPEED_SET 39
-#define __A_HIQUALITYBG_SET 40
-#define __A_PLAYSOUNDCLASS 41
-#define __A_GOTO_DESK 42
-#define __A_DESKRAY 43
-#define __A_AUTOSAVE_SET 44
-#define __A_HIDESHOW_BUTTON 45
-#define __A_ICONIFY 46
-#define __A_SLIDEOUT 47
-#define __A_SCROLL_WINDOWS 48
-#define __A_SHADE 49
-#define __A_MAX_HEIGHT 50
-#define __A_MAX_WIDTH 51
-#define __A_MAX_SIZE 52
-#define __A_SEND_TO_NEXT_DESK 53
-#define __A_SEND_TO_PREV_DESK 54
-#define __A_SNAPSHOT 55
-#define __A_TOOLTIP_SET 57
-#define __A_FOCUS_NEXT 58
-#define __A_FOCUS_PREV 59
-#define __A_FOCUS_SET 60
-#define __A_BACKGROUND_SET 61
-#define __A_AREA_SET 62
-#define __A_AREA_MOVE_BY 63
-#define __A_TOGGLE_FIXED 64
-#define __A_SET_LAYER 65
-#define __A_WARP_POINTER 66
-#define __A_MOVE_WIN_TO_AREA 67
-#define __A_MOVE_WIN_BY_AREA 68
-#define __A_SET_BORDER 69
-#define __A_AREA_LINEAR_SET 70
-#define __A_AREA_LINEAR_MOVE_BY 71
-#define __A_ABOUT 72
-#define __A_FX 73
-#define __A_MOVE_WIN_TO_LINEAR_AREA 74
-#define __A_MOVE_WIN_BY_LINEAR_AREA 75
-#define __A_SET_PAGER_HIQ 76
-#define __A_SET_PAGER_SNAP 77
-#define __A_CONFIG 78
-#define __A_MOVE_CONSTRAINED 79
-#define __A_TYPE_TEXT 80
-#define __A_START_GROUP 81
-#define __A_ADD_TO_GROUP 82
-#define __A_REMOVE_FROM_GROUP 83
-#define __A_BREAK_GROUP 84
-#define __A_SHOWHIDE_GROUP 85
-#define __A_CREATE_ICONBOX 86
-#define __A_RAISE_LOWER 87
-#define __A_ZOOM 88
-#define __A_SET_WINDOW_BORDER_NG 89
-#define __A_ICONIFY_NG 90
-#define __A_KILL_NG 91
-#define __A_MOVE_NG 92
-#define __A_RAISE_NG 93
-#define __A_LOWER_NG 94
-#define __A_STICK_NG 95
-#define __A_SHADE_NG 96
-#define __A_RAISE_LOWER_NG 97
-#define __A_SKIPFOCUS 98
-#define __A_SKIPTASK 99
-#define __A_SKIPWINLIST 100
-#define __A_NEVERFOCUS 101
-#define __A_SKIPLISTS 102
-#define __A_SWAPMOVE 103
+#define __A_EXEC exec
+#define __A_CMD
+
+#define __A_NONE nop
+#define __A_EXIT exit
+#define __A_ALERT alert
+#define __A_SHOW_MENU menus show
+#define __A_HIDE_MENU menus hide
+#define __A_CLEANUP misc arrange
+#define __A_ABOUT about
+
+#define __A_MOVE wop * mo ptr
+#define __A_RESIZE wop * sz ptr
+#define __A_RAISE wop * ra
+#define __A_LOWER wop * lo
+#define __A_RESIZE_H wop * sz ptr-h
+#define __A_RESIZE_V wop * sz ptr-v
+#define __A_KILL wop * close
+#define __A_KILL_NASTY wop * kill
+#define __A_STICK wop * st
+#define __A_ICONIFY wop * ic
+#define __A_SHADE wop * sh
+#define __A_MAX_HEIGHT wop * th
+#define __A_MAX_WIDTH wop * tw
+#define __A_MAX_SIZE wop * ts
+#define __A_TOGGLE_FIXED wop * fix
+#define __A_SET_LAYER wop * la
+#define __A_SNAPSHOT remember * all
+#define __A_ZOOM wop * zoom
+#define __A_FULLSCREEN wop * fs
+#define __A_RAISE_LOWER wop * raiselower
+#define __A_SET_BORDER wop * bo
+#define __A_MOVE_CONSTRAINED 79
+
+#define __A_ICONIFY_NG wop % ic
+#define __A_KILL_NG wop % close
+#define __A_MOVE_NG wop % mo ptr
+#define __A_RAISE_NG wop % ra
+#define __A_LOWER_NG wop % lo
+#define __A_STICK_NG wop % st
+#define __A_SHADE_NG wop % sh
+#define __A_RAISE_LOWER_NG wop % raiselower
+#define __A_SET_BORDER_NG wop % bo
+
+#define __A_SKIPFOCUS wop * skipfocus
+#define __A_SKIPTASK wop * skiptask
+#define __A_SKIPWINLIST wop * skipwinlist
+#define __A_NEVERFOCUS wop * neverfocus
+#define __A_SKIPLISTS wop * skiplists
+#define __A_SWAPMOVE wop * swapmove
+
+#define __A_SEND_TO_NEXT_DESK wop * desk next
+#define __A_SEND_TO_PREV_DESK wop * desk prev
+#define __A_MOVE_WIN_TO_AREA wop * area
+#define __A_MOVE_WIN_BY_AREA wop * arel
+#define __A_MOVE_WIN_TO_LINEAR_AREA 74
+#define __A_MOVE_WIN_BY_LINEAR_AREA 75
+
+#define __A_DESKTOP_NEXT desk next
+#define __A_DESKTOP_PREV desk prev
+#define __A_DESKTOP_RAISE desk raise
+#define __A_DESKTOP_LOWER desk lower
+#define __A_DESKTOP_DRAG desk drag
+#define __A_DESKTOP_INPLACE desk this
+#define __A_GOTO_DESK desk goto
+
+#define __A_AREA_SET area set
+#define __A_AREA_MOVE_BY area move
+
+#define __A_DRAG_BUTTON button mo ptr
+
+#define __A_FOCUSMODE_SET 23
+#define __A_MOVEMODE_SET 24
+#define __A_RESIZEMODE_SET 25
+#define __A_SLIDEMODE_SET 26
+#define __A_CLEANUPSLIDE_SET 27
+#define __A_MAPSLIDE_SET 28
+#define __A_SOUND_SET 29
+#define __A_BUTTONMOVE_RESIST_SET 30
+#define __A_DESKTOPBG_TIMEOUT_SET 31
+#define __A_MAPSLIDE_SPEED_SET 32
+#define __A_CLEANUPSLIDE_SPEED_SET 33
+#define __A_DRAGDIR_SET 34
+#define __A_DRAGBAR_ORDER_SET 35
+#define __A_DRAGBAR_WIDTH_SET 36
+#define __A_DRAGBAR_LENGTH_SET 37
+#define __A_DESKSLIDE_SET 38
+#define __A_DESKSLIDE_SPEED_SET 39
+#define __A_HIQUALITYBG_SET 40
+
+#define __A_PLAYSOUNDCLASS 41
+#define __A_DESKRAY 43
+#define __A_AUTOSAVE_SET 44
+#define __A_HIDESHOW_BUTTON button_show
+#define __A_SLIDEOUT slideout
+#define __A_SCROLL_WINDOWS 48
+#define __A_TOOLTIP_SET 57
+#define __A_FOCUS_NEXT focus next
+#define __A_FOCUS_PREV focus prev
+#define __A_FOCUS_SET 60
+#define __A_BACKGROUND_SET bg use
+
+#define __A_WARP_POINTER 66
+#define __A_AREA_LINEAR_SET 70
+#define __A_AREA_LINEAR_MOVE_BY 71
+#define __A_FX 73
+#define __A_SET_PAGER_HIQ 76
+#define __A_SET_PAGER_SNAP 77
+#define __A_TYPE_TEXT 80
+
+#define __A_START_GROUP gop * start
+#define __A_ADD_TO_GROUP gop * add
+#define __A_REMOVE_FROM_GROUP gop * del
+#define __A_BREAK_GROUP gop * break
+#define __A_SHOWHIDE_GROUP gop * showhide
+
+#define __A_CREATE_ICONBOX ibox new
#define __MODIFIER_KEY 101
#define __TYPE 102
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/menus.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- menus.cfg 11 Mar 2004 23:08:12 -0000 1.1
+++ menus.cfg 28 Dec 2004 23:46:42 -0000 1.2
@@ -2,44 +2,10 @@
__E_CFG_VERSION 0
-BEGIN_NEW_FILE_MENU("APPS_SUBMENU", "ROOT", ECONFDIR"/file.menu")
+BEGIN_NEW_FILE_MENU("APPS_SUBMENU", "ROOT", ECONFDIR"/menus/file.menu")
END_MENU
-/*
-BEGIN_NEW_MENU("APPS_SUBMENU", "ROOT")
-ADD_MENU_TITLE("Apps")
-ADD_MENU_TEXT_ITEM("Eterm", __A_EXEC, "Eterm")
-ADD_MENU_TEXT_ITEM("Xterm", __A_EXEC, "xterm")
-ADD_MENU_TEXT_ITEM("RXVT" , __A_EXEC, "rxvt")
-ADD_MENU_TEXT_ITEM("Gnome Terminal",__A_EXEC, "gnome-terminal")
-ADD_MENU_TEXT_ITEM("TkRat", __A_EXEC, "tkrat")
-ADD_MENU_TEXT_ITEM("Netscape Mail", __A_EXEC, "netscape -mail
-no-about-splash")
-ADD_MENU_TEXT_ITEM("Exmh", __A_EXEC, "exmh")
-ADD_MENU_TEXT_ITEM("Balsa", __A_EXEC, "balsa")
-ADD_MENU_TEXT_ITEM("Netscape", __A_EXEC, "netscape -no-about-splash")
-ADD_MENU_TEXT_ITEM("Gimp", __A_EXEC, "gimp")
-ADD_MENU_TEXT_ITEM("XV", __A_EXEC, "xv")
-ADD_MENU_TEXT_ITEM("Electric Eyes", __A_EXEC, "ee")
-ADD_MENU_TEXT_ITEM("GQview", __A_EXEC, "gqview")
-ADD_MENU_TEXT_ITEM("XMag", __A_EXEC, "xmag")
-ADD_MENU_TEXT_ITEM("Xeyes", __A_EXEC, "xeyes")
-ADD_MENU_TEXT_ITEM("XawTV", __A_EXEC, "xawtv")
-ADD_MENU_TEXT_ITEM("Imlib Settings",__A_EXEC, "imlib_config")
-ADD_MENU_TEXT_ITEM("TkMan", __A_EXEC, "tkman")
-ADD_MENU_TEXT_ITEM("Xman", __A_EXEC, "xman")
-ADD_MENU_TEXT_ITEM("X-Chat", __A_EXEC, "xchat")
-ADD_MENU_TEXT_ITEM("GnomeICU", __A_EXEC, "gnomeicu -a")
-ADD_MENU_TEXT_ITEM("eMusic", __A_EXEC, "emusic")
-ADD_MENU_TEXT_ITEM("GQmpeg", __A_EXEC, "gqmpeg")
-ADD_MENU_TEXT_ITEM("X11Amp", __A_EXEC, "x11amp")
-ADD_MENU_TEXT_ITEM("XMMS", __A_EXEC, "xmms")
-ADD_MENU_TEXT_ITEM("Civilization", __A_EXEC, "civctp")
-ADD_MENU_TEXT_ITEM("Myth 2", __A_EXEC, "myth2")
-ADD_MENU_TEXT_ITEM("Myth 2 Loathing",__A_EXEC, "loathing")
-ADD_MENU_TEXT_ITEM("Myth 2 Fear", __A_EXEC, "fear")
-END_MENU
-*/
-/* recursively scan $HOME/.enlightenment.backgrounds and build menu if images
+/* recursively scan $HOME/.enlightenment/backgrounds and build menu if images
* are there */
BEGIN_NEW_DIRSCAN_MENU("BACKGROUNDS_MENU", "ROOT_IMAGE",
ECONFDIR"/backgrounds")
ADD_MENU_TITLE("Backgrounds")
@@ -48,10 +14,11 @@
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_CLEANUP, "")
-ADD_MENU_TEXT_ITEM("Goto Next Desktop", __A_DESKTOP_NEXT, "")
-ADD_MENU_TEXT_ITEM("Goto Previous Desktop", __A_DESKTOP_PREV, "")
-ADD_MENU_TEXT_ITEM("Create New Iconbox", __A_CREATE_ICONBOX, "")
+ADD_MENU_TEXT_ITEM("Cleanup Desktop", __A_CMD, "misc 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")
@@ -83,21 +50,23 @@
BEGIN_NEW_MENU("CONFIG_SUBMENU", "ROOT")
ADD_MENU_TITLE("Settings")
-ADD_MENU_TEXT_ITEM("Focus Settings ...", __A_CONFIG, "focus")
-ADD_MENU_TEXT_ITEM("Move & Resize Settings ...", __A_CONFIG, "moveresize")
-ADD_MENU_TEXT_ITEM("Pager Settings ...", __A_CONFIG, "pager")
-ADD_MENU_TEXT_ITEM("Window Placement Settings ...", __A_CONFIG, "placement")
-ADD_MENU_TEXT_ITEM("Multiple Desktop Settings ...", __A_CONFIG, "desktops")
-ADD_MENU_TEXT_ITEM("Virtual Desktop Settings ...", __A_CONFIG, "area")
-/*ADD_MENU_TEXT_ITEM("Icon Settings ...", __A_CONFIG, "icons")*/
-ADD_MENU_TEXT_ITEM("Autoraise Settings ...", __A_CONFIG, "autoraise")
-ADD_MENU_TEXT_ITEM("Tooltip Settings ...", __A_CONFIG, "tooltips")
-ADD_MENU_TEXT_ITEM("Audio Settings ...", __A_CONFIG, "audio")
-ADD_MENU_TEXT_ITEM("Group Settings ...", __A_CONFIG,
"group_defaults")
-ADD_MENU_TEXT_ITEM("Remember Settings ...", __A_CONFIG, "remember");
-ADD_MENU_TEXT_ITEM("Special FX Settings ...", __A_CONFIG, "fx")
-ADD_MENU_TEXT_ITEM("Desktop Background Settings ...", __A_CONFIG, "bg")
-ADD_MENU_TEXT_ITEM("Miscellaneous Settings ...", __A_CONFIG,
"miscellaneous");
+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("Pager Settings ...", __A_CMD, "pager cfg")
+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("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, "misc cfg fx")
+ADD_MENU_TEXT_ITEM("Misc. 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("Miscellaneous Settings ...", __A_CMD, "misc cfg
misc");
ADD_MENU_TEXT_ITEM("Legacy E-conf tool ...", __A_EXEC, "e-conf")
END_MENU
@@ -109,115 +78,81 @@
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_ABOUT, "")
+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_EXIT, "restart")
-ADD_MENU_TEXT_ITEM("Log Out", __A_EXIT, "logout")
+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_MAX_HEIGHT,
"conservative")
-ADD_MENU_TEXT_ITEM("Available Max Height Toggle", __A_MAX_HEIGHT, "available")
-ADD_MENU_TEXT_ITEM("Absolute Max Height Toggle", __A_MAX_HEIGHT, "")
+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")
END_MENU
BEGIN_NEW_MENU("WINOPS_W", "EMPTY")
-ADD_MENU_TEXT_ITEM("Max Width Toggle", __A_MAX_WIDTH,
"conservative")
-ADD_MENU_TEXT_ITEM("Available Max Width Toggle", __A_MAX_WIDTH, "available")
-ADD_MENU_TEXT_ITEM("Absolute Max Width Toggle", __A_MAX_WIDTH, "")
+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")
END_MENU
BEGIN_NEW_MENU("WINOPS_WH", "EMPTY")
-ADD_MENU_TEXT_ITEM("Max Size Toggle", __A_MAX_SIZE,
"conservative")
-ADD_MENU_TEXT_ITEM("Available Max Size Toggle", __A_MAX_SIZE, "available")
-ADD_MENU_TEXT_ITEM("Absolute Max Size Toggle", __A_MAX_SIZE, "")
+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")
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/Window", __A_ZOOM, "")
+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_SET_LAYER, "2")
-ADD_MENU_TEXT_ITEM("Normal", __A_SET_LAYER, "4")
-ADD_MENU_TEXT_ITEM("Above", __A_SET_LAYER, "6")
-ADD_MENU_TEXT_ITEM("On Top", __A_SET_LAYER, "20")
+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 20")
+END_MENU
+
+BEGIN_NEW_MENU("WINOPS_OPACITY", "EMPTY")
+ADD_MENU_TEXT_ITEM("20%", __A_CMD, "wop * op 51")
+ADD_MENU_TEXT_ITEM("40%", __A_CMD, "wop * op 102")
+ADD_MENU_TEXT_ITEM("60%", __A_CMD, "wop * op 153")
+ADD_MENU_TEXT_ITEM("80%", __A_CMD, "wop * op 204")
+ADD_MENU_TEXT_ITEM("100%", __A_CMD, "wop * op 255")
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_CONFIG,
"group")
-ADD_MENU_TEXT_ITEM("Start a new group", __A_START_GROUP,"")
-ADD_MENU_TEXT_ITEM("Select group to add this window to", __A_CONFIG,
"group_membership")
-ADD_MENU_TEXT_ITEM("Add this window to the current group", __A_ADD_TO_GROUP,
"");
-ADD_MENU_TEXT_ITEM("Remove this window from a group",
__A_REMOVE_FROM_GROUP,"")
-ADD_MENU_TEXT_ITEM("Destroy a group this window belongs to", __A_BREAK_GROUP,
"")
-ADD_MENU_TEXT_ITEM("Show/Hide this window's group(s)",
__A_SHOWHIDE_GROUP, "")
+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("Select group to add this window to", __A_CMD, "groups
cfg group_membership")
+ADD_MENU_TEXT_ITEM("Add this window to the current group", __A_CMD, "gop *
add");
+ADD_MENU_TEXT_ITEM("Remove this window from a group", __A_CMD, "gop *
del")
+ADD_MENU_TEXT_ITEM("Destroy a group this window belongs to", __A_CMD, "gop *
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_TEXT_ITEM("Close", __A_KILL, "")
-ADD_MENU_TEXT_ITEM("Annihilate", __A_KILL_NASTY, "")
-ADD_MENU_TEXT_ITEM("Iconify", __A_ICONIFY, "")
-ADD_MENU_TEXT_ITEM("Raise", __A_RAISE, "")
-ADD_MENU_TEXT_ITEM("Lower", __A_LOWER, "")
-ADD_MENU_TEXT_ITEM("Shade/Unshade", __A_SHADE, "")
-ADD_MENU_TEXT_ITEM("Stick/Unstick", __A_STICK, "")
-ADD_MENU_TEXT_ITEM("Toggle Skip Window Lists", __A_SKIPLISTS, "")
-/* ADD_MENU_TEXT_ITEM("Toggle Never Focus", __A_NEVERFOCUS ,"") */
-ADD_MENU_TEXT_ITEM("Remember...", __A_SNAPSHOT, "dialog")
+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("Toggle Skip Window Lists", __A_CMD, "wop * skip")
+/* ADD_MENU_TEXT_ITEM("Toggle Never Focus", __A_CMD ,"") */
+ADD_MENU_TEXT_ITEM("Remember...", __A_CMD, "remember * dialog")
ADD_MENU_SUBMENU_TEXT_ITEM("Window Groups", "WINOPS_GROUP")
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("Opacity", "WINOPS_OPACITY")
/*ADD_MENU_SUBMENU_TEXT_ITEM("Remember State", "WINOPS_SNAP")*/
END_MENU
-
-/* Also available macros:
-ADD_MENU_ITEM(text, icon_iclass, action, parameters)
-ADD_MENU_ICON_ITEM(icon_iclass, action, parameters)
-ADD_MENU_SUBMENU_ITEM(text, icon_iclass, submenu_name)
-ADD_MENU_SUBMENU_ICON_ITEM(icon_iclass, submenu_name)
-*/
-
-
-
-
-/* The LONG Way */
-/* A menu style - MUST provide DEFAULT */
-/*
-__MENU_STYLE __BGN
- __NAME "DEFAULT"
- __BORDER "MENU_BORDER"
- __TCLASS "TEXT1"
- __BG_ICLASS "TITLE_BAR_HORIZONTAL"
- __ITEM_ICLASS "TITLE_BAR_HORIZONTAL"
- __SUBMENU_ICLASS "DEFAULT_MENU_SUB"
- __USE_ITEM_BACKGROUNDS __OFF
- __MAXIMUM_NUMBER_OF_COLUMNS 10
- __MAXIMUM_NUMBER_OF_ROWS 20
-__END
-
-__MENU __BGN
- __NAME "SUBMENU1"
- __STYLE "DEFAULT"
- __MENU_ITEM "NULL" "Text Only"
- __MENU_ITEM "DEFAULT_TOOLTIP_CLOUD1" "Text + Icon"
- __MENU_ACTION __A_EXEC "Eterm"
-__END
-__MENU __BGN
- __NAME "WINDOW_MENU"
- __STYLE "DEFAULT"
- __MENU_ITEM "NULL" "This menu Item does Nothing"
- __MENU_ITEM "ICON_ICLASS" "Eterm"
- __MENU_ACTION __A_EXEC "Eterm"
- __MENU_ITEM "DEFAULT_TOOLTIP_CLOUD1"
- __MENU_ACTION __A_EXEC "xterm"
- __SUMENU "SUBMENU1" "DEFAULT_TOOLTIP_CLOUD1" "This is a submenu"
-__END
-*/
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/strings.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- strings.c 12 Jul 2004 23:48:15 -0000 1.1
+++ strings.c 28 Dec 2004 23:46:42 -0000 1.2
@@ -1,6 +1,7 @@
#define _(x) x
char *s[] = {
+/* The settings menu */
_("Focus Settings ..."),
_("Move & Resize Settings ..."),
_("Pager Settings ..."),
@@ -16,4 +17,17 @@
_("Desktop Background Settings ..."),
_("Miscellaneous Settings ..."),
_("Legacy E-conf tool ..."),
+
+/* bindings.cfg */
+_("Clicking your mouse on the desktop will perform\nthe following actions"),
+_("Display User Menus"),
+_("Display Enlightenment Menu"),
+_("Display Settings Menu"),
+_("Display Enlightenment Menu"),
+_("Display Task List Menu"),
+_("Display Desktop Menu"),
+_("Display Group Menu"),
+_("Display Settings Menu"),
+_("Go Back a Desktop"),
+_("Go Forward a Desktop"),
};
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
