Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/config
Modified Files:
actionclasses.cfg bindings.cfg menus.cfg strings.c strings.pl
Log Message:
Defer menu loading. Unload 5 min after last use.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/actionclasses.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- actionclasses.cfg 28 Dec 2004 23:46:42 -0000 1.3
+++ actionclasses.cfg 25 Sep 2005 00:50:52 -0000 1.4
@@ -69,7 +69,7 @@
__TOOLTIP_ACTION_TEXT "Show the Window Options menu."
__EVENT __MOUSE_PRESS
__BUTTON 3
- __ACTION __A_SHOW_MENU "named WINOPS_MENU"
+ __ACTION __A_SHOW_MENU "WINOPS_MENU"
__NEXT_ACTION
__TOOLTIP_ACTION_TEXT "Toggle the shaded (rolled-up) state of this window."
__EVENT __DOUBLE_CLICK
@@ -275,7 +275,7 @@
__ALLOW_ANY_MODIFIER_KEYS __ON
__EVENT __MOUSE_PRESS
__ALLOW_ANY_BUTTON __ON
- __ACTION __A_SHOW_MENU "named WINOPS_MENU"
+ __ACTION __A_SHOW_MENU "WINOPS_MENU"
__END
@@ -292,7 +292,7 @@
__TOOLTIP_ACTION_TEXT "Open the Window Options Menu."
__EVENT __MOUSE_PRESS
__BUTTON 3
- __ACTION __A_SHOW_MENU "named WINOPS_MENU"
+ __ACTION __A_SHOW_MENU "WINOPS_MENU"
__END
__ACLASS __BGN
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/bindings.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- bindings.cfg 29 Jan 2005 09:55:57 -0000 1.4
+++ bindings.cfg 25 Sep 2005 00:50:52 -0000 1.5
@@ -39,28 +39,28 @@
MouseDouble A 1 wop * shade
MouseDown A 2 wop * sz ptr
MouseDouble A 2 wop * th available
-MouseDown A 3 menus show named WINOPS_MENU
+MouseDown A 3 menus show WINOPS_MENU
# Mouse presses on the desktop background ....
Aclass DESKBINDINGS normal
Tooltip Clicking your mouse on the desktop will perform
Tooltip the following actions
-MouseDown - 1 menus show named APPS_SUBMENU
+MouseDown - 1 menus show APPS_SUBMENU
Tooltip Display User Menus
-MouseDown C 1 menus show named ROOT_2
+MouseDown C 1 menus show ROOT_2
Tooltip Display Enlightenment Menu
-MouseDown 4 1 menus show named CONFIG_SUBMENU
+MouseDown 4 1 menus show CONFIG_SUBMENU
Tooltip Display Settings Menu
-MouseDown - 2 menus show named ROOT_2
+MouseDown - 2 menus show ROOT_2
Tooltip Display Enlightenment Menu
-MouseDown A 2 menus show taskmenu
+MouseDown A 2 menus show windowlist
Tooltip Display Task List Menu
MouseDown C 2 menus show deskmenu
Tooltip Display Desktop Menu
MouseDown S 2 menus show groupmenu
Tooltip Display Group Menu
-MouseDown - 3 menus show named CONFIG_SUBMENU
+MouseDown - 3 menus show CONFIG_SUBMENU
Tooltip Display Settings Menu
MouseDown * 4 desk prev
Tooltip Go Back a Desktop
@@ -104,12 +104,12 @@
KeyDown CA r wop * shade
KeyDown CA f wop * fullscreen
KeyDown CA m wop * ts conservative
-KeyDown CA w menus show named WINOPS_MENU
+KeyDown CA w menus show WINOPS_MENU
KeyDown A Return wop * zoom
-KeyDown CS F1 menus show named APPS_SUBMENU
-KeyDown CS F2 menus show named ROOT_2
-KeyDown CS F3 menus show named CONFIG_SUBMENU
-KeyDown CS F4 menus show taskmenu
+KeyDown CS F1 menus show APPS_SUBMENU
+KeyDown CS F2 menus show ROOT_2
+KeyDown CS F3 menus show CONFIG_SUBMENU
+KeyDown CS F4 menus show windowlist
# These keybindings cant be edited because they arent called "KEYBINDINGS" thus
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/menus.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- menus.cfg 25 Aug 2005 22:28:48 -0000 1.7
+++ menus.cfg 25 Sep 2005 00:50:52 -0000 1.8
@@ -22,7 +22,7 @@
END_MENU
BEGIN_NEW_MENU("MAINT_SUBMENU", "ROOT")
-ADD_MENU_TITLE("Enlightenment Maintenance")
+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")
@@ -36,16 +36,13 @@
/* dont need this anymore - will have a scritp soon to do it all
BEGIN_NEW_GNOME_MENU("GNOME_SUBMENU", "ROOT", "/usr/share/gnome/apps")
-ADD_MENU_TITLE("Gnome Apps")
END_MENU
BEGIN_NEW_GNOME_MENU("GNOME_USER_SUBMENU", "ROOT", HOME_DIR"/.gnome/apps")
-ADD_MENU_TITLE("Gnome Apps")
END_MENU
*/
BEGIN_NEW_THEMES_MENU("THEMES_SUBMENU", "ROOT")
-ADD_MENU_TITLE("Themes")
END_MENU
BEGIN_NEW_MENU("CONFIG_SUBMENU", "ROOT")
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/strings.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- strings.c 22 Aug 2005 21:27:24 -0000 1.4
+++ strings.c 25 Sep 2005 00:50:52 -0000 1.5
@@ -74,11 +74,14 @@
_("Go Back a Desktop"),
_("Go Forward a Desktop"),
/* menus.cfg */
+_("Backgrounds"),
+_("Desktop Operations"),
_("Cleanup Desktop"),
_("Goto Next Desktop"),
_("Goto Previous Desktop"),
_("Create New Iconbox"),
_("Create Systray"),
+_("Maintenance"),
_("Purge config file cache"),
_("Purge pager background cache"),
_("Purge background selector cache"),
@@ -88,6 +91,7 @@
_("Query background selector cache usage"),
_("Query all cache usage"),
_("Regenerate Menus"),
+_("Settings"),
_("Focus Settings ..."),
_("Move & Resize Settings ..."),
_("Pager Settings ..."),
@@ -105,6 +109,7 @@
_("Theme Transparency Settings ..."),
_("Composite Settings ..."),
_("Miscellaneous Settings ..."),
+_("Enlightenment"),
_("Help"),
_("About Enlightenment"),
_("About this theme"),
@@ -133,8 +138,11 @@
_("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"),
_("Select group to add this window to"),
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/config/strings.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- strings.pl 22 Aug 2005 21:27:24 -0000 1.1
+++ strings.pl 25 Sep 2005 00:50:52 -0000 1.2
@@ -52,7 +52,11 @@
}
# menus.cfg
- if (/ADD_MENU_TEXT_ITEM\s*\(\s*(\".*\"),/) {
+ if (/ADD_MENU_TITLE\s*\(\s*(\".*\")/) {
+ $t = "$1";
+ print "_($t),\n";
+ }
+ elsif (/ADD_MENU_TEXT_ITEM\s*\(\s*(\".*\"),/) {
$t = "$1";
print "_($t),\n";
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
