Index: UI/PR/GA/TandemBox.cls.xml =================================================================== diff -u -r13009 -r13617 --- UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 13009) +++ UI/PR/GA/TandemBox.cls.xml (.../TandemBox.cls.xml) (revision 13617) @@ -428,6 +428,10 @@ %TMComboBox + +%TMComboBox + + %TMLabel @@ -830,14 +834,16 @@ Quit cshSPZK ; Spoelbak Zijkant / OpvulLijst Quit:('$LD(Params,1)) - new TBKlas,SPVisible,SPHidden,NewTopLbl,NewTopTxt + new TBKlas,SPVisible,OpvullijstVisible,NewTopLbl,NewTopTxt Set TBKlas=$LI(Params,1) - Set SPHidden=$S(..SpoelbakCtrlsInvullen(TBKlas):"False", 1:"True") - Set SPVisible=$S(SPHidden="False":"True", 1:"False") ; $S(TBKlas="SP":"True", 1:"False") + Set OpvullijstVisible=$S(..SpoelbakCtrlsInvullen(TBKlas):"False", 1:"True") + Set SPVisible=$S(OpvullijstVisible="False":"True", 1:"False") ; Controls voor OpvulLijst - Set ..txtOpvulLijstLi.Visible=SPHidden - Set ..txtOpvulLijstRe.Visible=SPHidden - Set ..lblOpvulLijstTxt.Visible=SPHidden + Set ..txtOpvulLijstLi.Visible=OpvullijstVisible + Set ..txtOpvulLijstRe.Visible=OpvullijstVisible + Set ..lblOpvulLijstTxt.Visible=OpvullijstVisible + Set ..cboOpvullijstKleur.Visible=OpvullijstVisible + If OpvullijstVisible="True" Do ..BLOpvullijstControlsRefresh() ; cboOpvullijstKleur kan alsnog op hidden gezet worden. ; Controls voor Spoelbak Set ..cboSPZijkant.Visible=SPVisible Set ..lblSPZijkantCbo.Visible=SPVisible @@ -1349,7 +1355,7 @@ ; ParentColor = True ; ParentCtl3D = False ; Style = lbOwnerDrawFixed - ; TabOrder = 11 + ; TabOrder = 12 ; Visible = False ; OnEnter = lstSPBreedteInfoEnter ; end @@ -1368,7 +1374,7 @@ ; 'Re : 131') ; ParentColor = True ; ParentCtl3D = False - ; TabOrder = 12 + ; TabOrder = 13 ; Visible = False ; OnEnter = lstSP2BreedtesOpMaatEnter ; end @@ -1386,7 +1392,7 @@ ; Font.Style = [] ; ParentCtl3D = False ; ParentFont = False - ; TabOrder = 7 + ; TabOrder = 8 ; OnChange = txtNutBreedteChange ; end ; object txtCDiepte: CEdit @@ -1403,7 +1409,7 @@ ; Font.Style = [] ; ParentCtl3D = False ; ParentFont = False - ; TabOrder = 9 + ; TabOrder = 10 ; end ; object cboSPZijkant: CComboBox ; Left = 135 @@ -1485,7 +1491,7 @@ ; ItemHeight = 13 ; ParentCtl3D = False ; ParentFont = False - ; TabOrder = 10 + ; TabOrder = 11 ; Text = 'cboDraagKracht' ; OnEnter = cboAlgemeenEnter ; OnExit = cboAlgemeenExit @@ -1506,7 +1512,7 @@ ; ItemHeight = 13 ; ParentCtl3D = False ; ParentFont = False - ; TabOrder = 8 + ; TabOrder = 9 ; Text = 'cboLadeDiepte' ; OnEnter = cboAlgemeenEnter ; OnExit = cboLadeDiepteExit @@ -1576,7 +1582,7 @@ ; Height = 17 ; TabStop = False ; Caption = '-1 mm' - ; TabOrder = 6 + ; TabOrder = 7 ; OnClick = chkMinTolerantieClick ; end ; object btnSPZijkantOpMaat: CButton @@ -1591,10 +1597,34 @@ ; Font.Name = 'MS Sans Serif' ; Font.Style = [] ; ParentFont = False - ; TabOrder = 13 + ; TabOrder = 14 ; Visible = False ; OnClick = btnSPZijkantOpMaatClick ; end + ; object cboOpvullijstKleur: CComboBox + ; Left = 215 + ; Top = 80 + ; Width = 65 + ; Height = 21 + ; TabStop = False + ; Anchors = [akTop, akRight] + ; Color = 14286847 + ; Ctl3D = True + ; Font.Charset = DEFAULT_CHARSET + ; Font.Color = clWindowText + ; Font.Height = -11 + ; Font.Name = 'MS Sans Serif' + ; Font.Style = [] + ; ItemHeight = 13 + ; ParentCtl3D = False + ; ParentFont = False + ; TabOrder = 6 + ; Text = 'cboOpvullijstKleur' + ; Visible = False + ; OnEnter = cboAlgemeenEnter + ; OnExit = cboAlgemeenExit + ; ControlClass = 'UI.Lib.Ctrl.TComboBox' + ; end ; end ; object grpKleur: CGroupBox ; Left = 313 @@ -2043,30 +2073,6 @@ ; OnEnter = cboAlgemeenEnter ; OnExit = cboAlgemeenExit ; ControlClass = 'UI.Lib.Ctrl.TComboBox' - ; end - ; object cboDwarsVerdeling: CComboBox - ; Left = 136 - ; Top = 118 - ; Width = 145 - ; Height = 21 - ; TabStop = False - ; Anchors = [akTop, akRight] - ; Ctl3D = True - ; Font.Charset = DEFAULT_CHARSET - ; Font.Color = clBlack - ; Font.Height = -11 - ; Font.Name = 'MS Sans Serif' - ; Font.Style = [] - ; ItemHeight = 13 - ; ParentCtl3D = False - ; ParentFont = False - ; TabOrder = 4 - ; Text = 'cboDwarsVerdeling' - ; OnEnter = cboAlgemeenEnter - ; OnExit = cboAlgemeenExit - ; ControlClass = 'UI.Lib.Ctrl.TComboBox' - ; end - ; object cboFrontSteun: CComboBox q ]]> @@ -2185,6 +2191,7 @@ d %this.zzLabel14.%Close() d %this.zzLabel13.%Close() d %this.grpKleur.%Close() + d %this.cboOpvullijstKleur.%Close() d %this.btnSPZijkantOpMaat.%Close() d %this.chkMinTolerantie.%Close() d %this.txtOpvulLijstRe.%Close() @@ -2472,6 +2479,7 @@ . Set bln=($S(($$$SPZkOpMaat(..cboSPZijkant.SelectedGetKey())||(..IsNieuweSifonlade(TBKlas)))&&('$$givSpoelbakMatenVolledig(TBKlas)):0, 1:1)) Quit:('bln) . Set bln=($S(..cboLadeDiepte.SelectedGetKey()="":0, 1:1)) Quit:('bln) . Set bln=($S(..cboDraagKracht.SelectedGetKey()="":0, 1:1)) Quit:('bln) + . Set bln=($S(($$givOpvullijstenAanwezig())&&(..cboOpvullijstKleur.SelectedGetKey()=""):0, 1:1)) Quit:('bln) . ; txtCDiepte en txtNutBreedte zijn berekende velden Else If GroepNaam="Kleur" Do Quit bln . Set bln=($S(..cboBodemKleur.SelectedGetKey()="":(..cboBodemKleur.Items.Count=0), 1:1)) Quit:('bln) @@ -2491,6 +2499,9 @@ Quit 0 +givOpvullijstenAanwezig() + Quit $L(..txtOpvulLijstLi.Text_..txtOpvulLijstRe.Text) > 0 + givSpoelbakMatenVolledig(Klasse) New BTV,IsVolledig Set BTV=..blTBox.BTValues @@ -2708,6 +2719,7 @@ s %this.txtOpvulLijstRe=##class(%TMEdit).%New($lb(%this.grpAfmetingen.Address,0)) s %this.chkMinTolerantie=##class(%TMCheckBox).%New($lb(%this.grpAfmetingen.Address,0)) s %this.btnSPZijkantOpMaat=##class(%TMButton).%New($lb(%this.grpAfmetingen.Address,0)) + s %this.cboOpvullijstKleur=##class(UI.Lib.Ctrl.TComboBox).%New($lb(%this.grpAfmetingen.Address,0)) s %this.grpKleur=##class(%TMGroupBox).%New($lb(%this.Form.Address,0)) s %this.zzLabel13=##class(%TMLabel).%New($lb(%this.grpKleur.Address,0)) s %this.zzLabel14=##class(%TMLabel).%New($lb(%this.grpKleur.Address,0)) @@ -2808,33 +2820,35 @@ d %this.lblOpvulLijstTxt.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Caption","Transparent","Layout"),$lb(11,80,104,21,"False","Opvullijst Li/Re"_$C(9)_"(mm)","True","tlCenter")) d %this.lstSPBreedteInfo.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","BorderStyle","Ctl3D","ItemHeight"),$lb(215,107,71,43,"False","bsNone","False",13)) d %this.lstSPBreedteInfo.Items.SetMultiProperty($lb("Strings"),$lb("S : 450"_$C(13,10)_"B : 510")) - d %this.lstSPBreedteInfo.SetMultiProperty($lb("ParentColor","ParentCtl3D","Style","TabOrder","Visible","OnEnter"),$lb("True","False","lbOwnerDrawFixed",11,"False",$lb(%this,"lstSPBreedteInfoEnter"))) + d %this.lstSPBreedteInfo.SetMultiProperty($lb("ParentColor","ParentCtl3D","Style","TabOrder","Visible","OnEnter"),$lb("True","False","lbOwnerDrawFixed",12,"False",$lb(%this,"lstSPBreedteInfoEnter"))) d %this.lstSP2BreedtesOpMaat.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","BorderStyle","Ctl3D","ItemHeight"),$lb(215,107,71,43,"False","bsNone","False",13)) d %this.lstSP2BreedtesOpMaat.Items.SetMultiProperty($lb("Strings"),$lb("Li : 295"_$C(13,10)_" SpB : 663"_$C(13,10)_"Re : 131")) - d %this.lstSP2BreedtesOpMaat.SetMultiProperty($lb("ParentColor","ParentCtl3D","TabOrder","Visible","OnEnter"),$lb("True","False",12,"False",$lb(%this,"lstSP2BreedtesOpMaatEnter"))) - d %this.txtNutBreedte.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","Enabled","ParentCtl3D","ParentFont","TabOrder","OnChange"),$lb(135,93,73,21,"True","False","False","False",7,$lb(%this,"txtNutBreedteChange"))) + d %this.lstSP2BreedtesOpMaat.SetMultiProperty($lb("ParentColor","ParentCtl3D","TabOrder","Visible","OnEnter"),$lb("True","False",13,"False",$lb(%this,"lstSP2BreedtesOpMaatEnter"))) + d %this.txtNutBreedte.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","Enabled","ParentCtl3D","ParentFont","TabOrder","OnChange"),$lb(135,93,73,21,"True","False","False","False",8,$lb(%this,"txtNutBreedteChange"))) d %this.txtNutBreedte.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) - d %this.txtCDiepte.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","Enabled","ParentCtl3D","ParentFont","TabOrder"),$lb(136,182,73,21,"True","False","False","False",9)) + d %this.txtCDiepte.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","Enabled","ParentCtl3D","ParentFont","TabOrder"),$lb(136,182,73,21,"True","False","False","False",10)) d %this.txtCDiepte.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.cboSPZijkant.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","Visible","OnEnter","OnExit"),$lb(135,109,73,21,$lb("akTop","akRight"),"True",13,"False","False",3,"cboSPZijkant","False",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboAlgemeenExit"))) d %this.cboSPZijkant.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.cboWandDikte.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","OnEnter","OnExit"),$lb(135,52,145,21,$lb("akTop","akRight"),"True",13,"False","False",2,"cboWandDikte",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboAlgemeenExit"))) d %this.cboWandDikte.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.cboCBreedte.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","Visible","OnEnter","OnExit"),$lb(136,22,145,21,$lb("akTop","akRight"),"True",13,"False","False",0,"cboCBreedte","False",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboCBreedteExit"))) d %this.cboCBreedte.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) - d %this.cboDraagKracht.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","OnEnter","OnExit"),$lb(136,222,145,21,$lb("akTop","akRight"),"True",13,"False","False",10,"cboDraagKracht",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboAlgemeenExit"))) + d %this.cboDraagKracht.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","OnEnter","OnExit"),$lb(136,222,145,21,$lb("akTop","akRight"),"True",13,"False","False",11,"cboDraagKracht",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboAlgemeenExit"))) d %this.cboDraagKracht.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) - d %this.cboLadeDiepte.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","OnEnter","OnExit"),$lb(136,150,145,21,$lb("akTop","akRight"),"True",13,"False","False",8,"cboLadeDiepte",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboLadeDiepteExit"))) + d %this.cboLadeDiepte.SetMultiProperty($lb("Left","Top","Width","Height","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","OnEnter","OnExit"),$lb(136,150,145,21,$lb("akTop","akRight"),"True",13,"False","False",9,"cboLadeDiepte",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboLadeDiepteExit"))) d %this.cboLadeDiepte.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.txtCBreedte.SetMultiProperty($lb("Left","Top","Width","Height","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange","OnExit"),$lb(135,22,73,21,"True","False","False",1,$lb(%this,"txtCBreedteChange"),$lb(%this,"txtCBreedteExit"))) d %this.txtCBreedte.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.txtOpvulLijstLi.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Color","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange","OnEnter","OnExit"),$lb(135,80,33,21,"False",14286847,"True","False","False",4,$lb(%this,"txtOpvulLijstLiChange"),$lb(%this,"txtOpvulLijstLiEnter"),$lb(%this,"txtOpvulLijstLiExit"))) d %this.txtOpvulLijstLi.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.txtOpvulLijstRe.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Color","Ctl3D","ParentCtl3D","ParentFont","TabOrder","OnChange","OnEnter","OnExit"),$lb(175,80,33,21,"False",14286847,"True","False","False",5,$lb(%this,"txtOpvulLijstReChange"),$lb(%this,"txtOpvulLijstReEnter"),$lb(%this,"txtOpvulLijstReExit"))) d %this.txtOpvulLijstRe.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) - d %this.chkMinTolerantie.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Caption","TabOrder","OnClick"),$lb(232,33,49,17,"False","-1 mm",6,$lb(%this,"chkMinTolerantieClick"))) - d %this.btnSPZijkantOpMaat.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont","TabOrder","Visible","OnClick"),$lb(14,128,83,17,"SPZK op maat","False",13,"False",$lb(%this,"btnSPZijkantOpMaatClick"))) + d %this.chkMinTolerantie.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Caption","TabOrder","OnClick"),$lb(232,33,49,17,"False","-1 mm",7,$lb(%this,"chkMinTolerantieClick"))) + d %this.btnSPZijkantOpMaat.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont","TabOrder","Visible","OnClick"),$lb(14,128,83,17,"SPZK op maat","False",14,"False",$lb(%this,"btnSPZijkantOpMaatClick"))) d %this.btnSPZijkantOpMaat.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) + d %this.cboOpvullijstKleur.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Anchors","Color","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","Visible","OnEnter","OnExit"),$lb(215,80,65,21,"False",$lb("akTop","akRight"),14286847,"True",13,"False","False",6,"cboOpvullijstKleur","False",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboAlgemeenExit"))) + d %this.cboOpvullijstKleur.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.grpKleur.SetMultiProperty($lb("Left","Top","Width","Height","Caption","ParentFont","TabOrder","OnEnter","OnExit"),$lb(313,145,297,161," KLEUR ","False",3,$lb(%this,"OnGroupBoxEnter"),$lb(%this,"OnGroupBoxExit"))) d %this.grpKleur.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.zzLabel13.SetMultiProperty($lb("Left","Top","Width","Height","AutoSize","Caption","Layout"),$lb(11,22,112,21,"False","Plaatmat. bodem (+rug)","tlCenter")) @@ -2874,9 +2888,6 @@ d %this.cboBlumotion.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clWindowText,-11,"MS Sans Serif",$lb())) d %this.cboStalenRug.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","Visible"),$lb(208,190,81,21,"False",$lb("akTop","akRight"),"True",13,"False","False",8,"cboStalenRug","False")) d %this.cboStalenRug.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clRed,-11,"MS Sans Serif",$lb())) - d %this.chkStalenRug.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","AllowGrayed","Caption","TabOrder"),$lb(16,191,225,16,"False","True","Stalen/houten rug",7)) - d %this.cboHangMap.SetMultiProperty($lb("Left","Top","Width","Height","TabStop","Anchors","Ctl3D","ItemHeight","ParentCtl3D","ParentFont","TabOrder","Text","OnEnter","OnExit"),$lb(136,142,145,21,"False",$lb("akTop","akRight"),"True",13,"False","False",5,"cboHangMap",$lb(%this,"cboAlgemeenEnter"),$lb(%this,"cboAlgemeenExit"))) - d %this.cboHangMap.Font.SetMultiProperty($lb("Charset","Color","Height","Name","Style"),$lb($$$DEFAULTCHARSET,$$$clBlack,-11,"MS Sans Serif",$lb())) d ..Initialization1(initvalue) q ]]> @@ -3036,6 +3047,7 @@ Set tmpAr("TBCBreedte")= $LB("Afm",+..txtCBreedte,+..cboCBreedte,,) Set tmpAr("OpvullijstLi")= $LB("Afm",+..txtOpvulLijstLi,,,) Set tmpAr("OpvullijstRe")= $LB("Afm",+..txtOpvulLijstRe,,,) + Set tmpAr("TBOpvullijstKleur")=$LB("Afm",+..cboOpvullijstKleur,,,"REF:KLROPVL\K:GR") Set tmpAr("MinTolerantie")= $LB("Afm",+..chkMinTolerantie,,) Set tmpAr("TBSPZijkant")= $LB("Afm",+..cboSPZijkant,,,"REF:SPZK\K:SA") ; Added K:SA (on 09/11/2009) to set Default for type DLS Set tmpAr("TBLadeDiepte")= $LB("Afm",+..cboLadeDiepte,,,"REF:LD") @@ -3097,25 +3109,6 @@ ]]> - -cache -0 -document -literal -0:NB, 1:NB) -]]> - - chkOref:UI.Lib.Ctrl.TCheckBox cache @@ -3853,6 +3846,25 @@ ]]> + +cache +0 +document +literal +0:NB, 1:NB) +]]> + + Msg:%String cache @@ -3869,6 +3881,19 @@ ]]> + +cache +0 +document +literal + + + Validatie van de groep + toegang wijzigen. CtrlOref moet verwijzen naar een groep (GroupBox) of naar een bepalende control in een GroupBox. @@ -4449,7 +4474,31 @@ document literal document literal grpMainFake + +cboOpvullijstKleur +