--- dao/DelphiScanner/Main.pas 2015/08/23 11:00:22 2654 +++ dao/DelphiScanner/Main.pas 2015/08/23 11:06:48 2655 @@ -36,8 +36,8 @@ Lukprogrammet1: TMenuItem; N2: TMenuItem; N3: TMenuItem; - RadioButton1: TRadioButton; - RadioButton2: TRadioButton; + radioStorPakke: TRadioButton; + radioLillePakke: TRadioButton; N4: TMenuItem; Storepakker1: TMenuItem; Smpakker1: TMenuItem; @@ -113,8 +113,8 @@ procedure FormKeyPress(Sender: TObject; var Key: Char); procedure FormCreate(Sender: TObject); procedure ApplicationEvents1Idle(Sender: TObject; var Done: Boolean); - procedure RadioButton1Click(Sender: TObject); - procedure RadioButton2Click(Sender: TObject); + procedure radioStorPakkeClick(Sender: TObject); + procedure radioLillePakkeClick(Sender: TObject); procedure chkSporgEfterKundeClick(Sender: TObject); procedure Pakkernormal1Click(Sender: TObject); procedure Testforbindelsen1Click(Sender: TObject); @@ -1000,12 +1000,12 @@ if Pakketype = '1' then begin Storepakker1.Checked := true; - RadioButton1.Checked := true; + radioStorPakke.Checked := true; end else begin Smpakker1.Checked := true; - RadioButton2.Checked := true; + radioLillePakke.Checked := true; end; if TestFunktionen = '1' then @@ -1242,7 +1242,7 @@ if StregKode = 'Lille pakke' then begin - if RadioButton2.Enabled = true then + if radioLillePakke.Enabled = true then begin InitLillePakke(); end @@ -1268,7 +1268,7 @@ if StregKode = 'Stor pakke' then begin - if RadioButton1.Enabled = true then + if radioStorPakke.Enabled = true then begin InitStorPakke(); end @@ -2297,8 +2297,8 @@ Testprinter1.Visible := true; Smpakker1.Enabled := true; Storepakker1.Enabled := true; - RadioButton1.Enabled := true; - RadioButton2.Enabled := true; + radioStorPakke.Enabled := true; + radioLillePakke.Enabled := true; DownloadButton01.Enabled := false; // kontrolfil bruges ikke her OpdaterListenButton01.Enabled := true; IdFTP1.Passive := true; @@ -2335,8 +2335,8 @@ Testprinter1.Visible := true; Smpakker1.Enabled := true; Storepakker1.Enabled := true; - RadioButton1.Enabled := true; - RadioButton2.Enabled := true; + radioStorPakke.Enabled := true; + radioLillePakke.Enabled := true; DownloadButton01.Enabled := false; // kontrolfil bruges ikke her OpdaterListenButton01.Enabled := true; IdFTP1.Passive := true; @@ -2355,11 +2355,11 @@ pakkestorrelse : String; PrintNyLabelInteger : Integer; begin - if RadioButton1.Checked then + if radioStorPakke.Checked then begin pakkestorrelse := 'Stor'; end; - if RadioButton2.Checked then + if radioLillePakke.Checked then begin pakkestorrelse := 'Lille'; end; @@ -2514,11 +2514,11 @@ if Pakkeshoplevering1.Checked then List1msg := List1msg + PakkeshopStregkode + ' ' + PakkeshopTjekkode + '; ' + KommentarST.Caption + '; '; List1Pakkestorrelse := ''; - if RadioButton1.Checked then + if radioStorPakke.Checked then begin List1Pakkestorrelse := 'Stor pakke'; end; - if RadioButton2.Checked then + if radioLillePakke.Checked then begin List1Pakkestorrelse := 'Lille pakke'; end; @@ -2540,11 +2540,11 @@ if Budlevering1.Checked then begin List1msg := TimeToStr(now) + '; ' + Kommentar + '; ' + BoghandlerNavn; - if (RadioButton1.Checked) then + if (radioStorPakke.Checked) then begin List1msg := List1msg + '; Stor pakke'; end; - if (RadioButton2.Checked) then + if (radioLillePakke.Checked) then begin List1msg := List1msg + '; Lille pakke'; end; @@ -2849,16 +2849,16 @@ end; -procedure TMainForm.RadioButton1Click(Sender: TObject); +procedure TMainForm.radioStorPakkeClick(Sender: TObject); begin Storepakker1.Checked := true; - RadioButton1.Checked := true; + radioStorPakke.Checked := true; end; -procedure TMainForm.RadioButton2Click(Sender: TObject); +procedure TMainForm.radioLillePakkeClick(Sender: TObject); begin Smpakker1.Checked := true; - RadioButton2.Checked := true; + radioLillePakke.Checked := true; end; @@ -3825,8 +3825,8 @@ Sprgefterboghandlernummer1.Enabled := true; Smpakker1.Enabled := false; Storepakker1.Enabled := false; - RadioButton1.Enabled := false; - RadioButton2.Enabled := false; + radioStorPakke.Enabled := false; + radioLillePakke.Enabled := false; ListBox1.Visible := true; OpdaterListenButton01.Enabled := true; EKLoverforsel.Enabled := true; @@ -3857,8 +3857,8 @@ Sprgefterboghandlernummer1.Enabled := false; Smpakker1.Enabled := true; Storepakker1.Enabled := true; - RadioButton1.Enabled := true; - RadioButton2.Enabled := true; + radioStorPakke.Enabled := true; + radioLillePakke.Enabled := true; ListBox1.Visible := true; ListBox1.Items.Clear; ListBox2.Items.Clear; @@ -3883,8 +3883,8 @@ Sprgefterboghandlernummer1.Enabled := false; Smpakker1.Enabled := true; Storepakker1.Enabled := true; - RadioButton1.Enabled := true; - RadioButton2.Enabled := true; + radioStorPakke.Enabled := true; + radioLillePakke.Enabled := true; ListBox1.Visible := true; ListBox1.Items.Clear; ListBox2.Items.Clear; @@ -3910,8 +3910,8 @@ Sprgefterboghandlernummer1.Enabled := false; Smpakker1.Enabled := true; Storepakker1.Enabled := true; - RadioButton1.Enabled := true; - RadioButton2.Enabled := true; + radioStorPakke.Enabled := true; + radioLillePakke.Enabled := true; ListBox1.Visible := true; ListBox1.Items.Clear; DownloadButton01.Enabled := false; @@ -3946,8 +3946,8 @@ Sprgefterboghandlernummer1.Enabled := false; Smpakker1.Enabled := false; Storepakker1.Enabled := false; - RadioButton1.Enabled := false; - RadioButton2.Enabled := false; + radioStorPakke.Enabled := false; + radioLillePakke.Enabled := false; ListBox1.Visible := true; ListBox1.Items.Clear; DownloadButton01.Enabled := false; @@ -3984,8 +3984,8 @@ Sprgefterboghandlernummer1.Enabled := false; Smpakker1.Enabled := false; Storepakker1.Enabled := false; - RadioButton1.Enabled := false; - RadioButton2.Enabled := false; + radioStorPakke.Enabled := false; + radioLillePakke.Enabled := false; ListBox1.Visible := true; ListBox1.Items.Clear; DownloadButton01.Enabled := false; @@ -4026,8 +4026,8 @@ Sprgefterboghandlernummer1.Enabled := false; Smpakker1.Enabled := false; Storepakker1.Enabled := false; - RadioButton1.Enabled := false; - RadioButton2.Enabled := false; + radioStorPakke.Enabled := false; + radioLillePakke.Enabled := false; ListBox1.Visible := true; ListBox1.Items.Clear; DownloadButton01.Enabled := false; @@ -4056,7 +4056,7 @@ procedure TMainForm.InitLillePakke(); begin - RadioButton2.Checked := true; + radioLillePakke.Checked := true; Smpakker1.Checked := true; // 20150310: start // Stregkode := ''; @@ -4065,7 +4065,7 @@ procedure TMainForm.InitStorPakke(); begin - RadioButton1.Checked := true; + radioStorPakke.Checked := true; Storepakker1.Checked := true; // 20150310: start // Stregkode := '';