Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r12 -r15
--- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 12)
+++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 15)
@@ -9,8 +9,8 @@
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\UI\DrieKnoppenScherm.pas=E:\svn\Delphi\AAPClient\Unit1.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.dfm=E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm
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/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=
@@ -20,11 +20,14 @@
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 11:54:27.053,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/05 11:57:08.016,E:\svn\Delphi\AAPClient\UI\PopupScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/06 07:41:24.503,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/07 08:39:12.150,=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
+ 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
@@ -36,6 +39,8 @@
+
+
Index: AAPClient/UI/LoginScherm.dfm
===================================================================
diff -u -r14 -r15
--- AAPClient/UI/LoginScherm.dfm (.../LoginScherm.dfm) (revision 14)
+++ AAPClient/UI/LoginScherm.dfm (.../LoginScherm.dfm) (revision 15)
@@ -24,9 +24,11 @@
Caption = 'Initalen:'
end
inherited btnLinksOnder: TButton
- Action = actAfsluiten
+ Action = nil
+ ImageIndex = 1
ModalResult = 3
TabOrder = 2
+ OnClick = actAfsluitenExecute
end
inherited btnCentraalOnder: TButton
TabOrder = 3
@@ -66,9 +68,7 @@
inherited actVolgende: TAction
OnExecute = actVolgendeExecute
end
- object actAfsluiten: TAction
- Category = 'LoginScherm'
- ImageIndex = 1
+ inherited actAfsluiten: TAction
OnExecute = actAfsluitenExecute
end
end
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r14 -r15
Binary files differ
Index: AAPClient/UI/LoginScherm.pas
===================================================================
diff -u -r14 -r15
--- AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 14)
+++ AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 15)
@@ -9,7 +9,6 @@
type
TfmLoginScherm = class(TfmDrieKnoppenScherm)
- actAfsluiten: TAction;
lblWelkom: TLabel;
lblGeefPincodeIn: TLabel;
edtPincode: TEdit;
@@ -21,7 +20,6 @@
procedure edtInitialenKeyUp(Sender: TObject; var Key: Word;
Shift: TShiftState);
procedure FormShow(Sender: TObject);
- procedure FormCreate(Sender: TObject);
procedure actAfsluitenExecute(Sender: TObject);
procedure actVolgendeExecute(Sender: TObject);
private
@@ -120,21 +118,16 @@
SetStatusButtonRechtsOnderaan;
end;
-procedure TfmLoginScherm.FormCreate(Sender: TObject);
+procedure TfmLoginScherm.FormShow(Sender: TObject);
begin
- inherited;
-
actRechtsOnder := actVolgende;
actLinksOnder := actAfsluiten;
btnRechtsOnder.Action := actRechtsOnder;
btnLinksOnder.Action := actAfsluiten;
-end;
-
-procedure TfmLoginScherm.FormShow(Sender: TObject);
-begin
- inherited;
+ btnLinksOnder.Enabled := true;
btnRechtsOnder.Enabled := false;
SetStatusButtonRechtsOnderaan;
+ inherited;
end;
function TfmLoginScherm.GeefInitialen: string;
Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r14 -r15
--- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 14)
+++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 15)
@@ -20,6 +20,8 @@
alAlgemeen: TActionList;
actVolgende: TAction;
actHome: TAction;
+ actAfsluiten: TAction;
+ actUitloggen: TAction;
procedure FormShow(Sender: TObject);
procedure FormCreate(Sender: TObject);
private
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r14 -r15
--- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 14)
+++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 15)
@@ -7,7 +7,8 @@
LoginScherm in 'UI\LoginScherm.pas' {fmLoginScherm},
GebruikerService in 'WS\GebruikerService.pas',
PopupScherm in 'UI\PopupScherm.pas' {fmPopupScherm},
- Images in 'UI\Images.pas' {ImagesScherm};
+ Images in 'UI\Images.pas' {ImagesScherm},
+ HomeScherm in 'UI\HomeScherm.pas' {fmHomeScherm};
{$R *.res}
@@ -20,5 +21,6 @@
Application.CreateForm(TfmLoginScherm, fmLoginScherm);
Application.CreateForm(TfmPopupScherm, fmPopupScherm);
Application.CreateForm(TImagesScherm, ImagesScherm);
+ Application.CreateForm(TfmHomeScherm, fmHomeScherm);
Application.Run;
end.
Index: AAPClient/ProScanMain.dfm
===================================================================
diff -u -r10 -r15
--- AAPClient/ProScanMain.dfm (.../ProScanMain.dfm) (revision 10)
+++ AAPClient/ProScanMain.dfm (.../ProScanMain.dfm) (revision 15)
@@ -13,6 +13,7 @@
OldCreateOrder = False
OnClose = FormClose
OnCreate = FormCreate
+ OnShow = FormShow
PixelsPerInch = 96
TextHeight = 13
end
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r11 -r15
--- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 11)
+++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 15)
@@ -10,10 +10,13 @@
TfmProScanHoofdscherm = class(TForm)
procedure FormCreate(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
+ procedure FormShow(Sender: TObject);
private
fInitialen: string;
fLoginCode: string;
fHuidigScherm: TForm;
+ fLoginScherm: TForm;
+ fHomeScherm: TForm;
public
end;
@@ -23,7 +26,7 @@
implementation
uses
- LoginScherm, GebruikerService;
+ LoginScherm, GebruikerService, HomeScherm;
{$R *.dfm}
@@ -46,7 +49,6 @@
Request.Header := Header;
Service.GebruikerAfmelden(Request);
- ShowMessage(fInitialen+'afgemeld');
finally
Request.Free;
end;
@@ -56,20 +58,45 @@
procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
var
LoginScherm: TfmLoginScherm;
+begin
+ fLoginScherm := TfmLoginScherm.Create(Self);
+ fHomeScherm := TfmHomeScherm.Create(Self);
+ fHuidigScherm := fLoginScherm;
+
+ Self.Show;
+end;
+
+procedure TfmProScanHoofdscherm.FormShow(Sender: TObject);
+var
fModalResult: TModalResult;
begin
- fHuidigScherm := TfmLoginScherm.Create(Self);
- fModalResult := fHuidigScherm.ShowModal;
+ fModalResult := mrNone;
+
while fModalResult <> mrAbort do begin
+ //LoginScherm tonen
if fHuidigScherm.ClassType = TfmLoginScherm then begin
+ fModalResult := fHuidigScherm.ShowModal;
if fHuidigScherm.ModalResult = mrRetry then begin
fModalResult := fHuidigScherm.ShowModal;
end;
if fHuidigScherm.ModalResult = mrOk then begin
- ShowMessage('volgend scherm');
+ fInitialen := (fHuidigScherm as TfmLoginScherm).GeefInitialen();
+ fLoginCode := (fHuidigScherm as TfmLoginScherm).GeefLoginCode();
+ fHuidigScherm := fHomeScherm;
end;
end;
+
+ //HomeScherm tonen
+ if fHuidigScherm.ClassType = TfmHomeScherm then begin
+ fModalResult := fHuidigScherm.ShowModal;
+ if fHuidigScherm.ModalResult = mrRetry then begin
+ ShowMessage('retry');
+ end;
+ if fHuidigScherm.ModalResult = mrOk then begin
+ fHuidigScherm := fLoginScherm;
+ end;
+ end;
end;
Self.Close;
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r14 -r15
Binary files differ
Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu
===================================================================
diff -u -r14 -r15
Binary files differ
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r14 -r15
--- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 14)
+++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 15)
@@ -103,6 +103,10 @@
dfm
+
+
+ dfm
+
Cfg_2
Base
Index: AAPClient/UI/DrieKnoppenScherm.dfm
===================================================================
diff -u -r14 -r15
--- AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 14)
+++ AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 15)
@@ -76,5 +76,14 @@
object actHome: TAction
Category = 'Algemeen'
end
+ object actAfsluiten: TAction
+ Category = 'Algemeen'
+ ImageIndex = 1
+ end
+ object actUitloggen: TAction
+ Category = 'Algemeen'
+ Caption = 'actUitloggen'
+ ImageIndex = 1
+ end
end
end
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r14 -r15
Binary files differ