paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-16 04:39:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: project po output directory: keep relative

Browse Source 
git-svn-id: trunk@35948 -
This commit is contained in:
mattias 2012-03-13 22:45:45 +00:00
parent 418d6a5181
commit 51e35fb2e6
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ide/frames/project_i18n_options.pas
View File

@ -84,16 +84,11 @@ begin
end; end;
procedure TProjectI18NOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TProjectI18NOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
var
AFilename: String;
begin begin
FProject := AOptions as TProject; FProject := AOptions as TProject;
with FProject do with FProject do
begin begin
AFilename := POOutputDirectory; POOutDirEdit.Text := POOutputDirectory;
if not IsVirtual then
AFilename:=CreateRelativePath(AFilename,FProject.ProjectDirectory);
POOutDirEdit.Text := AFilename;
EnableI18NCheckBox.Checked := Enablei18n; EnableI18NCheckBox.Checked := Enablei18n;
PoForFormsCheckBox.Checked:=EnableI18NForLFM; PoForFormsCheckBox.Checked:=EnableI18NForLFM;
Enablei18nInfo(Enablei18n); Enablei18nInfo(Enablei18n);
@ -101,17 +96,10 @@ begin
end; end;
procedure TProjectI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions); procedure TProjectI18NOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
var
AFilename: String;
begin begin
with AOptions as TProject do with AOptions as TProject do
begin begin
AFilename := ChompPathDelim(TrimFilename(POOutDirEdit.Text)); POOutputDirectory := POOutDirEdit.Text;
if EnableI18NCheckBox.Checked
and (AFilename<>'')
and (not FilenameIsAbsolute(AFilename)) and (not IsVirtual) then
AFilename:=AppendPathDelim(ProjectDirectory)+AFilename;
POOutputDirectory := AFilename;
EnableI18N := EnableI18NCheckBox.Checked; EnableI18N := EnableI18NCheckBox.Checked;
EnableI18NForLFM := PoForFormsCheckBox.Checked; EnableI18NForLFM := PoForFormsCheckBox.Checked;
end; end;

8
ide/project.pp
View File

@ -3861,12 +3861,12 @@ end;
procedure TProject.SetModified(const AValue: boolean); procedure TProject.SetModified(const AValue: boolean);
begin begin
{$IFDEF VerboseTProjectSetModified} { $IFDEF VerboseTProjectSetModified}
if (not Modified) and AValue then begin if Modified<>AValue then begin
debugln(['TProject.SetModified ']); debugln(['TProject.SetModified ================= ',AValue]);
DumpStack; DumpStack;
end; end;
{$ENDIF} { $ENDIF}
if fDestroying then exit; if fDestroying then exit;
inherited SetModified(AValue); inherited SetModified(AValue);