--- dao/DelphiScanner/Main.pas	2015/09/03 13:43:10	2689
+++ dao/DelphiScanner/Main.pas	2015/09/03 14:27:21	2693
@@ -52,7 +52,7 @@
     Testlyd1: TMenuItem;
     ListBox1: TListBox;
     Budlevering1: TMenuItem;
-    DownloadButton01: TButton;
+    BtnDownloadKontrolfil: TButton;
     IdFTP1: TIdFTP;
     Image1: TImage;
     ListBox2: TListBox;
@@ -93,9 +93,6 @@
     PanelManglendePakker6: TPanel;
     menuIndlevering: TMenuItem;
 
-
-  function Sto_GetFmtFileVersion(const FileName: String = ''): String;
-
   function getProddato() : TDate;
   function getProddag() : String;
   function retRutenummer(rutenummer : String) : String;
@@ -134,7 +131,7 @@
   procedure Button1Click(Sender: TObject);
   procedure ListBox1DrawItem(Control: TWinControl; Index: Integer; Rect: TRect; State: TOwnerDrawState);
   procedure Budlevering1Click(Sender: TObject);
-  procedure DownloadButton01Click(Sender: TObject);
+  procedure BtnDownloadKontrolfilClick(Sender: TObject);
   procedure OpdaterListenButton01Click(Sender: TObject);
   procedure DownloadBladhusRuteskiftfil();
   procedure DownloadBladhusKontrolfil();
@@ -605,7 +602,7 @@
 
     if (SkrivLog = '1') then
     begin
-      logTekst := 'Program start (Version: ' + Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
+      logTekst := 'Program start (Version: ' + TUtils.Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
       try
         SkrivScanningLogFil(logTekst);
         Uploadlogfil1.Enabled := true;
@@ -1131,7 +1128,7 @@
     Scanningtype := gemScanningtype;
 
     SendInfoTilServer(Sted, Scanningtype, 'Begin', '');
-    SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', Sto_GetFmtFileVersion(''));
+    SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', TUtils.Sto_GetFmtFileVersion(''));
 
 end;
 
@@ -1980,7 +1977,7 @@
     01 :
           begin;      // NS
             Testprinter1.Visible := true;
-            DownloadButton01.Enabled := true;
+            BtnDownloadKontrolfil.Enabled := true;
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -1996,7 +1993,7 @@
             Storepakker1.Enabled := true;
             radioStorPakke.Enabled := true;
             radioLillePakke.Enabled := true;
-            DownloadButton01.Enabled := false;     // kontrolfil bruges ikke her
+            BtnDownloadKontrolfil.Enabled := false;     // kontrolfil bruges ikke her
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -2013,7 +2010,7 @@
             begin
               DownloadButton03.Visible := false;
             end;
-            DownloadButton01.Enabled := true;
+            BtnDownloadKontrolfil.Enabled := true;
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -2034,7 +2031,7 @@
             Storepakker1.Enabled := true;
             radioStorPakke.Enabled := true;
             radioLillePakke.Enabled := true;
-            DownloadButton01.Enabled := false;    // kontrolfil bruges ikke her
+            BtnDownloadKontrolfil.Enabled := false;    // kontrolfil bruges ikke her
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -3244,27 +3241,14 @@
 
 procedure TMainForm.PanelValgAClick(Sender: TObject);
 begin
-// 20150311: start
-(*
-  if PanelValgA.Color = clBtnFace then
-  begin
-     AutomatiskValg1.Checked := true;
-     PanelValgA.Color := clGreen;
-     PanelValgA.Font.Color := clWhite;
-  end
-  else
-  begin
-     AutomatiskValg1.Checked := false;
-     PanelValgA.Color := clBtnFace;
-     PanelValgA.Font.Color := clWindowText;
-  end;
-*)
 // Skal ikke toggle men bare sætte funktionen on
 // Fravælges ved at vælge en scanningstype
-     AutomatiskValg1.Checked := true;
-     PanelValgA.Color := clGreen;
-     PanelValgA.Font.Color := clWhite;
-// 20150311: slut
+  AutomatiskValg1.Checked := true;
+  PanelValgA.Color := clGreen;
+  PanelValgA.Font.Color := clWhite;
+
+
+
 end;
 
 procedure TMainForm.Pakkernormal1Click(Sender: TObject);
