diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-09-26 05:30:01 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-09-26 05:30:01 +0000 |
| commit | 5d3f1763fa2168bfe76bb8ca9ea920884e5dc28a (patch) | |
| tree | 05c80aec8089caf640edab51526e2a73623d4f40 | |
| parent | 35dd3065a93bfed213bc7b8602d945b93f7edfb4 (diff) | |
updates and fixes for the xml/xsd shit
| -rw-r--r-- | data/menu.xml.in | 7 | ||||
| -rw-r--r-- | data/menu.xsd | 3 | ||||
| -rw-r--r-- | data/rc.xml.in | 7 | ||||
| -rw-r--r-- | data/rc.xsd | 1 |
4 files changed, 9 insertions, 9 deletions
diff --git a/data/menu.xml.in b/data/menu.xml.in index 3dbff30a..8892f316 100644 --- a/data/menu.xml.in +++ b/data/menu.xml.in @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<openbox_menu xmlns="http://openbox/.org" +<openbox_menu xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://openbox.org/schema.php?type=menu&version=@version@ - file://@xsddir@/rc.xsd"> + xsi:schemaLocation="http://openbox.org/ + file://@xsddir@/menu.xsd"> <menu id="games-menu" label="Games"> <item label="Crack-Attack"> diff --git a/data/menu.xsd b/data/menu.xsd index 2837a1b7..0342687d 100644 --- a/data/menu.xsd +++ b/data/menu.xsd @@ -38,6 +38,7 @@ <xs:element maxOccurs="unbounded" minOccurs="0" name="separator" type="ob:empty"/> </xs:choice> <xs:attribute name="label" type="xs:string" use="optional"/> + <xs:attribute name="execute" type="xs:string" use="optional"/> <xs:attribute name="id" type="xs:string" use="required"/> </xs:complexType> <xs:complexType name="empty"> @@ -50,7 +51,7 @@ <xs:element minOccurs="0" name="action"> <xs:complexType> <xs:sequence> - <xs:element minOccurs="0" name="Execute" type="xs:string"/> + <xs:element minOccurs="0" name="execute" type="xs:string"/> </xs:sequence> <xs:attribute name="name" type="ob:actionname" use="required"/> </xs:complexType> diff --git a/data/rc.xml.in b/data/rc.xml.in index c516f763..df2c4823 100644 --- a/data/rc.xml.in +++ b/data/rc.xml.in @@ -3,10 +3,9 @@ <!-- Do not edit this file, it will be overwritten on install. Copy the file to $HOME/.config/openbox/ instead. --> -<openbox_config xmlns="http://openbox/.org" +<openbox_config xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://openbox.org/schema.php?type=rc&version=@version@ + xsi:schemaLocation="http://openbox.org/ file://@xsddir@/rc.xsd"> <resistance> @@ -16,8 +15,8 @@ <focus> <focusNew>yes</focusNew> - <followMouse>no</followMouse> <focusLast>yes</focusLast> + <followMouse>no</followMouse> <focusDelay>0</focusDelay> <raiseOnFocus>no</raiseOnFocus> </focus> diff --git a/data/rc.xsd b/data/rc.xsd index 9124c924..9ddc67b7 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -213,6 +213,7 @@ <xs:enumeration value="Iconify"/> <xs:enumeration value="Icon"/> <xs:enumeration value="Close"/> + <xs:enumeration value="MoveResize"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="button"> |