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);