[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kaxul
From:       George Staikos <staikos () kde ! org>
Date:       2003-05-30 16:10:18
[Download RAW message or body]

CVS commit by staikos: 

fix the "checked" attribute and add a testcase.
note: you can't assume that the value in xul will align with something in
"ui".  first see if the developer attempted to set non-text attributes, and if
so, then add the ui equivalent.  Of course if there is a default that is
different than the ui default, then it must always be added.


  M +7 -2      kaxul.cpp   1.32
  M +3 -2      test/testcases/allelem.xul   1.11


--- kdenonbeta/kaxul/kaxul.cpp  #1.31:1.32
@@ -346,5 +346,7 @@ int KaXul::parseNodes(const QDomElement&
                                 val.insert(val.find(e.attribute("accesskey")[ 0 ]), '&');
                         ne.appendChild(createProperty("text", val, "string"));
-                        ne.appendChild(createProperty("checked", e.attribute("checked"), "bool"));
+                        if (e.attribute("checked") == "true") {
+                                ne.appendChild(createProperty("checked", "true", "bool"));
+                        }
 
                         out.appendChild(ne);
@@ -358,5 +360,8 @@ int KaXul::parseNodes(const QDomElement&
                                 val.insert(val.find(e.attribute("accesskey")[ 0 ]), '&');
                         ne.appendChild(createProperty("text", val, "string"));
-                        ne.appendChild(createProperty("checked", e.attribute("checked"), "bool"));
+                        if (e.attribute("checked") == "true") {
+                                ne.appendChild(createProperty("checked", "true", "bool"));
+                        }
+
                         out.appendChild(ne);
 

--- kdenonbeta/kaxul/test/testcases/allelem.xul  #1.10:1.11
@@ -127,13 +127,14 @@
             <caption id="caption" label="Groupbox"/>
             <label id="label" value="Label" control="button"/>
-            <label id="label2" value="Label, accesskey, disabled" accesskey="L" disabled="true"/>
+            <label id="label2" value="Label, disabled" disabled="true"/>
             <button id="button" label="Button" default="true"/>
             <spacer id="spacer" flex="1"/>
             <checkbox id="checkbox" label="Checkbox" accesskey="C" disabled="true"/>
+            <checkbox id="checkbox" label="Checkbox2" accesskey="o" disabled="false"/>
          </groupbox>
          <radiogroup id="radiogroup" orient="vertical">
             <caption id="caption" value="Radiogroup"/>
             <radio id="radio_1" label="Radio 1" group="radiogroup" accesskey="1"/>
-            <radio id="radio_2" label="Radio 2" group="radiogroup" accesskey="2"/>
+            <radio id="radio_2" label="Radio 2" group="radiogroup" accesskey="2" checked="true"/>
             <radio id="radio_3" label="Radio 3" group="radiogroup" accesskey="3"/>
          </radiogroup>


[prev in list] [next in list] [prev in thread] [next in thread]