Permalink
Browse files

Merge pull request #47 from darealshinji/lazarus-1.8

Lazarus 1.8.4 / FPC 3.0.4 compatibility
  • Loading branch information...
tedsmith committed Sep 21, 2018
2 parents cdd888f + efe4ff5 commit 51afae72f799b4063ea2813f7e641f8b3a9e5722
Showing with 6 additions and 6 deletions.
  1. +6 −6 unit2.pas
@@ -2197,13 +2197,13 @@ procedure TMainForm.popmenuDBGrid_FilesPopup(Sender: TObject);
procedure TMainForm.ShellTreeView_FolderAChange(Sender: TObject; Node: TTreeNode
);
begin
lblFolderAName.Caption := ShellTreeView_FolderA.GetSelectedNodePath;
lblFolderAName.Caption := ShellTreeView_FolderA.Path;
end;
procedure TMainForm.ShellTreeView_FolderBChange(Sender: TObject; Node: TTreeNode
);
begin
lblFolderBName.Caption := ShellTreeView_FolderB.GetSelectedNodePath;
lblFolderBName.Caption := ShellTreeView_FolderB.Path;
end;
@@ -2567,10 +2567,10 @@ procedure TMainForm.btnCompareClick(Sender: TObject);
// If UNC mode is DISabled, get FolderA and FolderB paths from list view
if not cbUNCModeCompFolders.Checked then
begin
FolderA := ShellTreeView_FolderA.GetSelectedNodePath;
FolderA := ShellTreeView_FolderA.Path;
lblFolderAName.Caption:= FolderA;
FolderB := ShellTreeView_FolderB.GetSelectedNodePath;
FolderB := ShellTreeView_FolderB.Path;
lblFolderBName.Caption:= FolderB;
end;
@@ -3000,7 +3000,7 @@ procedure TMainForm.Button8CopyAndHashClick(Sender: TObject);
// User just wants a sub-folder listing as text
if CheckBoxListOfDirsOnly.Checked then
begin
SourceDir := DirListA.GetSelectedNodePath;
SourceDir := DirListA.Path;
sdFileAndFolderListOnly.Title := 'Save listing as text file...';
sdFileAndFolderListOnly.InitialDir := GetCurrentDir;
@@ -3021,7 +3021,7 @@ procedure TMainForm.Button8CopyAndHashClick(Sender: TObject);
else // User just wants a sub-folder and file listing as text
if CheckBoxListOfDirsAndFilesOnly.Checked then
begin
SourceDir := DirListA.GetSelectedNodePath;
SourceDir := DirListA.Path;
try
slSubDirAndFilesListing := TStringList.Create;
slSubDirAndFilesListing := GetSubDirAndFileListing(SourceDir);

0 comments on commit 51afae7

Please sign in to comment.