relocate the xsd's so they don't clash, and point to the right places

[chaz/openbox] / themes / Natura / openbox-3 / themerc.xml

diff --git a/themes/Natura/openbox-3/themerc.xml b/themes/Natura/openbox-3/themerc.xml
index 2135ebb168ed7f8fc84a09ad5a2cc6ad3b1a589b..3a13bd100a1d627592e4f5ba4cb48d40d3a98b5d 100644 (file)
--- a/themes/Natura/openbox-3/themerc.xml
+++ b/themes/Natura/openbox-3/themerc.xml
@@ -1,17 +1,25 @@
 <?xml version="1.0"?>
-<openbox_theme version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
+  <about>
+    <author></author>
+    <email></email>
+    <webpage></webpage>
+    <comment></comment>
+  </about>
   <dimensions>
     <handle>2</handle>
     <padding x="2" y="2"/>
+    <window>
+      <border>1</border>
+      <clientpadding x="0" y="0"/>
+    </window>
+    <menu>
+      <border>1</border>
+    </menu>
   </dimensions>
   <window>
-    <border>
-      <width>1</width>
-      <primary r="0" g="0" b="0" a="255"/>
-    </border>
-    <clientpadding x="0" y="0"/>
-    <justify>left</justify>
     <active>
+      <border r="0" g="0" b="0" a="255"/>
       <clientpadding r="238" g="238" b="238" a="255"/>
       <label>
         <text>
@@ -35,10 +43,10 @@
           <style>parentrelative</style>
           <primary r="52" g="59" b="64" a="255"/>
           <secondary r="0" g="0" b="0" a="255"/>
-          <border r="149" g="165" b="178" a="255"/>
+          <border r="177" g="161" b="158" a="255"/>
         </pressed>
         <disabled>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="114" g="94" b="81" a="255"/>
           <style>parentrelative</style>
           <border r="78" g="88" b="96" a="255"/>
         </disabled>
@@ -48,14 +56,14 @@
           <primary r="87" g="103" b="115" a="255"/>
           <border r="154" g="171" b="185" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="249" g="242" b="238" a="255"/>
           <style>parentrelative</style>
           <border r="78" g="88" b="96" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
-        <style>flat gradient splitvertical</style>
+        <style>flat gradient split</style>
         <primary r="92" g="78" b="69" a="255"/>
         <secondary r="81" g="68" b="62" a="255"/>
         <border r="0" g="0" b="0" a="255"/>
@@ -72,6 +80,7 @@
       </grip>
     </active>
     <inactive>
+      <border r="0" g="0" b="0" a="255"/>
       <clientpadding r="238" g="238" b="238" a="255"/>
       <label>
         <text>
@@ -98,23 +107,23 @@
           <border r="123" g="125" b="123" a="255"/>
         </pressed>
         <disabled>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="221" g="221" b="221" a="255"/>
           <style>parentrelative</style>
           <primary r="238" g="238" b="238" a="255"/>
           <border r="201" g="201" b="201" a="255"/>
         </disabled>
         <hover>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="160" g="160" b="160" a="255"/>
           <style>parentrelative</style>
           <primary r="175" g="177" b="178" a="255"/>
           <border r="217" g="223" b="228" a="255"/>
         </hover>
-        <toggled>
+        <toggled-unpressed>
           <image r="182" g="182" b="182" a="255"/>
           <style>parentrelative</style>
           <primary r="238" g="238" b="238" a="255"/>
           <border r="201" g="201" b="201" a="255"/>
-        </toggled>
+        </toggled-unpressed>
       </buttons>
       <titlebar>
         <style>flat gradient vertical</style>
@@ -133,12 +142,10 @@
         <border r="191" g="191" b="191" a="255"/>
       </grip>
     </inactive>
+    <justify>left</justify>
   </window>
   <menu>
-    <border>
-      <width>1</width>
-      <primary r="0" g="0" b="0" a="255"/>
-    </border>
+    <border r="0" g="0" b="0" a="255"/>
     <justify>left</justify>
     <overlap>0</overlap>
     <title>
@@ -149,7 +156,7 @@
           <primary r="0" g="0" b="0" a="191"/>
         </shadow>
       </text>
-      <style>flat gradient splitvertical</style>
+      <style>flat gradient split</style>
       <primary r="92" g="78" b="69" a="255"/>
       <secondary r="81" g="68" b="62" a="255"/>
     </title>
@@ -159,11 +166,19 @@
     <disabled>
       <primary r="115" g="117" b="115" a="255"/>
     </disabled>
+    <activedisabled>
+      <text>
+        <primary r="115" g="117" b="115" a="255"/>
+      </text>
+      <style>flat gradient split</style>
+      <primary r="92" g="78" b="69" a="255"/>
+      <secondary r="81" g="68" b="62" a="255"/>
+    </activedisabled>
     <active>
       <text>
         <primary r="249" g="242" b="238" a="255"/>
       </text>
-      <style>flat gradient splitvertical</style>
+      <style>flat gradient split</style>
       <primary r="92" g="78" b="69" a="255"/>
       <secondary r="81" g="68" b="62" a="255"/>
     </active>