Index: AAPClient/UI/InfoLogScherm.dfm =================================================================== diff -u -r235 -r240 --- AAPClient/UI/InfoLogScherm.dfm (.../InfoLogScherm.dfm) (revision 235) +++ AAPClient/UI/InfoLogScherm.dfm (.../InfoLogScherm.dfm) (revision 240) @@ -156,7 +156,6 @@ OnExecute = actSchermLinksExecute end inherited actTerug: TAction - ImageIndex = 20 OnExecute = actTerugExecute end end Index: AAPClient/UI/LoginScherm2.pas =================================================================== diff -u -r227 -r240 --- AAPClient/UI/LoginScherm2.pas (.../LoginScherm2.pas) (revision 227) +++ AAPClient/UI/LoginScherm2.pas (.../LoginScherm2.pas) (revision 240) @@ -35,7 +35,7 @@ implementation uses - GebruikerService, UiContext, Agent; + GebruikerService, UiContext, Agent, ProScanMain; {$R *.dfm} @@ -57,6 +57,7 @@ finally Response.Free; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmLoginScherm2.edtInitialenKeyUp(Sender: TObject; var Key: Word; @@ -95,8 +96,8 @@ procedure TfmLoginScherm2.imgAfmeldenClick(Sender: TObject); begin inherited; - Self.ModalResult := mrAbort; HuidigeGebruikerAfmelden; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrAbort); end; procedure TfmLoginScherm2.SetContext; Index: AAPClient/UI/DnaCodeScherm.dfm =================================================================== diff -u -r229 -r240 --- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 229) +++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 240) @@ -1,8 +1,7 @@ inherited fmDnaCodeScherm: TfmDnaCodeScherm ActiveControl = edtDnaCode Caption = 'fmDnaCodeScherm' - ExplicitWidth = 480 - ExplicitHeight = 640 + OnActivate = FormActivate PixelsPerInch = 96 TextHeight = 19 object lblToeleveringData: TLabel [0] @@ -175,8 +174,6 @@ OnClick = btnInfoClick end inherited alAlgemeen: TActionList - Left = 16 - Top = 208 inherited actHome: TAction OnExecute = actHomeExecute end Index: AAPClient/UI/HomeScherm.pas =================================================================== diff -u -r123 -r240 --- AAPClient/UI/HomeScherm.pas (.../HomeScherm.pas) (revision 123) +++ AAPClient/UI/HomeScherm.pas (.../HomeScherm.pas) (revision 240) @@ -28,32 +28,32 @@ implementation uses - UiContext; + UiContext, ProScanMain; {$R *.dfm} procedure TfmHomeScherm.actAfsluitenExecute(Sender: TObject); begin inherited; - Self.ModalResult := mrLogin; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin); end; procedure TfmHomeScherm.btnAfmeldenProductenClick(Sender: TObject); begin inherited; - Self.ModalResult := mrPallet; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet); end; procedure TfmHomeScherm.btnHernoemPalletClick(Sender: TObject); begin inherited; - Self.ModalResult := mrHernoemPallet; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHernoemPallet); end; procedure TfmHomeScherm.btnUitloggenClick(Sender: TObject); begin inherited; - Self.ModalResult := mrLogin; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin); end; end. Index: AAPClient/UI/UiContext.pas =================================================================== diff -u -r219 -r240 --- AAPClient/UI/UiContext.pas (.../UiContext.pas) (revision 219) +++ AAPClient/UI/UiContext.pas (.../UiContext.pas) (revision 240) @@ -25,6 +25,7 @@ fLaatsteDnaCode: String; fInfoLogSchermToonGescand: boolean; fImagesScherm: TImagesScherm; + fDesktopMode: boolean; public Property Initialen: String Read fInitialen Write fInitialen; Property LoginCode: String Read fLoginCode Write fLoginCode; @@ -33,6 +34,7 @@ Property LaatsteDnaCode: String Read fLaatsteDnaCode Write fLaatsteDnaCode; Property InfoLogSchermToonGescand: boolean Read fInfoLogSchermToonGescand Write fInfoLogSchermToonGescand; Property ImagesScherm: TImagesScherm Read fImagesScherm Write fImagesScherm; + Property DesktopMode: boolean Read fDesktopMode Write fDesktopMode; end; implementation Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r237 -r240 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 237) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 240) @@ -55,14 +55,14 @@ implementation uses - UiContext, Agent, CommonFunctions; + UiContext, Agent, CommonFunctions, ProScanMain; {$R *.dfm} procedure TfmHernoemPalletScherm.actHomeExecute(Sender: TObject); begin inherited; - Self.ModalResult := mrHome; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; procedure TfmHernoemPalletScherm.actVolgendeExecute(Sender: TObject); @@ -171,7 +171,7 @@ Response.Free; end; if Self.ModalResult = mrHome then - CloseModal; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; procedure TfmHernoemPalletScherm.FormShow(Sender: TObject); Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas =================================================================== diff -u -r239 -r240 --- AAPClient/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 239) +++ AAPClient/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 240) @@ -35,14 +35,14 @@ implementation uses - UiContext, DnaCodeService, Agent, CommonFunctions; + UiContext, DnaCodeService, Agent, CommonFunctions, ProScanMain; {$R *.dfm} procedure TfmDnaCodeReedsGescandScherm.btnTerugClick(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmDnaCodeReedsGescandScherm.btnVerplaatsenClick(Sender: TObject); @@ -103,14 +103,13 @@ Response.Free; end; if Self.ModalResult = mrDnaCode then - CloseModal; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmDnaCodeReedsGescandScherm.Wegnemen; var Response: DnaCodeAfmeldenResponse; begin - Self.ModalResult := mrDnaCode; Response := TAgent.Create(UiContext).DnaCodeAfmelden(UiContext.LaatsteDnaCode,UiContext.Toelevering,UiContext.Pallet,-1); try if Response.Header.Status <> '200' then begin @@ -119,6 +118,7 @@ finally Response.Free; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; end. Index: AAPClient/UI/PalletScherm.pas =================================================================== diff -u -r211 -r240 --- AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 211) +++ AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 240) @@ -19,6 +19,7 @@ procedure edtPalletKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); procedure btnGenereerTbpClick(Sender: TObject); + procedure FormActivate(Sender: TObject); private procedure SetContext; public @@ -31,14 +32,14 @@ implementation uses - DnaCodeService, UiContext, Agent; + DnaCodeService, UiContext, Agent, ProScanMain; {$R *.dfm} procedure TfmPalletScherm.actHomeExecute(Sender: TObject); begin inherited; - Self.ModalResult := mrHome; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; procedure TfmPalletScherm.actVolgendeExecute(Sender: TObject); @@ -82,7 +83,7 @@ end else begin Self.ModalResult := mrPallet; end; - + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject); @@ -117,16 +118,20 @@ end; end; +procedure TfmPalletScherm.FormActivate(Sender: TObject); +begin + inherited; + ActiveControl := edtPallet; +end; + procedure TfmPalletScherm.FormShow(Sender: TObject); begin btnLinksOnder.Action := nil; btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := actVolgende; edtPallet.Text := ''; SetContext; - ActiveControl := edtPallet; inherited; - end; procedure TfmPalletScherm.SetContext; Index: AAPClient/ProScan.dproj.local =================================================================== diff -u -r230 -r240 --- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 230) +++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 240) @@ -2,120 +2,120 @@ 2019/03/01 14:25:16.000.954,=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.pas=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas - 2019/03/01 14:25:57.000.930,E:\svn\Delphi\AAPClient\ProScanMain.dfm=C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm - 2019/03/01 14:26:05.000.981,E:\svn\Delphi\AAPClient\ProScan.dproj=C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj + 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.pas=E:\svn\Delphi\AAPClient\ProScanMain.pas + 2019/03/01 14:25:57.000.930,C:\Users\TomV\Documents\RAD Studio\Projects\Unit2.dfm=E:\svn\Delphi\AAPClient\ProScanMain.dfm + 2019/03/01 14:26:05.000.981,C:\Users\TomV\Documents\RAD Studio\Projects\Project2.dproj=E:\svn\Delphi\AAPClient\ProScan.dproj 2019/03/01 14:28:35.000.977,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 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\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm + 2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.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\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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= - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm + 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas 2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas + 2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS\GebruikerService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm + 2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PopupScherm.pas 2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\Images.pas + 2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\Images.dfm 2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HomeScherm.pas + 2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm 2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm 2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas - 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm - 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm - 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm + 2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas + 2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas + 2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm 2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm - 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas + 2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm 2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas - 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas - 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\UiContext.pas 2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas 2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas + 2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm 2019/04/10 07:45:17.000.841,=E:\svn\Delphi\AAPClient\WS.pas 2019/04/10 07:45:55.000.611,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/04/10 07:46:07.000.445,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:14.000.961,=E:\svn\Delphi\AAPClient\WS.pas 2019/05/02 15:08:28.000.270,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/05/02 15:08:38.000.127,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/09/03 15:55:43.000.155,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas - 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm + 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/03 15:56:30.000.060,E:\svn\Delphi\AAPClient\UI\LoginScherm2.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 13:14:25.000.076,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm - 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DimmerForm.pas + 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/09/04 13:17:21.000.462,E:\svn\Delphi\AAPClient\UI\DimmerForm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm 2019/09/04 14:42:49.000.071,=E:\svn\Delphi\AAPClient\Unit1.pas 2019/09/06 07:39:37.000.990,=E:\svn\Delphi\AAPClient\WS.pas 2019/09/06 07:39:48.000.040,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas - 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas + 2019/09/06 07:40:00.000.929,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm 2019/09/06 07:44:11.000.442,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/09/06 07:45:06.000.602,=E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas - 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/09/06 07:46:50.000.159,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/09/09 10:12:07.000.120,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas= 2019/09/25 09:00:58.000.441,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.pas + 2019/09/25 09:40:05.000.670,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\DnaCodeReedsGescandScherm.dfm 2019/10/01 13:49:36.000.449,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/01 13:49:56.000.314,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/01 13:50:07.000.220,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 13:33:49.000.729,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 13:33:55.000.547,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/02 13:34:08.000.237,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/02 15:42:02.000.588,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/02 15:42:14.000.814,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/02 15:42:25.000.143,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/03 11:18:12.000.484,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/03 15:21:13.000.953,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\WS\Agent.pas + 2019/10/03 15:21:30.000.855,E:\svn\Delphi\AAPClient\WS\Agent.pas=E:\svn\Delphi\AAPClient\Unit1.pas 2019/10/07 09:39:36.000.456,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:39:44.000.760,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/07 09:40:00.000.589,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/07 09:43:00.000.939,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/07 09:43:11.000.201,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas + 2019/10/07 09:43:28.000.012,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas 2019/10/07 10:02:08.000.507,=E:\svn\Delphi\AAPClient\Unit1.pas - 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas=E:\svn\Delphi\AAPClient\Unit1.pas + 2019/10/07 10:02:34.000.480,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\CommonFunctions.pas 2019/10/15 10:29:07.000.266,=E:\svn\Delphi\AAPClient\WS.pas 2019/10/15 10:29:23.000.010,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= - 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/15 10:29:44.000.142,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas 2019/10/21 13:21:40.000.148,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas= 2019/10/21 13:21:55.000.323,=E:\svn\Delphi\AAPClient\WS.pas - 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas + 2019/10/21 13:22:13.000.787,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas Index: AAPClient/UI/PopupScherm.dfm =================================================================== diff -u -r212 -r240 --- AAPClient/UI/PopupScherm.dfm (.../PopupScherm.dfm) (revision 212) +++ AAPClient/UI/PopupScherm.dfm (.../PopupScherm.dfm) (revision 240) @@ -11,9 +11,8 @@ Font.Height = -16 Font.Name = 'Tahoma' Font.Style = [] - FormStyle = fsStayOnTop OldCreateOrder = False - Position = poOwnerFormCenter + Position = poDefault OnShow = FormShow PixelsPerInch = 96 TextHeight = 19 Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r232 -r240 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 232) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 240) @@ -31,6 +31,7 @@ procedure edtDnaCodeKeyPress(Sender: TObject; var Key: Char); procedure FormCreate(Sender: TObject); procedure btnInfoClick(Sender: TObject); + procedure FormActivate(Sender: TObject); private fImagesScherm: TImagesScherm; procedure MeldDnaCodeAf(); @@ -50,14 +51,14 @@ implementation uses - UiContext, Agent, CommonFunctions; + UiContext, Agent, CommonFunctions, ProScanMain; {$R *.dfm} procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject); begin inherited; - Self.ModalResult := mrHome; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; procedure TfmDnaCodeScherm.actPalletExecute(Sender: TObject); @@ -81,7 +82,7 @@ Self.ModalResult := mrDnaCode; end; end; - + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer; @@ -130,6 +131,7 @@ UiContext.InfoLogSchermToonGescand := true; Self.ModalResult := mrInfoLog; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject); @@ -154,6 +156,7 @@ end; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmDnaCodeScherm.edtDnaCodeKeyPress(Sender: TObject; var Key: Char); @@ -166,6 +169,12 @@ end; end; +procedure TfmDnaCodeScherm.FormActivate(Sender: TObject); +begin + inherited; + ActiveControl := edtDnaCode; +end; + procedure TfmDnaCodeScherm.FormCreate(Sender: TObject); begin inherited; @@ -178,7 +187,6 @@ btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := actAfronden; edtDnaCode.Text := ''; - ActiveControl := edtDnaCode; lblHuidigePalletData.Caption := UiContext.Pallet; lblToeleveringData.Caption := UiContext.Toelevering; lblAantalGescand.Caption := ''; @@ -194,7 +202,6 @@ imgWegwerpPallet.Visible := false; end; ZetIcoontjesBovenaan; - inherited; end; @@ -231,6 +238,7 @@ finally Response.Free; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmDnaCodeScherm.PalletBijwerken(Status: DnaCodeStatus; @@ -250,6 +258,7 @@ finally Response.Free; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmDnaCodeScherm.ToeleveringDataOphalen; @@ -272,6 +281,7 @@ finally Response.Free; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode); @@ -336,6 +346,7 @@ finally Response.Free; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; end. Index: AAPClient/UI/BestaandePalletScherm.pas =================================================================== diff -u -r228 -r240 --- AAPClient/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 228) +++ AAPClient/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 240) @@ -17,10 +17,6 @@ procedure FormShow(Sender: TObject); procedure btnExtraToeleveringClick(Sender: TObject); procedure btnReworkClick(Sender: TObject); - procedure imgHuidigeToeleveringClick(Sender: TObject); - procedure imgReworkClick(Sender: TObject); - procedure imgExtraToeleveringClick(Sender: TObject); - procedure imgRechtsOnderClick(Sender: TObject); procedure btnHuidigeToeleveringClick(Sender: TObject); procedure btnTerugClick(Sender: TObject); private @@ -35,32 +31,39 @@ implementation uses - UiContext, DnaCodeService, Agent; + UiContext, DnaCodeService, Agent, ProScanMain; {$R *.dfm} procedure TfmBestaandePalletScherm.btnExtraToeleveringClick(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; + UiContext.Toelevering := ''; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmBestaandePalletScherm.btnHuidigeToeleveringClick(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; + if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) = 1) then begin + UiContext.Toelevering := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet).DnaCodes[0].Toelevering; + end else if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) > 1) then begin + UiContext.Toelevering := ''; + end; + + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmBestaandePalletScherm.btnTerugClick(Sender: TObject); begin inherited; - Self.ModalResult := mrPallet; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet); end; procedure TfmBestaandePalletScherm.FormShow(Sender: TObject); @@ -72,37 +75,6 @@ inherited; end; -procedure TfmBestaandePalletScherm.imgExtraToeleveringClick(Sender: TObject); -begin - inherited; - UiContext.Toelevering := ''; - Self.ModalResult := mrDnaCode; -end; - -procedure TfmBestaandePalletScherm.imgHuidigeToeleveringClick(Sender: TObject); -begin - inherited; - Self.ModalResult := mrDnaCode; -end; - -procedure TfmBestaandePalletScherm.imgRechtsOnderClick(Sender: TObject); -begin - inherited; - Self.ModalResult := mrPallet; -end; - -procedure TfmBestaandePalletScherm.imgReworkClick(Sender: TObject); -begin - inherited; - if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) = 1) then begin - UiContext.Toelevering := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet).DnaCodes[0].Toelevering; - end else if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) > 1) then begin - UiContext.Toelevering := ''; - end; - - Self.ModalResult := mrDnaCode; -end; - function TfmBestaandePalletScherm.BepaalAantalToeleveringenOpPallet( PalletCode: string): integer; var Index: AAPClient/ProScanMain.dfm =================================================================== diff -u -r133 -r240 --- AAPClient/ProScanMain.dfm (.../ProScanMain.dfm) (revision 133) +++ AAPClient/ProScanMain.dfm (.../ProScanMain.dfm) (revision 240) @@ -1,8 +1,12 @@ object fmProScanHoofdscherm: TfmProScanHoofdscherm Left = 0 Top = 0 + Margins.Left = 0 + Margins.Top = 0 + Margins.Right = 0 + Margins.Bottom = 0 BorderStyle = bsNone - Caption = 'fmProScanHoofdscherm' + Caption = 'ProScan' ClientHeight = 640 ClientWidth = 480 Color = clBtnFace @@ -17,4 +21,18 @@ OnCreate = FormCreate PixelsPerInch = 96 TextHeight = 13 + object pcMain: TPageControl + Left = 0 + Top = 0 + Width = 480 + Height = 640 + Margins.Left = 0 + Margins.Top = 0 + Margins.Right = 0 + Margins.Bottom = 0 + Align = alClient + Style = tsFlatButtons + TabOrder = 0 + ExplicitLeft = -2 + end end Index: AAPClient/UI/HernoemPalletScherm.dfm =================================================================== diff -u -r237 -r240 --- AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 237) +++ AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 240) @@ -47,6 +47,10 @@ object tsOudeCode: TTabSheet Caption = 'tsOudeCode' TabVisible = False + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object lblOudeCode: TLabel Left = 13 Top = 248 @@ -599,6 +603,10 @@ Caption = 'tsResultaat' ImageIndex = 1 TabVisible = False + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object sgToeleveringData: TStringGrid Left = 4 Top = 18 @@ -667,6 +675,10 @@ Caption = 'tsNieuweCode' ImageIndex = 2 TabVisible = False + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 object lblNieuweCode: TLabel Left = 13 Top = 207 Index: AAPClient/UI/PopupScherm.pas =================================================================== diff -u -r176 -r240 --- AAPClient/UI/PopupScherm.pas (.../PopupScherm.pas) (revision 176) +++ AAPClient/UI/PopupScherm.pas (.../PopupScherm.pas) (revision 240) @@ -46,6 +46,8 @@ fDimmerForm: TfmDimmerform; begin fDimmerForm := TfmDimmerform.Create(Self); + fDimmerForm.Left := Self.Left - 40; + fDimmerForm.Top := Self.Top - 40; fDimmerForm.Show; end; Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r219 -r240 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 219) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 240) @@ -4,26 +4,21 @@ uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, - Vcl.Controls, Vcl.Forms, Vcl.Dialogs, ActnList, UiContext, Vcl.AppEvnts; + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, ActnList, UiContext, Vcl.AppEvnts, + Vcl.ComCtrls, Vcl.ExtCtrls; type TfmProScanHoofdscherm = class(TForm) + pcMain: TPageControl; procedure FormCreate(Sender: TObject); procedure FormActivate(Sender: TObject); private fUiContext: TUiContext; fHuidigScherm: TForm; - fLoginScherm2: TForm; - fHomeScherm: TForm; - fPalletScherm: TForm; - fBestaandePalletScherm: TForm; - fDnaCodeScherm: TForm; - fInfoLogScherm: TForm; - fHernoemPalletScherm: TForm; - fDnaCodeReedsGescandScherm: TForm; procedure HuidigeGebruikerAfmelden; public property UiContext: TUiContext read fUiContext; + procedure NavigeerNaar(mr: TModalResult); end; var @@ -39,52 +34,63 @@ {$R *.dfm} procedure TfmProScanHoofdscherm.FormActivate(Sender: TObject); -var - fModalResult: TModalResult; begin - fModalResult := mrNone; - - while fModalResult <> mrAbort do begin - (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext; - fModalResult := fHuidigScherm.ShowModal; - fUiContext := (fHuidigScherm as TfmDrieKnoppenScherm).UiContext; - fHuidigScherm.Free; - - case fModalResult of - mrLogin : fHuidigScherm := TfmLoginScherm2.Create(Self); - mrHome : fHuidigScherm := TfmHomeScherm.Create(Self); - mrPallet : fHuidigScherm := TfmPalletScherm.Create(Self); - mrHernoemPallet : fHuidigScherm := TfmHernoemPalletScherm.Create(Self); - mrBestaandePallet : fHuidigScherm := TfmBestaandePalletScherm.Create(Self); - mrDnaCode : fHuidigScherm := TfmDnaCodeScherm.Create(Self); - mrInfoLog : fHuidigScherm := TfmInfoLogScherm.Create(Self); - mrDnaCodeReedsGescand : fHuidigScherm := TfmDnaCodeReedsGescandScherm.Create(Self); - end; - end; - - HuidigeGebruikerAfmelden; - Application.Terminate; + NavigeerNaar(mrLogin); end; procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject); begin fUiContext := TUiContext.Create(); fUiContext.ImagesScherm := TImagesScherm.Create(self); - {fLoginScherm2 := TfmLoginScherm2.Create(Self); - fHomeScherm := TfmHomeScherm.Create(Self); - fPalletScherm := TfmPalletScherm.Create(Self); - fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self); - fDnaCodeScherm := TfmDnaCodeScherm.Create(Self); - fInfoLogScherm := TfmInfoLogScherm.Create(Self); - fHernoemPalletScherm := TfmHernoemPalletScherm.Create(Self); - fDnaCodeReedsGescandScherm := TfmDnaCodeReedsGescandScherm.Create(Self); - } - fHuidigScherm := TfmLoginScherm2.Create(Self); + + if ParamStr(1)='displaymode=desktop' then begin + Self.BorderStyle := bsSingle; + Self.ClientHeight := 640; + Self.ClientWidth := 480; + end; end; procedure TfmProScanHoofdscherm.HuidigeGebruikerAfmelden; begin TAgent.Create(UiContext).GebruikerAfmelden(); end; +procedure TfmProScanHoofdscherm.NavigeerNaar(mr: TModalResult); +var + TabSheet: TTabSheet; + pnlMain: TPanel; +begin + + if pcMain.PageCount > 0 then + pcMain.Pages[0].Free; + TabSheet := TTabSheet.Create(pcMain); + TabSheet.TabVisible := false; + TabSheet.PageControl := pcMain; + pcMain.ActivePageIndex := 0; + + if mr = mrAbort then begin + HuidigeGebruikerAfmelden; + Application.Terminate; + end else begin + case mr of + mrLogin : fHuidigScherm := TfmLoginScherm2.Create(TabSheet); + mrHome : fHuidigScherm := TfmHomeScherm.Create(TabSheet); + mrPallet : fHuidigScherm := TfmPalletScherm.Create(TabSheet); + mrHernoemPallet : fHuidigScherm := TfmHernoemPalletScherm.Create(TabSheet); + mrBestaandePallet : fHuidigScherm := TfmBestaandePalletScherm.Create(TabSheet); + mrDnaCode : fHuidigScherm := TfmDnaCodeScherm.Create(TabSheet); + mrInfoLog : fHuidigScherm := TfmInfoLogScherm.Create(TabSheet); + mrDnaCodeReedsGescand : fHuidigScherm := TfmDnaCodeReedsGescandScherm.Create(TabSheet); + end; + + pnlMain := TPanel.Create(Self); + pnlMain.Parent := Self; + pnlMain.Align := alClient; + + fHuidigScherm.Parent := pnlMain; + (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext; + fHuidigScherm.Show; + end; +end; + end. Index: AAPClient/UI/DrieKnoppenScherm.pas =================================================================== diff -u -r235 -r240 --- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 235) +++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 240) @@ -109,23 +109,20 @@ begin if btnLinksOnder.Action<>nil then begin btnLinksOnder.Action.Execute; - CloseModal; end; end; procedure TfmDrieKnoppenScherm.imgCentraalOnderClick(Sender: TObject); begin if btnCentraalOnder.Action<>nil then begin btnCentraalOnder.Action.Execute; - CloseModal; end; end; procedure TfmDrieKnoppenScherm.imgRechtsOnderClick(Sender: TObject); begin if btnRechtsOnder.Action<>nil then begin btnRechtsOnder.Action.Execute; - CloseModal; end; end; @@ -134,6 +131,9 @@ PopupScherm: TfmPopupScherm; begin PopupScherm := TfmPopupScherm.Create(self); + + PopupScherm.Top := self.parent.parent.parent.ClientOrigin.Y + 40; + PopupScherm.Left := self.parent.parent.parent.ClientOrigin.X + 40; PopupScherm.lblWaarschuwing.Caption := Melding; PopupScherm.lblActie1.Caption := Actie1; Index: AAPClient/UI/PalletScherm.dfm =================================================================== diff -u -r237 -r240 --- AAPClient/UI/PalletScherm.dfm (.../PalletScherm.dfm) (revision 237) +++ AAPClient/UI/PalletScherm.dfm (.../PalletScherm.dfm) (revision 240) @@ -1,5 +1,6 @@ inherited fmPalletScherm: TfmPalletScherm Caption = 'fmPalletScherm' + OnActivate = FormActivate PixelsPerInch = 96 TextHeight = 19 object imgPallet: TImage [0] @@ -387,11 +388,6 @@ Font.Style = [] ParentFont = False end - inherited pnlDrieKnoppen: TPanel - inherited btnRechtsOnder: TButton - Default = True - end - end object edtPallet: TEdit [4] Left = 66 Top = 321 Index: AAPClient/UI/LoginScherm2.dfm =================================================================== diff -u -r227 -r240 --- AAPClient/UI/LoginScherm2.dfm (.../LoginScherm2.dfm) (revision 227) +++ AAPClient/UI/LoginScherm2.dfm (.../LoginScherm2.dfm) (revision 240) @@ -310,101 +310,93 @@ Height = 48 Picture.Data = { 0954506E67496D61676589504E470D0A1A0A0000000D49484452000000300000 - 003008060000005702F987000001177A5458745261772070726F66696C652074 - 7970652065786966000078DAAD9B697225B77285FF63155E02E661391823BC03 - 2FDFDF41D565B35B2D59925F339A97BC431580CC3C430234FB7FFEFB98FFE25F - F1D69A984ACD2D67CBBFD862F39D1FAA7DFE3D8FCEC6FBFDFE0BEF4BFCFED3F3 - E6EB05CF53E1C73BF37EDFDF793EFDF84089EFF3E3E7E74D99EF75EA7BA1F785 - CF0583EECCD0ED7A07F95E28F8E779F7FE6E9A7F7EE8F9DB74DEFF73DF4B58F7 - 5EF4D7DF63613156E2C9E08DDF81E7EF77FFDC29308AD042E7BBE3BB0DD1EB19 - CFCF2994FBFD73B36FEB67BE96EE370BF8F5D32FEB67E7FB7CF8B11CCF853ED3 - CABFACD3FBBC4BBF5FBFBB4ADF47E4FCD79DFD4F23AAC4E6FBBF6FEB77CEAAE7 - EC67763D66C372E5775218AB80C800000184694343504943432070726F66696C - 650000789C7D913B48C3501486FFA6958A561CEC20E290A13A59105F384A158B - 60A1B4155A7530B9E90B9A3424292E8E826BC1C1C762D5C1C55957075741107C - 80B8B83A29BA4889E7268516315E38DC8FFFDEFFE7DC7301A15161AA19180754 - CD3252F19898CDAD8AC157F42240358DA8C44C3D915ECCC0737DDDC3C7F7BB28 - CFF2BEF7E7EA53F226037C22F11CD30D8B78837866D3D239EF138759495288CF - 89C70C6A90F891EBB2CB6F9C8B0E0B3C336C6452F3C46162B1D8C17207B392A1 - 124F11471455A37C21EBB2C2798BB35AA9B1569FFC85A1BCB692E63AD530E258 - 4202498890514319155888D2AE91622245E7310FFF90E34F924B2657198C1C0B - A84285E4F8C1FFE0F76CCDC2E4849B148A015D2FB6FD310204778166DDB6BF8F - 6DBB7902F89F812BADEDAF3680D94FD2EB6D2D7204F46F0317D76D4DDE032E77 - 80C1275D322447F253098502F07E46DF9403066E819E35776EAD739C3E00199A - D5F20D7070088C16297BDDE3DDDD9D73FBF74E6B7E3FBD3B72C5B795062E0000 - 0006624B474400FF00FF00FFA0BDA793000000097048597300000EC300000EC3 - 01C76FA8640000000774494D4507E30B040B393A606BDE23000008B149444154 - 78DAED99095093671AC7FF5FBE0408090904C2A950D12E8A5AAF4EBB9E20DA05 - 1C5D11C1AD825AAA5540B10A75F13E90025E50AD072AF528D675716754F016B7 - DE62DDD5D595454ACB2172953B8170E4DA37E84C215F0209E0ACCEF699C96426 - F9DEF7797EEFFBBCCFF17ED423408DB758A8DF007E03780301A83F04803BDC1D - 26BC56B4E6DC83ECE48DB707800E590771903F046E8EA0392AA8EA8A2039B517 - 65EB8FBF0500E3E743BCF6CF107BBA81CD6181A2C86F6A1594958F50B22204B5 - 7F79FA8603CCDF0CE7354B603940F4D2F857A26E95A076EF7C14479D7DB301A8 - 45F170890E85A09F10EDEC875ADE00C937E1280CEF7D37FAFF03A0C67B826DCE - 01144D905FBBDD2300D6780FD05CCD5C32C8FF7EF735038C180B93E1E3210C98 - 0E8BFE22A0AE10D2CC33A83B7713F2AC6CE3005C5C61E233079653BDC1732573 - D5FE04E9F9B3A8BB7C0B8A8779AF01608C37B81303210E99012B57AB575669A2 - 4B0E6A8E7D85D2E86F8C0260CF23A1362214D6C31D40D32F9F544B0B517B2A05 - 556997D074E5612F027C3819E67E0B6117EC0BBE031F2C563BD3548D68BA770A - 259BB6A3F15A8E6100C3BCC09F1D0587081F9873A98EBA5AAA20BD7008A5FBD3 - D09CF9B81700467A813B6D1EEC17F881EF68D1D1F836CB9AD1FC281D659B6320 - C9F88F6100237C20F864151CC226C08CAD43A7BC1692337B509A948A96AC9F7A - 06C009DD06BBB0B9B072B7058BA618FFAB9BABD070F110F267AE7D3999812E64 - 169D0287E54110D899EAD4ABAA2B40DDF1ED285E96DC7D00CA773E6C2256423C - 712038A62C6DD3A156B4A0E5E15994EF4946FDF11B4601505E1F4310BC18F6FE - A3612A3081F6D2A8550A288A7E40C5F6CDA84EBEDA0D80115EC4EF17C1316206 - CC859C0E59B54D8192B84ED67778B1ED086419BF863F63C228356E3AF84161B0 - 0F9800AEB5991684BA6D4CE3B5232849D887E69B3F1A07C00A0883CD8A75B0FB - D09EE9F7E4F1D687DFA270D51E3465FEB3E36446E601EA83A9E07D1609A7C031 - CC9DD044B9F227A83A9080F298342300DEF384F9D45038AC0A049FCFF47B54DE - C0CFF342D170399739597732F1C800586DDA08276F7752BD6AE953D6A3E1CA51 - 3C8FDE01F9D312030148821145C4C0C9D7150CCF5754A13AE64F2889FD5EF764 - DD2D2502BFC43B894B2170E413776D3F520545FE4D54EC8E43D5EE4CC300D841 - D1B0252B22EE6FA6653D99ECE931640F5BA07F3B7B500B99A73E42BF5943DBCA - F00E6A25F9A839B20B2F567C6D00808D23B89F24C269732078DA4946B3FADB3F - C38BB5FA4BE21E15730189E8971C0681482BB4AA881B9D4F41D1173BA0C8ABE8 - 02E07D0FF0E7C7C1397C34B4DD515D7D1B4521D1A83F774FBF110BBF84CBAA70 - 085DB5005A1B507F68118A224EEA1F3BD40FA2C329E83B4AA4A5588EE6072751 - BA3511D2D3CCECDC1160DC471046ED81F3F477B5FC5F0DE5E3C3C899BB15CAA7 - 9D6447FF95705ABF02A2A19AE8D56E7453392A63835016FF3D3A13D3EF72E036 - DB8D1152E5B997084002EA8EDEEA02C0D307561BC82A783A6A4DA242F3954DC8 - F589EDD4008C9A4C767019EC66798167C305A509C18A06C8EE9C40F1C62412CF - 733B1D4EC55FC790E809CCC57B7E1BA50909A849BED83900E5E50B51CC51F419 - 23D67A4C05D9E965C89BB90F5D0935D91F7C0F02326A204C7872B27A0F20C9BC - 8A8634036E26569F877BACAF96FBAAA12AF981EC403CAAF7A477013051037004 - 7DC6DA3201CE4422CF7F77D746BC12FA236FB0384AC82F641A3C066B2F62708C - 37D80C80FB640708C0DE8CCE01E0E10DAB7587D077521F861FB65E8F478ED73A - C38DE986D04977E1FEF9EF992E5478AB6D076A0E5CEE0260CC64083EDF05E780 - 41A0B55721F7247283E2481991FDDA00CC4F1760C07417E6E26567B41DE2FAE3 - 595D008C9C00DEC79BD037D213DA05A85AF66F948484A3FAD49DD7633D499076 - 695FC1FE5D9E96E21634DD4945E9B6DD6838C7BC57626462D3B083708C5B0081 - 50BB0E6A86F4D862E487A4BE1E802527F0BBAD33C1D55C18B417452524690750 - 10BC41E73006003D6B096CD7C741EC6EC12CA34B2EE149DF29BD6FFC50927F76 - 1E84F34467ADC68994D535CF507D3009256B520C03C08419107EBA1A4E734681 - C3D62690417A220AF9730FF4AAFD9C9547F1CEEA59E00ACD3A2E1AC9C22D4FCE - A13C711BEA52EF1B0860ED08D3D96B60BFFA53081DCC18DD121A7F44D9C6E5F8 - 25F152AF184FCF5E07DBA8C5B019E6C85C7D92C125A7935118BC45EF789D0D0D - E5130CABD068384C71079BCDEC099445D7495448229931033D11DA2F02A2F0C5 - 108F7303C78CEEF8A75A0179DE4DFCB22B0155FBF5E712BD3DB1C9D224384486 - 40E822609E05D2B32A9FFF0395DFA6A026FD36140FF5B77C3A65C0209878CC84 - 28780EAC3E18000E97CD089D2A5905247FDD89A2053B3B9D4AFFADC4B83F42B8 - 2012F633348D374767E3AD2C7F86FA6B17517FFD1EA447CE18643B6BCA6C526A - 4C8270F2240806F705DB84C57846D373B712DF2F89DD492AD0FB9DCED7E9B50A - 6BDA52582F0985ADE7409D8A344D8EAA458AD6A25C343EFA1764B9B990653F43 - F3DF3A165D2C6F3F98BA0F81B9DB407007BF07DE60579808CDC1A274EB5514DF - 45C58E58547DDDF539EBF2668E1DBC9E1CB2508806DB8366EBD1D8062283A2AE - 06F2CA4A28EBEAA16A68844A498365CE074B20042DB60547640936CF4CC74541 - 3B692C40F9F6D5A8E8A491370A40239C85F1B05D1602D120B1CE0B2E26108920 - 2A25F9A240D134E30CE91D26C943E5BE2D285B63F835BCC1B7D32CBF48587F11 - 0187312E30D01E2384146CA4E22C236E53BDEB8251238D7A3F40BD3F0DBCC80D - E8E33712A666BD84A16C84ECC159522E27A331FDB6D1C3BBF58686151C0BDBE5 - F348F2E9039A3676F42BD1C4F9E2C7A83EB11F156B0E779BBF47AF9838A15B60 - E93D161683FAC3D4D612B429A7CDE7350D31A5698A2932B54A45CE838AAC3439 - 13F2562825D568F9F929A477AEA236E33A14593D2BCF7BE71D19E923CC467B80 - 37848088ADC0B6B0201F3ED91D25F1900628A412286A89E105D968BC9785E6F4 - 5B3D56D9BB00FF4379EB01FE0B5630E8FEC0B386C90000000049454E44AE4260 - 82} + 003008060000005702F987000000207A5458745261772070726F66696C652074 + 7970652065786966000078DA53000000210021020ADEDC000001846943435049 + 43432070726F66696C650000789C7D913B48C3501486FFA6958A561CEC20E290 + A13A59105F384A158B60A1B4155A7530B9E90B9A3424292E8E826BC1C1C762D5 + C1C55957075741107C80B8B83A29BA4889E7268516315E38DC8FFFDEFFE7DC73 + 01A15161AA19180754CD3252F19898CDAD8AC157F42240358DA8C44C3D915ECC + C0737DDDC3C7F7BB28CFF2BEF7E7EA53F226037C22F11CD30D8B78837866D3D2 + 39EF138759495288CF89C70C6A90F891EBB2CB6F9C8B0E0B3C336C6452F3C461 + 62B1D8C17207B392A1124F11471455A37C21EBB2C2798BB35AA9B1569FFC85A1 + BCB692E63AD530E2584202498890514319155888D2AE91622245E7310FFF90E3 + 4F924B2657198C1C0BA84285E4F8C1FFE0F76CCDC2E4849B148A015D2FB6FD31 + 0204778166DDB6BF8F6DBB7902F89F812BADEDAF3680D94FD2EB6D2D7204F46F + 0317D76D4DDE032E7780C1275D322447F253098502F07E46DF9403066E819E35 + 776EAD739C3E00199AD5F20D7070088C16297BDDE3DDDD9D73FBF74E6B7E3FBD + 3B72C5B795062E00000006624B474400FF00FF00FFA0BDA79300000009704859 + 7300000EC300000EC301C76FA8640000000774494D4507E30B040B393A606BDE + 23000008B14944415478DAED99095093671AC7FF5FBE0408090904C2A950D12E + 8A5AAF4EBB9E20DA051C5D11C1AD825AAA5540B10A75F13E90025E50AD072AF5 + 28D675716754F016B7DE62DDD5D595454ACB2172953B8170E4DA37E84C215F02 + 09E0ACCEF699C96426F9DEF7797EEFFBBCCFF17ED423408DB758A8DF007E0378 + 0301A83F04803BDC1D26BC56B4E6DC83ECE48DB707800E590771903F046E8EA0 + 392AA8EA8A2039B51765EB8FBF0500E3E743BCF6CF107BBA81CD6181A2C86F6A + 1594958F50B22204B57F79FA8603CCDF0CE7354B603940F4D2F857A26E95A076 + EF7C14479D7DB301A845F170890E85A09F10EDEC875ADE00C937E1280CEF7D37 + FAFF03A0C67B826DCE01144D905FBBDD2300D6780FD05CCD5C32C8FF7EF73503 + 8C180B93E1E3210C980E8BFE22A0AE10D2CC33A83B7713F2AC6CE3005C5C61E2 + 33079653BDC1732573D5FE04E9F9B3A8BB7C0B8A8779AF01608C37B81303210E + 99012B57AB575669A24B0E6A8E7D85D2E86F8C0260CF23A1362214D6C31D40D3 + 2F9F544B0B517B2A05556997D074E5612F027C3819E67E0B6117EC0BBE031F2C + 563BD3548D68BA770A259BB6A3F15A8E6100C3BCC09F1D0587081F9873A98EBA + 5AAA20BD7008A5FBD3D09CF9B81700467A813B6D1EEC17F881EF68D1D1F836CB + 9AD1FC281D659B6320C9F88F6100237C20F864151CC226C08CAD43A7BC169233 + 7B509A948A96AC9F7A06C009DD06BBB0B9B072B7058BA618FFAB9BABD070F110 + F267AE7D3999812E64169D0287E54110D899EAD4ABAA2B40DDF1ED285E96DC7D + 00CA773E6C2256423C712038A62C6DD3A156B4A0E5E15994EF4946FDF11B4601 + 505E1F4310BC18F6FEA3612A3081F6D2A8550A288A7E40C5F6CDA84EBEDA0D80 + 115EC4EF17C1316206CC859C0E59B54D8192B84ED67778B1ED086419BF863F63 + C228356E3AF84161B00F9800AEB5991684BA6D4CE3B5232849D887E69B3F1A07 + C00A0883CD8A75B0FBD09EE9F7E4F1D687DFA270D51E3465FEB3E36446E601EA + 83A9E07D1609A7C031CC9DD044B9F227A83A9080F298342300DEF384F9D45038 + AC0A049FCFF47B54DEC0CFF342D170399739597732F1C800586DDA08276F7752 + BD6AE953D6A3E1CA513C8FDE01F9D312030148821145C4C0C9D7150CCF5754A1 + 3AE64F2889FD5EF764DD2D2502BFC43B894B2170E413776D3F520545FE4D54EC + 8E43D5EE4CC300D841D1B0252B22EE6FA6653D99ECE931640F5BA07F3B7B500B + 99A73E42BF5943DBCAF00E6A25F9A839B20B2F567C6D00808D23B89F24C26973 + 2078DA4946B3FADB3FC38BB5FA4BE21E15730189E8971C0681482BB4AA881B9D + 4F41D1173BA0C8ABE802E07D0FF0E7C7C1397C34B4DD515D7D1B4521D1A83F77 + 4FBF110BBF84CBAA70085DB5005A1B507F68118A224EEA1F3BD40FA2C329E83B + 4AA4A5588EE6072751BA3511D2D3CCECDC1160DC471046ED81F3F477B5FC5F0D + E5E3C3C899BB15CAA79D6447FF95705ABF02A2A19AE8D56E7453392A63835016 + FF3D3A13D3EF72E036DB8D1152E5B997084002EA8EDEEA02C0D307561BC82A78 + 3A6A4DA242F3954DC8F589EDD4008C9A4C767019EC66798167C305A509C18A06 + C8EE9C40F1C62412CF733B1D4EC55FC790E809CCC57B7E1BA50909A849BED839 + 00E5E50B51CC51F41923D67A4C05D9E965C89BB90F5D0935D91F7C0F02326A20 + 4C7872B27A0F20C9BC8A8634036E26569F877BACAF96FBAAA12AF981EC403CAA + F7A4770130510370047DC6DA3201CE4422CF7F77D746BC12FA236FB0384AC82F + 641A3C066B2F62708C37D80C80FB640708C0DE8CCE01E0E10DAB7587D077521F + 861FB65E8F478ED73AC38DE986D04977E1FEF9EF992E5478AB6D076A0E5CEE02 + 60CC64083EDF05E78041A0B55721F7247283E2481991FDDA00CC4F1760C07417 + E6E26567B41DE2FAE3595D008C9C00DEC79BD037D213DA05A85AF66F948484A3 + FAD49DD7633D499076695FC1FE5D9E96E21634DD4945E9B6DD6838C7BC576264 + 62D3B083708C5B008150BB0E6A86F4D862E487A4BE1E802527F0BBAD33C1D55C + 18B41745252469075010BC41E73006003D6B096CD7C741EC6EC12CA34B2EE149 + DF29BD6FFC50927F761E84F34467ADC68994D535CF507D3009256B520C03C084 + 19107EBA1A4E734681C3D62690417A220AF9730FF4AAFD9C9547F1CEEA59E00A + CD3A2E1AC9C22D4FCEA13C711BEA52EF1B0860ED08D3D96B60BFFA53081DCC18 + DD121A7F44D9C6E5F825F152AF184FCF5E07DBA8C5B019E6C85C7D92C125A793 + 5118BC45EF789D0D0DE5130CABD068384C71079BCDEC099445D7495448229931 + 033D11DA2F02A2F0C5108F7303C78CEEF8A75A0179DE4DFCB22B0155FBF5E712 + BD3DB1C9D22438448640E822609E05D2B32A9FFF0395DFA6A026FD36140FF5B7 + 7C3A65C0209878CC8428780EAC3E18000E97CD089D2A5905247FDD89A2053B3B + 9D4AFFADC4B83F42B82012F633348D374767E3AD2C7F86FA6B17517FFD1EA447 + CE18643B6BCA6C526A4C8270F2240806F705DB84C57846D373B712DF2F89DD49 + 2AD0FB9DCED7E9B50A6BDA52582F0985ADE7409D8A344D8EAA458AD6A25C343E + FA1764B9B990653F43F3DF3A165D2C6F3F98BA0F81B9DB407007BF07DE605798 + 08CDC1A274EB5514DF45C58E58547DDDF539EBF2668E1DBC9E1CB2508806DB83 + 66EBD1D8062283A2AE06F2CA4A28EBEAA16A68844A498365CE074B20042DB605 + 47640936CF4CC745413B692C40F9F6D5A8E8A491370A40239C85F1B05D1602D1 + 20B1CE0B2E261089202A25F9A240D134E30CE91D26C943E5BE2D285B63F835BC + C1B7D32CBF48587F110187312E30D01E2384146CA4E22C236E53BDEB8251238D + 7A3F40BD3F0DBCC80DE8E33712A666BD84A16C84ECC159522E27A331FDB6D1C3 + BBF58686151C0BDBE5F348F2E9039A3676F42BD1C4F9E2C7A83EB11F156B0E77 + 9BBF47AF9838A15B60E93D161683FAC3D4D612B429A7CDE7350D31A5698A2932 + B54A45CE838AAC343913F2562825D568F9F929A477AEA236E33A14593D2BCF7B + E71D19E923CC467B8037848088ADC0B6B0201F3ED91D25F1900628A412286A89 + E105D968BC9785E6F45B3D56D9BB00FF4379EB01FE0B5630E8FEC0B386C90000 + 000049454E44AE426082} OnClick = imgAfmeldenClick end object btnLogin: TButton Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r235 -r240 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 235) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 240) @@ -46,7 +46,7 @@ implementation uses - Agent, CommonFunctions; + Agent, CommonFunctions, ProScanMain; {$R *.dfm} @@ -63,7 +63,7 @@ procedure TfmInfoLogScherm.actTerugExecute(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmInfoLogScherm.actOngedaanMakenExecute(Sender: TObject); @@ -86,6 +86,7 @@ Response.Free; end; end; + (Self.Parent.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; procedure TfmInfoLogScherm.btnEerstClick(Sender: TObject); Index: AAPClient/ProScan.dproj =================================================================== diff -u -r211 -r240 --- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 211) +++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 240) @@ -70,6 +70,7 @@ true + displaymode=desktop ProScan_Icon.ico true 1033