Обновление переводчика

Signed-off-by: Vlad55 <[email protected]>
pulledup · Jun 10, 2011 · 576738e · 576738e
1 parent 5784329
commit 576738e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/demos/translate_demo/main.dfm b/demos/translate_demo/main.dfm
@@ -103,9 +103,7 @@ object Form6: TForm6
   object Translator1: TTranslator
     SourceLang = unknown
     DestLang = lng_ru
-    OnTranslate = Translator1Translate
-    OnTranslateError = Translator1TranslateError
-    Left = 236
-    Top = 176
+    Left = 328
+    Top = 136
   end
 end
diff --git a/demos/translate_demo/main.pas b/demos/translate_demo/main.pas
@@ -14,12 +14,13 @@   TForm6 = class(TForm)
     Memo1: TMemo;
     Button1: TButton;
     ComboBox1: TComboBox;
-    Translator1: TTranslator;
+    //Translator1: TTranslator;
     Label3: TLabel;
     Label4: TLabel;
     ComboBox2: TComboBox;
     Label5: TLabel;
     Edit2: TEdit;
+    Translator1: TTranslator;
     procedure Button1Click(Sender: TObject);
     procedure Translator1Translate(const SourceStr, TranslateStr: string;
       LangDetected: TLanguageEnum);

diff --git a/demos/translate_demo/translate_demo.dproj b/demos/translate_demo/translate_demo.dproj
@@ -4,7 +4,7 @@
 			<MainSource>translate_demo.dpr</MainSource>
 			<Config Condition="'$(Config)'==''">Debug</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-			<ProjectVersion>12.2</ProjectVersion>
+			<ProjectVersion>12.3</ProjectVersion>
 			<Base>True</Base>
 			<Platform>Win32</Platform>
 			<AppType>Application</AppType>
@@ -60,7 +60,7 @@
 			</BuildConfiguration>
 		</ItemGroup>
 		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
+		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
 		<ProjectExtensions>
 			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
 			<Borland.ProjectType>VCLApplication</Borland.ProjectType>

diff --git a/packages/translator_pack/Translator_pack.dpk b/packages/translator_pack/Translator_pack.dpk
@@ -25,7 +25,8 @@ package Translator_pack;
 {$IMPLICITBUILD ON}
 
 requires
-  rtl;
+  rtl,
+  vcl;
 
 contains
   GTranslate in '..\..\source\GTranslate.pas',

diff --git a/packages/translator_pack/Translator_pack.dproj b/packages/translator_pack/Translator_pack.dproj
@@ -2,13 +2,13 @@
 		<PropertyGroup>
 			<ProjectGuid>{A8A6F560-7E36-46FD-9177-49EC16EFFD9B}</ProjectGuid>
 			<MainSource>Translator_pack.dpk</MainSource>
-			<ProjectVersion>12.2</ProjectVersion>
+			<ProjectVersion>12.3</ProjectVersion>
 			<Config Condition="'$(Config)'==''">Debug</Config>
 			<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
 			<Base>True</Base>
 			<Platform>Win32</Platform>
 			<AppType>Package</AppType>
-			<FrameworkType>None</FrameworkType>
+			<FrameworkType>VCL</FrameworkType>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
 			<Base>true</Base>
@@ -46,6 +46,7 @@
 				<MainSource>MainSource</MainSource>
 			</DelphiCompile>
 			<DCCReference Include="rtl.dcp"/>
+			<DCCReference Include="vcl.dcp"/>
 			<DCCReference Include="..\..\source\GTranslate.pas"/>
 			<DCCReference Include="..\..\addons\superobject\superobject.pas"/>
 			<BuildConfiguration Include="Debug">
@@ -61,7 +62,7 @@
 			</BuildConfiguration>
 		</ItemGroup>
 		<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\8.0\UserTools.proj"/>
+		<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
 		<ProjectExtensions>
 			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
 			<Borland.ProjectType>Package</Borland.ProjectType>