Attachment #190417 for bug #225747

Line 0 Link Here

(-)files/patch-addtorrent.pas (+11 lines)
	1	--- addtorrent.pas.orig 2018-02-08 05:35:22 UTC
	2	+++ addtorrent.pas
	3	@@ -156,7 +156,7 @@ const
	4
	5	implementation
	6
	7	-uses lclintf, lcltype, main, variants, Utils, rpc, lclproc;
	8	+uses lclintf, lcltype, main, variants, Utils, rpc, lclproc, LazUtf8;
	9
	10	const
	11	roChecked = $030000;




--- baseform.lfm.orig	2018-02-08 05:16:25 UTC
+++ baseform.lfm
@@ -1,7 +1,7 @@
-object BaseForm: TBaseForm
-  Left = 234
-  Height = 240
-  Top = 132
-  Width = 320
-  LCLVersion = '1.0.15.0'
-end
+object BaseForm: TBaseForm
+  Left = 234
+  Height = 240
+  Top = 132
+  Width = 320
+  LCLVersion = '1.4.5.0'
+end




--- baseform.pas.orig	2018-02-08 06:43:04 UTC
+++ baseform.pas
@@ -52,11 +52,11 @@ implementation
 uses LCLType, ButtonPanel, VarGrid, ComCtrls, StdCtrls, ExtCtrls, lclversion;
 
 var
-  ScaleM, ScaleD: integer;
+  ScaleMul, ScaleDiv: integer;
 
 function ScaleInt(i: integer): integer;
 begin
-  Result:=i*ScaleM div ScaleD;
+  Result:=i*ScaleMul div ScaleDiv;
 end;
 
 type THackControl = class(TWinControl) end;
@@ -117,8 +117,8 @@ begin
     if C is TWinControl then
       TWinControl(C).DisableAlign;
     try
-      if ScaleM <> ScaleD then begin
-        ScaleConstraints(ScaleM, ScaleD);
+      if ScaleMul <> ScaleDiv then begin
+        ScaleConstraints(ScaleMul, ScaleDiv);
         R := BaseBounds;
         R.Left := ScaleInt(R.Left);
         R.Top := ScaleInt(R.Top);
@@ -237,26 +237,26 @@ var
   i: integer;
   tm: TLCLTextMetric;
 begin
-  if ScaleD <> 0 then exit;
-  ScaleD:=11;
+  if ScaleDiv <> 0 then exit;
+  ScaleDiv:=11;
   i:=Screen.SystemFont.Height;
   if i = 0 then begin
     if Canvas.GetTextMetrics(tm) then begin
-      ScaleM:=tm.Ascender;
-      if ScaleM < 11 then
-        ScaleM:=11;
+      ScaleMul:=tm.Ascender;
+      if ScaleMul < 11 then
+        ScaleMul:=11;
     end
     else begin
-      ScaleM:=Canvas.TextHeight('Wy');
-      ScaleD:=13;
+      ScaleMul:=Canvas.TextHeight('Wy');
+      ScaleDiv:=13;
     end;
-    if ScaleM = 0 then
-      ScaleM:=ScaleD;
+    if ScaleMul = 0 then
+      ScaleMul:=ScaleDiv;
   end
   else
-    ScaleM:=Abs(i);
-  ScaleM:=ScaleM*IntfScale;
-  ScaleD:=ScaleD*100;
+    ScaleMul:=Abs(i);
+  ScaleMul:=ScaleMul*IntfScale;
+  ScaleDiv:=ScaleDiv*100;
 end;
 
 initialization




--- connoptions.lfm.orig	2018-02-08 06:59:29 UTC
+++ connoptions.lfm
@@ -33,33 +33,33 @@ inherited ConnOptionsForm: TConnOptionsF
       ClientWidth = 505
       object txPassword: TLabel
         Left = 24
-        Height = 14
+        Height = 13
         Top = 157
-        Width = 51
+        Width = 50
         Caption = 'Password:'
         ParentColor = False
       end
       object txUserName: TLabel
         Left = 24
-        Height = 14
+        Height = 13
         Top = 128
-        Width = 56
+        Width = 55
         Caption = 'User name:'
         ParentColor = False
       end
       object txPort: TLabel
         Left = 8
-        Height = 14
+        Height = 13
         Top = 76
-        Width = 25
+        Width = 24
         Caption = 'Port:'
         ParentColor = False
       end
       object txHost: TLabel
         Left = 8
-        Height = 14
+        Height = 13
         Top = 48
-        Width = 66
+        Width = 65
         Caption = 'Remote host:'
         ParentColor = False
       end
@@ -137,9 +137,9 @@ inherited ConnOptionsForm: TConnOptionsF
       end
       object txRpcPath: TLabel
         Left = 8
-        Height = 14
+        Height = 13
         Top = 212
-        Width = 50
+        Width = 49
         Caption = 'RPC path:'
         ParentColor = False
       end
@@ -374,9 +374,9 @@ inherited ConnOptionsForm: TConnOptionsF
     TabOrder = 0
     object txConName: TLabel
       Left = 0
-      Height = 14
+      Height = 13
       Top = 4
-      Width = 88
+      Width = 87
       Caption = 'Connection name:'
       ParentColor = False
     end

Line 0 Link Here

(-)files/patch-daemonoptions.pas (+11 lines)
	1	--- daemonoptions.pas.orig 2018-02-08 05:37:10 UTC
	2	+++ daemonoptions.pas
	3	@@ -124,7 +124,7 @@ type
	4
	5	implementation
	6
	7	-uses main, utils, fpjson;
	8	+uses main, utils, fpjson, LazUtf8;
	9
	10	{ TDaemonOptionsForm }
	11

Line 0 Link Here

(-)files/patch-main.pas (+11 lines)
	1	--- main.pas.orig 2018-02-08 05:39:04 UTC
	2	+++ main.pas
	3	@@ -786,7 +786,7 @@ uses
	4	{$endif darwin}
	5	synacode, ConnOptions, clipbrd, DateUtils, TorrProps, DaemonOptions, About,
	6	ToolWin, download, ColSetup, types, AddLink, MoveTorrent, ssl_openssl_lib, AddTracker, lcltype,
	7	- Options, ButtonPanel, BEncode, synautil;
	8	+ Options, ButtonPanel, BEncode, synautil, LazFileUtils, LazUtf8;
	9
	10	const
	11	TR_STATUS_CHECK_WAIT_1 = ( 1 shl 0 ); // Waiting in queue to check files




--- options.lfm.orig	2018-02-08 07:03:23 UTC
+++ options.lfm
@@ -74,7 +74,7 @@ inherited OptionsForm: TOptionsForm
         TabOrder = 0
         object txSeconds: TLabel
           Left = 438
-          Height = 14
+          Height = 13
           Top = 6
           Width = 40
           Anchors = [akTop, akRight]
@@ -83,25 +83,25 @@ inherited OptionsForm: TOptionsForm
         end
         object txRefreshInterval: TLabel
           Left = 10
-          Height = 14
+          Height = 13
           Top = 5
-          Width = 105
+          Width = 104
           Caption = 'Data refresh interval:'
           ParentColor = False
         end
         object txRefreshIntervalMin: TLabel
           Left = 10
-          Height = 14
+          Height = 13
           Top = 33
-          Width = 182
+          Width = 181
           Caption = 'Data refresh interval when minimized:'
           ParentColor = False
         end
         object txSeconds2: TLabel
           Left = 438
-          Height = 14
+          Height = 13
           Top = 34
-          Width = 40
+          Width = 39
           Anchors = [akTop, akRight]
           Caption = 'seconds'
           ParentColor = False




--- restranslator.pas.orig	2018-02-08 05:44:33 UTC
+++ restranslator.pas
@@ -12,7 +12,7 @@ unit ResTranslator;
 interface
 
 uses
-  Classes, StrUtils, SysUtils, FileUtil, LResources, TypInfo, LCLProc;
+  Classes, StrUtils, SysUtils, FileUtil, LazFileUtils, LResources, TypInfo, LCLProc;
 
 type
 
@@ -106,7 +106,7 @@ const
 implementation
 
 uses
-  Forms, utils;
+  Forms, utils, LazUtf8;
 
 const
   LineSeparator = '###################';
