chmmaker: clean up

git-svn-id: trunk@35441 -
This commit is contained in:
mattias 2012-02-18 14:04:09 +00:00
parent dd23bc3128
commit 43e8d15510
2 changed files with 13 additions and 23 deletions

View File

@ -1,18 +1,20 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="7"/> <Version Value="9"/>
<General> <General>
<Flags> <Flags>
<LRSInOutputDirectory Value="False"/> <LRSInOutputDirectory Value="False"/>
</Flags> </Flags>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<TargetFileExt Value=""/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <StringTable ProductVersion=""/>
</VersionInfo> </VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
</BuildModes>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
<IgnoreBinaries Value="False"/> <IgnoreBinaries Value="False"/>
@ -60,15 +62,16 @@
</Units> </Units>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="11"/>
<Parsing> <Parsing>
<SyntaxOptions> <SyntaxOptions>
<CStyleOperator Value="False"/> <CStyleOperator Value="False"/>
<UseAnsiStrings Value="False"/>
</SyntaxOptions> </SyntaxOptions>
</Parsing> </Parsing>
<Linking> <Linking>
<Debugging> <Debugging>
<GenerateDebugInfo Value="True"/> <DebugInfoType Value="dsStabs"/>
</Debugging> </Debugging>
<Options> <Options>
<Win32> <Win32>

View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Buttons, chmwriter, ComCtrls, chmsitemap, SynEdit, Menus, ExtCtrls, CheckLst, Buttons, ComCtrls, chmsitemap, SynEdit, LazFileUtils, Menus, ExtCtrls,
EditBtn, chmfilewriter; EditBtn, chmfilewriter;
type type
@ -67,8 +67,8 @@ type
procedure ChmFileNameEditAcceptFileName(Sender: TObject; var Value: String); procedure ChmFileNameEditAcceptFileName(Sender: TObject; var Value: String);
procedure CompileBtnClick(Sender: TObject); procedure CompileBtnClick(Sender: TObject);
procedure CompileViewBtnClick(Sender: TObject); procedure CompileViewBtnClick(Sender: TObject);
procedure FileListBoxDrawItem(Control: TWinControl; Index: Integer; procedure FileListBoxDrawItem({%H-}Control: TWinControl; Index: Integer;
ARect: TRect; State: TOwnerDrawState); ARect: TRect; {%H-}State: TOwnerDrawState);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure IndexEditAcceptFileName(Sender: TObject; var Value: String); procedure IndexEditAcceptFileName(Sender: TObject; var Value: String);
@ -84,7 +84,7 @@ type
procedure TOCEditBtnClick(Sender: TObject); procedure TOCEditBtnClick(Sender: TObject);
private private
FModified: Boolean; FModified: Boolean;
procedure AddItems(AParentItem: TTreeNode; ChmItems: TChmSiteMapItems); procedure AddItems({%H-}AParentItem: TTreeNode; {%H-}ChmItems: TChmSiteMapItems);
function GetModified: Boolean; function GetModified: Boolean;
procedure Save(aAs: Boolean); procedure Save(aAs: Boolean);
@ -105,9 +105,6 @@ uses CHMSiteMapEditor, LHelpControl, Process;
{ TCHMForm } { TCHMForm }
procedure TCHMForm.AddItems(AParentItem: TTreeNode; ChmItems: TChmSiteMapItems); procedure TCHMForm.AddItems(AParentItem: TTreeNode; ChmItems: TChmSiteMapItems);
var
Item: TTreeNode;
I: Integer;
begin begin
{ for I := 0 to ChmItems.Count-1 do begin { for I := 0 to ChmItems.Count-1 do begin
Item := TreeView1.Items.AddChild(AParentItem, ChmItems.Item[I].Text); Item := TreeView1.Items.AddChild(AParentItem, ChmItems.Item[I].Text);
@ -116,9 +113,6 @@ procedure TCHMForm.AddItems(AParentItem: TTreeNode; ChmItems: TChmSiteMapItems);
} end; } end;
procedure TCHMForm.Button1Click(Sender: TObject); procedure TCHMForm.Button1Click(Sender: TObject);
var
SiteMap: TChmSiteMap;
Stream: TMemoryStream;
begin begin
{SiteMap := TChmSiteMap.Create(stTOC); {SiteMap := TChmSiteMap.Create(stTOC);
OpenDialog1.InitialDir := GetCurrentDir; OpenDialog1.InitialDir := GetCurrentDir;
@ -186,10 +180,6 @@ begin
end; end;
procedure TCHMForm.Button2Click(Sender: TObject); procedure TCHMForm.Button2Click(Sender: TObject);
var
OutStream: TFileStream;
CHM: TChmWriter;
I: Integer;
begin begin
{ {
if OpenDialog1.Execute = False then Exit; if OpenDialog1.Execute = False then Exit;
@ -422,8 +412,6 @@ begin
end; end;
procedure TCHMForm.Save(aAs: Boolean); procedure TCHMForm.Save(aAs: Boolean);
var
SaveName: String;
begin begin
if aAs or (Project.FileName = '') then if aAs or (Project.FileName = '') then
if SaveDialog1.Execute then if SaveDialog1.Execute then
@ -481,11 +469,10 @@ end;
procedure TCHMForm.AddFilesToProject(Strings: TStrings); procedure TCHMForm.AddFilesToProject(Strings: TStrings);
var var
ADir, BDir: String; BDir: String;
I: Integer; I: Integer;
RelativePath: String; RelativePath: String;
FileName: String; FileName: String;
NewFileName: String;
begin begin
Modified := True; Modified := True;
BDir := ExtractFilePath(Project.FileName); BDir := ExtractFilePath(Project.FileName);