@@ -3379,7 +3363,7 @@
  tekst, filversion : String;
 begin
 
-  filversion := Sto_GetFmtFileVersion('');
+  filversion := TUtils.Sto_GetFmtFileVersion('');
   tekst := 'Program til indscanning af pakker'+crlf+'Version '+filversion+crlf+crlf+'Udviklet af it afdelingen, DAO';
 
   tekst := tekst+crlf+crlf;
@@ -3657,7 +3641,7 @@
       radioLillePakke.Enabled := true;
       ListBox1.Visible := true;
       ListBox1.Items.Clear;
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
       DownloadButton03.Visible := false;
       EKLoverforsel.Enabled := false;
@@ -3693,7 +3677,7 @@
       radioLillePakke.Enabled := false;
       ListBox1.Visible := true;
       ListBox1.Items.Clear;
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
 
       EKLoverforsel.Enabled := true;
@@ -3730,7 +3714,7 @@
       radioLillePakke.Enabled := false;
       ListBox1.Visible := true;
       ListBox1.Items.Clear;
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
       EKLoverforsel.Enabled := false;
       InitLillePakke();
@@ -3777,7 +3761,7 @@
       ListBox1.Visible := true;
       ListBox1.Items.Clear();
 
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
       EKLoverforsel.Enabled := false;
       InitLillePakke();
@@ -3817,60 +3801,7 @@
 // 20150310: slut
 end;
 
-/// <summary>
-///   This function reads the file resource of "FileName" and returns
-///   the version number as formatted text.</summary>
-/// <example>
-///   Sto_GetFmtFileVersion() = '4.13.128.0'
-///   Sto_GetFmtFileVersion('', '%.2d-%.2d-%.2d') = '04-13-128'
-/// </example>
-/// <remarks>If "Fmt" is invalid, the function may raise an
-///   EConvertError exception.</remarks>
-/// <param name="FileName">Full path to exe or dll. If an empty
-///   string is passed, the function uses the filename of the
-///   running exe or dll.</param>
-/// <param name="Fmt">Format string, you can use at most four integer
-///   values.</param>
-/// <returns>Formatted version number of file, '' if no version
-///   resource found.</returns>
-function TMainForm.Sto_GetFmtFileVersion(const FileName: String = ''): String;
-var
-  sFileName: String;
-  iBufferSize: DWORD;
-  iDummy: DWORD;
-  pBuffer: Pointer;
-  pFileInfo: Pointer;
-  iVer: array[1..4] of Integer;
-begin
-  // set default value
-  Result := '';
-  // get filename of exe/dll if no filename is specified
-  sFileName := Trim(FileName);
-  if (sFileName = '') then
-    sFileName := GetModuleName(HInstance);
-  // get size of version info (0 if no version info exists)
-  iBufferSize := GetFileVersionInfoSize(PChar(sFileName), iDummy);
-  if (iBufferSize > 0) then
-  begin
-    GetMem(pBuffer, iBufferSize);
-    try
-    // get fixed file info (language independent)
-    GetFileVersionInfo(PChar(sFileName), 0, iBufferSize, pBuffer);
-    VerQueryValue(pBuffer, '\', pFileInfo, iDummy);
-    // read version blocks
-    iVer[1] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
-    iVer[2] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
-    iVer[3] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
-    iVer[4] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
-    finally
-      FreeMem(pBuffer);
-    end;
-
-    // format result string
-    Result := Format('%d.%d.%d.%d', [iVer[1], iVer[2], iVer[3], iVer[4]]);
 
-  end;
-end;
 
 procedure TMainForm.PlaySound(filename : PWideChar);
 begin
@@ -4540,7 +4471,7 @@
   ListBox1.SetFocus;  // for at flytte fokus væk fra upload knappen så denne ikke aktiveres ved scanning / indtastning af stregkode
 end;
 
-procedure TMainForm.DownloadButton01Click(Sender: TObject);
+procedure TMainForm.BtnDownloadKontrolfilClick(Sender: TObject);
 begin
     DownloadBladhusKontrolfil();
     ListBox1.SetFocus;  // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode