Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r49 -r53 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 49) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 53) @@ -19,14 +19,15 @@ lblTotaalAantal: TLabel; lblSlash: TLabel; imgGls: TImage; + btnInfo: TButton; procedure FormShow(Sender: TObject); procedure actPalletExecute(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); private { Private declarations } public - { Public declarations } + function GeefToelevering: String; end; var @@ -106,4 +107,9 @@ inherited; end; +function TfmDnaCodeScherm.GeefToelevering: String; +begin + result := lblToelevering.Caption; +end; + end. Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r47 -r53 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 47) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 53) @@ -15,12 +15,14 @@ fInitialen: string; fLoginCode: string; fHuidigePallet: string; + fHuidigeToelevering: string; fHuidigScherm: TForm; fLoginScherm: TForm; fHomeScherm: TForm; fPalletScherm: TForm; fBestaandePalletScherm: TForm; fDnaCodeScherm: TForm; + fInfoLogScherm: TForm; procedure HuidigeGebruikerAfmelden; public end; @@ -32,7 +34,7 @@ uses LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm, - BestaandePalletscherm, DnaCodeScherm; + BestaandePalletscherm, DnaCodeScherm, InfoLogScherm; {$R *.dfm} @@ -53,6 +55,7 @@ fPalletScherm := TfmPalletScherm.Create(Self); fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self); fDnaCodeScherm := TfmDnaCodeScherm.Create(Self); + fInfoLogScherm := TfmInfoLogScherm.Create(Self); fHuidigScherm := fLoginScherm; Self.Show; @@ -152,10 +155,33 @@ end else if fHuidigScherm.ModalResult = mrNone then begin fHuidigScherm := fDnaCodeScherm; + end + else if fHuidigScherm.ModalResult = mrIgnore then begin + fHuidigScherm := fInfoLogScherm; end; + fHuidigeToelevering := (fHuidigScherm as TfmDnaCodeScherm).GeefToelevering(); continue; end; + //InfoLogScherm tonen + if fHuidigScherm.ClassType = TfmInfoLogScherm then begin + (fHuidigScherm as TfmInfoLogScherm).lblToelevering.Caption := fHuidigeToelevering; + fModalResult := fHuidigScherm.ShowModal; + if fHuidigScherm.ModalResult = mrYes then begin + fHuidigScherm := fmInfoLogScherm; + end + else if fHuidigScherm.ModalResult = mrOk then begin + fHuidigScherm := fDnaCodeScherm; + end + else if fHuidigScherm.ModalResult = mrNone then begin + fHuidigScherm := fmInfoLogScherm; + end + else if fHuidigScherm.ModalResult = mrIgnore then begin + fHuidigScherm := fmInfoLogScherm; + end; + continue; + end; + end; Self.Close; Index: AAPClient/UI/DnaCodeScherm.dfm =================================================================== diff -u -r48 -r53 --- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 48) +++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 53) @@ -65,7 +65,7 @@ Caption = '/' end object imgGls: TImage [9] - Left = 113 + Left = 77 Top = 8 Width = 25 Height = 26 @@ -82,6 +82,15 @@ Default = True TabOrder = 3 end + object btnInfo: TButton [14] + Left = 108 + Top = 8 + Width = 30 + Height = 30 + ImageAlignment = iaCenter + ModalResult = 5 + TabOrder = 4 + end inherited alAlgemeen: TActionList Left = 16 Top = 160 Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r48 -r53 Binary files differ Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r50 -r53 Binary files differ