diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 04:18:17 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 04:19:05 -0500 |
| commit | 37705f444eecabb2e5bd31e92bc8b82ae9b8b596 (patch) | |
| tree | 6c2ef624542f53985773b3399ca49baacbbf7d77 /data/menu.xml | |
| parent | a47d0a53652a96ca1df96fc9268757df1431ae55 (diff) | |
| parent | e8ce4dbb8fa8f415759745d57bb1c971ea360ec5 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/all.h
openbox/event.c
openbox/prompt.c
Diffstat (limited to 'data/menu.xml')
| -rw-r--r-- | data/menu.xml | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/data/menu.xml b/data/menu.xml index d19bda65..b7c0d64f 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -331,6 +331,45 @@ </item> </menu> +<menu id="system-menu" label="System"> + <item label="Openbox Configuration Manager"> + <action name="Execute"> + <command>obconf</command> + <startupnotify><enabled>yes</enabled></startupnotify> + </action> + </item> + <item label="Gnome Control Center"> + <action name="Execute"> + <command>gnome-control-center</command> + <startupnotify><enabled>yes</enabled></startupnotify> + </action> + </item> + <item label="KDE Control Center"> + <action name="Execute"> + <command>kcontrol</command> + <startupnotify><enabled>yes</enabled></startupnotify> + </action> + </item> + <item label="Manage Cups Printers"> + <action name="Execute"> + <command>xdg-open http://localhost:631/</command> + <startupnotify> + <enabled>no</enabled> + <icon>cups</icon> + </startupnotify> + </action> + </item> + <separator /> + <item label="Reconfigure Openbox"> + <action name="Reconfigure" /> + </item> + <item label="Exit Openbox"> + <action name="Exit"> + <prompt>yes</prompt> + </action> + </item> +</menu> + <menu id="root-menu" label="Openbox 3"> <separator label="Applications" /> <menu id="apps-accessories-menu"/> @@ -342,18 +381,10 @@ <menu id="apps-term-menu"/> <menu id="apps-fileman-menu"/> <separator label="System" /> - <item label="ObConf"> - <action name="Execute"> - <command>obconf</command> - <startupnotify><enabled>yes</enabled></startupnotify> - </action> - </item> - <item label="Reconfigure"> - <action name="Reconfigure" /> - </item> + <menu id="system-menu"/> <separator /> - <item label="Exit"> - <action name="Exit"> + <item label="Logout"> + <action name="SessionLogout"> <prompt>yes</prompt> </action> </item> |