Changed illogically named 'window' tag into the more descriptive 'widgets' tag.

55 files changed, 112 insertions, 112 deletions

diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index 7173e2a..16ccf53 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -105,7 +105,7 @@ void MacroWindow::initMacro(QDomNode &node)
       printf("Unknown script type %s\n", xml_elem.attribute("language").toStdString().c_str());
     }
 
-  } else if(xml_elem.tagName() == "window") {
+  } else if(xml_elem.tagName() == "widgets") {
     Window *window = new Window(xml_elem, this);
     macrotitle = xml_elem.attribute("caption");
     mainwidget = window;
diff --git a/server/src/macroheaderparser.cc b/server/src/macroheaderparser.cc
index e9748b1..d6ba0bb 100644
--- a/server/src/macroheaderparser.cc
+++ b/server/src/macroheaderparser.cc
@@ -94,7 +94,7 @@ MacroHeaderParser::~MacroHeaderParser()
 
 void MacroHeaderParser::startTag(std::string name, std::map< std::string, std::string> attributes)
 {
-  // Create macro and enable parsing of queries, maps and window
+  // Create macro and enable parsing of queries, maps and widgets
   if(name == "macro") {
     assert(!m); // A Macro has already been allocated, cannot create macro!
     m = new Macro();
diff --git a/server/src/macroparser.cc b/server/src/macroparser.cc
index fac39b6..b91462a 100644
--- a/server/src/macroparser.cc
+++ b/server/src/macroparser.cc
@@ -119,7 +119,7 @@ void MacroParser::characterData(std::string &data)
 
 void MacroParser::startTag(std::string name, std::map< std::string, std::string> attributes)
 {
-  // Create macro and enable parsing of queries, maps and window
+  // Create macro and enable parsing of queries, maps and widgets
   if(name == "macro") {
     if(state != UNDEFINED) error("macro found not root tag.");
     state = MACRO;
@@ -219,17 +219,17 @@ void MacroParser::startTag(std::string name, std::map< std::string, std::string>
   }
 
   // Enable widget parsing
-  if(name == "window") {
+  if(name == "widgets") {
 
-    if(state != MACRO) error("window found outside macro.");
-    state = WINDOW;
+    if(state != MACRO) error("widgets found outside macro.");
+    state = WIDGETS;
 
-    assert(m); // No macro is currently available, cannot create window!
+    assert(m); // No macro is currently available, cannot create widgets!
   
-    m->window.attributes = attributes;
-    m->window.attributes["tagname"] = name;
+    m->widgets.attributes = attributes;
+    m->widgets.attributes["tagname"] = name;
 
-    Widget *current = &(m->window);
+    Widget *current = &(m->widgets);
     widgetstack.push_back(current);
 
     return;
@@ -237,7 +237,7 @@ void MacroParser::startTag(std::string name, std::map< std::string, std::string>
 
   // TODO: We need to parse some (maybe even all) widgets in order to
   //       make db lookup of the previous values.
-  if(state == WINDOW) {
+  if(state == WIDGETS) {
 
     assert(widgetstack.size()); // Widget stack is empty, cannot create!
 
@@ -281,9 +281,9 @@ void MacroParser::endTag(std::string name)
     current_script = NULL;
     state = SCRIPTS;
   }
-  if(name == "window") state = MACRO;
+  if(name == "widgets") state = MACRO;
   
-  if(state == WINDOW) {
+  if(state == WIDGETS) {
     assert(widgetstack.size()); // Widget stack is empty, cannot pop!
     widgetstack.pop_back();
     if(widgetstack.size() == 0) state = MACRO;
diff --git a/server/src/macroparser.h b/server/src/macroparser.h
index 9d90ff1..a283d26 100644
--- a/server/src/macroparser.h
+++ b/server/src/macroparser.h
@@ -39,7 +39,7 @@ class MacroParser : public SAXParser {
     QUERY,
     MAPS,
     MAP,
-    WINDOW,
+    WIDGETS,
     SCRIPTS,
     SCRIPT
   } ParserState;
diff --git a/server/src/macrotool_dump.cc b/server/src/macrotool_dump.cc
index 71bc690..990d247 100644
--- a/server/src/macrotool_dump.cc
+++ b/server/src/macrotool_dump.cc
@@ -80,7 +80,7 @@ static std::map<std::string, struct _macro> macroList()
     std::string key = macro->attributes["name"];// + "-" + macro->attributes["version"];
     macros[key].name = macro->attributes["name"];
     macros[key].file = *mfs;
-    macros[key].title = macro->window.attributes["caption"];
+    macros[key].title = macro->widgets.attributes["caption"];
     macros[key].version = macro->attributes["version"];
 
     mfs++;
diff --git a/server/src/macrotool_fieldnames.cc b/server/src/macrotool_fieldnames.cc
index 4c18de5..1d92df8 100644
--- a/server/src/macrotool_fieldnames.cc
+++ b/server/src/macrotool_fieldnames.cc
@@ -85,7 +85,7 @@ static std::map<std::string, std::vector<std::string> > getMacroRefsList()
     Macro *macro = parser.getMacro();
 
     std::string key = name;
-    reflist[key] = getWidgetNames(macro->window);
+    reflist[key] = getWidgetNames(macro->widgets);
 
     mfs++;
   }
diff --git a/server/src/macrotool_filehandler.cc b/server/src/macrotool_filehandler.cc
index 2d9ea4e..d0245ba 100644
--- a/server/src/macrotool_filehandler.cc
+++ b/server/src/macrotool_filehandler.cc
@@ -55,7 +55,7 @@ public:
   std::vector< Query > queries;
   std::vector< Map > maps;
   std::vector< Script > scripts;
-  Widget window;
+  Widget widgets;
   std::map< std::string, std::string > attributes;
   Resume resume;
 };
diff --git a/server/src/server.cc b/server/src/server.cc
index f75aeab..0eeec43 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -65,9 +65,9 @@ static std::string error_box(std::string message)
     "<pracro version=\"1.0\">\n"
     "  <template name=\"error\">\n"
     "    <macro name=\"error\" static=\"true\">\n"
-    "      <window caption=\"ERROR!\" layout=\"vbox\" name=\"error\">\n"
+    "      <widgets caption=\"ERROR!\" layout=\"vbox\" name=\"error\">\n"
     "        <textedit name=\"errorlabel\" value=\"" + message + "\"/>\n"
-    "      </window>\n"
+    "      </widgets>\n"
     "    </macro>\n"
     "  </template>\n"
     "</pracro>\n";
@@ -173,7 +173,7 @@ static std::string handleRequest(Transaction *transaction,
         MacroParser mp(macrolist.getLatestVersion(macro.attributes["name"]));
         mp.parse();
         Macro *m = mp.getMacro();
-        answer += " caption=\"" + m->window.attributes["caption"] + "\"";
+        answer += " caption=\"" + m->widgets.attributes["caption"] + "\"";
         answer += ">\n";
 
         LUAQueryMapper lqm;
@@ -225,7 +225,7 @@ static std::string handleRequest(Transaction *transaction,
         MacroParser mp(macrolist.getLatestVersion(macro.attributes["name"]));
         mp.parse();
         Macro *m = mp.getMacro();
-        answer += " caption=\"" + m->window.attributes["caption"] + "\"";
+        answer += " caption=\"" + m->widgets.attributes["caption"] + "\"";
         answer += ">\n";
 
       }
diff --git a/server/src/template.h b/server/src/template.h
index c14577e..031f068 100644
--- a/server/src/template.h
+++ b/server/src/template.h
@@ -62,7 +62,7 @@ public:
   std::vector< Query > queries;
   std::vector< Map > maps;
   std::vector< Script > scripts;
-  Widget window;
+  Widget widgets;
   std::map< std::string, std::string > attributes;
   Resume resume;
   bool isHeader;
diff --git a/server/src/templateheaderparser.cc b/server/src/templateheaderparser.cc
index 8b0f162..8698e05 100644
--- a/server/src/templateheaderparser.cc
+++ b/server/src/templateheaderparser.cc
@@ -94,7 +94,7 @@ TemplateHeaderParser::~TemplateHeaderParser()
 
 void TemplateHeaderParser::startTag(std::string name, std::map< std::string, std::string> attributes)
 {
-  // Create template and enable parsing of queries, maps and window
+  // Create template and enable parsing of queries, maps and widgets
   if(name == "template") {
     assert(!t); // A Template has already been allocated, cannot create template!
     t = new Template();
diff --git a/server/src/templateparser.cc b/server/src/templateparser.cc
index 62be9c7..3a1e17b 100644
--- a/server/src/templateparser.cc
+++ b/server/src/templateparser.cc
@@ -95,7 +95,7 @@ void TemplateParser::startTag(std::string name, std::map< std::string, std::stri
     return;
   }
 
-  // Create macro and enable parsing of queries, maps and window
+  // Create macro and enable parsing of queries, maps and widgets
   if(name == "macro" || name == "header") {
     if(state != TEMPLATE) error("macro found outside template.");
     state = MACRO;
diff --git a/server/src/widgetgenerator.cc b/server/src/widgetgenerator.cc
index b7d6ac3..f8f3790 100644
--- a/server/src/widgetgenerator.cc
+++ b/server/src/widgetgenerator.cc
@@ -192,9 +192,9 @@ static void get_fields(Widget &widget, Fieldnames &fields)
 std::string widgetgenerator(std::string cpr, Macro &macro, LUAQueryMapper &mapper, Database &db)
 {
   Fieldnames fields;
-  get_fields(macro.window, fields);
+  get_fields(macro.widgets, fields);
 
   Values values = db.getValues(cpr, fields);
   
-  return send_macro_widget(macro, macro.window, "      ", mapper, values);
+  return send_macro_widget(macro, macro.widgets, "      ", mapper, values);
 }
diff --git a/server/xml/macros/5steps-1.0.xml b/server/xml/macros/5steps-1.0.xml
index d655b23..1369b82 100644
--- a/server/xml/macros/5steps-1.0.xml
+++ b/server/xml/macros/5steps-1.0.xml
@@ -14,7 +14,7 @@
       end
     </script>
   </scripts>
-  <window caption="Gennemgang af de 5 trin (B.3.1.2)" layout="vbox">
+  <widgets caption="Gennemgang af de 5 trin (B.3.1.2)" layout="vbox">
     <frame layout="vbox">
       <checkbox name="five_steps" script="yes_only" truevalue="ja" falsevalue="nej"
 		caption="De 5 trin til forebyggelse af forveksling af øjnene er gennemgået:"/>
@@ -23,5 +23,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/90Dlens-1.0.xml b/server/xml/macros/90Dlens-1.0.xml
index 5953817..4219efe 100644
--- a/server/xml/macros/90Dlens-1.0.xml
+++ b/server/xml/macros/90Dlens-1.0.xml
@@ -182,7 +182,7 @@
       return true
     </script>
   </scripts>
-  <window caption="90-D linse (B.2.2.7)"
+  <widgets caption="90-D linse (B.2.2.7)"
           layout="vbox">
     
     <frame layout="hbox">
@@ -262,5 +262,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdconsent-1.0.xml b/server/xml/macros/amdconsent-1.0.xml
index 37fa61c..04ab291 100644
--- a/server/xml/macros/amdconsent-1.0.xml
+++ b/server/xml/macros/amdconsent-1.0.xml
@@ -35,7 +35,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Informeret samtykke (B.2.10.3)"
+  <widgets caption="Informeret samtykke (B.2.10.3)"
           layout="vbox">
 
     <label height="80" caption="Pt informeres om muligheden for behandling og de risici og bivirkninger, som kan være forbundet hermed. Specielt informeres om, behandlingen foregår ved en injektion i øjet i lokalbedøvelse, samt at der kræves månedlig kontrol for at vurdere om behandlingen skal gentages. Endvidere at behandlingen kan være forbundet med smerter og irritation det første døgn, og i sjældne tilfælde kan medføre infektion. På baggrund af den givne behandling indvilliger patienten i at få foretaget behandlingen."/>
@@ -51,5 +51,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdindication-1.0.xml b/server/xml/macros/amdindication-1.0.xml
index 67909ed..e1ed3c3 100644
--- a/server/xml/macros/amdindication-1.0.xml
+++ b/server/xml/macros/amdindication-1.0.xml
@@ -11,7 +11,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Behandlingsindikation (B.2.10.2)"
+  <widgets caption="Behandlingsindikation (B.2.10.2)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -38,5 +38,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdinformation-1.0.xml b/server/xml/macros/amdinformation-1.0.xml
index 4eaa6e6..5bd4b78 100644
--- a/server/xml/macros/amdinformation-1.0.xml
+++ b/server/xml/macros/amdinformation-1.0.xml
@@ -22,7 +22,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Information (B.2.10.1)"
+  <widgets caption="Information (B.2.10.1)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -37,5 +37,5 @@
       <button caption="Gem" action="commit"/>
     </frame>
 
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdinjektionindikation-1.0.xml b/server/xml/macros/amdinjektionindikation-1.0.xml
index 3275bb7..8aa9303 100644
--- a/server/xml/macros/amdinjektionindikation-1.0.xml
+++ b/server/xml/macros/amdinjektionindikation-1.0.xml
@@ -10,7 +10,7 @@ Klargøring udført af: ${intravitreal.initials}
   </maps>
   <scripts>
   </scripts>
-  <window caption="Intravitreal injektion indikation (B.3.1.1)" layout="vbox">
+  <widgets caption="Intravitreal injektion indikation (B.3.1.1)" layout="vbox">
     <frame layout="vbox">
       <label caption="Der er fundet indikation for intravitreal injektion med Lucentis og patienten klargøres i henhold til afdelingens instruks."/>
       <frame layout="hbox">
@@ -22,5 +22,5 @@ Klargøring udført af: ${intravitreal.initials}
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdpreopconclusion-1.0.xml b/server/xml/macros/amdpreopconclusion-1.0.xml
index e3cfdac..03dbff0 100644
--- a/server/xml/macros/amdpreopconclusion-1.0.xml
+++ b/server/xml/macros/amdpreopconclusion-1.0.xml
@@ -19,7 +19,7 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
       return true
     </script>
   </scripts>
-  <window caption="Yderligere diagnostik (B.2.2.8)"
+  <widgets caption="Yderligere diagnostik (B.2.2.8)"
           layout="vbox">
     
     <frame layout="vbox">
@@ -44,5 +44,5 @@ ${amd_preop.conclusion_additional}${amd_preop.conclusion_terminated}.</resume>
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdprocedure-1.0.xml b/server/xml/macros/amdprocedure-1.0.xml
index a8e44f7..abcc81a 100644
--- a/server/xml/macros/amdprocedure-1.0.xml
+++ b/server/xml/macros/amdprocedure-1.0.xml
@@ -20,7 +20,7 @@ behandling.
   </maps>
   <scripts>
   </scripts>
-  <window caption="Procedure (B.3.1.3)" layout="vbox">
+  <widgets caption="Procedure (B.3.1.3)" layout="vbox">
     <frame layout="vbox">
       <label height="80" caption="Der afvaskes periorbitalt med povidoniodid og efterfølgende dryppes der med povidoniodid. Efter 5 min bedøves med spongostan vædet i Lidocain 20 mg/ml tilsat adrenalin.
 Injektionsstedet nedadtil temporalt i konjunktiva afmærkes med passer 3,5 mm fra limbus."/>
@@ -40,5 +40,5 @@ Der gives tid til kontrol om 1 måned og stillingtagen til evt fornyet behandlin
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/amdtreatmentindication-1.0.xml b/server/xml/macros/amdtreatmentindication-1.0.xml
index e98a0df..29c70c5 100644
--- a/server/xml/macros/amdtreatmentindication-1.0.xml
+++ b/server/xml/macros/amdtreatmentindication-1.0.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Behandlingsindikation (B.2.10.4)"
+  <widgets caption="Behandlingsindikation (B.2.10.4)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -34,5 +34,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/autoref-1.0.xml b/server/xml/macros/autoref-1.0.xml
index ab5b345..61c2a81 100644
--- a/server/xml/macros/autoref-1.0.xml
+++ b/server/xml/macros/autoref-1.0.xml
@@ -134,7 +134,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Autorefraktion (B.2.2.3)"
+  <widgets caption="Autorefraktion (B.2.2.3)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -199,5 +199,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/cave-1.0.xml b/server/xml/macros/cave-1.0.xml
index e2120a1..12c5b61 100644
--- a/server/xml/macros/cave-1.0.xml
+++ b/server/xml/macros/cave-1.0.xml
@@ -17,7 +17,7 @@ ${cave}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Allergier (B.1.1)"
+  <widgets caption="Allergier (B.1.1)"
           layout="vbox">
 
     <frame layout="vbox" help="Der anføres allergi eller intolerance for medicin, konserveringsmidler, iod eller andre emner, som man kunne blive udsat for i forbindelse med diagnostik, pleje og behandling på øjenafdelingen.\nDer anføres IKKE høfeber og hududslæt som følge af pollen, husdyr, fødemidler, rengøringsmidler, kosmetik etc. eller kendte medicinbivirkninger, f.eks. nyresten og prikken i fingrene som reaktion på acetazolamid.\nSåfremt der ikke findes nogen allergier som falder under punkt a) anføres: Allergier: Ingen kendte.\nSåfremt man ikke finder en relevant allergi i menuen indhentes linien ”Andet”, den relevante allergi skrives i journalen, og der lægges note til administrator, som vil indføje den ikke kendte allergiårsag blandt standardmulighederne. Der skal i journalteksten altid foreligge oplysning om hvordan en allergi eller intolerance ytrer sig, f.eks. ”hududslæt, konjunktivitis, anafylaktisk shock”">
@@ -109,5 +109,5 @@ ${cave}</resume>
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/current-1.0.xml b/server/xml/macros/current-1.0.xml
index 1bfd6ea..263c4fe 100644
--- a/server/xml/macros/current-1.0.xml
+++ b/server/xml/macros/current-1.0.xml
@@ -69,7 +69,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Aktuelle (B.2.1.3)"
+  <widgets caption="Aktuelle (B.2.1.3)"
           layout="vbox">
 
     <frame layout="vbox">
@@ -279,5 +279,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/example.xml b/server/xml/macros/example.xml
index dbdc4fa..acb7133 100644
--- a/server/xml/macros/example.xml
+++ b/server/xml/macros/example.xml
@@ -41,7 +41,7 @@
       end
     </script>
   </scripts>
-  <window name="mainwindow"
+  <widgets name="mainwindow"
           caption="Example Window"
           width="400"
           height="500"
@@ -137,5 +137,5 @@
       <button name="cancel" caption="Annuller" action="cancel"/>
       <button name="commit" caption="Godkend" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/fluoresceinconclusion-1.0.xml b/server/xml/macros/fluoresceinconclusion-1.0.xml
index 123570c..a8bd277 100644
--- a/server/xml/macros/fluoresceinconclusion-1.0.xml
+++ b/server/xml/macros/fluoresceinconclusion-1.0.xml
@@ -61,7 +61,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Konklusion (B.2.7.3)"
+  <widgets caption="Konklusion (B.2.7.3)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -124,5 +124,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/fluoresceininj-1.0.xml b/server/xml/macros/fluoresceininj-1.0.xml
index d81d953..648933b 100644
--- a/server/xml/macros/fluoresceininj-1.0.xml
+++ b/server/xml/macros/fluoresceininj-1.0.xml
@@ -12,7 +12,7 @@ Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Injektion ved (B.2.7.1)"
+  <widgets caption="Injektion ved (B.2.7.1)"
           layout="vbox">
 
     <label caption="I henhold til ovenstående ordination foretages fluorescein injektion."/>
@@ -37,5 +37,5 @@ Injektion af fluorescein ved: ${fluorescein_injection.initials}</resume>
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/fluoresceinphases-1.0.xml b/server/xml/macros/fluoresceinphases-1.0.xml
index 3dd329a..b530687 100644
--- a/server/xml/macros/fluoresceinphases-1.0.xml
+++ b/server/xml/macros/fluoresceinphases-1.0.xml
@@ -17,7 +17,7 @@ ${fluorescens.angiografic_fases}.</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Beskrivelse (B.2.7.2)"
+  <widgets caption="Beskrivelse (B.2.7.2)"
           layout="vbox">
 
     <frame layout="vbox">
@@ -59,5 +59,5 @@ ${fluorescens.angiografic_fases}.</resume>
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/fundus-1.0.xml b/server/xml/macros/fundus-1.0.xml
index ed48236..6e3d51e 100644
--- a/server/xml/macros/fundus-1.0.xml
+++ b/server/xml/macros/fundus-1.0.xml
@@ -34,7 +34,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Vurdering af fundus (B.2.5)"
+  <widgets caption="Vurdering af fundus (B.2.5)"
           layout="vbox">
 
     <combobox name="fundus.source" value="">
@@ -54,5 +54,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/header-1.0.xml b/server/xml/macros/header-1.0.xml
index cea390a..5919a8c 100644
--- a/server/xml/macros/header-1.0.xml
+++ b/server/xml/macros/header-1.0.xml
@@ -30,7 +30,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Patient informationer (B.0)"
+  <widgets caption="Patient informationer (B.0)"
           layout="hbox">
 
     <!-- Patient info -->
@@ -61,5 +61,5 @@
       </frame>
     </frame>
 
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/lensmeter-1.0.xml b/server/xml/macros/lensmeter-1.0.xml
index bd6b910..5b828b4 100644
--- a/server/xml/macros/lensmeter-1.0.xml
+++ b/server/xml/macros/lensmeter-1.0.xml
@@ -199,7 +199,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Egen brille (B.2.2.2)"
+  <widgets caption="Egen brille (B.2.2.2)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -263,5 +263,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/medicine-1.0.xml b/server/xml/macros/medicine-1.0.xml
index 4f83a95..4bc21f6 100644
--- a/server/xml/macros/medicine-1.0.xml
+++ b/server/xml/macros/medicine-1.0.xml
@@ -21,7 +21,7 @@ ${medicin}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Medicin (B.1.2)"
+  <widgets caption="Medicin (B.1.2)"
           layout="vbox">
 
     <frame layout="vbox" help="For ambulante patienter noteres de typer og den dosering af medicin, som foreligger oplyst og som har relevans for sygdomsforløbet. Der kan refereres til indskannet medicinliste, såfremt denne er dækkende og læselig.\nFor indlagte patienter noteres detaljeret medicinanamnese med præparatnavn og dosering.">
@@ -85,5 +85,5 @@ ${medicin}</resume>
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/ocgtt-1.0.xml b/server/xml/macros/ocgtt-1.0.xml
index 9f93ea3..7a00ef4 100644
--- a/server/xml/macros/ocgtt-1.0.xml
+++ b/server/xml/macros/ocgtt-1.0.xml
@@ -29,7 +29,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Øjendrypning (B.2.3)"
+  <widgets caption="Øjendrypning (B.2.3)"
           layout="vbox">
 
     <!-- Øjendrypning -->
@@ -67,5 +67,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/octevaluation-1.0.xml b/server/xml/macros/octevaluation-1.0.xml
index a2b0097..b9993f2 100644
--- a/server/xml/macros/octevaluation-1.0.xml
+++ b/server/xml/macros/octevaluation-1.0.xml
@@ -99,7 +99,7 @@
       return true
     </script>
   </scripts>
-  <window caption="OCT konklusion (B.2.2.4.2)"
+  <widgets caption="OCT konklusion (B.2.2.4.2)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -177,5 +177,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/octmeasurement-1.0.xml b/server/xml/macros/octmeasurement-1.0.xml
index 2497e70..220a845 100644
--- a/server/xml/macros/octmeasurement-1.0.xml
+++ b/server/xml/macros/octmeasurement-1.0.xml
@@ -103,7 +103,7 @@
       return true
     </script>
   </scripts>
-  <window caption="OCT måling (B.2.2.4.1)"
+  <widgets caption="OCT måling (B.2.2.4.1)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -141,5 +141,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/pressure-1.0.xml b/server/xml/macros/pressure-1.0.xml
index 8f67c61..e19abc8 100644
--- a/server/xml/macros/pressure-1.0.xml
+++ b/server/xml/macros/pressure-1.0.xml
@@ -129,7 +129,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Øjentryk (B.2.2.5)"
+  <widgets caption="Øjentryk (B.2.2.5)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -179,5 +179,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/preveyediseases-1.0.xml b/server/xml/macros/preveyediseases-1.0.xml
index 63e61b5..7a73597 100644
--- a/server/xml/macros/preveyediseases-1.0.xml
+++ b/server/xml/macros/preveyediseases-1.0.xml
@@ -22,7 +22,7 @@ ${missing_eye_left}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Tidligere øjensygdomme (B.2.1.2)"
+  <widgets caption="Tidligere øjensygdomme (B.2.1.2)"
           layout="vbox">
 
     <altcombobox name="previous_eye_diseases" value="Ingen relevante" layout="vbox">
@@ -48,5 +48,5 @@ ${missing_eye_left}</resume>
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/previouscommon-1.0.xml b/server/xml/macros/previouscommon-1.0.xml
index 318023c..7b801d2 100644
--- a/server/xml/macros/previouscommon-1.0.xml
+++ b/server/xml/macros/previouscommon-1.0.xml
@@ -16,7 +16,7 @@ ${previous_common_diseases}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Tidligere alment (B.1.3)"
+  <widgets caption="Tidligere alment (B.1.3)"
           layout="vbox">
 
     <altcombobox name="previous_common_diseases" layout="vbox" value="Intet relevant">
@@ -32,5 +32,5 @@ ${previous_common_diseases}</resume>
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/referral-1.0.xml b/server/xml/macros/referral-1.0.xml
index bd0e52c..68919af 100644
--- a/server/xml/macros/referral-1.0.xml
+++ b/server/xml/macros/referral-1.0.xml
@@ -17,7 +17,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Henvisning (B.0.1)"
+  <widgets caption="Henvisning (B.0.1)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -46,5 +46,5 @@
       <button caption="Gem" action="commit"/>
     </frame>
 
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/slitlamp-1.0.xml b/server/xml/macros/slitlamp-1.0.xml
index f954c67..b706f49 100644
--- a/server/xml/macros/slitlamp-1.0.xml
+++ b/server/xml/macros/slitlamp-1.0.xml
@@ -101,7 +101,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Spaltelampe (B.2.2.6)"
+  <widgets caption="Spaltelampe (B.2.2.6)"
           layout="vbox">
     
     <frame layout="hbox">
@@ -175,5 +175,5 @@
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/subjeval-1.0.xml b/server/xml/macros/subjeval-1.0.xml
index 4dbd265..1d0cb03 100644
--- a/server/xml/macros/subjeval-1.0.xml
+++ b/server/xml/macros/subjeval-1.0.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Subjektiv evaluering (B.1.4)"
+  <widgets caption="Subjektiv evaluering (B.1.4)"
           layout="vbox">
 
     <label caption="Subjektivt er symptomerne:"/>
@@ -23,5 +23,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_altcombobox.xml b/server/xml/macros/test_altcombobox.xml
index 9e620b5..24f471b 100644
--- a/server/xml/macros/test_altcombobox.xml
+++ b/server/xml/macros/test_altcombobox.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test AltComboBox"
+  <widgets caption="Test AltComboBox"
           layout="vbox">
 
     <altcombobox name="dims" value="futtefejer">
@@ -24,5 +24,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_button.xml b/server/xml/macros/test_button.xml
index 56f4168..9f01960 100644
--- a/server/xml/macros/test_button.xml
+++ b/server/xml/macros/test_button.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test Button"
+  <widgets caption="Test Button"
           layout="vbox">
 
     <checkbox name="dims" caption="Er dette en checkbox?"
@@ -20,5 +20,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_checkbox.xml b/server/xml/macros/test_checkbox.xml
index acc2c0c..858aa21 100644
--- a/server/xml/macros/test_checkbox.xml
+++ b/server/xml/macros/test_checkbox.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test CheckBox"
+  <widgets caption="Test CheckBox"
           layout="vbox">
 
     <checkbox name="dims" caption="Er dette en checkbox?"
@@ -19,5 +19,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_combobox.xml b/server/xml/macros/test_combobox.xml
index 7ed186f..3fb0822 100644
--- a/server/xml/macros/test_combobox.xml
+++ b/server/xml/macros/test_combobox.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test ComboBox"
+  <widgets caption="Test ComboBox"
           layout="vbox">
 
     <combobox name="combo1" type="select">
@@ -36,5 +36,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_dbwidget.xml b/server/xml/macros/test_dbwidget.xml
index 761862e..1c78490 100644
--- a/server/xml/macros/test_dbwidget.xml
+++ b/server/xml/macros/test_dbwidget.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test DBWidget"
+  <widgets caption="Test DBWidget"
           layout="vbox">
 
     <dbwidget name="prep" driver="QPSQL" server="sensei.j.auh.dk" user="postgres" database="lms"
@@ -23,5 +23,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_lineedit.xml b/server/xml/macros/test_lineedit.xml
index 92f33e3..783ad57 100644
--- a/server/xml/macros/test_lineedit.xml
+++ b/server/xml/macros/test_lineedit.xml
@@ -15,7 +15,7 @@
       return false
     </script>
   </scripts>
-  <window caption="Test LineEdit"
+  <widgets caption="Test LineEdit"
           layout="vbox">
 
     <lineedit name="dims" value="tester" script="A" map="test.data" regexp="[0-9]"/>
@@ -25,5 +25,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_listbox.xml b/server/xml/macros/test_listbox.xml
index 5287d2f..a913391 100644
--- a/server/xml/macros/test_listbox.xml
+++ b/server/xml/macros/test_listbox.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test ListBox"
+  <widgets caption="Test ListBox"
           layout="vbox">
 
     <listbox name="dims" value="test2">
@@ -22,5 +22,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_meta.xml b/server/xml/macros/test_meta.xml
index 0dc379d..3d4dec5 100644
--- a/server/xml/macros/test_meta.xml
+++ b/server/xml/macros/test_meta.xml
@@ -8,7 +8,7 @@ AltComboTest: ${altcombotest}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Meta Test"
+  <widgets caption="Meta Test"
           layout="vbox">
 
     <altcombobox name="altcombotest" layout="vbox" value="prut at pille i">
@@ -34,5 +34,5 @@ AltComboTest: ${altcombotest}</resume>
 <!--      <button caption="Annullér" action="cancel"/> -->
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_metawidget.xml b/server/xml/macros/test_metawidget.xml
index c2a71a5..a2d51ea 100644
--- a/server/xml/macros/test_metawidget.xml
+++ b/server/xml/macros/test_metawidget.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test Metawidget"
+  <widgets caption="Test Metawidget"
           layout="vbox">
 
     <metawidget layout="vbox" name="dims" format="${test1}: ${test2}" storechildren="true">
@@ -25,5 +25,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_multilist.xml b/server/xml/macros/test_multilist.xml
index bb6ffff..6874ddf 100644
--- a/server/xml/macros/test_multilist.xml
+++ b/server/xml/macros/test_multilist.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test MultiList"
+  <widgets caption="Test MultiList"
           layout="vbox">
 
     <multilist name="dims" innerwidget="inner" value="tester">
@@ -19,5 +19,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_radiobuttons.xml b/server/xml/macros/test_radiobuttons.xml
index 92133be..d5aa375 100644
--- a/server/xml/macros/test_radiobuttons.xml
+++ b/server/xml/macros/test_radiobuttons.xml
@@ -7,7 +7,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test Radiobuttons"
+  <widgets caption="Test Radiobuttons"
           layout="vbox">
 
     <radiobuttons name="test_radiobuttons" layout="vbox" value="test1">
@@ -21,5 +21,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/test_resume.xml b/server/xml/macros/test_resume.xml
index a0916e7..c3e3cbe 100644
--- a/server/xml/macros/test_resume.xml
+++ b/server/xml/macros/test_resume.xml
@@ -15,7 +15,7 @@
   </maps>
   <scripts>
   </scripts>
-  <window caption="Test Resume"
+  <widgets caption="Test Resume"
           layout="vbox">
 
     <metawidget layout="vbox" name="dims"
@@ -32,5 +32,5 @@
       <button caption="Reset" action="reset"/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/tobacco-1.0.xml b/server/xml/macros/tobacco-1.0.xml
index 16eb52b..2341a7f 100644
--- a/server/xml/macros/tobacco-1.0.xml
+++ b/server/xml/macros/tobacco-1.0.xml
@@ -12,7 +12,7 @@ ${tobacco}</resume>
   </maps>
   <scripts>
   </scripts>
-  <window caption="Tobaksrygning (B.2.1.1)"
+  <widgets caption="Tobaksrygning (B.2.1.1)"
           layout="vbox">
 
     <altcombobox name="tobacco" value="Har aldrig røget" layout="vbox"
@@ -34,5 +34,5 @@ ${tobacco}</resume>
       <spacer/>
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>
diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 6866c6c..61bf123 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -155,7 +155,7 @@
       return true
     </script>
   </scripts>
-  <window caption="Visus (B.2.2.1)"
+  <widgets caption="Visus (B.2.2.1)"
           layout="vbox">
 
     <frame layout="hbox">
@@ -543,5 +543,5 @@
       <spacer />
       <button caption="Gem" action="commit"/>
     </frame>
-  </window>
+  </widgets>
 </macro>