--- dao/DelphiScanner/Main.pas 2015/08/26 19:52:38 2682 +++ dao/DelphiScanner/Main.pas 2015/08/27 12:31:30 2685 @@ -8,7 +8,7 @@ IdTCPClient, IdHTTP, xmldom, XMLIntf, msxmldom, XMLDoc, IniFiles, AppEvnts, Menus, ExtCtrls, ComCtrls, StrUtils, MMSystem, DateUtils, IdExplicitTLSClientServerBase, IdFTP, pngimage, GIFImg, IdException, - Winspool, Registry, ShellApi, ClipBrd, Buttons, wininet, + Winspool, ShellApi, ClipBrd, Buttons, wininet, UITypes, PakkeshopLabels, StBarC, @@ -101,7 +101,7 @@ function retRutenummer(rutenummer : String) : String; function GetCurrentPrinterHandle() : THandle; function SavePChar(p: PChar): PChar; - function AdobeReaderExists(): Boolean; + function FileTime2DateTime(FileTime: TFileTime): TDateTime; function CheckUrl(url:string):boolean; @@ -207,9 +207,9 @@ AlarmLyd : String; ScannetOkLyd : String; ScannetOkStorLyd : String; -// 20150317: start + ScannetOkTilTjekkodeLyd : String; -// 20150317: slut + PrinterNavn : String; TjekPrinter : String; XPosRute : integer; @@ -498,27 +498,11 @@ procedure TMainForm.Automatiskvalg1Click(Sender: TObject); begin -// 20150317: start -(* - if Automatiskvalg1.Checked 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; -// 20150317: slut end; procedure TMainForm.FormCreate(Sender: TObject); @@ -790,7 +774,6 @@ // Hvis specialversion er valgt (SpecialVersionSted er sat til en værdi ovenfor) // ændrer vi Sted og Scanningtype her: -// 20150313: start if SpecialVersionSted = 'NS' then begin SpecialVersionSted := '01'; @@ -801,7 +784,6 @@ SpecialVersionSted := '03'; SpecialVersionScanningtype := '4'; end; -// 20150313: slut if SpecialVersionSted = 'BK' then begin @@ -3437,7 +3419,7 @@ if FileExists(fileName) then begin - if AdobeReaderExists then + if TUtils.AdobeReaderExists then begin //ShellExecute(Handle, 'open', 'c:\Windows\notepad.exe', nil, nil, SW_SHOWNORMAL); ShellExecute(Handle,'open',PChar(fileName), nil, nil, SW_SHOWNORMAL); @@ -3461,7 +3443,7 @@ if FileExists(fileName) then begin - if AdobeReaderExists then + if TUtils.AdobeReaderExists then begin //ShellExecute(Handle, 'open', 'c:\Windows\notepad.exe', nil, nil, SW_SHOWNORMAL); ShellExecute(Handle,'open',PChar(fileName), nil, nil, SW_SHOWNORMAL); @@ -4534,7 +4516,6 @@ XForm, XFormOld: TXForm; //Bruges til rotate X-formation Angle: integer; gMode: integer; - BarcodeArea: TRect; Dirigering: string; begin @@ -5380,17 +5361,7 @@ end; end; -function TMainForm.AdobeReaderExists: Boolean; -var - AReg: TRegistry; -begin - result:= false; - AReg := TRegistry.Create; - AReg.RootKey := HKEY_LOCAL_MACHINE; - if AReg.KeyExists('\SOFTWARE\Adobe\Acrobat Reader') then - result:= True; - AReg.Free; -end; + function TMainForm.CheckUrl(url:string):boolean;