diff options
| -rw-r--r-- | design/xmlformat.tex | 4 | ||||
| -rw-r--r-- | dtd/macro.dtd | 8 | ||||
| -rw-r--r-- | server/xml/example.xml | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/design/xmlformat.tex b/design/xmlformat.tex index 98f26fa..3d0608c 100644 --- a/design/xmlformat.tex +++ b/design/xmlformat.tex @@ -153,7 +153,7 @@ Et vindue har flg. attributter: \subsubsection{\texttt{frame} elementet} En frame benyttes til at indsætte nestede elementer i makroen, såsom -gruperinger af radio buttons.\\ +gruperinger af checkboxe.\\ En frame har flg. attributter: \begin{itemize} \item \textit{caption} - Den tekst som skal vises i framen. Hvis @@ -262,6 +262,8 @@ Radiobuttons gruppen har flg. attributter: valgt initielt. Hvis udeladt eller ikke-matchende vil ingen radiobutton være valgt, hvilket vil svare til at et regulært udtryk på et tekstfelt ikke er opfyldt. +\item \textit{layout} - Vinduets layout engine. Kan have værdierne + ``hbox'' eller ``vbox''. Hvis udeladt benyttes et vbox layout. \end{itemize} Radiobuttons indeholder \texttt{item} tags som beskriver hvilke valgmuligheder den givne gruppe har.\\ diff --git a/dtd/macro.dtd b/dtd/macro.dtd index f90c0b7..6a2c973 100644 --- a/dtd/macro.dtd +++ b/dtd/macro.dtd @@ -10,21 +10,21 @@ <!ATTLIST frame name CDATA #REQUIRED layout CDATA #REQUIRED> -<!ELEMENT label (lineedit|label|combo|button|frame)*> +<!ELEMENT label EMPTY> <!ATTLIST label name CDATA #REQUIRED caption CDATA #REQUIRED layout CDATA #IMPLIED> -<!ELEMENT lineedit (lineedit|label|combo|button|frame)*> +<!ELEMENT lineedit EMPTY> <!ATTLIST lineedit name CDATA #REQUIRED regexp CDATA #IMPLIED layout CDATA #IMPLIED> -<!ELEMENT combo (lineedit|label|combo|button|frame)*> +<!ELEMENT combo EMPTY> <!ATTLIST combo name CDATA #REQUIRED layout CDATA #IMPLIED> -<!ELEMENT button (lineedit|label|combo|button|frame)*> +<!ELEMENT button EMPTY> <!ATTLIST button name CDATA #REQUIRED caption CDATA #REQUIRED layout CDATA #IMPLIED diff --git a/server/xml/example.xml b/server/xml/example.xml index a8093cf..ebef918 100644 --- a/server/xml/example.xml +++ b/server/xml/example.xml @@ -15,18 +15,18 @@ </frame> <frame name="swelling_frame" layout="hbox"> <label name="swelling" caption="Der findes central hævelse med:"/> - <frame name="swelling_radios" layout="vbox"> + <frame name="swelling_radios" layout="hbox"> <radiobuttons name="radio" value="exsudater" layout="vbox"> <item caption="Radio Randblødning" value="rand"/> <item caption="Radio Exsudater" value="exsudater"/> <item caption="Radio Blahblah" value="blabla"/> </radiobuttons> - <combobox name="combo" value="exsudater" layout="vbox"> + <combobox name="combo" value="exsudater"> <item caption="Combo Randblødning" value="rand"/> <item caption="Combo Exsudater" value="exsudater"/> <item caption="Combo Blahblah" value="blabla"/> </combobox> - <listbox name="list" value="exsudater" layout="vbox"> + <listbox name="list" value="exsudater"> <item caption="List Randblødning" value="rand"/> <item caption="List Exsudater" value="exsudater"/> <item caption="List Blahblah" value="blabla"/> |