Index: VerpakkingsDefinitie/UI/ZoekProductenScherm.pas
===================================================================
diff -u
--- VerpakkingsDefinitie/UI/ZoekProductenScherm.pas	(revision 0)
+++ VerpakkingsDefinitie/UI/ZoekProductenScherm.pas	(revision 550)
@@ -0,0 +1,54 @@
+unit ZoekProductenScherm;
+
+interface
+
+uses
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
+  System.Classes, Vcl.Graphics,
+  Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
+  Vcl.ComCtrls, Vcl.StdCtrls,
+  Subscherm;
+
+type
+  TFormZoekProducten = class(TFormSubscherm)
+    PageControl1: TPageControl;
+    TabSheetKortTekst: TTabSheet;
+    TabSheetIdentificatieNr: TTabSheet;
+    TabSheetLeveranciersRef: TTabSheet;
+    TabSheetTekst: TTabSheet;
+    TabSheetProductboom: TTabSheet;
+    Label1: TLabel;
+    EditZoek: TEdit;
+    Label2: TLabel;
+    ComboBoxAt: TComboBox;
+    EditKlantNr: TEdit;
+    ButtonZoekViaKortTekst: TButton;
+    procedure FormCreate(Sender: TObject);
+    procedure ButtonZoekViaKortTekstClick(Sender: TObject);
+  private
+    { Private declarations }
+  public
+    { Public declarations }
+  end;
+
+implementation
+
+{$R *.dfm}
+
+procedure TFormZoekProducten.FormCreate(Sender: TObject);
+begin
+  ComboBoxAt.Style := csDropDownList; // Typen in combobox uitzetten
+  // Waarden toevoegen aan combobox
+  ComboBoxAt.AddItem('K', nil);
+  ComboBoxAt.AddItem('L', nil);
+  ComboBoxAt.AddItem('', nil);
+  // Default value
+  ComboBoxAt.ItemIndex := 0;
+end;
+
+procedure TFormZoekProducten.ButtonZoekViaKortTekstClick(Sender: TObject);
+begin
+  // TODO Zoeken
+end;
+
+end.
Index: VerpakkingsDefinitie/VerpakkingsDefinitie.dproj
===================================================================
diff -u -r549 -r550
--- VerpakkingsDefinitie/VerpakkingsDefinitie.dproj	(.../VerpakkingsDefinitie.dproj)	(revision 549)
+++ VerpakkingsDefinitie/VerpakkingsDefinitie.dproj	(.../VerpakkingsDefinitie.dproj)	(revision 550)
@@ -96,7 +96,6 @@
 			<DCCReference Include="WS\UserServerService.pas"/>
 			<DCCReference Include="UI\ZoekProductenScherm.pas">
 				<Form>FormZoekProducten</Form>
-				<FormType>dfm</FormType>
 			</DCCReference>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
Index: VerpakkingsDefinitie/UI/Subscherm.pas
===================================================================
diff -u -r549 -r550
--- VerpakkingsDefinitie/UI/Subscherm.pas	(.../Subscherm.pas)	(revision 549)
+++ VerpakkingsDefinitie/UI/Subscherm.pas	(.../Subscherm.pas)	(revision 550)
@@ -18,12 +18,12 @@
     property ApplicationContext: TApplicationContext Read fApplicationContext
       write fApplicationContext;
 
-    Constructor Create(AOwner: TComponent; ApplicationContext: TApplicationContext); overload;
+    Constructor Create(AOwner: TComponent; var ApplicationContext: TApplicationContext); overload;
   end;
 
 implementation
 
-constructor TFormSubscherm.Create(AOwner: TComponent; ApplicationContext: TApplicationContext);
+constructor TFormSubscherm.Create(AOwner: TComponent; var ApplicationContext: TApplicationContext);
 begin
   inherited Create(AOwner);
 
Index: VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm
===================================================================
diff -u
--- VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm	(revision 0)
+++ VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm	(revision 550)
@@ -0,0 +1,100 @@
+object FormZoekProducten: TFormZoekProducten
+  Left = 0
+  Top = 0
+  BorderStyle = bsSizeToolWin
+  Caption = 'FormZoekProducten'
+  ClientHeight = 624
+  ClientWidth = 837
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  OldCreateOrder = False
+  OnCreate = FormCreate
+  DesignSize = (
+    837
+    624)
+  PixelsPerInch = 96
+  TextHeight = 13
+  object PageControl1: TPageControl
+    Left = 0
+    Top = 0
+    Width = 839
+    Height = 625
+    ActivePage = TabSheetKortTekst
+    Anchors = [akLeft, akTop, akRight, akBottom]
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clWindowText
+    Font.Height = -11
+    Font.Name = 'Tahoma'
+    Font.Style = []
+    ParentFont = False
+    TabOrder = 0
+    object TabSheetKortTekst: TTabSheet
+      Caption = 'Kort tekst'
+      object Label1: TLabel
+        Left = 3
+        Top = 16
+        Width = 27
+        Height = 13
+        Caption = 'Zoek:'
+      end
+      object Label2: TLabel
+        Left = 3
+        Top = 56
+        Width = 33
+        Height = 13
+        Caption = 'Beperk'
+      end
+      object EditZoek: TEdit
+        Left = 56
+        Top = 13
+        Width = 289
+        Height = 21
+        TabOrder = 0
+      end
+      object ComboBoxAt: TComboBox
+        Left = 56
+        Top = 53
+        Width = 65
+        Height = 21
+        Style = csDropDownList
+        TabOrder = 1
+      end
+      object EditKlantNr: TEdit
+        Left = 144
+        Top = 53
+        Width = 201
+        Height = 21
+        TabOrder = 2
+      end
+      object ButtonZoekViaKortTekst: TButton
+        Left = 56
+        Top = 88
+        Width = 289
+        Height = 25
+        Caption = 'Zoek via kortTekst'
+        TabOrder = 3
+        OnClick = ButtonZoekViaKortTekstClick
+      end
+    end
+    object TabSheetIdentificatieNr: TTabSheet
+      Caption = 'Identificatie nr'
+      ImageIndex = 1
+    end
+    object TabSheetLeveranciersRef: TTabSheet
+      Caption = 'Leveranciers ref'
+      ImageIndex = 2
+    end
+    object TabSheetTekst: TTabSheet
+      Caption = 'Tekst'
+      ImageIndex = 3
+    end
+    object TabSheetProductboom: TTabSheet
+      Caption = 'Productboom'
+      ImageIndex = 4
+    end
+  end
+end
Index: VerpakkingsDefinitie/Main.pas
===================================================================
diff -u -r549 -r550
--- VerpakkingsDefinitie/Main.pas	(.../Main.pas)	(revision 549)
+++ VerpakkingsDefinitie/Main.pas	(.../Main.pas)	(revision 550)
@@ -6,7 +6,6 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
   System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ExtCtrls,
