Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r61 -r65
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 61)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 65)
@@ -4,14 +4,15 @@
 
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
-  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, ActnList;
+  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, ActnList, UiContext;
 
 type
   TfmProScanHoofdscherm = class(TForm)
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormShow(Sender: TObject);
   private
+    fUiContext: TUiContext;
     fInitialen: string;
     fLoginCode: string;
     fHuidigePallet: string;
@@ -23,6 +24,7 @@
     fBestaandePalletScherm: TForm;
     fDnaCodeScherm: TForm;
     fInfoLogScherm: TForm;
+    fImagesScherm: TForm;
     procedure HuidigeGebruikerAfmelden;
   public
   end;
@@ -34,7 +36,7 @@
 
 uses
   LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm,
-  BestaandePalletscherm, DnaCodeScherm, InfoLogScherm;
+  BestaandePalletscherm, DnaCodeScherm, InfoLogScherm, Images;
 
 {$R *.dfm}
 
@@ -48,6 +50,8 @@
 
 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);
@@ -68,15 +72,16 @@
 
 
   while fModalResult <> mrAbort do begin
-    (fHuidigScherm as TfmDrieKnoppenScherm).lblGebruiker.Caption := fInitialen;
-
+    //(fHuidigScherm as TfmDrieKnoppenScherm).lblGebruiker.Caption := fUiContext.Initialen;
+    (fHuidigScherm as TfmDrieKnoppenScherm).UiContext := fUiContext;
     //LoginScherm tonen
     if fHuidigScherm.ClassType = TfmLoginScherm then begin
       fModalResult := fHuidigScherm.ShowModal;
       if fHuidigScherm.ModalResult = mrRetry then begin
         fModalResult := fHuidigScherm.ShowModal;
       end
       else if fHuidigScherm.ModalResult = mrOk then begin
+        fUiContext.Initialen := (fHuidigScherm as TfmLoginScherm).GeefInitialen();
         fInitialen := (fHuidigScherm as TfmLoginScherm).GeefInitialen();
         fLoginCode := (fHuidigScherm as TfmLoginScherm).GeefLoginCode();
         fHuidigScherm := fHomeScherm;
@@ -197,9 +202,9 @@
   Request := GebruikerAfmeldenRequest.Create;
   Header := RequestHeader.Create;
   try
-    Request.Initialen := fInitialen;
+    Request.Initialen := fUiContext.Initialen;
     Request.LoginCode := fLoginCode;
-    Header.Initialen := fInitialen;
+    Header.Initialen := fUiContext.Initialen;
     Request.Header := Header;
 
     Service.GebruikerAfmelden(Request);
Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu
===================================================================
diff -u -r63 -r65
Binary files differ
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r63 -r65
--- AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 63)
+++ AAPClient/ProScan.dproj.local	(.../ProScan.dproj.local)	(revision 65)
@@ -14,50 +14,52 @@
     <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>
-    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
+    <Transaction>2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas</Transaction>
     <Transaction>2019/03/05 11:54:27.000.053,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/05 11:57:08.000.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/06 07:41:24.000.503,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/06 07:41:41.000.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/07 08:39:12.000.150,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/07 08:39:29.000.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/07 11:22:02.000.536,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/07 11:29:09.000.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/07 15:18:54.000.922,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/07 15:19:13.000.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 10:21:18.000.208,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 10:26:55.000.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
-    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
     <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas</Transaction>
-    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
+    <Transaction>2019/03/08 10:27:08.000.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm</Transaction>
     <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
+    <Transaction>2019/03/08 10:27:45.000.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm</Transaction>
     <Transaction>2019/03/08 10:28:02.000.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 11:14:25.000.860,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
     <Transaction>2019/03/08 11:15:19.000.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/08 13:41:42.000.692,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/08 13:43:18.000.167,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
+    <Transaction>2019/03/08 13:43:18.000.168,E:\svn\Delphi\AAPClient\UI\DnaCodeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm</Transaction>
     <Transaction>2019/03/08 16:42:04.000.691,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/08 16:42:12.000.086,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/03/08 16:42:32.000.114,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/12 11:42:34.000.194,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=</Transaction>
     <Transaction>2019/03/12 11:42:41.000.845,=E:\svn\Delphi\AAPClient\WS.pas</Transaction>
     <Transaction>2019/03/12 11:42:52.000.715,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas</Transaction>
     <Transaction>2019/03/18 09:44:48.000.103,=E:\svn\Delphi\AAPClient\Unit1.pas</Transaction>
-    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas</Transaction>
     <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.dfm=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.dfm</Transaction>
+    <Transaction>2019/03/18 09:46:03.000.084,E:\svn\Delphi\AAPClient\Unit1.pas=E:\svn\Delphi\AAPClient\UI\InfoLogScherm.pas</Transaction>
     <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>
   </Transactions>
 	<ProjectSortOrder AutoSort="0" SortType="0">
     <File Path="UI"/>
