Index: CHUI/Derde/Agenda/MainForm.cls.xml
===================================================================
diff -u -r1074 -r2578
--- CHUI/Derde/Agenda/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 1074)
+++ CHUI/Derde/Agenda/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 2578)
@@ -2,8 +2,7 @@
 <Export generator="Cache" version="9">
 <Class name="CHUI.Derde.Agenda.MainForm">
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%CHUI.TForm</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
+<Super>TCHUI.TForm</Super>
 
 <UDLText name="T">
 <Content><![CDATA[
@@ -27,95 +26,95 @@
 </UDLText>
 
 <Property name="kdrMain">
-<Type>%CHUI.TKader</Type>
+<Type>TCHUI.TKader</Type>
 </Property>
 
 <Property name="lblHeader">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="lblUserLabel">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="lblDateLabel">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="poUser">
-<Type>%CHUI.TPopup</Type>
+<Type>TCHUI.TPopup</Type>
 </Property>
 
 <Property name="lblDate">
-<Type>%CHUI.TLabel</Type>
+<Type>TCHUI.TLabel</Type>
 </Property>
 
 <Property name="lstAgenda">
-<Type>%CHUI.TLijst</Type>
+<Type>TCHUI.TLijst</Type>
 </Property>
 
 <Property name="dslAgenda">
-<Type>%CHUI.TDataSetList</Type>
+<Type>TCHUI.TDataSetList</Type>
 </Property>
 
 <Property name="lstSommatie">
-<Type>%CHUI.TLijst</Type>
+<Type>TCHUI.TLijst</Type>
 </Property>
 
 <Property name="dslSommatie">
-<Type>%CHUI.TDataSetList</Type>
+<Type>TCHUI.TDataSetList</Type>
 </Property>
 
 <Property name="btnClose">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="btnUpdate">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="btnRemoveProximity">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="btnSetPrive">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="btnChangeDate">
-<Type>%CHUI.TButton</Type>
+<Type>TCHUI.TButton</Type>
 </Property>
 
 <Property name="acUpdate">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acClose">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acChangeDate">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acPreviousDate">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acNextDate">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acGeoDetail">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acRemoveProximity">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <Property name="acSetPrive">
-<Type>%CHUI.TAction</Type>
+<Type>TCHUI.TAction</Type>
 </Property>
 
 <UDLText name="T">
@@ -219,21 +218,21 @@
 	Set ..OnShow=$LB(%this,"FormOnShow")
 	
 	;Actions
-	;Set ..acUpdate=##class(%CHUI.TAction).Create(%this, "acUpdate", "Update", 1, $LB("U"), $LB(%this,"acUpdateClick"))
-	Set ..acClose=##class(%CHUI.TAction).Create(%this, "acClose", "Close", 1, $LB("-"), $LB(%this,"acCloseClick"))
-	Set ..acChangeDate=##class(%CHUI.TAction).Create(%this, "acChangeDate", "Change", 1, $LB("C"), $LB(%this,"acChangeDateClick"))
-	Set ..acPreviousDate=##class(%CHUI.TAction).Create(%this, "acPreviousDate", "PrevDate", 1, $LB("("), $LB(%this,"acPreviousDateClick"))
-	Set ..acNextDate=##class(%CHUI.TAction).Create(%this, "acNextDate", "NextDate", 1, $LB(")"), $LB(%this,"acNextDateClick"))
-	Set ..acGeoDetail=##class(%CHUI.TAction).Create(%this, "acGeoDetail", "GeoDetail", 1, $LB("G","D"), $LB(%this,"acGeoDetailClick"))
-	Set ..acRemoveProximity=##class(%CHUI.TAction).Create(%this, "acRemoveProximity", "Verwijder proximity lookup", 1, , $LB(%this,"acRemoveProximityClick"))
-	Set ..acSetPrive=##class(%CHUI.TAction).Create(%this, "acSetPrive", "Markeer als Prive", 1, , $LB(%this,"acSetPriveClick"))
+	;Set ..acUpdate=##class(TCHUI.TAction).Create(%this, "acUpdate", "Update", 1, $LB("U"), $LB(%this,"acUpdateClick"))
+	Set ..acClose=##class(TCHUI.TAction).Create(%this, "acClose", "Close", 1, $LB("-"), $LB(%this,"acCloseClick"))
+	Set ..acChangeDate=##class(TCHUI.TAction).Create(%this, "acChangeDate", "Change", 1, $LB("C"), $LB(%this,"acChangeDateClick"))
+	Set ..acPreviousDate=##class(TCHUI.TAction).Create(%this, "acPreviousDate", "PrevDate", 1, $LB("("), $LB(%this,"acPreviousDateClick"))
+	Set ..acNextDate=##class(TCHUI.TAction).Create(%this, "acNextDate", "NextDate", 1, $LB(")"), $LB(%this,"acNextDateClick"))
+	Set ..acGeoDetail=##class(TCHUI.TAction).Create(%this, "acGeoDetail", "GeoDetail", 1, $LB("G","D"), $LB(%this,"acGeoDetailClick"))
+	Set ..acRemoveProximity=##class(TCHUI.TAction).Create(%this, "acRemoveProximity", "Verwijder proximity lookup", 1, , $LB(%this,"acRemoveProximityClick"))
+	Set ..acSetPrive=##class(TCHUI.TAction).Create(%this, "acSetPrive", "Markeer als Prive", 1, , $LB(%this,"acSetPriveClick"))
 
 	;Label header
-	Set ..lblHeader=##class(%CHUI.TLabel).Create(%this,"lblHeader"," "_..Caption_" ",1,1,1,,,,,$LB($$$clUltraLight,$$$clUltraDark,$$$fsNoUnderline))
+	Set ..lblHeader=##class(TCHUI.TLabel).Create(%this,"lblHeader"," "_..Caption_" ",1,1,1,,,,,$LB($$$clUltraLight,$$$clUltraDark,$$$fsNoUnderline))
 	Set ..lblHeader.Sizing=$$$lsFixed
 
-	Set ..lblUserLabel=##class(%CHUI.TLabel).Create(%this,"lblUserLabel","Gebruiker:",3,5,1)
-	Set ..poUser=##class(%CHUI.TPopup).Create(%this,"poUser","Gebruiker",3,16,1,30,,,,)
+	Set ..lblUserLabel=##class(TCHUI.TLabel).Create(%this,"lblUserLabel","Gebruiker:",3,5,1)
+	Set ..poUser=##class(TCHUI.TPopup).Create(%this,"poUser","Gebruiker",3,16,1,30,,,,)
 	Set ..poUser.opDefaultContextMenu=0
 	Do ..poUser.InitSpec(,,,3)
 	; Ophalen van de GeoUsers
@@ -247,23 +246,23 @@
 	Set ..poUser.Selected=$LB(..pBLAgenda.User.%Id())
 	Set ..poUser.OnLostFocus=$LB(%this,"poUserOnLostFocus")
 
-	Set ..lblDateLabel=##class(%CHUI.TLabel).Create(%this,"lblDateLabel","Datum:",4,9,1)
-	Set ..lblDate=##class(%CHUI.TLabel).Create(%this,"lblDate",$$FormatDateTime^vhLib("Ddd dd-mm-jj",..CurrentDate),4,16,1,14,,,,$LB(,,$$$fsNoUnderline))
+	Set ..lblDateLabel=##class(TCHUI.TLabel).Create(%this,"lblDateLabel","Datum:",4,9,1)
+	Set ..lblDate=##class(TCHUI.TLabel).Create(%this,"lblDate",$$FormatDateTime^vhLib("Ddd dd-mm-jj",..CurrentDate),4,16,1,14,,,,$LB(,,$$$fsNoUnderline))
 
-	Set ..btnChangeDate=##class(%CHUI.TButton).Create(%this,"btnChangeDate","Change",4,..lblDate.Left+14,1,10,,,,,$$$alCenter)
+	Set ..btnChangeDate=##class(TCHUI.TButton).Create(%this,"btnChangeDate","Change",4,..lblDate.Left+14,1,10,,,,,$$$alCenter)
 	Set ..btnChangeDate.Action=..acChangeDate
     
 	;Button update
-	;Set ..btnUpdate=##class(%CHUI.TButton).Create(%this,"btnUpdate","Update",3,..Width-13,1,9,,,,,$$$alCenter)
+	;Set ..btnUpdate=##class(TCHUI.TButton).Create(%this,"btnUpdate","Update",3,..Width-13,1,9,,,,,$$$alCenter)
 	;Set ..btnUpdate.Action=..acUpdate
 
  	;Button close
-	Set ..btnClose=##class(%CHUI.TButton).Create(%this,"btnClose","Sluiten",4,..Width-13,1,9,,,,,$$$alCenter)
+	Set ..btnClose=##class(TCHUI.TButton).Create(%this,"btnClose","Sluiten",4,..Width-13,1,9,,,,,$$$alCenter)
 	Set ..btnClose.Action=..acClose
 	
-	Set ..btnRemoveProximity=##class(%CHUI.TButton).Create(%this,"btnRemoveProximity","DelProx",3,55,1,10,,,,,$$$alCenter)
+	Set ..btnRemoveProximity=##class(TCHUI.TButton).Create(%this,"btnRemoveProximity","DelProx",3,55,1,10,,,,,$$$alCenter)
 	Set ..btnRemoveProximity.Action=..acRemoveProximity
-	Set ..btnSetPrive=##class(%CHUI.TButton).Create(%this,"btnSetPRive","Prive",4,55,1,10,,,,,$$$alCenter)
+	Set ..btnSetPrive=##class(TCHUI.TButton).Create(%this,"btnSetPRive","Prive",4,55,1,10,,,,,$$$alCenter)
 	Set ..btnSetPrive.Action=..acSetPrive
 	
 	;Tab & paint order     
@@ -274,7 +273,7 @@
 <Method name="InitAgendaLijst">
 <Implementation><![CDATA[
 	
-	Set ..lstAgenda=##class(%CHUI.TLijst).Create(%this,"lstAgenda","lstAgenda",6,5,..Height-9,..Width-10,,,,,$$$alRight)
+	Set ..lstAgenda=##class(TCHUI.TLijst).Create(%this,"lstAgenda","lstAgenda",6,5,..Height-9,..Width-10,,,,,$$$alRight)
   //Set ..lstAgenda.DefaultlbSearchInCols=$LB(..#colType)
   Set ..lstAgenda.OnRow=$LB(%this,"lstAgendaOnRow")
   	;Set ..lstAgenda.OnSetFocus=$LB(%this,"ChangeDataOnSetFocus")
@@ -293,7 +292,7 @@
 	Set rdAgenda2=$$BuildAgendaColumns("rdRijden",1)
 	//Set ..lstAgenda.Controls("rdRijden")=rdAgenda2  
 
-	Set ..dslAgenda=##class(%CHUI.TDataSetList).Create(..lstAgenda,"dslAgenda")
+	Set ..dslAgenda=##class(TCHUI.TDataSetList).Create(..lstAgenda,"dslAgenda")
 	Do ..dslAgenda.AddColDef(..#colTijdVan,$$$rsList,1)
 	Do ..dslAgenda.AddColDef(..#colTijdsDuur,$$$rsList,2)
 	Do ..dslAgenda.AddColDef(..#colType,$$$rsList,3,,,"Type")
@@ -323,10 +322,10 @@
 
 <Method name="InitSommatieLijst">
 <Implementation><![CDATA[
-	Set ..lstSommatie=##class(%CHUI.TLijst).Create(%this,"lstSommatie","lstSommatie",22,5,3,..Width-10,,,,,$$$alRight)
+	Set ..lstSommatie=##class(TCHUI.TLijst).Create(%this,"lstSommatie","lstSommatie",22,5,3,..Width-10,,,,,$$$alRight)
 	Set ..lstSommatie.Options=$LB($$$loHideSelection)
 	Set ..lstSommatie.TabStop=0
-	Set ..dslSommatie=##class(%CHUI.TDataSetList).Create(..lstSommatie,"dslSommatie")
+	Set ..dslSommatie=##class(TCHUI.TDataSetList).Create(..lstSommatie,"dslSommatie")
 	
 	Set rdHeader=..lstSommatie.CreateRowDef("rdHeader",$$$ftAddLijstHeader)
 	
@@ -403,7 +402,7 @@
 </Method>
 
 <Method name="dslAgendaOnQueryInit">
-<FormalSpec><![CDATA[Sender:%CHUI.TDataSetList,&varResultStr:%String]]></FormalSpec>
+<FormalSpec><![CDATA[Sender:TCHUI.TDataSetList,&varResultStr:%String]]></FormalSpec>
 <Implementation><![CDATA[
 	Set Query="Derde.Agenda.Agenda:GetAgenda"
 	Set RS=##class(%ResultSet).%New(Query)
@@ -447,7 +446,7 @@
 </Method>
 
 <Method name="dslSommatieOnQueryInit">
-<FormalSpec><![CDATA[Sender:%CHUI.TDataSetList,&varResultStr:%String]]></FormalSpec>
+<FormalSpec><![CDATA[Sender:TCHUI.TDataSetList,&varResultStr:%String]]></FormalSpec>
 <Implementation><![CDATA[
 	Set Query="BL.Derde.Agenda.Agenda:SommatieDagTransposed"
 	Set RS=##class(%ResultSet).%New(Query)
@@ -472,16 +471,17 @@
 
 <Method name="FormOnShow">
 <FormalSpec>Sender</FormalSpec>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="acCloseClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[	Do ..Close()
 ]]></Implementation>
 </Method>
 
 <Method name="acUpdateClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Do ..pBLAgenda.BLGeoMobile.DeleteVanafDag(..CurrentDate)
 	Do ..UpdateAgenda()
@@ -491,7 +491,7 @@
 </Method>
 
 <Method name="poUserOnLostFocus">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set UserID=$LG(..poUser.Selected)
 	
@@ -502,15 +502,15 @@
 </Method>
 
 <Method name="OnNewUser">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Do ..UpdateAgenda()
 	Do ..UpdateLists()
 ]]></Implementation>
 </Method>
 
 <Method name="acChangeDateClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set OrigVal=$ZD(..CurrentDate,4)
 	Set CurVal=OrigVal
@@ -532,29 +532,29 @@
 </Method>
 
 <Method name="acPreviousDateClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set ..CurrentDate=..CurrentDate-1
 	Do ..UpdateLists()
 ]]></Implementation>
 </Method>
 
 <Method name="acNextDateClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set ..CurrentDate=..CurrentDate+1
 	Do ..UpdateLists()
 ]]></Implementation>
 </Method>
 
 <Method name="acGeoDetailClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[	Do ##class(GeoDetail).CreateLoadShow(..pBLAgenda,..CurrentDate)
 ]]></Implementation>
 </Method>
 
 <Method name="acRemoveProximityClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set AgendaID=..lstAgenda.GetSelectedData(..#colAgendaID)
 	Quit:AgendaID=""
@@ -563,7 +563,7 @@
 </Method>
 
 <Method name="acSetPriveClick">
-<FormalSpec>Sender:%CHUI.TControlBasis</FormalSpec>
+<FormalSpec>Sender:TCHUI.TControlBasis</FormalSpec>
 <Implementation><![CDATA[
 	Set AgendaID=..lstAgenda.GetSelectedData(..#colAgendaID)
 	Quit:AgendaID=""