Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r18 -r19 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 18) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 19) @@ -17,6 +17,7 @@ fHuidigScherm: TForm; fLoginScherm: TForm; fHomeScherm: TForm; + fPalletScherm: TForm; procedure HuidigeGebruikerAfmelden; public end; @@ -27,7 +28,7 @@ implementation uses - LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm; + LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm; {$R *.dfm} @@ -45,6 +46,7 @@ begin fLoginScherm := TfmLoginScherm.Create(Self); fHomeScherm := TfmHomeScherm.Create(Self); + fPalletScherm := TfmPalletScherm.Create(Self); fHuidigScherm := fLoginScherm; Self.Show; @@ -78,7 +80,7 @@ if fHuidigScherm.ClassType = TfmHomeScherm then begin fModalResult := fHuidigScherm.ShowModal; if fHuidigScherm.ModalResult = mrYes then begin - ShowMessage('Afmelden Producten'); + fHuidigScherm := fPalletScherm; end; if fHuidigScherm.ModalResult = mrNo then begin ShowMessage('Hernoem Pallet'); @@ -89,6 +91,15 @@ end; continue; end; + + //PalletScherm tonen + if fHuidigScherm.ClassType = TfmPalletScherm then begin + fModalResult := fHuidigScherm.ShowModal; + + + continue; + end; + end; Self.Close; Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r15 -r19 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 15) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 19) @@ -9,8 +9,8 @@ 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= @@ -23,11 +23,14 @@ 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/06 07:41:24.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/03/07 08:39:12.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 11:22:02.536,=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas @@ -41,6 +44,8 @@ + + Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r18 -r19 Binary files differ Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r18 -r19 Binary files differ Index: AAPClient/ProScan.dpr =================================================================== diff -u -r15 -r19 --- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 15) +++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 19) @@ -8,7 +8,8 @@ GebruikerService in 'WS\GebruikerService.pas', PopupScherm in 'UI\PopupScherm.pas' {fmPopupScherm}, Images in 'UI\Images.pas' {ImagesScherm}, - HomeScherm in 'UI\HomeScherm.pas' {fmHomeScherm}; + HomeScherm in 'UI\HomeScherm.pas' {fmHomeScherm}, + PalletScherm in 'UI\PalletScherm.pas' {fmPalletScherm}; {$R *.res} @@ -22,5 +23,6 @@ Application.CreateForm(TfmPopupScherm, fmPopupScherm); Application.CreateForm(TImagesScherm, ImagesScherm); Application.CreateForm(TfmHomeScherm, fmHomeScherm); + Application.CreateForm(TfmPalletScherm, fmPalletScherm); Application.Run; end. Index: AAPClient/UI/PalletScherm.dfm =================================================================== diff -u --- AAPClient/UI/PalletScherm.dfm (revision 0) +++ AAPClient/UI/PalletScherm.dfm (revision 19) @@ -0,0 +1,5 @@ +inherited fmPalletScherm: TfmPalletScherm + Caption = 'fmPalletScherm' + PixelsPerInch = 96 + TextHeight = 19 +end Index: AAPClient/ProScan.dproj =================================================================== diff -u -r15 -r19 --- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 15) +++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 19) @@ -107,6 +107,10 @@
fmHomeScherm
dfm + +
fmPalletScherm
+ dfm +
Cfg_2 Base Index: AAPClient/UI/PalletScherm.pas =================================================================== diff -u --- AAPClient/UI/PalletScherm.pas (revision 0) +++ AAPClient/UI/PalletScherm.pas (revision 19) @@ -0,0 +1,25 @@ +unit PalletScherm; + +interface + +uses + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList, + Vcl.StdCtrls; + +type + TfmPalletScherm = class(TfmDrieKnoppenScherm) + private + { Private declarations } + public + { Public declarations } + end; + +var + fmPalletScherm: TfmPalletScherm; + +implementation + +{$R *.dfm} + +end.