paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 07:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Make TMainIDE.UpdateDefaultPascalFileExtensions a global proc and change its name because there are others with identical name

Browse Source 
git-svn-id: trunk@38703 -
This commit is contained in:
juha 2012-09-16 22:37:43 +00:00
parent ea6e7aa309
commit f05db0a164
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/main.pp
View File

@ -723,7 +723,6 @@ type
procedure StartIDE; override;
destructor Destroy; override;
procedure CreateOftenUsedForms; override;
procedure UpdateDefaultPascalFileExtensions;
function DoResetToolStatus(AFlags: TResetToolFlags): boolean; override;
function DoCallProjectChangedHandler(
HandlerType: TLazarusIDEHandlerType): TModalResult;
@ -1296,7 +1295,7 @@ begin
ExternalTools.OnNeedsOutputFilter := @OnExtToolNeedsOutputFilter;
ExternalTools.OnFreeOutputFilter := @OnExtToolFreeOutputFilter;
UpdateDefaultPascalFileExtensions;
UpdateDefaultPasFileExt;
LoadFileDialogFilter;
EditorOpts := TEditorOptions.Create;
@ -4676,16 +4675,6 @@ begin
TheEnvironmentOptions.ObjectInspectorOptions.AssignTo(ObjectInspector1);
end;
procedure TMainIDE.UpdateDefaultPascalFileExtensions;
var
DefPasExt: string;
begin
// change default pascal file extensions
DefPasExt:=PascalExtension[EnvironmentOptions.PascalFileExtension];
if LazProjectFileDescriptors<>nil then
LazProjectFileDescriptors.DefaultPascalFileExt:=DefPasExt;
end;
procedure TMainIDE.OnLoadIDEOptions(Sender: TObject; AOptions: TAbstractIDEOptions);
begin
if AOptions is TEnvironmentOptions then
@ -4816,7 +4805,7 @@ begin
// invalidate cached substituted macros
IncreaseCompilerParseStamp;
CompileProgress.SetEnabled(EnvironmentOptions.ShowCompileDialog);
UpdateDefaultPascalFileExtensions;
UpdateDefaultPasFileExt;
if OldLanguage <> EnvironmentOptions.LanguageID then
begin
TranslateResourceStrings(EnvironmentOptions.GetParsedLazarusDirectory,

13
ide/sourcefilemanager.pas
View File

@ -36,7 +36,7 @@ uses
LCLIntf, LCLType, LCLProc, FileProcs, FileUtil, IDEProcs, DialogProcs, IDEDialogs,
LConvEncoding, LResources, PropEdits, DefineTemplates, IDEMsgIntf, IDEProtocol,
LazIDEIntf, MainBase, MainBar, MainIntf, MenuIntf, LazarusIDEStrConsts,
ProjectIntf, Project, ProjectInspector, CompilerOptions,
ProjectIntf, Project, ProjectDefs, ProjectInspector, CompilerOptions,
BasePkgManager, PackageIntf, PackageDefs, PackageSystem,
SrcEditorIntf, SourceEditor, EditorOptions, CustomFormEditor, FormEditor,
EmptyMethodsDlg, BaseDebugManager, ControlSelection, TransferMacros,
@ -168,6 +168,7 @@ type
function CreateSrcEditPageName(const AnUnitName, AFilename: string;
IgnoreEditor: TSourceEditor): string;
procedure UpdateDefaultPasFileExt;
implementation
@ -197,6 +198,16 @@ begin
Result:=SourceEditorManager.FindUniquePageName(Result,IgnoreEditor);
end;
procedure UpdateDefaultPasFileExt;
var
DefPasExt: string;
begin
// change default pascal file extensions
DefPasExt:=PascalExtension[EnvironmentOptions.PascalFileExtension];
if LazProjectFileDescriptors<>nil then
LazProjectFileDescriptors.DefaultPascalFileExt:=DefPasExt;
end;
{ TLazSourceFileManager }