point and padding became redundant.. do remove padding type from xsd and use point...
authorDana Jansens <danakj@orodu.net>
Mon, 5 Mar 2007 16:23:13 +0000 (16:23 +0000)
committerDana Jansens <danakj@orodu.net>
Mon, 5 Mar 2007 16:23:13 +0000 (16:23 +0000)
data/themerc.xsd
render/theme.c
tools/themetoxml/themetoxml.c

index 7b9573d..621f99c 100755 (executable)
     </xs:annotation>
   </xs:element>
 
-  <xs:complexType name="padding">
-    <xs:attribute name="horizontal" type="xs:integer"/>
-    <xs:attribute name="vertical" type="xs:integer"/>
-  </xs:complexType>
-
   <xs:complexType name="color">
     <xs:attribute name="r" type="xs:integer"/>
     <xs:attribute name="g" type="xs:integer"/>
 
   <xs:complexType name="allwindows">
     <xs:all>
-      <xs:element name="clientpadding" type="obt:padding" minOccurs="0"/>
+      <xs:element name="clientpadding" type="obt:point" minOccurs="0"/>
       <xs:element name="justify" type="obt:justify" minOccurs="0"/>
       <xs:element name="border" type="obt:border" minOccurs="0"/>
       <xs:element name="inactive" type="obt:window" minOccurs="0"/>
 
   <xs:complexType name="themeDimensions">
     <xs:all>
-      <xs:element name="padding" type="obt:padding" minOccurs="0"/>
+      <xs:element name="padding" type="obt:point" minOccurs="0"/>
       <xs:element name="handle" type="xs:integer" minOccurs="0"/>
     </xs:all>
   </xs:complexType>
index c31ca11..95b4889 100644 (file)
@@ -1307,8 +1307,8 @@ static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
 {
     if ((n = find_node(n, names))) {
         gint a, b;
-        if (parse_attr_int("horizontal", n, &a) &&
-            parse_attr_int("vertical", n, &b) &&
+        if (parse_attr_int("x", n, &a) &&
+            parse_attr_int("y", n, &b) &&
             a >= lowx && a <= upx && b >= lowy && b <= upy)
         {
             *x = a; *y = b;
index 56a5f9c..c03bd29 100644 (file)
@@ -321,8 +321,8 @@ int main(int argc, char **argv)
         CONT2("dimensions", "handle", NUM(i));
 
     if (read_int(db, "padding.width", &i)) {
-        ATTR2("dimensions", "padding", "horizontal", NUM(i));
-        ATTR2("dimensions", "padding", "vertical", NUM(i));
+        ATTR2("dimensions", "padding", "x", NUM(i));
+        ATTR2("dimensions", "padding", "y", NUM(i));
     }
     
     if (read_int(db, "borderWidth", &i)) {
@@ -339,8 +339,8 @@ int main(int argc, char **argv)
     }
 
     if (read_int(db, "window.client.padding.width", &i)) {
-        ATTR2("window", "clientpadding", "horizontal", NUM(i));
-        ATTR2("window", "clientpadding", "vertical", NUM(i));
+        ATTR2("window", "clientpadding", "x", NUM(i));
+        ATTR2("window", "clientpadding", "y", NUM(i));
     }
 
     if (read_string(db, "window.label.text.justify", &s)) {