paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-19 21:39:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Use CreateAbsolutePath when switching between relative/absolute paths in AddFile dialogs (CreateAbsoluteSearchPath gives wrong output)

Browse Source 
git-svn-id: trunk@36664 -
This commit is contained in:
juha 2012-04-09 07:08:22 +00:00
parent 531e504b64
commit 2edd428275
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ide/addtoprojectdlg.pas
View File

@ -422,14 +422,13 @@ var
ADirectory: String;
begin
if FilesListView.Items.Count=0 then exit;
if (TheProject=nil)
or (not FilenameIsAbsolute(TheProject.ProjectDirectory)) then exit;
if (TheProject=nil) or (not FilenameIsAbsolute(TheProject.ProjectDirectory)) then exit;
ADirectory:=TheProject.ProjectDirectory;
SwitchToAbsolute:=not FilenameIsAbsolute(FilesListView.Items[0].Caption);
for i:=0 to FilesListView.Items.Count-1 do begin
Filename:=FilesListView.Items[i].Caption;
if SwitchToAbsolute then
Filename:=CreateAbsoluteSearchPath(Filename,ADirectory)
Filename:=CreateAbsolutePath(Filename,ADirectory)
else
Filename:=CreateRelativePath(Filename,ADirectory);
FilesListView.Items[i].Caption:=Filename;

2
packager/addtopackagedlg.pas
View File

@ -781,7 +781,7 @@ begin
for i:=0 to FilesListView.Items.Count-1 do begin
Filename:=FilesListView.Items[i].Caption;
if SwitchToAbsolute then
Filename:=CreateAbsoluteSearchPath(Filename,LazPackage.Directory)
Filename:=CreateAbsolutePath(Filename,LazPackage.Directory)
else
Filename:=CreateRelativePath(Filename,LazPackage.Directory);
FilesListView.Items[i].Caption:=Filename;