@@ -240,7 +240,7 @@ procedure MakeTranslationFile(Language: 
 var
   lLang, sLang, s: string;
 begin
-  LCLGetLanguageIDs(lLang, sLang);
+  LazGetLanguageIDs(lLang, sLang);
   sLang:=AnsiLowerCase(sLang);
   s:=ExtractFileNameOnly(ParamStrUtf8(0));
   if (sLang <> '') and not FileExistsUTF8(DefaultLangDir + s + '.' + sLang) then
@@ -332,7 +332,7 @@ var
   lLang, sLang, s: string;
   i: integer;
 begin
-  LCLGetLanguageIDs(lLang, sLang);
+  LazGetLanguageIDs(lLang, sLang);
   lLang:=LowerCase(lLang);
   sLang:=LowerCase(sLang);
 {$ifdef windows}

Line 0 Link Here

(-)files/patch-transgui.lpi (+11 lines)
	1	--- transgui.lpi.orig 2018-02-08 05:42:55 UTC
	2	+++ transgui.lpi
	3	@@ -1,7 +1,7 @@
	4	<?xml version="1.0"?>
	5	<CONFIG>
	6	<ProjectOptions>
	7	- <Version Value="9"/>
	8	+ <Version Value="10"/>
	9	<PathDelim Value="\"/>
	10	<General>
	11	<Flags>




--- utils.pas.orig	2018-02-08 05:29:54 UTC
+++ utils.pas
@@ -100,8 +100,7 @@ uses
 {$ifdef CALLSTACK}
   lineinfo2,
 {$endif CALLSTACK}
-  FileUtil, StdCtrls, Graphics;
-
+  LazFileUtils, LazUtf8, StdCtrls, Graphics, fileutil;
 {$ifdef windows}
 function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
 const
@@ -170,7 +169,7 @@ var
   s: widestring;
 begin
   if Win32Platform <> VER_PLATFORM_WIN32_NT then begin
-    Result:=FileUtil.ParamStrUTF8(Param);
+    Result:=LazUtf8.ParamStrUTF8(Param);
     exit;
   end;
 
@@ -235,7 +234,7 @@ end;
 
 function ParamStrUTF8(Param: Integer): utf8string;
 begin
-  Result:=FileUtil.ParamStrUTF8(Param);
+  Result:=LazUtf8.ParamStrUTF8(Param);
 end;
 
 function ParamCount: integer;

Line 0 Link Here

(-)files/patch-vargrid.pas (+11 lines)
	1	--- vargrid.pas.orig 2018-02-08 06:40:58 UTC
	2	+++ vargrid.pas
	3	@@ -237,7 +237,7 @@ procedure Register;
	4
	5	implementation
	6
	7	-uses Variants, Math, GraphType, lclintf, Themes, types, lclproc
	8	+uses Variants, Math, GraphType, lclintf, Themes, types, lclproc, LazUtf8
	9	{$ifdef LCLcarbon} , carbonproc {$endif LCLcarbon};
	10
	11	const

Return to bug 225747

Line 0 Link Here

(-)files/patch-baseform.lfm (+17 lines)
	1	--- baseform.lfm.orig 2018-02-08 05:16:25 UTC
	2	+++ baseform.lfm
	3	@@ -1,7 +1,7 @@
	4	-object BaseForm: TBaseForm
	5	- Left = 234
	6	- Height = 240
	7	- Top = 132
	8	- Width = 320
	9	- LCLVersion = '1.0.15.0'
	10	-end
	11	+object BaseForm: TBaseForm
	12	+ Left = 234
	13	+ Height = 240
	14	+ Top = 132
	15	+ Width = 320
	16	+ LCLVersion = '1.4.5.0'
	17	+end

Line 0 Link Here

(-)files/patch-baseform.pas (+66 lines)
		1	--- baseform.pas.orig 2018-02-08 06:43:04 UTC
		2	+++ baseform.pas
		3	@@ -52,11 +52,11 @@ implementation
		4	uses LCLType, ButtonPanel, VarGrid, ComCtrls, StdCtrls, ExtCtrls, lclversion;
		5
		6	var
		7	- ScaleM, ScaleD: integer;
		8	+ ScaleMul, ScaleDiv: integer;
		9
		10	function ScaleInt(i: integer): integer;
		11	begin
		12	- Result:=i*ScaleM div ScaleD;
		13	+ Result:=i*ScaleMul div ScaleDiv;
		14	end;
		15
		16	type THackControl = class(TWinControl) end;
		17	@@ -117,8 +117,8 @@ begin
		18	if C is TWinControl then
		19	TWinControl(C).DisableAlign;
		20	try
		21	- if ScaleM <> ScaleD then begin
		22	- ScaleConstraints(ScaleM, ScaleD);
		23	+ if ScaleMul <> ScaleDiv then begin
		24	+ ScaleConstraints(ScaleMul, ScaleDiv);
		25	R := BaseBounds;
		26	R.Left := ScaleInt(R.Left);
		27	R.Top := ScaleInt(R.Top);
		28	@@ -237,26 +237,26 @@ var
		29	i: integer;
		30	tm: TLCLTextMetric;
		31	begin
		32	- if ScaleD <> 0 then exit;
		33	- ScaleD:=11;
		34	+ if ScaleDiv <> 0 then exit;
		35	+ ScaleDiv:=11;
		36	i:=Screen.SystemFont.Height;
		37	if i = 0 then begin
		38	if Canvas.GetTextMetrics(tm) then begin
		39	- ScaleM:=tm.Ascender;
		40	- if ScaleM < 11 then
		41	- ScaleM:=11;
		42	+ ScaleMul:=tm.Ascender;
		43	+ if ScaleMul < 11 then
		44	+ ScaleMul:=11;
		45	end
		46	else begin
		47	- ScaleM:=Canvas.TextHeight('Wy');
		48	- ScaleD:=13;
		49	+ ScaleMul:=Canvas.TextHeight('Wy');
		50	+ ScaleDiv:=13;
		51	end;
		52	- if ScaleM = 0 then
		53	- ScaleM:=ScaleD;
		54	+ if ScaleMul = 0 then
		55	+ ScaleMul:=ScaleDiv;
		56	end
		57	else
		58	- ScaleM:=Abs(i);
		59	- ScaleM:=ScaleM*IntfScale;
		60	- ScaleD:=ScaleD*100;
		61	+ ScaleMul:=Abs(i);
		62	+ ScaleMul:=ScaleMul*IntfScale;
		63	+ ScaleDiv:=ScaleDiv*100;
		64	end;
65
66	initialization

Line 0 Link Here

(-)files/patch-connoptions.lfm (+68 lines)
		1	--- connoptions.lfm.orig 2018-02-08 06:59:29 UTC
		2	+++ connoptions.lfm
		3	@@ -33,33 +33,33 @@ inherited ConnOptionsForm: TConnOptionsF
		4	ClientWidth = 505
		5	object txPassword: TLabel
		6	Left = 24
		7	- Height = 14
		8	+ Height = 13
		9	Top = 157
		10	- Width = 51
		11	+ Width = 50
		12	Caption = 'Password:'
		13	ParentColor = False
		14	end
		15	object txUserName: TLabel
		16	Left = 24
		17	- Height = 14
		18	+ Height = 13
		19	Top = 128
		20	- Width = 56
		21	+ Width = 55
		22	Caption = 'User name:'
		23	ParentColor = False
		24	end
		25	object txPort: TLabel
		26	Left = 8
		27	- Height = 14
		28	+ Height = 13
		29	Top = 76
		30	- Width = 25
		31	+ Width = 24
		32	Caption = 'Port:'
		33	ParentColor = False
		34	end
		35	object txHost: TLabel
		36	Left = 8
		37	- Height = 14
		38	+ Height = 13
		39	Top = 48
		40	- Width = 66
		41	+ Width = 65
		42	Caption = 'Remote host:'
		43	ParentColor = False
		44	end
		45	@@ -137,9 +137,9 @@ inherited ConnOptionsForm: TConnOptionsF
		46	end
		47	object txRpcPath: TLabel
		48	Left = 8
		49	- Height = 14
		50	+ Height = 13
		51	Top = 212
		52	- Width = 50
		53	+ Width = 49
		54	Caption = 'RPC path:'
		55	ParentColor = False
		56	end
		57	@@ -374,9 +374,9 @@ inherited ConnOptionsForm: TConnOptionsF
		58	TabOrder = 0
		59	object txConName: TLabel
		60	Left = 0
		61	- Height = 14
		62	+ Height = 13
		63	Top = 4
		64	- Width = 88
65	+ Width = 87
66	Caption = 'Connection name:'
67	ParentColor = False
68	end

Line 0 Link Here

(-)files/patch-options.lfm (+43 lines)
	1	--- options.lfm.orig 2018-02-08 07:03:23 UTC
	2	+++ options.lfm
	3	@@ -74,7 +74,7 @@ inherited OptionsForm: TOptionsForm
	4	TabOrder = 0
	5	object txSeconds: TLabel
	6	Left = 438
	7	- Height = 14
	8	+ Height = 13
	9	Top = 6
	10	Width = 40
	11	Anchors = [akTop, akRight]
	12	@@ -83,25 +83,25 @@ inherited OptionsForm: TOptionsForm
	13	end
	14	object txRefreshInterval: TLabel
	15	Left = 10
	16	- Height = 14
	17	+ Height = 13
	18	Top = 5
	19	- Width = 105
	20	+ Width = 104
	21	Caption = 'Data refresh interval:'
	22	ParentColor = False
	23	end
	24	object txRefreshIntervalMin: TLabel
	25	Left = 10
	26	- Height = 14
	27	+ Height = 13
	28	Top = 33
	29	- Width = 182
	30	+ Width = 181
	31	Caption = 'Data refresh interval when minimized:'
	32	ParentColor = False
	33	end
	34	object txSeconds2: TLabel
	35	Left = 438
	36	- Height = 14
	37	+ Height = 13
	38	Top = 34
	39	- Width = 40
	40	+ Width = 39
	41	Anchors = [akTop, akRight]
	42	Caption = 'seconds'
	43	ParentColor = False

Line 0 Link Here

(-)files/patch-restranslator.pas (+38 lines)
	1	--- restranslator.pas.orig 2018-02-08 05:44:33 UTC
	2	+++ restranslator.pas
	3	@@ -12,7 +12,7 @@ unit ResTranslator;
	4	interface
	5
	6	uses
	7	- Classes, StrUtils, SysUtils, FileUtil, LResources, TypInfo, LCLProc;
	8	+ Classes, StrUtils, SysUtils, FileUtil, LazFileUtils, LResources, TypInfo, LCLProc;
	9
	10	type
	11
	12	@@ -106,7 +106,7 @@ const
	13	implementation
	14
	15	uses
	16	- Forms, utils;
	17	+ Forms, utils, LazUtf8;
	18
	19	const
	20	LineSeparator = '###################';
	21	@@ -240,7 +240,7 @@ procedure MakeTranslationFile(Language:
	22	var
	23	lLang, sLang, s: string;
	24	begin
	25	- LCLGetLanguageIDs(lLang, sLang);
	26	+ LazGetLanguageIDs(lLang, sLang);
	27	sLang:=AnsiLowerCase(sLang);
	28	s:=ExtractFileNameOnly(ParamStrUtf8(0));
	29	if (sLang <> '') and not FileExistsUTF8(DefaultLangDir + s + '.' + sLang) then
	30	@@ -332,7 +332,7 @@ var
	31	lLang, sLang, s: string;
	32	i: integer;
	33	begin
	34	- LCLGetLanguageIDs(lLang, sLang);
	35	+ LazGetLanguageIDs(lLang, sLang);
	36	lLang:=LowerCase(lLang);
	37	sLang:=LowerCase(sLang);
	38	{$ifdef windows}

Line 0 Link Here

(-)files/patch-utils.pas (+30 lines)
	1	--- utils.pas.orig 2018-02-08 05:29:54 UTC
	2	+++ utils.pas
	3	@@ -100,8 +100,7 @@ uses
	4	{$ifdef CALLSTACK}
	5	lineinfo2,
	6	{$endif CALLSTACK}
	7	- FileUtil, StdCtrls, Graphics;
	8	-
	9	+ LazFileUtils, LazUtf8, StdCtrls, Graphics, fileutil;
	10	{$ifdef windows}
	11	function FileOpenUTF8(Const FileName : string; Mode : Integer) : THandle;
	12	const
	13	@@ -170,7 +169,7 @@ var
	14	s: widestring;
	15	begin
	16	if Win32Platform <> VER_PLATFORM_WIN32_NT then begin
	17	- Result:=FileUtil.ParamStrUTF8(Param);
	18	+ Result:=LazUtf8.ParamStrUTF8(Param);
	19	exit;
	20	end;
	21
	22	@@ -235,7 +234,7 @@ end;
	23
	24	function ParamStrUTF8(Param: Integer): utf8string;
	25	begin
	26	- Result:=FileUtil.ParamStrUTF8(Param);
	27	+ Result:=LazUtf8.ParamStrUTF8(Param);
	28	end;
	29
	30	function ParamCount: integer;