-  Subscherm, LoginScherm, ZoekProductenScherm,
   ApplicationContext;
 
 const
@@ -31,6 +30,9 @@
 
 implementation
 
+uses
+  Subscherm, LogInScherm, ZoekProductenScherm;
+
 {$R *.dfm}
 
 procedure TFormMain.FormCreate(Sender: TObject);
Index: VerpakkingsDefinitie/UI/LogInScherm.pas
===================================================================
diff -u -r548 -r550
--- VerpakkingsDefinitie/UI/LogInScherm.pas	(.../LogInScherm.pas)	(revision 548)
+++ VerpakkingsDefinitie/UI/LogInScherm.pas	(.../LogInScherm.pas)	(revision 550)
@@ -6,8 +6,7 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
   System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls,
-  Subscherm,
-  UserServerService, Agent;
+  Subscherm;
 
 type
   TFormLogin = class(TFormSubscherm)
@@ -27,6 +26,10 @@
 
 implementation
 
+uses
+  Main,
+  UserServerService, Agent;
+
 {$R *.dfm}
 
 procedure TFormLogin.Panel1Click(Sender: TObject);
@@ -35,8 +38,12 @@
   fAgent: TAgent;
 begin
   fAgent := TAgent.Create();
-  Response := fAgent.GebruikerAanmelden(EditGebruikersnaam.Text,EditWachtwoord.Text);
+  //Response := fAgent.GebruikerAanmelden(EditGebruikersnaam.Text,EditWachtwoord.Text);
+  Response := fAgent.GebruikerAanmelden('tve','tve1502');
   ShowMessage(Response.ToString);
+
+  // TODO controleren of login succesvol was en waarden invullen in ApplicationContext
+  //(self.Parent.Parent as TFormMain).NavigeerNaar(Main.FORMZOEKPRODUCTENID);
 end;
 
 end.
Index: VerpakkingsDefinitie/UI/LogInScherm.dfm
===================================================================
diff -u -r548 -r550
--- VerpakkingsDefinitie/UI/LogInScherm.dfm	(.../LogInScherm.dfm)	(revision 548)
+++ VerpakkingsDefinitie/UI/LogInScherm.dfm	(.../LogInScherm.dfm)	(revision 550)
@@ -21,8 +21,8 @@
   object Label1: TLabel
     Left = 19
     Top = 28
-    Width = 160
-    Height = 55
+    Width = 162
+    Height = 52
     Anchors = [akTop]
     Caption = 'vHintra'
     Font.Charset = DEFAULT_CHARSET
@@ -31,13 +31,12 @@
     Font.Name = 'Tahoma'
     Font.Style = [fsBold]
     ParentFont = False
-    ExplicitLeft = 40
   end
   object Label2: TLabel
     Left = 43
     Top = 90
-    Width = 114
-    Height = 19
+    Width = 116
+    Height = 16
     Anchors = [akTop]
     Caption = 'GEBRUIKERSNAAM'
     Font.Charset = DEFAULT_CHARSET
@@ -46,13 +45,12 @@
     Font.Name = 'Tahoma'
     Font.Style = [fsBold]
     ParentFont = False
-    ExplicitLeft = 64
   end
   object Label3: TLabel
     Left = 51
     Top = 143
-    Width = 94
-    Height = 19
+    Width = 96
+    Height = 16
     Anchors = [akTop]
     Caption = 'WACHTWOORD'
     Font.Charset = DEFAULT_CHARSET
@@ -61,25 +59,22 @@
     Font.Name = 'Tahoma'
     Font.Style = [fsBold]
     ParentFont = False
-    ExplicitLeft = 72
   end
   object EditGebruikersnaam: TEdit
     Left = 19
     Top = 114
     Width = 159
-    Height = 24
+    Height = 21
     Anchors = [akTop]
     TabOrder = 0
-    ExplicitLeft = 40
   end
   object EditWachtwoord: TEdit
     Left = 19
     Top = 167
     Width = 159
-    Height = 24
+    Height = 21
     Anchors = [akTop]
     TabOrder = 1
-    ExplicitLeft = 40
   end
   object Panel1: TPanel
     Left = 53
@@ -100,6 +95,5 @@
     ParentFont = False
     TabOrder = 2
     OnClick = Panel1Click
-    ExplicitLeft = 74
   end
 end