Index: AAPClient/Win32/Debug/LoginScherm.dcu =================================================================== diff -u -r25 -r32 Binary files differ Index: AAPClient/UI/LoginScherm.pas =================================================================== diff -u -r31 -r32 --- AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 31) +++ AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 32) @@ -101,8 +101,8 @@ finally Request.Free; end; - edtInitialen.Text = ''; - edtPincode.Text = ''; + edtInitialen.Text := ''; + edtPincode.Text := ''; end; procedure TfmLoginScherm.edtInitialenKeyPress(Sender: TObject; var Key: Char); Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu =================================================================== diff -u -r25 -r32 Binary files differ Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r29 -r32 Binary files differ Index: AAPClient/UI/PalletScherm.pas =================================================================== diff -u -r31 -r32 --- AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 31) +++ AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 32) @@ -28,7 +28,7 @@ implementation uses - DnaCodeService, PopupScherm; + DnaCodeService; {$R *.dfm} @@ -44,7 +44,6 @@ Request: ValideerPalletCodeRequest; Response: ValideerPalletCodeResponse; Header: RequestHeader; - PopupScherm: TfmPopupScherm; begin Service := DnaCodeService.GetDnaCodeServiceSoap(); // request opbouwen @@ -60,10 +59,7 @@ try if Response.Header.Status <> '200' then begin Self.ModalResult := mrRetry; - PopupScherm := TfmPopupScherm.Create(self); - PopupScherm.lblWaarschuwing.Caption := Response.Header.Omschrijving; - PopupScherm.btnPopupActie.Caption := 'Scan opnieuw'; - PopupScherm.ShowModal; + ToonPopupScherm(Response.Header.Omschrijving, 'Scan opnieuw') end else begin Self.ModalResult := mrOk; end; Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r31 -r32 Binary files differ Index: AAPClient/UI/DrieKnoppenScherm.pas =================================================================== diff -u -r26 -r32 --- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 26) +++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 32) @@ -28,6 +28,7 @@ fImagesScherm: TImagesScherm; protected function ComputerName: String; + procedure ToonPopupScherm(Melding, Actie: String); public { Public declarations } end; @@ -37,6 +38,9 @@ implementation +uses + PopupScherm; + {$R *.dfm} procedure TfmDrieKnoppenScherm.FormCreate(Sender: TObject); @@ -74,6 +78,16 @@ end; +procedure TfmDrieKnoppenScherm.ToonPopupScherm(Melding, Actie: String); +var + PopupScherm: TfmPopupScherm; +begin + PopupScherm := TfmPopupScherm.Create(self); + PopupScherm.lblWaarschuwing.Caption := Melding; + PopupScherm.btnPopupActie.Caption := Actie; + PopupScherm.ShowModal; +end; + function TfmDrieKnoppenScherm.ComputerName: String; var buffer: array[0..255] of char;