Author: sytyi
Date: Tue Aug 23 21:44:49 2011
New Revision: 50901

URL: http://svn.gna.org/viewcvs/wesnoth?rev=50901&view=rev
Log:
Schema markup updates

Modified:
    trunk/data/gui/schema.cfg
    trunk/src/gui/auxiliary/window_builder/listbox.cpp
    trunk/src/gui/auxiliary/window_builder/tree_view.cpp

Modified: trunk/data/gui/schema.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/schema.cfg?rev=50901&r1=50900&r2=50901&view=diff
==============================================================================
--- trunk/data/gui/schema.cfg (original)
+++ trunk/data/gui/schema.cfg Tue Aug 23 21:44:49 2011
@@ -98,6 +98,21 @@
                     [link]
                         
name="gui/window/resolution/grid/row/column/toggle_panel"
                     [/link]
+                        [key]
+                            name="icon"
+                            type="t_string"
+                            default=""
+                        [/key]
+                        [key]
+                            name="label"
+                            type="t_string"
+                            default=""
+                        [/key]
+                        [key]
+                            name="tooltip"
+                            type="t_string"
+                            default=""
+                        [/key]
                     [/tag]
                     [key]
                         name="grow_factor"
@@ -1679,7 +1694,17 @@
                                             min="0"
                                             max="-1"
                                             super="gui/window/resolution/grid"
+                                            [key]
+                                                name="return_value_id"
+                                                type="string"
+                                                default=""
+                                            [/key]
                                         [/tag]
+                                        [key]
+                                            name="id"
+                                            type="string"
+                                            default=""
+                                        [/key]
                                     [/tag]
                                     [key]
                                         name="horizontal_scrollbar_mode"
@@ -1904,91 +1929,5 @@
                 mandatory="true"
             [/key]
         [/tag]
-        [tag]
-            name="wml_schema"
-            min="0"
-            max="0"
-            [tag]
-                name="tag"
-                min="0"
-                max="1"
-                [tag]
-                    name="key"
-                    min="0"
-                    max="-1"
-                    [key]
-                        name="default"
-                        type="string"
-                        mandatory="true"
-                    [/key]
-                    [key]
-                        name="mandatory"
-                        type="string"
-                        mandatory="true"
-                    [/key]
-                    [key]
-                        name="name"
-                        type="string"
-                        mandatory="true"
-                    [/key]
-                    [key]
-                        name="type"
-                        type="string"
-                        mandatory="true"
-                    [/key]
-                [/tag]
-                [tag]
-                    name="link"
-                    min="0"
-                    max="-1"
-                    [key]
-                        name="name"
-                        type="string"
-                        mandatory="true"
-                    [/key]
-                [/tag]
-                [tag]
-                    name="tag"
-                    min="0"
-                    max="-1"
-                    super="wml_schema/tag"
-                [/tag]
-                [key]
-                    name="max"
-                    type="int"
-                    mandatory="true"
-                [/key]
-                [key]
-                    name="min"
-                    type="int"
-                    mandatory="true"
-                [/key]
-                [key]
-                    name="name"
-                    type="string"
-                    mandatory="true"
-                [/key]
-                [key]
-                    name="super"
-                    type="string"
-                    default=""
-                [/key]
-            [/tag]
-            [tag]
-                name="type"
-                min="0"
-                max="-1"
-                [key]
-                    name="name"
-                    type="string"
-                    mandatory="true"
-                [/key]
-                [key]
-                    name="value"
-                    type="string"
-                    mandatory="true"
-                [/key]
-            [/tag]
-        [/tag]
     [/tag]
 [/wml_schema]

Modified: trunk/src/gui/auxiliary/window_builder/listbox.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/window_builder/listbox.cpp?rev=50901&r1=50900&r2=50901&view=diff
==============================================================================
--- trunk/src/gui/auxiliary/window_builder/listbox.cpp (original)
+++ trunk/src/gui/auxiliary/window_builder/listbox.cpp Tue Aug 23 21:44:49 2011
@@ -206,6 +206,9 @@
  * @end{table}
  * 
@begin{tag}{name="column"}{min="0"}{max="-1"}{super="gui/window/resolution/grid/row/column"}
  * @begin{table}{config}
+ *     label & t_string & "" &  $
+ *     tooltip & t_string & "" &  $
+ *     icon & t_string & "" &  $
  * @end{table}
  * @allow{link}{name="gui/window/resolution/grid/row/column/toggle_button"}
  * @allow{link}{name="gui/window/resolution/grid/row/column/toggle_panel"}

Modified: trunk/src/gui/auxiliary/window_builder/tree_view.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/auxiliary/window_builder/tree_view.cpp?rev=50901&r1=50900&r2=50901&view=diff
==============================================================================
--- trunk/src/gui/auxiliary/window_builder/tree_view.cpp (original)
+++ trunk/src/gui/auxiliary/window_builder/tree_view.cpp Tue Aug 23 21:44:49 
2011
@@ -135,7 +135,13 @@
  *                                     documentation. $
  * @end{table}
  * @begin{tag}{name="node"}{min=0}{max=-1}
+ * @begin{table}{config}
+ *     id & string & "" &  $
+ * @end{table}
  * 
@begin{tag}{name="node_definition"}{min=0}{max=-1}{super="gui/window/resolution/grid"}
+ * @begin{table}{config}
+ *     return_value_id & string & "" &  $
+ * @end{table}
  * @end{tag}{name="node_definition"}
  * @end{tag}{name="node"}
  * @end{tag}{name="tree_view"}


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to