--- dao/DelphiScanner/Main.pas 2015/09/03 14:40:49 2695 +++ dao/DelphiScanner/Main.pas 2015/09/03 14:48:45 2697 @@ -57,8 +57,8 @@ Image1: TImage; ListBox2: TListBox; OpdaterListenButton01: TButton; - UploadButton01: TButton; - DownloadButton03: TButton; + BtnUploadLogfil: TButton; + BtnDownloadRuteskiftFil: TButton; Pakkeshoplevering1: TMenuItem; PakkeshopText1: TStaticText; btnNulstil: TButton; @@ -137,8 +137,8 @@ procedure UploadInifilTilDAO(); procedure SletStregkodelinieFraListboks2(StregKode : String); procedure FormDestroy(Sender: TObject); - procedure UploadButton01Click(Sender: TObject); - procedure DownloadButton03Click(Sender: TObject); + procedure BtnUploadLogfilClick(Sender: TObject); + procedure BtnDownloadRuteskiftFilClick(Sender: TObject); procedure Pakkeshoplevering1Click(Sender: TObject); procedure btnNulstilClick(Sender: TObject); procedure Returpakkerfrapakkeshop1Click(Sender: TObject); @@ -603,7 +603,7 @@ try SkrivScanningLogFil(logTekst); Uploadlogfil1.Enabled := true; - UploadButton01.Enabled := true; + BtnUploadLogfil.Enabled := true; logTekst := 'Programmet er installeret som: '+ParamStr(0); SkrivScanningLogFil(logTekst); // Oprydning i gamle logfiler @@ -2001,11 +2001,11 @@ Testprinter1.Visible := true; if (getProddag() = 'lørdag') then begin - DownloadButton03.Visible := false; + BtnDownloadRuteskiftFil.Visible := false; end else begin - DownloadButton03.Visible := false; + BtnDownloadRuteskiftFil.Visible := false; end; BtnDownloadKontrolfil.Enabled := true; OpdaterListenButton01.Enabled := true; @@ -2288,7 +2288,7 @@ SkrivScanningLogFil(logTekst); end; -procedure TMainForm.UploadButton01Click(Sender: TObject); +procedure TMainForm.BtnUploadLogfilClick(Sender: TObject); begin UploadLogfilTilDAO(); UploadInifilTilDAO(); @@ -3630,7 +3630,7 @@ ListBox1.Items.Clear; BtnDownloadKontrolfil.Enabled := false; OpdaterListenButton01.Enabled := true; - DownloadButton03.Visible := false; + BtnDownloadRuteskiftFil.Visible := false; EKLoverforsel.Enabled := false; IdFTP1.Passive := true; IdFTP1.PassiveUseControlHost := true; @@ -4473,7 +4473,7 @@ ListBox1.SetFocus; // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode end; -procedure TMainForm.DownloadButton03Click(Sender: TObject); +procedure TMainForm.BtnDownloadRuteskiftFilClick(Sender: TObject); begin if (getProddag() = 'lørdag') then begin