Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r90 -r94
--- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 90)
+++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 94)
@@ -19,6 +19,7 @@
fBestaandePalletScherm: TForm;
fDnaCodeScherm: TForm;
fInfoLogScherm: TForm;
+ fHernoemPalletScherm: TForm;
procedure HuidigeGebruikerAfmelden;
public
end;
@@ -30,7 +31,7 @@
uses
LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm,
- BestaandePalletscherm, DnaCodeScherm, InfoLogScherm, Images;
+ BestaandePalletscherm, DnaCodeScherm, InfoLogScherm, Images, HernoemPalletScherm;
{$R *.dfm}
@@ -44,6 +45,7 @@
fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self);
fDnaCodeScherm := TfmDnaCodeScherm.Create(Self);
fInfoLogScherm := TfmInfoLogScherm.Create(Self);
+ fHernoemPalletScherm := TfmHernoemPalletScherm.Create(Self);
fHuidigScherm := fLoginScherm;
end;
@@ -63,7 +65,7 @@
mrLogin : fHuidigScherm := fLoginScherm;
mrHome : fHuidigScherm := fHomeScherm;
mrPallet : fHuidigScherm := fPalletScherm;
- mrNo : ShowMessage('Hernoem Pallet');
+ mrHernoemPallet : fHuidigScherm := fHernoemPalletScherm;
mrBestaandePallet : fHuidigScherm := fBestaandePalletScherm;
mrDnaCode : fHuidigScherm := fDnaCodeScherm;
mrInfoLog : fHuidigScherm := fInfoLogScherm;
Index: AAPClient/UI/UiContext.pas
===================================================================
diff -u -r77 -r94
--- AAPClient/UI/UiContext.pas (.../UiContext.pas) (revision 77)
+++ AAPClient/UI/UiContext.pas (.../UiContext.pas) (revision 94)
@@ -9,6 +9,7 @@
mrBestaandePallet = 104;
mrDnaCode = 105;
mrInfoLog = 106;
+ mrHernoemPallet = 107;
type
TUiContext = class
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r93 -r94
--- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 93)
+++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 94)
@@ -15,14 +15,14 @@
InfoLogScherm in 'UI\InfoLogScherm.pas' {fmInfoLogScherm},
UiContext in 'UI\UiContext.pas',
DnaCodeService in 'WS\DnaCodeService.pas',
- HernoemPalletScherm in 'UI\HernoemPalletScherm.pas' {fmHernoemPallet};
+ HernoemPalletScherm in 'UI\HernoemPalletScherm.pas' {fmHernoemPalletScherm};
{$R *.res}
begin
Application.Initialize;
Application.MainFormOnTaskbar := True;
Application.CreateForm(TfmProScanHoofdscherm, fmProScanHoofdscherm);
- Application.CreateForm(TfmHernoemPallet, fmHernoemPallet);
+ Application.CreateForm(TfmHernoemPalletScherm, fmHernoemPalletScherm);
Application.Run;
end.
Index: AAPClient/UI/HomeScherm.pas
===================================================================
diff -u -r75 -r94
--- AAPClient/UI/HomeScherm.pas (.../HomeScherm.pas) (revision 75)
+++ AAPClient/UI/HomeScherm.pas (.../HomeScherm.pas) (revision 94)
@@ -14,6 +14,7 @@
procedure FormShow(Sender: TObject);
procedure actAfsluitenExecute(Sender: TObject);
procedure btnAfmeldenProductenClick(Sender: TObject);
+ procedure btnHernoemPalletClick(Sender: TObject);
private
{ Private declarations }
public
@@ -42,6 +43,12 @@
Self.ModalResult := mrPallet;
end;
+procedure TfmHomeScherm.btnHernoemPalletClick(Sender: TObject);
+begin
+ inherited;
+ Self.ModalResult := mrHernoemPallet;
+end;
+
procedure TfmHomeScherm.FormShow(Sender: TObject);
begin
btnLinksOnder.Action := actAfsluiten;
Index: AAPClient/UI/HomeScherm.dfm
===================================================================
diff -u -r75 -r94
--- AAPClient/UI/HomeScherm.dfm (.../HomeScherm.dfm) (revision 75)
+++ AAPClient/UI/HomeScherm.dfm (.../HomeScherm.dfm) (revision 94)
@@ -19,6 +19,7 @@
Caption = 'Hernoem pallet'
ModalResult = 7
TabOrder = 3
+ OnClick = btnHernoemPalletClick
end
object btnAfmeldenProducten: TButton [5]
Left = 56
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r93 -r94
--- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 93)
+++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 94)
@@ -126,7 +126,7 @@
-
+
dfm