@@ -79,6 +81,7 @@
     <File Path="UI\DnaCodeScherm.dfm"/>
     <File Path="UI\InfoLogScherm.pas"/>
     <File Path="UI\InfoLogScherm.dfm"/>
+    <File Path="UI\UiContext.pas"/>
     <File Path="WS"/>
     <File Path="WS\GebruikerService.pas"/>
     <File Path="WS\DnaCodeService.pas"/>
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r63 -r65
Binary files differ
Index: AAPClient/UI/DrieKnoppenScherm.dfm
===================================================================
diff -u -r55 -r65
--- AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 55)
+++ AAPClient/UI/DrieKnoppenScherm.dfm	(.../DrieKnoppenScherm.dfm)	(revision 65)
@@ -11,7 +11,6 @@
   Font.Name = 'Tahoma'
   Font.Style = []
   OldCreateOrder = False
-  OnCreate = FormCreate
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 19
Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r63 -r65
--- AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 63)
+++ AAPClient/UI/DrieKnoppenScherm.pas	(.../DrieKnoppenScherm.pas)	(revision 65)
@@ -5,7 +5,7 @@
 uses
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ActnList, Images,
-  Vcl.ImgList;
+  Vcl.ImgList, UiContext;
 
 type
   TfmDrieKnoppenScherm = class(TForm)
@@ -28,11 +28,12 @@
     procedure FormCreate(Sender: TObject);
   private
     fImagesScherm: TImagesScherm;
+    fUiContext: TUiContext;
   protected
     function ComputerName: String;
     function ToonPopupScherm(Melding, Actie1: String; Actie2: String = ''): TModalResult;
   public
-    { Public declarations }
+    property UiContext: TUiContext Read fUiContext Write fUiContext;
   end;
 
 var
@@ -74,6 +75,8 @@
     btnRechtsOnder.Visible := true;
   end;
 
+  lblGebruiker.Caption := UiContext.Initialen;
+
   if lblGebruiker.Caption <> '' then begin
     lblGebruiker.Visible := true;
   end;
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r52 -r65
--- AAPClient/ProScan.dproj	(.../ProScan.dproj)	(revision 52)
+++ AAPClient/ProScan.dproj	(.../ProScan.dproj)	(revision 65)
@@ -124,6 +124,7 @@
 				<FormType>dfm</FormType>
 			</DCCReference>
 			<DCCReference Include="WS\DnaCodeService.pas"/>
+			<DCCReference Include="UI\UiContext.pas"/>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
 				<CfgParent>Base</CfgParent>
Index: AAPClient/UI/InfoLogScherm.dfm
===================================================================
diff -u -r63 -r65
--- AAPClient/UI/InfoLogScherm.dfm	(.../InfoLogScherm.dfm)	(revision 63)
+++ AAPClient/UI/InfoLogScherm.dfm	(.../InfoLogScherm.dfm)	(revision 65)
@@ -1,7 +1,5 @@
 inherited fmInfoLogScherm: TfmInfoLogScherm
   Caption = 'fmInfoLogScherm'
-  ExplicitWidth = 320
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 19
   object lblToelevering: TLabel [1]
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r63 -r65
Binary files differ
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r52 -r65
--- AAPClient/ProScan.dpr	(.../ProScan.dpr)	(revision 52)
+++ AAPClient/ProScan.dpr	(.../ProScan.dpr)	(revision 65)
@@ -13,7 +13,8 @@
   BestaandePalletScherm in 'UI\BestaandePalletScherm.pas' {fmBestaandePalletScherm},
   DnaCodeScherm in 'UI\DnaCodeScherm.pas' {fmDnaCodeScherm},
   InfoLogScherm in 'UI\InfoLogScherm.pas' {fmInfoLogScherm},
-  DnaCodeService in 'WS\DnaCodeService.pas';
+  DnaCodeService in 'WS\DnaCodeService.pas',
+  UiContext in 'UI\UiContext.pas';
 
 {$R *.res}
 
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r63 -r65
Binary files differ
Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r63 -r65
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 63)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 65)
@@ -6,7 +6,7 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList,
   Vcl.StdCtrls, Vcl.Grids, DnaCodeService, Data.DB, Datasnap.DBClient,
-  Vcl.DBGrids;
+  Vcl.DBGrids, UiContext;
 
 type
   TfmInfoLogScherm = class(TfmDrieKnoppenScherm)
Index: AAPClient/UI/LoginScherm.dfm
===================================================================
diff -u -r44 -r65
--- AAPClient/UI/LoginScherm.dfm	(.../LoginScherm.dfm)	(revision 44)
+++ AAPClient/UI/LoginScherm.dfm	(.../LoginScherm.dfm)	(revision 65)
@@ -1,5 +1,6 @@
 inherited fmLoginScherm: TfmLoginScherm
   Caption = 'fmLoginScherm'
+  OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 19
   object lblWelkom: TLabel [1]