--- dao/DelphiScanner/Main.pas	2015/08/20 20:58:26	2650
+++ dao/DelphiScanner/Main.pas	2015/08/23 11:06:48	2655
@@ -20,7 +20,7 @@
     IdHTTP1: TIdHTTP;
     XMLDocument1: TXMLDocument;
     ApplicationEvents1: TApplicationEvents;
-    CheckBox1: TCheckBox;
+    chkSporgEfterKunde: TCheckBox;
     KommentarST: TStaticText;
     MainMenu1: TMainMenu;
     N1: TMenuItem;
@@ -36,8 +36,8 @@
     Lukprogrammet1: TMenuItem;
     N2: TMenuItem;
     N3: TMenuItem;
-    RadioButton1: TRadioButton;
-    RadioButton2: TRadioButton;
+    radioStorPakke: TRadioButton;
+    radioLillePakke: TRadioButton;
     N4: TMenuItem;
     Storepakker1: TMenuItem;
     Smpakker1: TMenuItem;
@@ -59,14 +59,14 @@
     PakkeshopNulstil: TButton;
     Returpakkerfrapakkeshop1: TMenuItem;
     Altidprintepakkelabel1: TMenuItem;
-    CheckBox2: TCheckBox;
+    chkAltidPrintLabel: TCheckBox;
     EKLoverforsel: TButton;
     N5: TMenuItem;
     Uploadlogfil1: TMenuItem;
     Manual1: TMenuItem;
     PrinterstatusStaticText1: TStaticText;
     Timer1: TTimer;
-    CheckBox3: TCheckBox;
+    chkScanTjekkode: TCheckBox;
     Scanogstjekkoden1: TMenuItem;
     Automatisktjekkodestyring1: TMenuItem;
     Automatiskvalg1: TMenuItem;
@@ -113,9 +113,9 @@
   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 CheckBox1Click(Sender: TObject);
+  procedure radioStorPakkeClick(Sender: TObject);
+  procedure radioLillePakkeClick(Sender: TObject);
+  procedure chkSporgEfterKundeClick(Sender: TObject);
   procedure Pakkernormal1Click(Sender: TObject);
   procedure Testforbindelsen1Click(Sender: TObject);
   procedure Testprinter1Click(Sender: TObject);
@@ -154,14 +154,14 @@
   procedure InitIndleveringskode();
 
   procedure Altidprintepakkelabel1Click(Sender: TObject);
-  procedure CheckBox2Click(Sender: TObject);
+  procedure chkAltidPrintLabelClick(Sender: TObject);
   procedure EKLoverforselClick(Sender: TObject);
   procedure Uploadlogfil1Click(Sender: TObject);
   procedure Manual1Click(Sender: TObject);
   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;
 
@@ -472,11 +472,11 @@
 
   if Altidprintepakkelabel1.Checked then
   begin
-     CheckBox2.Checked := true;
+     chkAltidPrintLabel.Checked := true;
   end
   else
   begin
-     CheckBox2.Checked := false;
+     chkAltidPrintLabel.Checked := false;
   end;
 
 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;
 
@@ -711,30 +711,30 @@
 
     if SporgEfterBoghandler = '1' then
     begin
-      CheckBox1.Checked := true;
+      chkSporgEfterKunde.Checked := true;
       Sprgefterboghandlernummer1.Checked := true;
     end
     else
     begin
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
     end;
 
     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
@@ -1294,15 +1294,15 @@
 
     if StregKode = 'Indtast kundenummer' then
     begin
-       if CheckBox1.Enabled = true then
+       if chkSporgEfterKunde.Enabled = true then
        begin
-         if (CheckBox1.State = cbChecked) then
+         if (chkSporgEfterKunde.State = cbChecked) then
          begin
-          CheckBox1.State := cbUnchecked;
+          chkSporgEfterKunde.State := cbUnchecked;
          end
          else
          begin
-          CheckBox1.State := cbChecked;
+          chkSporgEfterKunde.State := cbChecked;
          end;
        end
        else
@@ -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;
@@ -2603,7 +2603,7 @@
 
 // 20150306: start
 //  if Sprgefterboghandlernummer1.Enabled and CheckBox1.Checked and (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) or (pakkeForkertSted > 0) then
-  if Sprgefterboghandlernummer1.Enabled and CheckBox1.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) or (pakkeForkertSted > 0) ) then
+  if Sprgefterboghandlernummer1.Enabled and chkSporgEfterKunde.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) or (pakkeForkertSted > 0) ) then
 // 20150306: slut
   begin
       if (RuteNummer = 'Ukendt') then
