--- dao/DelphiScanner/Main.pas	2015/08/23 10:44:23	2653
+++ 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;
@@ -66,7 +66,7 @@
     Manual1: TMenuItem;
     PrinterstatusStaticText1: TStaticText;
     Timer1: TTimer;
-    CheckBox3: TCheckBox;
+    chkScanTjekkode: TCheckBox;
     Scanogstjekkoden1: TMenuItem;
     Automatisktjekkodestyring1: TMenuItem;
     Automatiskvalg1: 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);
@@ -161,7 +161,7 @@
   procedure CheckPrintQue(tjektype : string);
   procedure Timer1Timer(Sender: TObject);
   procedure Scanogstjekkoden1Click(Sender: TObject);
-  procedure CheckBox3Click(Sender: TObject);
+  procedure chkScanTjekkodeClick(Sender: TObject);
   procedure Automatisktjekkodestyring1Click(Sender: TObject);
   procedure SendInfoTilServer(Sted, Scanningtype, Infotype, Info : String);
   procedure Automatiskvalg1Click(Sender: TObject);
@@ -409,29 +409,29 @@
     else
       PakkeshopText1.Visible := false;
 
-    CheckBox3.Checked := false;
-    CheckBox3.Enabled := false;
+    chkScanTjekkode.Checked := false;
+    chkScanTjekkode.Enabled := false;
     Scanogstjekkoden1.Enabled := false;
 
     if (Scanningtype = '1') or (Scanningtype = '5') then
     begin
       if (ScanTjekkode = '1') then
       begin
-        CheckBox3.Checked := true;
-        CheckBox3.Enabled := true;
+        chkScanTjekkode.Checked := true;
+        chkScanTjekkode.Enabled := true;
         Scanogstjekkoden1.Enabled := true;
       end
       else
       begin
-        CheckBox3.Checked := false;
-        CheckBox3.Enabled := true;         // False vil forhindre indtastning af tjekkode i nat x-press scanning
+        chkScanTjekkode.Checked := false;
+        chkScanTjekkode.Enabled := true;         // False vil forhindre indtastning af tjekkode i nat x-press scanning
         Scanogstjekkoden1.Enabled := true; // False vil forhindre indtastning af tjekkode i nat x-press scanning
       end;
     end;
 
     if Automatisktjekkodestyring1.Checked then
     begin
-      CheckBox3.Enabled := false;
+      chkScanTjekkode.Enabled := false;
       Scanogstjekkoden1.Enabled := false;
     end;
 
@@ -490,12 +490,12 @@
 begin
   if Automatisktjekkodestyring1.Checked then
   begin
-     CheckBox3.Enabled := false;
+     chkScanTjekkode.Enabled := false;
      Scanogstjekkoden1.Enabled := false;
   end
   else
   begin
-     CheckBox3.Enabled := true;
+     chkScanTjekkode.Enabled := true;
      Scanogstjekkoden1.Enabled := true;
   end;
 
@@ -722,19 +722,19 @@
 
     if ScanTjekkode = '1' then
     begin
-      CheckBox3.Checked := true;
+      chkScanTjekkode.Checked := true;
       Scanogstjekkoden1.Checked := true;
     end
     else
     begin
-      CheckBox3.Checked := false;
+      chkScanTjekkode.Checked := false;
       Scanogstjekkoden1.Checked := false;
     end;
 
     if ScanTjekkodeAutomatik = '1' then
     begin
       Automatisktjekkodestyring1.Checked := true;
-      CheckBox3.Enabled := false;
+      chkScanTjekkode.Enabled := false;
       Scanogstjekkoden1.Enabled := false;
     end;
 
@@ -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
@@ -1327,15 +1327,15 @@
 
     if (Stregkode = 'Scan tjekkode') or (PakkeshopStregkode = 'Scan tjekkode') or (BoghandlerStregkode = 'Scan tjekkode') then
     begin
-      if CheckBox3.Enabled = true then
+      if chkScanTjekkode.Enabled = true then
       begin
-         if (CheckBox3.State = cbChecked) then
+         if (chkScanTjekkode.State = cbChecked) then
          begin
-          CheckBox3.State := cbUnchecked;
+          chkScanTjekkode.State := cbUnchecked;
          end
          else
          begin
-          CheckBox3.State := cbChecked;
+          chkScanTjekkode.State := cbChecked;
          end;
       end
       else
@@ -1795,12 +1795,12 @@
 
     if (PakkeshopText1.Visible = true) and (PakkeshopText1.Caption = 'Stregkode') and Automatisktjekkodestyring1.Checked then
     begin
-      CheckBox3.Checked := false;
+      chkScanTjekkode.Checked := false;
       for i := 0 to length(stregkoderMedTjekkodeArray)-1 do
       begin
         if (Stregkode=stregkoderMedTjekkodeArray[i]) then
         begin
-            CheckBox3.Checked := true;
+            chkScanTjekkode.Checked := true;
             Scanogstjekkoden1.Checked := true;
         end;
       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;
 
 
@@ -2888,9 +2888,9 @@
 
 end;
 
-procedure TMainForm.CheckBox3Click(Sender: TObject);
+procedure TMainForm.chkScanTjekkodeClick(Sender: TObject);
 begin
-  if CheckBox3.Checked then
+  if chkScanTjekkode.Checked then
   begin
      Scanogstjekkoden1.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 := '';
@@ -5621,11 +5621,11 @@
 begin
   if Scanogstjekkoden1.Checked then
   begin
-     CheckBox3.Checked := true;
+     chkScanTjekkode.Checked := true;
   end
   else
   begin
-     CheckBox3.Checked := false;
+     chkScanTjekkode.Checked := false;
   end;
 end;