mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-17 06:49:12 +02:00
set default pascal extension for project descriptors
git-svn-id: trunk@8325 -
This commit is contained in:
parent
6eb78f3ee0
commit
7fdaec3be5
12
ide/main.pp
12
ide/main.pp
@ -1784,6 +1784,8 @@ begin
|
|||||||
|
|
||||||
// file descriptors
|
// file descriptors
|
||||||
LazProjectFileDescriptors:=TLazProjectFileDescriptors.Create;
|
LazProjectFileDescriptors:=TLazProjectFileDescriptors.Create;
|
||||||
|
LazProjectFileDescriptors.DefaultPascalFileExt:=
|
||||||
|
PascalExtension[EnvironmentOptions.PascalFileExtension];
|
||||||
RegisterProjectFileDescriptor(TFileDescPascalUnit.Create);
|
RegisterProjectFileDescriptor(TFileDescPascalUnit.Create);
|
||||||
RegisterProjectFileDescriptor(TFileDescPascalUnitWithForm.Create);
|
RegisterProjectFileDescriptor(TFileDescPascalUnitWithForm.Create);
|
||||||
RegisterProjectFileDescriptor(TFileDescPascalUnitWithDataModule.Create);
|
RegisterProjectFileDescriptor(TFileDescPascalUnitWithDataModule.Create);
|
||||||
@ -6307,13 +6309,12 @@ begin
|
|||||||
SkipSavingMainSource:=false;
|
SkipSavingMainSource:=false;
|
||||||
|
|
||||||
|
|
||||||
{ $IFDEF IDE_DEBUG}
|
{$IFDEF IDE_DEBUG}
|
||||||
DebugLn('TMainIDE.DoSaveProject A SaveAs=',dbgs(sfSaveAs in Flags),' SaveToTestDir=',dbgs(sfSaveToTestDir in Flags),' ProjectInfoFile=',Project1.ProjectInfoFile);
|
DebugLn('TMainIDE.DoSaveProject A SaveAs=',dbgs(sfSaveAs in Flags),' SaveToTestDir=',dbgs(sfSaveToTestDir in Flags),' ProjectInfoFile=',Project1.ProjectInfoFile);
|
||||||
{ $ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
if DoCheckFilesOnDisk(true) in [mrCancel,mrAbort] then exit;
|
if DoCheckFilesOnDisk(true) in [mrCancel,mrAbort] then exit;
|
||||||
DebugLn('TMainIDE.DoSaveProject AA1');
|
|
||||||
|
|
||||||
// check that all new units are saved first to get valid filenames
|
// check that all new units are saved first to get valid filenames
|
||||||
// (this can alter the mainunit: e.g. used unit names)
|
// (this can alter the mainunit: e.g. used unit names)
|
||||||
for i:=0 to Project1.UnitCount-1 do begin
|
for i:=0 to Project1.UnitCount-1 do begin
|
||||||
@ -6330,7 +6331,6 @@ begin
|
|||||||
if (Result=mrAbort) or (Result=mrCancel) then exit;
|
if (Result=mrAbort) or (Result=mrCancel) then exit;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
DebugLn('TMainIDE.DoSaveProject AA2');
|
|
||||||
|
|
||||||
if SourceNotebook.Notebook=nil then
|
if SourceNotebook.Notebook=nil then
|
||||||
Project1.ActiveEditorIndexAtStart:=-1
|
Project1.ActiveEditorIndexAtStart:=-1
|
||||||
@ -6348,12 +6348,10 @@ begin
|
|||||||
|
|
||||||
if Project1.IsVirtual then Include(Flags,sfSaveAs);
|
if Project1.IsVirtual then Include(Flags,sfSaveAs);
|
||||||
if ([sfSaveAs,sfSaveToTestDir]*Flags=[sfSaveAs]) then begin
|
if ([sfSaveAs,sfSaveToTestDir]*Flags=[sfSaveAs]) then begin
|
||||||
DebugLn('TMainIDE.DoSaveProject AA3');
|
|
||||||
// let user choose a filename
|
// let user choose a filename
|
||||||
Result:=DoShowSaveProjectAsDialog;
|
Result:=DoShowSaveProjectAsDialog;
|
||||||
if Result<>mrOk then exit;
|
if Result<>mrOk then exit;
|
||||||
end;
|
end;
|
||||||
DebugLn('TMainIDE.DoSaveProject AA4');
|
|
||||||
|
|
||||||
// update HasResources information
|
// update HasResources information
|
||||||
DoUpdateProjectResourceInfo;
|
DoUpdateProjectResourceInfo;
|
||||||
|
@ -1043,6 +1043,7 @@ begin
|
|||||||
raise Exception.Create('TLazProjectFileDescriptors.RegisterFileDescriptor FileDescriptor already registered');
|
raise Exception.Create('TLazProjectFileDescriptors.RegisterFileDescriptor FileDescriptor already registered');
|
||||||
// make name unique
|
// make name unique
|
||||||
FileDescriptor.Name:=GetUniqueName(FileDescriptor.Name);
|
FileDescriptor.Name:=GetUniqueName(FileDescriptor.Name);
|
||||||
|
// override pascal extension with users choice
|
||||||
DefPasExt:=DefaultPascalFileExt;
|
DefPasExt:=DefaultPascalFileExt;
|
||||||
if DefPasExt<>'' then
|
if DefPasExt<>'' then
|
||||||
FileDescriptor.UpdateDefaultPascalFileExtension(DefPasExt);
|
FileDescriptor.UpdateDefaultPascalFileExtension(DefPasExt);
|
||||||
|
Loading…
Reference in New Issue
Block a user