@@ -2757,15 +2757,15 @@
     exit;
   end;
 
-  if Budlevering1.Checked or ( Sprgefterboghandlernummer1.Enabled and CheckBox1.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) ) and (printNyLabel = false) ) then
+  if Budlevering1.Checked or ( Sprgefterboghandlernummer1.Enabled and chkSporgEfterKunde.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) ) and (printNyLabel = false) ) then
   begin
   end
   else
   begin
-    if ( (PrinterNavn <> 'Ingen') and (PrintNyLabel or CheckBox2.Checked) and (RuteNummer <> 'Ukendt') or (RuteNummer = 'Rutenr')) then
+    if ( (PrinterNavn <> 'Ingen') and (PrintNyLabel or chkAltidPrintLabel.Checked) and (RuteNummer <> 'Ukendt') or (RuteNummer = 'Rutenr')) then
     begin
       logTekst := 'Printer label type ';
-      if (CheckBox2.Checked) then
+      if (chkAltidPrintLabel.Checked) then
       begin
         logTekst := logTekst + 'Alle ';
       end
@@ -2849,22 +2849,22 @@
 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;
 
 
-procedure TMainForm.CheckBox1Click(Sender: TObject);
+procedure TMainForm.chkSporgEfterKundeClick(Sender: TObject);
 begin
-  if CheckBox1.Checked then
+  if chkSporgEfterKunde.Checked then
   begin
      Sprgefterboghandlernummer1.Checked := true;
   end
@@ -2875,9 +2875,9 @@
 end;
 
 
-procedure TMainForm.CheckBox2Click(Sender: TObject);
+procedure TMainForm.chkAltidPrintLabelClick(Sender: TObject);
 begin
-  if CheckBox2.Checked then
+  if chkAltidPrintLabel.Checked then
   begin
      Altidprintepakkelabel1.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
@@ -3783,11 +3783,11 @@
 
   if Sprgefterboghandlernummer1.Checked then
   begin
-     CheckBox1.Checked := true;
+     chkSporgEfterKunde.Checked := true;
   end
   else
   begin
-     CheckBox1.Checked := false;
+     chkSporgEfterKunde.Checked := false;
   end;
 
 
@@ -3815,18 +3815,18 @@
       InitForm(FarveNormal,TitelNormal,UrlNormal);
       PanelValg1.Color := clGreen;
       PanelValg1.Font.Color := clWhite;
-      CheckBox1.Enabled := true;
-      CheckBox2.Enabled := true;
+
+      chkAltidPrintLabel.Enabled := true;
       Altidprintepakkelabel1.Enabled := true;
       Altidprintepakkelabel1.Checked := false;
-      CheckBox2.Checked := false;
+      chkAltidPrintLabel.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -3847,18 +3847,18 @@
       InitForm(FarveReturDAO,TitelReturDAO,UrlReturDAO);
       PanelValg2.Color := clGreen;
       PanelValg2.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -3874,18 +3874,17 @@
       InitForm(FarveReturBoghandler,TitelReturBoghandler,UrlReturBoghandler);
       PanelValg3.Color := clGreen;
       PanelValg3.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -3901,18 +3900,18 @@
       InitForm(FarveBudlevering,TitelBudlevering,UrlBudlevering);
       PanelValg4.Color := clGreen;
       PanelValg4.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -3937,18 +3936,18 @@
       InitForm(FarvePakkeshoplevering,TitelPakkeshoplevering,UrlPakkeshoplevering);
       PanelValg5.Color := clGreen;
       PanelValg5.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -3975,18 +3974,18 @@
       InitForm(FarveReturPakkeshop,TitelReturPakkeshop,UrlReturPakkeshop);
       PanelValg6.Color := clGreen;
       PanelValg6.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -4017,18 +4016,18 @@
       InitForm(FarveReturPakkeshop,TitelReturPakkeshop,UrlReturPakkeshop);
       PanelValg7.Color := clGreen;
       PanelValg7.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       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;
@@ -4057,7 +4056,7 @@
 
 procedure TMainForm.InitLillePakke();
 begin
-  RadioButton2.Checked := true;
+  radioLillePakke.Checked := true;
   Smpakker1.Checked := true;
 // 20150310: start
 //  Stregkode := '';
@@ -4066,7 +4065,7 @@
 
 procedure TMainForm.InitStorPakke();
 begin
-  RadioButton1.Checked := true;
+  radioStorPakke.Checked := true;
   Storepakker1.Checked := true;
 // 20150310: start
 //  Stregkode := '';
@@ -5622,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;