--- dao/DelphiScanner/Configuration.pas 2016/08/15 15:56:50 3088 +++ dao/DelphiScanner/Configuration.pas 2016/08/15 19:26:48 3090 @@ -39,6 +39,11 @@ YPosSmskode : integer; FontSizeSmskode : integer; + FarveNormal, FarveReturDAO, FarveReturBoghandler, FarveBudlevering, FarvePakkeshoplevering, FarveReturPakkeshop, + FarveIndlevering : String; + + TitelNormal, TitelReturDAO, TitelReturBoghandler, TitelBudlevering, TitelPakkeshoplevering, TitelReturPakkeshop, + TitelIndlevering : String; @@ -51,6 +56,23 @@ UrlFindPakketype, UrlSendPrograminfo: String; + AlarmLyd : String; + ScannetOkLyd : String; + ScannetOkStorLyd : String; + + ScannetOkTilTjekkodeLyd : String; + + PrinterNavn : String; + TjekPrinter : String; + + SporgEfterBoghandler : String; + + ScanTjekkode : String; + ScanTjekkodeAutomatik : string; + + TjekUrls : String; + TestFunktionen : String; + procedure ReadFromInifile( iniFile: TIniFile); @@ -60,7 +82,7 @@ implementation -uses Utils; +uses Utils, SysUtils; procedure TConfiguration.ReadFromInifile( iniFile: TIniFile); @@ -71,6 +93,43 @@ with iniFile do begin + FarveNormal := ReadString('Settings','FarveNormal','D8D8D8'); + TitelNormal := ReadString('Settings','TitelNormal','Modtagelse af DAO NAT X-PRESS pakker'); + FarveReturDAO := ReadString('Settings','FarveReturDAO','A9F5A9'); + TitelReturDAO := ReadString('Settings','TitelReturDAO','Returforsendelse fra DAO'); + FarveReturBoghandler := ReadString('Settings','FarveReturBoghandler','F2F5A9'); + TitelReturBoghandler := ReadString('Settings','TitelReturBoghandler','Returforsendelse fra boghandler'); + FarveBudlevering := ReadString('Settings','FarveBudlevering','2E9AFE'); + TitelBudlevering := ReadString('Settings','TitelBudlevering','Modtagelse af DAO DIREKTE pakker'); + FarvePakkeshoplevering := ReadString('Settings','FarvePakkeshoplevering','99FFFF'); + TitelPakkeshoplevering := ReadString('Settings','TitelPakkeshoplevering','Modtagelse af DAO PAKKESHOP pakker'); + + FarveReturPakkeshop := ReadString('Settings','FarveReturPakkeshop','99FFCC'); + TitelReturPakkeshop := ReadString('Settings','TitelReturPakkeshop','Returforsendelse fra pakkeshop'); + + FarveIndlevering := ReadString('Settings', 'FarveIndlevering', 'E5B2CB'); + TitelIndlevering := ReadString('Settings', 'TitelIndlevering', 'Indleveringskode'); + + + SporgEfterBoghandler := ReadString('Settings','SporgEfterBoghandler','0'); + ScanTjekkode := ReadString('Settings','ScanTjekkode','0'); + ScanTjekkodeAutomatik := ReadString('Settings','ScanTjekkodeAutomatik','1'); + + //Scanningtype := ReadString('Settings','Scanningtype','A'); //Scanningstype skal ikke lęses fra config + //Pakketype := ReadString('Settings','Pakketype','0'); //Pakketype Skal ikke lęses fra config + + TestFunktionen := ReadString('Settings','TestFunktion','0'); + + AlarmLyd := ReadString('Settings','AlarmLyd','Sounds\Alarm.wav'); + ScannetOkLyd := ReadString('Settings','ScannetOkLyd','Sounds\Ok.wav'); + ScannetOkStorLyd := ReadString('Settings','ScannetOkStorLyd','Sounds\Ok_stor.wav'); + + ScannetOkTilTjekkodeLyd := ReadString('Settings','ScannetOkTilTjekkodeLyd','Sounds\Ok_til_tjekkode.wav'); + + PrinterNavn := ReadString('Settings','PrinterNavn',''); + TjekPrinter := ReadString('Settings','TjekPrinter','1'); + TjekUrls := ReadString('Settings','TjekUrls','2'); + LabelType := ReadInteger('Settings','LabelType',1); @@ -197,6 +256,31 @@ URLPrintLabel := InjectURL(URLPrintLabel); + + //Finally check for files: + if not FileExists(AlarmLyd) then + begin + AlarmLyd := ''; + end; + + if not FileExists(ScannetOkLyd) then + begin + ScannetOkLyd := ''; + end; + + if not FileExists(ScannetOkStorLyd) then + begin + ScannetOkStorLyd := ''; + end; + + + if not FileExists(ScannetOkTilTjekkodeLyd) then + begin + ScannetOkTilTjekkodeLyd := ''; + end; + + + end;