Index: AAPClient/UI/InfoLogScherm.dfm =================================================================== diff -u -r65 -r84 --- AAPClient/UI/InfoLogScherm.dfm (.../InfoLogScherm.dfm) (revision 65) +++ AAPClient/UI/InfoLogScherm.dfm (.../InfoLogScherm.dfm) (revision 84) @@ -63,13 +63,19 @@ end inherited alAlgemeen: TActionList inherited actVolgende: TAction - OnExecute = actVolgendeExecute + Caption = 'actVolgende' end inherited actHome: TAction - OnExecute = actHomeExecute + Caption = 'actHome' end + inherited actAfsluiten: TAction + Caption = 'actAfsluiten' + end + inherited actPallet: TAction + Caption = 'actPallet' + end inherited actOngedaanMaken: TAction - OnExecute = actOngedaanMakenExecute + Caption = 'actOngedaanMaken' end end end Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r77 -r84 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 77) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 84) @@ -18,7 +18,7 @@ sgToeleveringData: TStringGrid; procedure FormCreate(Sender: TObject); procedure FormShow(Sender: TObject); - procedure actHomeExecute(Sender: TObject); + procedure actSluitenExecute(Sender: TObject); procedure actOngedaanMakenExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); private @@ -37,7 +37,7 @@ {$R *.dfm} -procedure TfmInfoLogScherm.actHomeExecute(Sender: TObject); +procedure TfmInfoLogScherm.actSluitenExecute(Sender: TObject); begin inherited; Self.ModalResult := mrDnaCode; @@ -106,7 +106,7 @@ Response: ZoekViaToeleveringResponse; begin inherited; - btnLinksOnder.Action := actHome; + btnLinksOnder.Action := actSluiten; btnCentraalOnder.Action := actOngedaanMaken; btnRechtsOnder.Action := actVolgende; lblToelevering.Caption := UiContext.Toelevering; Index: AAPClient/UI/DrieKnoppenScherm.pas =================================================================== diff -u -r65 -r84 --- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 65) +++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 84) @@ -24,6 +24,7 @@ actUitloggen: TAction; actPallet: TAction; actOngedaanMaken: TAction; + actSluiten: TAction; procedure FormShow(Sender: TObject); procedure FormCreate(Sender: TObject); private Index: AAPClient/UI/DrieKnoppenScherm.dfm =================================================================== diff -u -r66 -r84 --- AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 66) +++ AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 84) @@ -91,5 +91,8 @@ object actOngedaanMaken: TAction Category = 'Algemeen' end + object actSluiten: TAction + Category = 'Algemeen' + end end end Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r83 -r84 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 83) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 84) @@ -127,6 +127,7 @@ //InfoLogScherm tonen if fHuidigScherm.ClassType = TfmInfoLogScherm then begin case fHuidigScherm.ModalResult of + mrHome : fHuidigScherm := fHomeScherm; mrYes : fHuidigScherm := fInfoLogScherm; mrNone : fHuidigScherm := fInfoLogScherm; mrDnaCode : fHuidigScherm := fDnaCodeScherm;