Index: AAPClient/UI/DnaCodeScherm.dfm =================================================================== diff -u -r41 -r42 --- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 41) +++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 42) @@ -61,7 +61,13 @@ AutoSize = False Caption = '/' end - object edtDnaCode: TEdit [12] + object Image1: TImage [9] + Left = 113 + Top = 8 + Width = 25 + Height = 26 + end + object edtDnaCode: TEdit [13] Left = 108 Top = 65 Width = 109 Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r41 -r42 Binary files differ Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r41 -r42 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 41) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 42) @@ -5,7 +5,7 @@ uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList, - Vcl.StdCtrls; + Vcl.StdCtrls, Vcl.ExtCtrls; type TfmDnaCodeScherm = class(TfmDrieKnoppenScherm) @@ -18,6 +18,7 @@ lblAantalGescand: TLabel; lblTotaalAantal: TLabel; lblSlash: TLabel; + Image1: TImage; procedure FormShow(Sender: TObject); private { Private declarations } Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r41 -r42 Binary files differ Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r41 -r42 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 41) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 42) @@ -20,6 +20,7 @@ fHomeScherm: TForm; fPalletScherm: TForm; fBestaandePalletScherm: TForm; + fDnaCodeScherm: TForm; procedure HuidigeGebruikerAfmelden; public end; @@ -31,7 +32,7 @@ uses LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm, - BestaandePalletscherm; + BestaandePalletscherm, DnaCodeScherm; {$R *.dfm} @@ -51,6 +52,7 @@ fHomeScherm := TfmHomeScherm.Create(Self); fPalletScherm := TfmPalletScherm.Create(Self); fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self); + fDnaCodeScherm := TfmDnaCodeScherm.Create(Self); fHuidigScherm := fLoginScherm; Self.Show; @@ -110,7 +112,7 @@ fHuidigScherm := fBestaandePalletScherm; end else if fHuidigScherm.ModalResult = mrOk then begin - ShowMessage('DnaCodeLeeg scherm'); + fHuidigScherm := fDnaCodeScherm; end else if fHuidigScherm.ModalResult = mrAbort then begin ShowMessage('DnaCodeGevuld scherm'); @@ -132,11 +134,18 @@ ShowMessage('DnaCodeGevuld scherm'); end else if fHuidigScherm.ModalResult = mrCancel then begin - ShowMessage('DnaCodeLeeg scherm'); + fHuidigScherm := fDnaCodeScherm; end; continue; end; + //DnaCodeScherm tonen + if fHuidigScherm.ClassType = TfmDnaCodeScherm then begin + (fHuidigScherm as TfmDnaCodeScherm).lblPalletCode.Caption := fHuidigePallet; + fModalResult := fHuidigScherm.ShowModal; + continue; + end; + end; Self.Close;