Commit 172c5986 authored by kravtsov's avatar kravtsov

[-] Исправлена ошибка обрезания текста

parent 1edfebd5
......@@ -4,6 +4,13 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_479.exe
12 марта 2018 17:35
[-] Исправлена ошибка обрезания текста
*******************************************************************
OposShtrih_1.13_478.exe
......
......@@ -42,7 +42,6 @@
-O"C:\COMPON~1\JVCL\jcl\lib\d7\debug"
-I"C:\COMPON~1\JVCL\jcl\lib\d7\debug"
-R"C:\COMPON~1\JVCL\jcl\lib\d7\debug"
-DMALINA
-w-SYMBOL_DEPRECATED
-w-SYMBOL_PLATFORM
-w-UNIT_PLATFORM
......
......@@ -96,7 +96,7 @@ PackageDLLOutputDir=
PackageDCPOutputDir=
SearchPath=C:\COMPON~1\JVCL\jcl\lib\d7\debug
Packages=Vcl50;SynEdit_D5;SynEdit_R5;vcl;rtl;indy
Conditionals=MALINA
Conditionals=
DebugSourceDirs=
UsePackages=0
[Parameters]
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=13
Release=0
Build=477
Build=480
Debug=0
PreRelease=0
Special=0
......@@ -126,24 +126,30 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=OPOS setup utility
FileVersion=1.13.0.477
InternalName=OPOS setup
LegalCopyright=SHTRIH-M 2013
FileVersion=1.13.0.480
InternalName=OPOS setup
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
OriginalFilename=OposConfig.exe
ProductName=OPOS drivers
ProductVersion=1.13
Comments=http://www.shtrih-m.ru
[Excluded Packages]
C:\Program Files (x86)\Borland\Delphi7\Projects\Bpl\PngComponentsD7.bpl=Png components
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=1
Item0=$(DELPHI)\Lib\Debug
Count=2
Item0=C:\COMPON~1\JVCL\jcl\lib\d7\debug
Item1=$(DELPHI)\Lib\Debug
[HistoryLists\hlUnitOutputDirectory]
Count=2
Item0=DCU
Item1=..\lib\D7
[HistoryLists\hlOutputDirectorry]
Count=1
Item0=..\..\Bin
[HistoryLists\hlBPLOutput]
Count=3
Item0=$(DELPHI)\Bin\
......
......@@ -8,43 +8,42 @@
resources were bound to the produced executable.
*/
#define pnglang_EPNGHeaderNotPresentText 65184
#define OleConst_SCannotActivate 65185
#define OleConst_SNoWindowHandle 65186
#define OleConst_SInvalidLicense 65187
#define OleConst_SNotLicensed 65188
#define pnglang_EPNGInvalidIHDRText 65200
#define pnglang_EPNGMissingMultipleIDATText 65201
#define pnglang_EPNGZLIBErrorText 65202
#define pnglang_EPNGInvalidPaletteText 65203
#define pnglang_EPNGInvalidFileHeaderText 65204
#define pnglang_EPNGIHDRNotFirstText 65205
#define pnglang_EPNGSizeExceedsText 65206
#define pnglang_EPNGUnknownPalEntryText 65207
#define pnglang_EPNGUnknownCriticalChunkText 65208
#define pnglang_EPNGUnknownCompressionText 65209
#define pnglang_EPNGUnknownInterlaceText 65210
#define pnglang_EPNGCannotAssignChunkText 65211
#define pnglang_EPNGUnexpectedEndText 65212
#define pnglang_EPNGNoImageDataText 65213
#define pnglang_EPNGCannotChangeSizeText 65214
#define pnglang_EPNGOutMemoryText 65215
#define ComConst_SNoCloseActiveServer1 65216
#define ComConst_SNoCloseActiveServer2 65217
#define OposDevice_MsgKeyOpenError 65218
#define VatCode_MsgVATCodeExists 65219
#define PrinterParametersReg_MsgRegistryKeyOpenError 65220
#define PrinterParametersRegIBT_MsgRegistryKeyOpenError 65221
#define TntSystem_SBufferOverflow 65222
#define TntSystem_SInvalidUTF7 65223
#define MalinaParams_MsgInvalidFuelAmountPrecision 65224
#define SynEditStrConst_SYNS_ScrollInfoFmt 65225
#define SynEditStrConst_SYNS_ScrollInfoFmtTop 65226
#define SynEditStrConst_SYNS_EDuplicateShortcut 65227
#define SynEditStrConst_SYNS_FriendlyLangUnknown 65228
#define SynEditTextBuffer_SListIndexOutOfBounds 65229
#define SynEditTextBuffer_SInvalidCapacity 65230
#define pnglang_EPngInvalidCRCText 65231
#define pnglang_EPNGNoImageDataText 65184
#define pnglang_EPNGCannotChangeSizeText 65185
#define pnglang_EPNGOutMemoryText 65186
#define pnglang_EPNGHeaderNotPresentText 65187
#define OleConst_SInvalidLicense 65200
#define OleConst_SNotLicensed 65201
#define pnglang_EPngInvalidCRCText 65202
#define pnglang_EPNGInvalidIHDRText 65203
#define pnglang_EPNGMissingMultipleIDATText 65204
#define pnglang_EPNGZLIBErrorText 65205
#define pnglang_EPNGInvalidPaletteText 65206
#define pnglang_EPNGInvalidFileHeaderText 65207
#define pnglang_EPNGIHDRNotFirstText 65208
#define pnglang_EPNGSizeExceedsText 65209
#define pnglang_EPNGUnknownPalEntryText 65210
#define pnglang_EPNGUnknownCriticalChunkText 65211
#define pnglang_EPNGUnknownCompressionText 65212
#define pnglang_EPNGUnknownInterlaceText 65213
#define pnglang_EPNGCannotAssignChunkText 65214
#define pnglang_EPNGUnexpectedEndText 65215
#define ComConst_SNoCloseActiveServer2 65216
#define OposDevice_MsgKeyOpenError 65217
#define VatCode_MsgVATCodeExists 65218
#define PrinterParametersReg_MsgRegistryKeyOpenError 65219
#define PrinterParametersRegIBT_MsgRegistryKeyOpenError 65220
#define TntSystem_SBufferOverflow 65221
#define TntSystem_SInvalidUTF7 65222
#define MalinaParams_MsgInvalidFuelAmountPrecision 65223
#define SynEditStrConst_SYNS_ScrollInfoFmt 65224
#define SynEditStrConst_SYNS_ScrollInfoFmtTop 65225
#define SynEditStrConst_SYNS_EDuplicateShortcut 65226
#define SynEditStrConst_SYNS_FriendlyLangUnknown 65227
#define SynEditTextBuffer_SListIndexOutOfBounds 65228
#define SynEditTextBuffer_SInvalidCapacity 65229
#define OleConst_SCannotActivate 65230
#define OleConst_SNoWindowHandle 65231
#define ComStrs_sTabFailDelete 65232
#define ComStrs_sTabFailRetrieve 65233
#define ComStrs_sTabFailGetObject 65234
......@@ -52,15 +51,15 @@
#define ComStrs_sTabFailSetObject 65236
#define ComStrs_sTabMustBeMultiLine 65237
#define ComStrs_sInvalidOwner 65238
#define ComStrs_sUDAssociated 65239
#define ComStrs_sPageIndexError 65240
#define ComStrs_sInvalidComCtl32 65241
#define WinHelpViewer_hNoKeyword 65242
#define ComConst_SOleError 65243
#define ComConst_SNoMethod 65244
#define ComConst_SVarNotObject 65245
#define ComConst_STooManyParams 65246
#define ComConst_SAutomationWarning 65247
#define ComStrs_sPageIndexError 65239
#define ComStrs_sInvalidComCtl32 65240
#define WinHelpViewer_hNoKeyword 65241
#define ComConst_SOleError 65242
#define ComConst_SNoMethod 65243
#define ComConst_SVarNotObject 65244
#define ComConst_STooManyParams 65245
#define ComConst_SAutomationWarning 65246
#define ComConst_SNoCloseActiveServer1 65247
#define ExtCtrls_clNameHighlightText 65248
#define ExtCtrls_clNameInactiveBorder 65249
#define ExtCtrls_clNameInactiveCaption 65250
......@@ -351,11 +350,13 @@
#define SysConst_SDiskFull 65535
STRINGTABLE
BEGIN
pnglang_EPNGNoImageDataText, "This \"Portable Network Graphics\" image contains no data."
pnglang_EPNGCannotChangeSizeText, "The \"Portable Network Graphics\" image can not be resize by changing width and height properties. Try assigning the image from a bitmap."
pnglang_EPNGOutMemoryText, "Some operation could not be performed because the system is out of resources. Close some windows and try again."
pnglang_EPNGHeaderNotPresentText, "This operation is not valid because the current image contains no valid header."
OleConst_SCannotActivate, "OLE control activation failed"
OleConst_SNoWindowHandle, "Could not obtain OLE control window handle"
OleConst_SInvalidLicense, "License information for %s is invalid"
OleConst_SNotLicensed, "License information for %s not found. You cannot use this control in design mode"
pnglang_EPngInvalidCRCText, "This \"Portable Network Graphics\" image is not valid because it contains invalid pieces of data (crc error)"
pnglang_EPNGInvalidIHDRText, "The \"Portable Network Graphics\" image could not be loaded because one of its main piece of data (ihdr) might be corrupted"
pnglang_EPNGMissingMultipleIDATText, "This \"Portable Network Graphics\" image is invalid because it has missing image parts."
pnglang_EPNGZLIBErrorText, "Could not decompress the image because it contains invalid compressed data.\r\n Description: "
......@@ -369,10 +370,6 @@ BEGIN
pnglang_EPNGUnknownInterlaceText, "This \"Portable Network Graphics\" image uses an unknown interlace scheme which could not be decoded."
pnglang_EPNGCannotAssignChunkText, "The chunks must be compatible to be assigned."
pnglang_EPNGUnexpectedEndText, "This \"Portable Network Graphics\" image is invalid because the decoder found an unexpected end of the file."
pnglang_EPNGNoImageDataText, "This \"Portable Network Graphics\" image contains no data."
pnglang_EPNGCannotChangeSizeText, "The \"Portable Network Graphics\" image can not be resize by changing width and height properties. Try assigning the image from a bitmap."
pnglang_EPNGOutMemoryText, "Some operation could not be performed because the system is out of resources. Close some windows and try again."
ComConst_SNoCloseActiveServer1, "There are still active COM objects in this application. One or more clients may have references to these objects, so manually closing "
ComConst_SNoCloseActiveServer2, "this application may cause those client application(s) to fail.\r\n\r\nAre you sure you want to close this application?"
OposDevice_MsgKeyOpenError, "Error opening registry key: %s"
VatCode_MsgVATCodeExists, "Item with app VAT code %d already exists."
......@@ -387,7 +384,8 @@ BEGIN
SynEditStrConst_SYNS_FriendlyLangUnknown, "<Unknown>"
SynEditTextBuffer_SListIndexOutOfBounds, "Invalid stringlist index %d"
SynEditTextBuffer_SInvalidCapacity, "Stringlist capacity cannot be smaller than count"
pnglang_EPngInvalidCRCText, "This \"Portable Network Graphics\" image is not valid because it contains invalid pieces of data (crc error)"
OleConst_SCannotActivate, "OLE control activation failed"
OleConst_SNoWindowHandle, "Could not obtain OLE control window handle"
ComStrs_sTabFailDelete, "Failed to delete tab at index %d"
ComStrs_sTabFailRetrieve, "Failed to retrieve tab at index %d"
ComStrs_sTabFailGetObject, "Failed to get object at index %d"
......@@ -395,7 +393,6 @@ BEGIN
ComStrs_sTabFailSetObject, "Failed to set object at index %d"
ComStrs_sTabMustBeMultiLine, "MultiLine must be True when TabPosition is tpLeft or tpRight"
ComStrs_sInvalidOwner, "Invalid owner"
ComStrs_sUDAssociated, "%s is already associated with %s"
ComStrs_sPageIndexError, "%d is an invalid PageIndex value. PageIndex must be between 0 and %d"
ComStrs_sInvalidComCtl32, "This control requires version 4.70 or greater of COMCTL32.DLL"
WinHelpViewer_hNoKeyword, "No help keyword specified."
......@@ -404,6 +401,7 @@ BEGIN
ComConst_SVarNotObject, "Variant does not reference an automation object"
ComConst_STooManyParams, "Dispatch methods do not support more than 64 parameters"
ComConst_SAutomationWarning, "COM Server Warning"
ComConst_SNoCloseActiveServer1, "There are still active COM objects in this application. One or more clients may have references to these objects, so manually closing "
ExtCtrls_clNameHighlightText, "Highlight Text"
ExtCtrls_clNameInactiveBorder, "Inactive Border"
ExtCtrls_clNameInactiveCaption, "Inactive Caption"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,478
PRODUCTVERSION 1,13,0,478
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS setup utility\0"
VALUE "FileVersion", "1.13.0.478\0"
VALUE "FileVersion", "1.13.0.479\0"
VALUE "InternalName", "OPOS setup \0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposConfig.exe\0"
......
[Closed Files]
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\SmResourceStrings.pas',0,1,1,1,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,1,24,7,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4448,16,4465,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,5123,1,5130,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,1617,3,1621,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\ReceiptTemplate.pas',0,1,288,79,300,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\SharedPrinter.pas',0,1,802,25,806,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,1,1,1,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\GS1Barcode.pas',0,1,35,18,48,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,296,32,313,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\DirectIOAPI.pas',0,1,1,1,9,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\SmResourceStrings.pas',0,1,1,1,1,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\PrinterParameters.pas',0,1,1,24,7,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\OposTest\Units\PrinterTest.pas',0,1,4448,16,4465,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,5123,1,5130,0,0
File_5=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FSSalesReceipt.pas',0,1,1617,3,1621,0,0
File_6=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\ReceiptTemplate.pas',0,1,288,79,300,0,0
File_7=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\SharedPrinter.pas',0,1,802,25,806,0,0
File_8=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterImpl.pas',0,1,1,1,1,0,0
File_9=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\GS1Barcode.pas',0,1,35,18,48,0,0
[Modules]
Count=0
EditWindowCount=0
Module0=c:\program files (x86)\borland\delphi7\source\rtl\common\Math.pas
Module1=c:\program files (x86)\borland\delphi7\source\rtl\Sys\Types.pas
Module2=c:\Program Files (x86)\Borland\Delphi7\Source\Rtl\Common\DateUtils.pas
Count=3
EditWindowCount=1
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
[c:\program files (x86)\borland\delphi7\source\rtl\common\Math.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[c:\program files (x86)\borland\delphi7\source\rtl\Sys\Types.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
[c:\Program Files (x86)\Borland\Delphi7\Source\Rtl\Common\DateUtils.pas]
ModuleType=SourceModule
FormState=0
FormOnTop=0
......@@ -91,6 +105,60 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
[EditWindow0]
ViewCount=3
CurrentView=1
View0=0
View1=1
View2=2
CodeExplorer=CodeExplorer@EditWindow0
MessageView=MessageView@EditWindow0
Create=1
Visible=1
State=2
Left=323
Top=138
Width=1302
Height=682
MaxLeft=-8
MaxTop=106
MaxWidth=1936
MaxHeight=952
ClientWidth=1920
ClientHeight=914
LeftPanelSize=0
LeftPanelClients=CodeExplorer@EditWindow0
LeftPanelData=00000400010000000C000000436F64654578706C6F7265720000000000000000000000000000000000FFFFFFFF
RightPanelSize=0
BottomPanelSize=81
BottomPanelClients=MessageView@EditWindow0
BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF
[View0]
Module=c:\Program Files (x86)\Borland\Delphi7\Source\Rtl\Common\DateUtils.pas
CursorX=16
CursorY=46
TopLine=26
LeftCol=1
[View1]
Module=c:\program files (x86)\borland\delphi7\source\rtl\common\Math.pas
CursorX=31
CursorY=1239
TopLine=1219
LeftCol=1
[View2]
Module=c:\program files (x86)\borland\delphi7\source\rtl\Sys\Types.pas
CursorX=19
CursorY=451
TopLine=431
LeftCol=1
[TypeLibEditWindow0]
Create=1
Visible=0
......@@ -414,6 +482,38 @@ Column2Width=545
EntryPointPane=225
CompUnitPane=104
[CodeExplorer@EditWindow0]
Create=1
Visible=0
State=0
Left=-127
Top=-6
Width=140
Height=305
MaxLeft=-1
MaxTop=-1
ClientWidth=140
ClientHeight=305
TBDockHeight=305
LRDockWidth=140
Dockable=1
[MessageView@EditWindow0]
Create=1
Visible=1
State=0
Left=12
Top=0
Width=1908
Height=81
MaxLeft=-1
MaxTop=-1
ClientWidth=1908
ClientHeight=81
TBDockHeight=81
LRDockWidth=443
Dockable=1
[DockHosts]
DockHostCount=0
......
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=13
Release=0
Build=482
Build=483
Debug=0
PreRelease=0
Special=0
......@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=OPOS test utility
FileVersion=1.13.0.482
FileVersion=1.13.0.483
InternalName=OPOS test
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
......@@ -138,12 +138,16 @@ Comments=http://www.shtrih-m.ru
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=1
Item0=$(DELPHI)\Lib\Debug
Count=2
Item0=C:\COMPON~1\JVCL\jcl\lib\d7\debug
Item1=$(DELPHI)\Lib\Debug
[HistoryLists\hlUnitOutputDirectory]
Count=2
Item0=DCU
Item1=..\lib\D7
[HistoryLists\hlOutputDirectorry]
Count=1
Item0=..\..\Bin
[HistoryLists\hlBPLOutput]
Count=3
Item0=$(DELPHI)\Bin\
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,478
PRODUCTVERSION 1,13,0,478
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS test utility\0"
VALUE "FileVersion", "1.13.0.478\0"
VALUE "FileVersion", "1.13.0.479\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -1504,11 +1504,11 @@ begin
FiscalPrinter.FiscalReceiptStation := FPTR_RS_RECEIPT;
Check(FiscalPrinter.BeginNonFiscal);
Check(FiscalPrinter.PrintNormal(FPTR_S_RECEIPT, 'Nonfiscal receipt line 1'));
Check(FiscalPrinter.PrintNormal(FPTR_S_RECEIPT, 'Nonfiscal receipt line 2'));
Check(FiscalPrinter.PrintNormal(FPTR_S_RECEIPT, ' Nonfiscal receipt line 1'));
Check(FiscalPrinter.PrintNormal(FPTR_S_RECEIPT, ' Nonfiscal receipt line 2'));
Check(FiscalPrinter.PrintNormal(FPTR_S_RECEIPT, 'Nonfiscal receipt line 3'));
Check(FiscalPrinter.PrintText('Nonfiscal receipt line 4', 5));
Check(FiscalPrinter.PrintText('Nonfiscal receipt line 5', 5));
Check(FiscalPrinter.PrintText(' Nonfiscal receipt line 4', 5));
Check(FiscalPrinter.PrintText(' Nonfiscal receipt line 5', 5));
Check(FiscalPrinter.PrintText('Nonfiscal receipt line 6', 5));
Check(FiscalPrinter.EndNonFiscal);
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 478;
GenericServiceVersion = deviceVersion113 + 479;
implementation
......
......@@ -30,7 +30,6 @@ function AnsiStringToWideString(CodePage: Integer; const S: string): WideString;
function BoolToStr(Value: Boolean): string;
function BoolToStr2(Value: Boolean): string;
function StrToBool(const Value: string): Boolean;
function TrimText(const Text: string; MaxWidth: Integer): string;
function AmountToStr(Value: Currency): string;
function AddTrailingSpaces(const S: string; Len: Integer): string;
function StrToDouble(const S: string): Double;
......@@ -309,23 +308,6 @@ begin
end;
end;
function TrimText(const Text: string; MaxWidth: Integer): string;
var
S: string;
begin
S := Text;
if (Length(S) > MaxWidth) then
begin
while Pos(' ', S) <> 0 do
begin
S := StringReplace(S, ' ', ' ', []);
if Length(S) <= MaxWidth then Break;
end;
S := Copy(S, 1, MaxWidth);
end;
Result := S;
end;
function AmountToStr(Value: Currency): string;
var
FormatSettings: TFormatSettings;
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,478
PRODUCTVERSION 1,13,0,478
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer service\0"
VALUE "FileVersion", "1.13.0.478\0"
VALUE "FileVersion", "1.13.0.479\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -967,7 +967,7 @@ end;
function TFiscalPrinterDevice.GetLine(const Text: string;
MinLength, MaxLength: Integer): string;
begin
Result := TrimText(Text, MaxLength);
Result := Copy(Text, 1, MaxLength);
Result := Result + StringOfChar(#0, MinLength - Length(Result));
end;
......@@ -1925,7 +1925,7 @@ begin
Text := Line;
if Text = '' then Text := ' ';
Text := TrimText(Text, GetPrintWidth);
Text := Copy(Text, 1, GetPrintWidth);
Flags := GetPrintFlags(Flags);
Execute(#$17 + IntToBin(GetUsrPassword, 4) + Chr(Flags) +
......@@ -4994,7 +4994,7 @@ var
L1: Integer;
L2: Integer;
begin
Result := TrimText(Line, PrintWidth);
Result := Copy(Line, 1, PrintWidth);
L := Length(Result);
case Alignment of
taCenter:
......@@ -8745,4 +8745,5 @@ begin
end;
end.
......@@ -12,7 +12,7 @@ unit FptrServerLib_TLB;
// ************************************************************************ //
// PASTLWTR : 1.2
// File generated on 12.02.2018 16:04:53 from Type Library described below.
// File generated on 12.03.2018 17:40:31 from Type Library described below.
// ************************************************************************ //
// Type Lib: C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.tlb (1)
......
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=12
Release=0
Build=391
Build=392
Debug=0
PreRelease=0
Special=0
......@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=Fiscal printer print server
FileVersion=1.12.0.391
FileVersion=1.12.0.392
InternalName=Fiscal printer driver
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
......@@ -138,12 +138,16 @@ Comments=http://www.shtrih-m.ru
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
[HistoryLists\hlSearchPath]
Count=1
Item0=$(DELPHI)\Lib\Debug
Count=2
Item0=C:\COMPON~1\JVCL\jcl\lib\d7\debug
Item1=$(DELPHI)\Lib\Debug
[HistoryLists\hlUnitOutputDirectory]
Count=2
Item0=DCU
Item1=..\lib\D7
[HistoryLists\hlOutputDirectorry]
Count=1
Item0=..\..\Bin
[HistoryLists\hlBPLOutput]
Count=3
Item0=$(DELPHI)\Bin\
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,478
PRODUCTVERSION 1,13,0,478
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer print server\0"
VALUE "FileVersion", "1.13.0.478\0"
VALUE "FileVersion", "1.13.0.479\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFptrSrv.exe\0"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,478