Index: AAPClient/ProScan.identcache
===================================================================
diff -u -r63 -r96
Binary files differ
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r93 -r96
--- AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 93)
+++ AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 96)
@@ -9,8 +9,8 @@
     <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/01 14:34:33.000.220,E:\svn\Delphi\AAPClient\UI\DrieKnoppenScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/01 15:26:22.000.761,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm</Transaction>
     <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\LoginScherm.pas</Transaction>
+    <Transaction>2019/03/01 15:27:42.000.618,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm</Transaction>
     <Transaction>2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=</Transaction>
@@ -58,14 +58,14 @@
     <Transaction>2019/03/18 11:06:46.000.842,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/18 11:07:10.000.880,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/03/18 11:07:23.000.750,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
-    <Transaction>2019/03/19 14:36:29.587,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/19 14:42:58.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/20 14:52:28.434,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/20 14:52:34.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/20 14:52:47.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
-    <Transaction>2019/03/22 12:38:06.040,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/22 12:42:12.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
-    <Transaction>2019/03/22 12:42:12.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/19 14:36:29.000.587,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/19 14:42:58.000.764,E:\svn\Delphi\AAPClient\UI\UiContext.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/20 14:52:28.000.434,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/20 14:52:34.000.233,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
+    <Transaction>2019/03/20 14:52:47.000.492,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
+    <Transaction>2019/03/22 12:38:06.000.040,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/22 12:42:12.000.397,E:\svn\Delphi\AAPClient\UI\HernoemPalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="UI"/>
Index: AAPClient/ProScanMain.dfm
===================================================================
diff -u -r90 -r96
--- AAPClient/ProScanMain.dfm	(.../ProScanMain.dfm)	(revision 90)
+++ AAPClient/ProScanMain.dfm	(.../ProScanMain.dfm)	(revision 96)
@@ -13,8 +13,8 @@
   Font.Style = []
   OldCreateOrder = False
   Visible = True
+  OnActivate = FormActivate
   OnCreate = FormCreate
-  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
 end
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r94 -r96
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 94)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 96)
@@ -9,7 +9,7 @@
 type
   TfmProScanHoofdscherm = class(TForm)
     procedure FormCreate(Sender: TObject);
-    procedure FormShow(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     fUiContext: TUiContext;
     fHuidigScherm: TForm;
@@ -35,22 +35,7 @@
 
 {$R *.dfm}
 
-procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
-begin
-  fUiContext := TUiContext.Create();
-  //fImagesScherm := TImagesScherm.Create(Self);
-  fLoginScherm := TfmLoginScherm.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);
-
-  fHuidigScherm := fLoginScherm;
-end;
-
-procedure TfmProScanHoofdscherm.FormShow(Sender: TObject);
+procedure TfmProScanHoofdscherm.FormActivate(Sender: TObject);
 var
   fModalResult: TModalResult;
 begin
@@ -76,6 +61,20 @@
   Application.Terminate;
 end;
 
+procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
+begin
+  fUiContext := TUiContext.Create();
+  fLoginScherm := TfmLoginScherm.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);
+
+  fHuidigScherm := fLoginScherm;
+end;
+
 procedure TfmProScanHoofdscherm.HuidigeGebruikerAfmelden;
 var
   Service: GebruikerServiceSoap;