[Initranslator-svncheckins] SF.net SVN: initranslator: [196] translator/trunk
Brought to you by:
peter3
Menu
▾
▴
[Initranslator-svncheckins] SF.net SVN: initranslator: [196] translator/trunk
|
From: <pe...@us...> - 2006-12-14 20:13:24
|
Revision: 196
http://svn.sourceforge.net/initranslator/?rev=196&view=rev
Author: peter3
Date: 2006-12-14 12:13:23 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
- FastMM added to repository for easy access
- Memory leak removed
- Don't show dialogs when CommandProcessor is running
- No need to load and save variables in FB5: use persistent variables instead
Modified Paths:
--------------
translator/trunk/clean.bat
translator/trunk/setup/IniTransCommon.iss
translator/trunk/setup/translator.fbp5
translator/trunk/src/FastMM4Options.inc
translator/trunk/src/MainFrm.pas
translator/trunk/src/TRANSLATOR.INC
translator/trunk/src/TranslateFile.pas
Modified: translator/trunk/clean.bat
===================================================================
--- translator/trunk/clean.bat 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/clean.bat 2006-12-14 20:13:23 UTC (rev 196)
@@ -1 +1 @@
-del /s /q *.dcu *.~* *.drc *.cfg *.ddp *.dsk .#* *.rsm *.rsb *.used *.identcache *.dll *.map *.exe
\ No newline at end of file
+del /s /q *.dcu *.~* *.drc *.cfg *.ddp *.dsk .#* *.rsm *.rsb *.used *.identcache *.dll *.map *.exe mainicon.ico *.rc *.local
\ No newline at end of file
Modified: translator/trunk/setup/IniTransCommon.iss
===================================================================
--- translator/trunk/setup/IniTransCommon.iss 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/setup/IniTransCommon.iss 2006-12-14 20:13:23 UTC (rev 196)
@@ -1,6 +1,6 @@
#define AppName "Ini Translator"
-#define AppVersion "1.9.0.42"
-#define AppShortVersion "19042"
+#define AppVersion "1.9.0.44"
+#define AppShortVersion "19044"
#define GroupName "Ini Translator"
#define URL "http://initranslator.sourceforge.net"
#define AppPublisher "Peter Th\xF6rnqvist"
Modified: translator/trunk/setup/translator.fbp5
===================================================================
--- translator/trunk/setup/translator.fbp5 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/setup/translator.fbp5 2006-12-14 20:13:23 UTC (rev 196)
@@ -56,51 +56,6 @@
<Property name="RetryPauseInterval" type="Cardinal">1000</Property>
<Property name="SuppressStatusMessages" type="Boolean">False</Property>
</Object>
- <Object Class="TFBVariablesLoadAction" XMLID="{CB3841EF-CCB4-4772-8F70-EC518AADE710}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
- <Property name="ActionTextColor" type="Cardinal">0</Property>
- <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
- <Property name="CreateVarInINIifNotExists" type="Boolean">True</Property>
- <Property name="Enabled" type="WordBool">True</Property>
- <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
- <Property name="FailIfVariableNotDefined" type="Boolean">False</Property>
- <Property name="FailIfVariableNotInIniFile" type="Boolean">False</Property>
- <Property name="IgnoreFailure" type="WordBool">False</Property>
- <Property name="IgnoreFileNotFound" type="Boolean">True</Property>
- <Property MultiValue="0" name="INIFile" type="string">%FBPROJECTDIR%\FBVariables.ini</Property>
- <Property name="IsAction" type="Boolean">True</Property>
- <Property name="IsBreakPoint" type="WordBool">False</Property>
- <Property MultiValue="0" name="LogToVariable" type="string"></Property>
- <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
- <Property name="NodeCollapsed" type="Boolean">False</Property>
- <Property name="PauseInterval" type="Cardinal">0</Property>
- <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
- <Property MultiValue="0" name="SectionName" type="string">FBVariables</Property>
- <Property name="SuppressStatusMessages" type="Boolean">False</Property>
- <Property name="Variables" type="TStrings"><![CDATA[ADDONS
-CREATETAG
-DELETE_FOLDER
-FTP_UPLOAD
-NEWS_NOTIFY
-ROOTPATH
-VERSION_BUILD
-VERSION_MAJOR
-VERSION_MINOR
-VERSION_RELEASE
-]]>
- </Property>
- <Property name="VariableTypes" type="TStrings"><![CDATA[String
-String
-String
-String
-String
-String
-String
-String
-String
-String
-]]>
- </Property>
- </Object>
<Object Class="TFBDialogBuilderAction" XMLID="{A317A7BB-C95A-4031-AF6C-8922CC87A759}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
<Property name="ActionTextColor" type="Cardinal">0</Property>
<Property MultiValue="0" name="ActionTypeID" type="string"></Property>
@@ -860,7 +815,7 @@
<Property name="ExpandActionLogTitle" type="Boolean">True</Property>
<Property MultiValue="0" name="ExtraCommandline" type="WideString"></Property>
<Property name="HintsAsError" type="Boolean">False</Property>
- <Property MultiValue="0" name="IconFile" type="WideString">%SRCPATH%FoxitPlugin\mainicon.ico</Property>
+ <Property MultiValue="0" name="IconFile" type="WideString"></Property>
<Property name="IgnoreFailure" type="WordBool">False</Property>
<Property name="IncludeCompileDate" type="WordBool">True</Property>
<Property name="IncludeVerInfo" type="WordBool">True</Property>
@@ -3020,6 +2975,141 @@
<Property name="VarStringChecks" type="WordBool">True</Property>
</Object>
</Object>
+ <Object Class="TDelphiCompilerAction" XMLID="{4C59E329-4B9C-4938-BEED-D4617F06B4CC}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
+ <Property name="ActionTextColor" type="Cardinal">0</Property>
+ <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
+ <Property name="AllowImplicitImport" type="Boolean">True</Property>
+ <Property name="AlwaysUseConditionalsFromDOF" type="WordBool">False</Property>
+ <Property name="AutoIncBuild" type="WordBool">False</Property>
+ <Property name="AutoUpdateFileVersion" type="Boolean">True</Property>
+ <Property name="BuildAll" type="WordBool">True</Property>
+ <Property name="BuildVersion" type="Integer">44</Property>
+ <Property name="CodePage" type="Integer">1252</Property>
+ <Property name="CompilerVersion" type="Integer">4</Property>
+ <Property name="DebugVersionNumbers" type="Boolean">False</Property>
+ <Property MultiValue="0" name="Description" type="string">ToolTrim DLL</Property>
+ <Property name="Enabled" type="WordBool">True</Property>
+ <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
+ <Property MultiValue="0" name="ExtraCommandline" type="WideString"></Property>
+ <Property name="HintsAsError" type="Boolean">False</Property>
+ <Property MultiValue="0" name="IconFile" type="WideString"></Property>
+ <Property name="IgnoreFailure" type="WordBool">False</Property>
+ <Property name="IncludeCompileDate" type="WordBool">True</Property>
+ <Property name="IncludeVerInfo" type="WordBool">True</Property>
+ <Property name="IsAction" type="Boolean">True</Property>
+ <Property name="IsBreakPoint" type="WordBool">False</Property>
+ <Property name="IsDebug" type="WordBool">False</Property>
+ <Property name="IsDLL" type="WordBool">True</Property>
+ <Property name="IsPreRelease" type="WordBool">False</Property>
+ <Property name="IsPrivate" type="WordBool">False</Property>
+ <Property name="IsSpecial" type="WordBool">False</Property>
+ <Property name="KeepCFG" type="Boolean">False</Property>
+ <Property name="LinkProductVersionToFileVersion" type="Boolean">False</Property>
+ <Property name="Locale" type="Integer">1033</Property>
+ <Property MultiValue="0" name="LogToVariable" type="string"></Property>
+ <Property name="MajorVersion" type="Integer">1</Property>
+ <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
+ <Property name="MinorVersion" type="Integer">9</Property>
+ <Property name="NodeCollapsed" type="Boolean">False</Property>
+ <Property name="PauseInterval" type="Cardinal">0</Property>
+ <Property MultiValue="0" name="ProjectFile" type="WideString">%SRCPATH%ToolTrim\ToolTrim.dpr</Property>
+ <Property name="RegenerateResource" type="WordBool">True</Property>
+ <Property name="ReleaseVersion" type="Integer">0</Property>
+ <Property MultiValue="0" name="ResourceCompilerOptions" type="string"></Property>
+ <Property MultiValue="0" name="ResourceCompilerPath" type="string"></Property>
+ <Property name="ResourceCompilerType" type="TFBDelphiResourceCompiler">rcBorland</Property>
+ <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
+ <Property MultiValue="0" name="StartingDir" type="WideString">%SRCPATH%ToolTrim\</Property>
+ <Property name="SuppressStatusMessages" type="Boolean">False</Property>
+ <Property name="UpdateDofFile" type="Boolean">False</Property>
+ <Property name="UpdatePackageSource" type="Boolean">False</Property>
+ <Property name="UseEurekaLogCompiler" type="Boolean">False</Property>
+ <Property name="UseProjectSettings" type="TFBUseProjectSettings">[]</Property>
+ <Property name="UsePropertySet" type="Boolean">False</Property>
+ <Property name="UseVersionFromDOF" type="Boolean">False</Property>
+ <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=IniTranslator
+FileDescription=Tool Trim Plugin for IniTranslator
+FileVersion=1.9.0.44
+InternalName=ToolTrim.dll
+LegalCopyright=Copyright (c) 2006 by Peter Thörnqvist; all rights reserved
+LegalTrademarks=
+OriginalFilename=ToolTrim.dll
+ProductName=Tool Trim Plugin for IniTranslator
+ProductVersion=1.9.0.44
+Comments=Latest version available at http://initranslator.sourceforge.net
+]]>
+ </Property>
+ <Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
+ <Property name="WarningsAsError" type="Boolean">False</Property>
+ <Property name="WorkAroundD5Bug" type="WordBool">False</Property>
+ <Object Class="TBuildScript" XMLID="{64A4880E-C242-49CA-89CA-F822F1856C79}"><Property MultiValue="0" name="BreakPointsStore" type="string"></Property>
+ <Property MultiValue="0" name="Name" type="string">BeforeAction</Property>
+ <Property MultiValue="1" name="Script" type="string"><![CDATA[Action.MajorVersion = VERSION_MAJOR;
+Action.MinorVersion = VERSION_MINOR;
+Action.ReleaseVersion = VERSION_RELEASE;
+Action.BuildVersion = VERSION_BUILD;
+Action.SetVersionInfoKey("ProductVersion",Action.GetVersionInfoKey("FileVersion"))
+]]>
+ </Property>
+ <Property MultiValue="0" name="ScriptLanguage" type="string">JavaScript</Property>
+ </Object>
+ <Object Class="TDelphiCompilerOptions" XMLID="{DE8991DD-B188-4349-BFCF-FDE0A6C340EA}"><Property name="AlwaysUseConditionalsFromDOF" type="WordBool">False</Property>
+ <Property name="AlwaysUseDelphiLibraryPath" type="WordBool">True</Property>
+ <Property name="AlwaysUseDOFSearchPath" type="WordBool">False</Property>
+ <Property name="Assertions" type="WordBool">True</Property>
+ <Property name="AssignableConst" type="WordBool">False</Property>
+ <Property name="BoolEval" type="WordBool">False</Property>
+ <Property MultiValue="0" name="BPLOutputDir" type="WideString"></Property>
+ <Property name="CompilerWarnings" type="TStrings"><![CDATA[-w-UNSAFE_TYPE=0
+-w-UNSAFE_CODE=0
+-w-UNSAFE_CAST=0
+]]>
+ </Property>
+ <Property MultiValue="0" name="Conditionals" type="WideString"></Property>
+ <Property name="ConsoleApp" type="WordBool">False</Property>
+ <Property MultiValue="0" name="DCPOutputDir" type="WideString"></Property>
+ <Property name="DebugInfo" type="WordBool">True</Property>
+ <Property MultiValue="0" name="DefaultNamespace" type="string"></Property>
+ <Property name="DefinitionsOnly" type="WordBool">True</Property>
+ <Property MultiValue="0" name="ExeDescription" type="WideString"></Property>
+ <Property name="ExportAllSymbols" type="WordBool">False</Property>
+ <Property name="ExtendedSyntax" type="WordBool">True</Property>
+ <Property name="GenerateDocumentation" type="Boolean">False</Property>
+ <Property name="GenerateHPP" type="WordBool">False</Property>
+ <Property name="HugeStrings" type="WordBool">True</Property>
+ <Property name="ImageBase" type="Cardinal">4194304</Property>
+ <Property name="IncludeNamespaces" type="WordBool">False</Property>
+ <Property name="IncludeRemoteSymbols" type="WordBool">False</Property>
+ <Property name="IncludeTD32" type="WordBool">False</Property>
+ <Property name="IOChecking" type="WordBool">True</Property>
+ <Property MultiValue="0" name="LibraryPath" type="WideString">$(DELPHI)\Lib;$(DELPHI)\Bin;$(DELPHI)\Imports;$(DELPHI)\Projects\Bpl;$(DELPHI)\Rave5\Lib;F:\Program\Borland\Add\JEDI\JCL\source;F:\Program\Borland\Add\JEDI\dev\JVCL3\common;F:\Program\Borland\Add\JEDI\dev\JVCL3\run;F:\Program\Borland\Add\dunit\src;F:\Program\Borland\Add\Others;F:\Program\Borland\Add\Utils;f:\program\borland\projects\work\eq plan\eq plan 2.0\eqplan</Property>
+ <Property name="LinkerOutput" type="Integer">3</Property>
+ <Property name="LocalSymbols" type="WordBool">True</Property>
+ <Property name="Mapfile" type="Integer">3</Property>
+ <Property name="MaxStackSize" type="Cardinal">1048576</Property>
+ <Property name="MinStackSize" type="Cardinal">16384</Property>
+ <Property MultiValue="0" name="NamespacePrefixes" type="string"></Property>
+ <Property name="OpenStrings" type="WordBool">True</Property>
+ <Property name="Optimisation" type="WordBool">True</Property>
+ <Property MultiValue="0" name="OutputDir" type="WideString">..\..\bin\plugins</Property>
+ <Property name="OverflowChecking" type="WordBool">False</Property>
+ <Property MultiValue="0" name="Packages" type="WideString"></Property>
+ <Property name="RangeChecking" type="WordBool">False</Property>
+ <Property name="RecordFieldAlign" type="TFieldAlign">fa8</Property>
+ <Property name="ReferenceInfo" type="WordBool">True</Property>
+ <Property name="SafeDivide" type="WordBool">False</Property>
+ <Property MultiValue="0" name="SearchPath" type="WideString"></Property>
+ <Property name="ShowHints" type="WordBool">True</Property>
+ <Property name="ShowWarnings" type="WordBool">True</Property>
+ <Property name="StackFrames" type="WordBool">False</Property>
+ <Property name="TypedPointers" type="WordBool">False</Property>
+ <Property MultiValue="0" name="UnitAliases" type="WideString">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Property>
+ <Property MultiValue="0" name="UnitOutputDir" type="WideString">..\..\dcu</Property>
+ <Property name="UseDebugDCU" type="WordBool">False</Property>
+ <Property name="UsePackages" type="WordBool">False</Property>
+ <Property name="VarStringChecks" type="WordBool">True</Property>
+ </Object>
+ </Object>
</Object>
</Object>
<Object Class="TGroupAction" XMLID="{CF0D85C6-C44F-4EE3-B47D-70B885A082BC}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
@@ -3638,36 +3728,6 @@
<Property MultiValue="0" name="ScriptLanguage" type="string">VBScript</Property>
</Object>
</Object>
- <Object Class="TFBVariablesSaveAction" XMLID="{FEA30826-A093-44B8-B43A-2D228C5DC717}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
- <Property name="ActionTextColor" type="Cardinal">0</Property>
- <Property MultiValue="0" name="ActionTypeID" type="string"></Property>
- <Property name="Enabled" type="WordBool">True</Property>
- <Property name="EraseSection" type="Boolean">True</Property>
- <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
- <Property name="IgnoreFailure" type="WordBool">False</Property>
- <Property MultiValue="0" name="INIFile" type="string">%FBPROJECTDIR%\FBVariables.ini</Property>
- <Property name="IsAction" type="Boolean">True</Property>
- <Property name="IsBreakPoint" type="WordBool">False</Property>
- <Property MultiValue="0" name="LogToVariable" type="string"></Property>
- <Property name="MaxRetryAttempts" type="Cardinal">0</Property>
- <Property name="NodeCollapsed" type="Boolean">False</Property>
- <Property name="PauseInterval" type="Cardinal">0</Property>
- <Property name="RetryPauseInterval" type="Cardinal">1000</Property>
- <Property MultiValue="0" name="SectionName" type="string">FBVariables</Property>
- <Property name="SuppressStatusMessages" type="Boolean">False</Property>
- <Property name="Variables" type="TStrings"><![CDATA[ADDONS
-CREATETAG
-DELETE_FOLDER
-FTP_UPLOAD
-NEWS_NOTIFY
-ROOTPATH
-VERSION_BUILD
-VERSION_MAJOR
-VERSION_MINOR
-VERSION_RELEASE
-]]>
- </Property>
- </Object>
</Object>
<Object Class="TFBEndBlockAction" XMLID="{B497A3C2-CD75-4C25-9F57-3F663C9D73B0}"><Property MultiValue="0" name="ActionComment" type="string"></Property>
<Property name="ActionTextColor" type="Cardinal">0</Property>
@@ -3713,7 +3773,7 @@
<Object Class="TFBVariable" XMLID="{8BFA64C1-2C51-4F04-996F-75E8F6E92E74}"><Property MultiValue="0" name="Comment" type="string"></Property>
<Property MultiValue="0" name="DefaultValue" type="string">%ProgramFiles%\Borland\AddOns</Property>
<Property name="IsMacro" type="Boolean">False</Property>
- <Property name="IsPersistent" type="Boolean">False</Property>
+ <Property name="IsPersistent" type="Boolean">True</Property>
<Property name="MakeEnv" type="Boolean">False</Property>
<Property MultiValue="0" name="Name" type="string">ADDONS</Property>
<Property name="VariableType" type="TFBVariableType">vtProject</Property>
@@ -3729,7 +3789,7 @@
<Object Class="TFBVariable" XMLID="{CD0B31FC-1CB1-4269-97CB-A5FC3899DA2B}"><Property MultiValue="0" name="Comment" type="string"></Property>
<Property MultiValue="0" name="DefaultValue" type="string">%ProgramFiles%\Borland\projects\private\translator\trunk</Property>
<Property name="IsMacro" type="Boolean">False</Property>
- <Property name="IsPersistent" type="Boolean">False</Property>
+ <Property name="IsPersistent" type="Boolean">True</Property>
<Property name="MakeEnv" type="Boolean">False</Property>
<Property MultiValue="0" name="Name" type="string">ROOTPATH</Property>
<Property name="VariableType" type="TFBVariableType">vtProject</Property>
@@ -3737,7 +3797,7 @@
<Object Class="TFBVariable" XMLID="{6FCDC26C-20F7-4422-92C8-073D4E1FD478}"><Property MultiValue="0" name="Comment" type="string"></Property>
<Property MultiValue="0" name="DefaultValue" type="string">1</Property>
<Property name="IsMacro" type="Boolean">False</Property>
- <Property name="IsPersistent" type="Boolean">False</Property>
+ <Property name="IsPersistent" type="Boolean">True</Property>
<Property name="MakeEnv" type="Boolean">False</Property>
<Property MultiValue="0" name="Name" type="string">VERSION_MAJOR</Property>
<Property name="VariableType" type="TFBVariableType">vtProject</Property>
@@ -3745,7 +3805,7 @@
<Object Class="TFBVariable" XMLID="{76F5D217-30E7-48D1-9638-D316BA7E2D27}"><Property MultiValue="0" name="Comment" type="string"></Property>
<Property MultiValue="0" name="DefaultValue" type="string">9</Property>
<Property name="IsMacro" type="Boolean">False</Property>
- <Property name="IsPersistent" type="Boolean">False</Property>
+ <Property name="IsPersistent" type="Boolean">True</Property>
<Property name="MakeEnv" type="Boolean">False</Property>
<Property MultiValue="0" name="Name" type="string">VERSION_MINOR</Property>
<Property name="VariableType" type="TFBVariableType">vtProject</Property>
@@ -3753,7 +3813,7 @@
<Object Class="TFBVariable" XMLID="{608062A2-70E0-4230-814A-68433682D1F7}"><Property MultiValue="0" name="Comment" type="string"></Property>
<Property MultiValue="0" name="DefaultValue" type="string">0</Property>
<Property name="IsMacro" type="Boolean">False</Property>
- <Property name="IsPersistent" type="Boolean">False</Property>
+ <Property name="IsPersistent" type="Boolean">True</Property>
<Property name="MakeEnv" type="Boolean">False</Property>
<Property MultiValue="0" name="Name" type="string">VERSION_RELEASE</Property>
<Property name="VariableType" type="TFBVariableType">vtProject</Property>
@@ -3761,7 +3821,7 @@
<Object Class="TFBVariable" XMLID="{2C0ECC00-A68D-45F6-9BBA-67E2C178ACCA}"><Property MultiValue="0" name="Comment" type="string"></Property>
<Property MultiValue="0" name="DefaultValue" type="string">42</Property>
<Property name="IsMacro" type="Boolean">False</Property>
- <Property name="IsPersistent" type="Boolean">False</Property>
+ <Property name="IsPersistent" type="Boolean">True</Property>
<Property name="MakeEnv" type="Boolean">False</Property>
<Property MultiValue="0" name="Name" type="string">VERSION_BUILD</Property>
<Property name="VariableType" type="TFBVariableType">vtProject</Property>
Modified: translator/trunk/src/FastMM4Options.inc
===================================================================
--- translator/trunk/src/FastMM4Options.inc 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/src/FastMM4Options.inc 2006-12-14 20:13:23 UTC (rev 196)
@@ -13,7 +13,7 @@
smallest block sizes will be 8-byte aligned instead which may result in a
reduction in memory usage. Medium and large blocks are always 16-byte aligned
irrespective of this setting.}
-{.$define Align16Bytes}
+{$define Align16Bytes}
{Enable to use faster fixed-size move routines when upsizing small blocks.
These routines are much faster than the Borland RTL move procedure since they
@@ -97,7 +97,7 @@
Very important: If you enable this option your application will require the
FastMM_FullDebugMode.dll library. If this library is not available you will
get an error on startup.}
-{.$define FullDebugMode}
+{$define FullDebugMode}
{Set this option to perform "raw" stack traces, i.e. check all entries on the
stack for valid return addresses. Note that this is significantly slower
@@ -133,7 +133,7 @@
{Set this option to enable reporting of memory leaks. Combine it with the two
options below for further fine-tuning.}
-{.$define EnableMemoryLeakReporting}
+{$define EnableMemoryLeakReporting}
{Set this option to suppress the display and logging of expected memory leaks
that were registered by pointer. Leaks registered by size or class are often
@@ -150,7 +150,7 @@
{Set this option to require the program to be run inside the IDE debugger to
report memory leaks. This option has no effect if the option
"EnableMemoryLeakReporting" is not also set.}
- {$define RequireDebuggerPresenceForLeakReporting}
+ {.$define RequireDebuggerPresenceForLeakReporting}
{Set this option to require the presence of debug info ($D+ option) in the
compiled unit to perform memory leak checking. This option has no effect if
@@ -231,16 +231,16 @@
{Group the options you use for release and debug versions below}
{$ifdef Release}
{Specify the options you use for release versions below}
- {$undef FullDebugMode}
- {$undef CheckHeapForCorruption}
- {$define ASMVersion}
- {$undef EnableMemoryLeakReporting}
- {$undef UseOutputDebugString}
+ {.$undef FullDebugMode}
+ {.$undef CheckHeapForCorruption}
+ {.$define ASMVersion}
+ {.$undef EnableMemoryLeakReporting}
+ {.$undef UseOutputDebugString}
{$else}
{Specify the options you use for debugging below}
{.$define FullDebugMode}
- {$define EnableMemoryLeakReporting}
- {$define UseOutputDebugString}
+ {.$define EnableMemoryLeakReporting}
+ {.$define UseOutputDebugString}
{$endif}
{--------------------Compilation Options For borlndmm.dll---------------------}
Modified: translator/trunk/src/MainFrm.pas
===================================================================
--- translator/trunk/src/MainFrm.pas 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/src/MainFrm.pas 2006-12-14 20:13:23 UTC (rev 196)
@@ -481,6 +481,7 @@
function CheckOrphans: boolean;
procedure LoadSettings(FirstLoad: boolean);
procedure SaveSettings;
+ function CloseApp: boolean;
procedure LoadTranslate;
function LoadOriginal(const FileName: WideString; Encoding: TEncoding): TEncoding;
function LoadTranslation(const FileName: WideString; Encoding: TEncoding): TEncoding;
@@ -499,9 +500,10 @@
procedure LoadDictionary(const FileName: WideString);
procedure SaveDictionary(const FileName: WideString);
procedure HandleCommandLine;
+ // performs a command
// returns false if the application should be terminated
function ProcessCommand(const ACommand: WideString): boolean;
- // lods a file with commands and processes them
+ // lods a file with commands and calls ProcessCommand for each row
procedure ProcessCommands(const CommandFile: WideString);
procedure DoMonitoredFileChange(Sender: TObject; const FileName: WideString; var AContinue, AReset: boolean);
procedure DoThreadTerminate(Sender: TObject);
@@ -791,6 +793,8 @@
end;
end;
+
+
function TfrmMain.ProcessCommand(const ACommand: WideString): boolean;
var
tmp, tmp2: WideString;
@@ -873,7 +877,7 @@
begin
WaitCursor;
FCommandProcessor := true;
- ShowWindow(Application.Handle, SW_MINIMIZE);
+ ShowWindow(Application.Handle, SW_HIDE);
SendMessage(Handle, WM_SETREDRAW, 0, 0);
try
S := TTntStringlist.Create;
@@ -882,6 +886,7 @@
for i := 0 to S.Count - 1 do
if not ProcessCommand(S[i]) then
begin
+ CloseApp;
Application.Terminate;
Halt(0); // Close is not fast enough
Exit; // this will skip the ShowWindow below
@@ -893,8 +898,8 @@
FCommandProcessor := false;
end;
lvTranslateStrings.Items.Count := FTranslateFile.Items.Count;
- ShowWindow(Application.Handle, SW_RESTORE);
- ShowWindow(Handle, SW_RESTORE);
+ ShowWindow(Application.Handle, SW_SHOW);
+ ShowWindow(Handle, SW_SHOW);
SendMessage(Handle, WM_SETREDRAW, 1, 0);
end;
end;
@@ -2127,7 +2132,7 @@
function TfrmMain.CheckDictModified: boolean;
begin
Result := true;
- if FDictionary.Modified then
+ if not FCommandProcessor and FDictionary.Modified then
begin
case YesNoCancel(_(ClassName, SSaveDictPrompt), _(ClassName, SConfirmCaption)) of
IDYES:
@@ -2144,7 +2149,7 @@
function TfrmMain.CheckOrphans: boolean;
begin
- if FTranslateFile.Orphans.Count > 0 then
+ if not FCommandProcessor and (FTranslateFile.Orphans.Count > 0) then
Result := YesNo(_(ClassName, SConfirmRemoveOrphans),
_(ClassName, SConfirmDelete))
else
@@ -2460,13 +2465,12 @@
Hint := '';
end;
-procedure TfrmMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+function TfrmMain.CloseApp:boolean;
var
i: integer;
begin
- WaitCursor;
- CanClose := CheckModified and CheckDictModified;
- if not CanClose then
+ Result := CheckModified and CheckDictModified;
+ if not Result then
Exit;
if acFullScreen.Checked then
acFullScreen.Execute;
@@ -2488,6 +2492,12 @@
FApplicationServices := nil;
end;
+procedure TfrmMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+begin
+ WaitCursor;
+ CanClose := CloseApp;
+end;
+
procedure TfrmMain.lvTranslateStringsChange(Sender: TObject;
Item: TListItem; Change: TItemChange);
begin
@@ -4544,7 +4554,7 @@
procedure TfrmMain.mnuToolsPopup(Sender: TTBCustomItem; FromLink: Boolean);
begin
-// BuildToolMenu(Sender);
+ BuildToolMenu(Sender);
end;
end.
Modified: translator/trunk/src/TRANSLATOR.INC
===================================================================
--- translator/trunk/src/TRANSLATOR.INC 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/src/TRANSLATOR.INC 2006-12-14 20:13:23 UTC (rev 196)
@@ -5,7 +5,7 @@
// define this to use TBX pre 2.2 beta
{$DEFINE USEOLDTBX}
// define this to use the FastMM4 memory manager
-{.$DEFINE USE_FASTMM4}
+{$DEFINE USE_FASTMM4}
// defines for various Delphi/Kylix versions
{$IFDEF WIN32}
Modified: translator/trunk/src/TranslateFile.pas
===================================================================
--- translator/trunk/src/TranslateFile.pas 2006-12-14 14:39:34 UTC (rev 195)
+++ translator/trunk/src/TranslateFile.pas 2006-12-14 20:13:23 UTC (rev 196)
@@ -517,6 +517,7 @@
FItems := nil;
FOrphans.Clear;
FOrphans := nil;
+ FCommentChars.Free;
inherited;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
