Index: AAPClient/UI/DrieKnoppenScherm.pas =================================================================== diff -u -r241 -r324 --- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 241) +++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 324) @@ -49,7 +49,7 @@ function ComputerName: String; function WUserName: String; function FullName: String; - function ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''; imgCentraalIndex: integer = 13; ImageIndex1: integer = -1; ImageIndex2: integer = -1; knopkleur: TColor = $001717CD): TModalResult; + function ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''; imgCentraalIndex: integer = 13; ImageIndex1: integer = -1; ImageIndex2: integer = -1; knopkleur: TColor = $001717CD; ClientDataSet: TClientDataSet = nil): TModalResult; public property UiContext: TUiContext Read fUiContext Write fUiContext; end; @@ -126,9 +126,10 @@ end; end; -function TfmDrieKnoppenScherm.ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''; imgCentraalIndex: integer = 13; ImageIndex1: integer = -1; ImageIndex2: integer = -1;knopkleur: TColor = $001717CD): TModalResult; +function TfmDrieKnoppenScherm.ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''; imgCentraalIndex: integer = 13; ImageIndex1: integer = -1; ImageIndex2: integer = -1;knopkleur: TColor = $001717CD; ClientDataSet: TClientDataSet = nil): TModalResult; var PopupScherm: TfmPopupScherm; + kolomteller, rijteller: integer; begin PopupScherm := TfmPopupScherm.Create(self); @@ -174,6 +175,20 @@ PopupScherm.imgActie2.BringToFront; end; + if Assigned(ClientDataSet) then begin + PopupScherm.dbgPopup.Visible := true; + PopupScherm.pnlGroteImage.Visible := false; + for kolomteller := 0 to ClientDataSet.FieldCount-1 do begin + PopupScherm.dbgPopup.Columns.Add; + PopupScherm.dbgPopup.Columns[kolomteller].FieldName := ClientDataSet.FieldDefs[kolomteller].Name; + PopupScherm.dbgPopup.Columns[kolomteller].Field := ClientDataSet.Fields[kolomteller]; + PopupScherm.dbgPopup.Columns[kolomteller].Width := PopupScherm.dbgPopup.Width div ClientDataSet.FieldCount; + end; + PopupScherm.dsPopup.Dataset := ClientDataSet; + ClientDataSet.Open; + end; + + result := PopupScherm.ShowModal; end;