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

Move units IDECmdLine, IDEGuiCmdLine, IDEProcs and CompOptsModes to IdeConfig package.

Browse Source
This commit is contained in:
Juha 2023-07-23 12:41:33 +03:00
parent 0cd1374f3c
commit 636e902e6a
63 changed files with 281 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lazutils/lazstringutils.pas
View File

@ -519,7 +519,7 @@ function CommentText(const s: string; CommentType: TCommentType): string;
inc(NewPos,length(EndOfLine));
end;
if NewPos<>NewLen+1 then
raise Exception.Create('IDEProcs.CommentText ERROR: '
raise Exception.Create('CommentText ERROR: '
+IntToStr(NewPos-1)+'<>'+IntToStr(NewLen));
end;

2
components/lazutils/objectlists.pas
View File

@ -1,6 +1,6 @@
{
/***************************************************************************
packagedefs.pas
objectlists.pas
---------------

4
converter/chgencodingdlg.pas
View File

@ -40,8 +40,10 @@ uses
LConvEncoding, LazFileUtils, LazFileCache, LazStringUtils, LazUTF8, AvgLvlTree,
// IDEIntf
IdeIntfStrConsts, IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEImagesIntf,
// IdeConfig
IDEProcs,
// IDE
IDEProcs, PackageDefs, PackageSystem, Project, LazarusIDEStrConsts,
PackageDefs, PackageSystem, Project, LazarusIDEStrConsts,
EnvironmentOpts, SearchPathProcs;
type

4
converter/convertdelphi.pas
View File

@ -44,8 +44,10 @@ uses
// IDEIntf
ComponentReg, IDEDialogs, LazIDEIntf, PackageIntf, ProjectIntf,
IDEExternToolIntf, IDEOptEditorIntf,
// IdeConfig
IDEProcs,
// IDE
IDEProcs, DialogProcs, CompilerOptions, ProjPackCommon, Project,
DialogProcs, CompilerOptions, ProjPackCommon, Project,
PackageDefs, PackageSystem, PackageEditor,
BasePkgManager, LazarusIDEStrConsts, SearchPathProcs, SourceFileManager,
// Converter

2
converter/convertsettings.pas
View File

@ -40,7 +40,7 @@ uses
// IdeIntf
IdeIntfStrConsts, BaseIDEIntf, IDEMsgIntf, IDEExternToolIntf, IDEImagesIntf,
// IDE
IDEProcs, DialogProcs, LazarusIDEStrConsts,
DialogProcs, LazarusIDEStrConsts,
// Converter
ConverterTypes, ReplaceNamesUnit, ReplaceFuncsUnit;

4
debugger/frames/debugger_general_options.pas
View File

@ -33,11 +33,11 @@ uses
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf,
// IdeConfig
SearchPathProcs, EnvironmentOpts,
SearchPathProcs, EnvironmentOpts, IDEProcs,
// IdeDebugger
BaseDebugManager, IdeDebuggerOpts, EnvDebuggerOptions,
// IDE
LazarusIDEStrConsts, PathEditorDlg, IDEProcs;
LazarusIDEStrConsts, PathEditorDlg;
type

6
designer/askcompnamedlg.pas
View File

@ -29,12 +29,12 @@ uses
Classes, SysUtils, TypInfo,
// LCL
LCLType, Forms, Controls, Dialogs, StdCtrls, ButtonPanel, ExtCtrls,
// LazUtils
LazStringUtils,
// IdeIntf
IdeIntfStrConsts, PropEdits,
// IdeConfig
IDEProcs,
// IDE
IDEProcs, LazarusIDEStrConsts;
LazarusIDEStrConsts;
type

7
ide/buildmanager.pas
View File

@ -35,9 +35,9 @@ interface
uses
// RTL + FCL
Classes, SysUtils, Types, AVL_Tree,
Classes, SysUtils, Types, AVL_Tree, System.UITypes,
// LCL
InterfaceBase, LCLPlatformDef, Dialogs, Forms, Controls,
InterfaceBase, LCLPlatformDef,
// CodeTools
ExprEval, BasicCodeTools, CodeToolManager, DefineTemplates, CodeCache,
FileProcs, CodeToolsCfgScript, LinkScanner,
@ -51,8 +51,9 @@ uses
IDEDialogs, LazIDEIntf, IDEMsgIntf, SrcEditorIntf, InputHistory,
// IdeConfig
LazConf, EnvironmentOpts, ModeMatrixOpts, TransferMacros, IdeConfStrConsts,
IDEProcs,
// IDE
IDECmdLine, LazarusIDEStrConsts, DialogProcs, IDEProcs,
LazarusIDEStrConsts, DialogProcs,
EditDefineTree, ProjectResources, MiscOptions, CompilerOptions,
ExtTools, etMakeMsgParser, etFPCMsgParser, etPas2jsMsgParser, Compiler,
FPCSrcScan, PackageDefs, PackageSystem, Project, ProjectIcon, BaseBuildManager,

4
ide/buildmodediffdlg.pas
View File

@ -35,8 +35,10 @@ uses
StdCtrls, ComCtrls, Forms, ButtonPanel,
// LazUtils
LazUTF8, LazLoggerBase, AvgLvlTree,
// IdeConfig
EnvironmentOpts, ModeMatrixOpts, CompOptsModes,
// IDE
LazarusIDEStrConsts, EnvironmentOpts, Project, ModeMatrixOpts, CompOptsModes;
LazarusIDEStrConsts, Project;
type

6
ide/buildprofilemanager.pas
View File

@ -31,11 +31,11 @@ unit BuildProfileManager;
interface
uses
Classes, SysUtils,
Classes, SysUtils, Contnrs, System.UITypes,
// LazUtils
Laz2_XMLCfg, LazLoggerBase, LazFileUtils, LazUTF8,
// LCL
Forms, Controls, Dialogs, ExtCtrls, StdCtrls, ComCtrls, Contnrs, ButtonPanel,
Forms, Dialogs, ExtCtrls, StdCtrls, ComCtrls, ButtonPanel,
InterfaceBase, LCLPlatformDef,
// Codetools
DefineTemplates,
@ -44,7 +44,7 @@ uses
// IdeConfig
EnvironmentOpts, TransferMacros, IdeXmlConfigProcs,
// IDE
LazarusIDEStrConsts, IDEProcs;
LazarusIDEStrConsts;
type

5
ide/buildprojectdlg.pas
View File

@ -37,9 +37,10 @@ uses
FileProcs, CodeToolManager, DirectoryCacher,
// IDEIntf
IdeIntfStrConsts, IDEDialogs, IDEImagesIntf, PackageIntf, InputHistory,
// IdeConfig
EnvironmentOpts, RecentListProcs,
// IDE
PackageDefs, PackageSystem, LazarusIDEStrConsts, Project,
EnvironmentOpts, IDEProcs, RecentListProcs;
PackageDefs, PackageSystem, LazarusIDEStrConsts, Project;
type
TBuildProjectDialogItem = class

5
ide/checkcompileropts.pas
View File

@ -43,10 +43,9 @@ uses
ProjectIntf, MacroIntf, IDEExternToolIntf, LazIDEIntf, IDEDialogs,
PackageIntf, IDEMsgIntf,
// IdeConfig
TransferMacros, SearchPathProcs,
TransferMacros, SearchPathProcs, IDEProcs,
// IDE
Project, PackageSystem, IDEProcs, LazarusIDEStrConsts, PackageDefs,
CompilerOptions;
Project, PackageSystem, LazarusIDEStrConsts, PackageDefs, CompilerOptions;
type
TCompilerOptionsTest = (

8
ide/codeexplopts.pas
View File

@ -42,10 +42,14 @@ uses
BasicCodeTools,
// LazUtils
AvgLvlTree, Laz2_XMLCfg, LazFileUtils, LazFileCache, LazLoggerBase,
// BuildIntf
IDEOptionsIntf,
// IDEIntf
IDEOptionsIntf, IDEOptEditorIntf,
IDEOptEditorIntf,
// IdeConfig
LazConf, IdeXmlConfigProcs,
// IDE
LazConf, IDEProcs, LazarusIDEStrConsts, IdeXmlConfigProcs;
LazarusIDEStrConsts;
type
{ TCodeExplorerOptions }

4
ide/codehelp.pas
View File

@ -56,9 +56,9 @@ uses
IDECommands, IDEMsgIntf, MacroIntf, PackageIntf, LazHelpIntf, ProjectIntf,
IDEDialogs, IDEHelpIntf, LazIDEIntf, IDEExternToolIntf,
// IdeConfig
EnvironmentOpts, TransferMacros,
EnvironmentOpts, TransferMacros, IDEProcs,
// IDE
EditorOptions, LazarusIDEStrConsts, IDEProcs, PackageDefs, PackageSystem,
EditorOptions, LazarusIDEStrConsts, PackageDefs, PackageSystem,
DialogProcs, KeyMapping, SearchPathProcs;
const

4
ide/codetoolsdefines.pas
View File

@ -57,10 +57,10 @@ uses
// IdeIntf
IdeIntfStrConsts, IDEWindowIntf, IDEImagesIntf, IDEDialogs,
// IdeConfig
LazConf, TransferMacros,
LazConf, TransferMacros, IDEProcs,
// IDE
LazarusIDEStrConsts, CodeToolsOptions, CodeToolsDefPreview,
EditorOptions, InputFileDialog, IDEProcs, EditDefineTree, CompilerOptions;
EditorOptions, InputFileDialog, EditDefineTree, CompilerOptions;
type

4
ide/compiler.pp
View File

@ -48,9 +48,9 @@ uses
// IdeIntf
IDEMsgIntf, LazIDEIntf,
// IdeConfig
TransferMacros,
TransferMacros, IDECmdLine,
// IDE
IDECmdLine, LazarusIDEStrConsts, CompilerOptions, Project;
LazarusIDEStrConsts, CompilerOptions, Project;
type
TOnCmdLineCreate = procedure(var CmdLine: string; var Abort:boolean) of object;

3
ide/compileroptions.pp
View File

@ -55,8 +55,9 @@ uses
SrcEditorIntf,
// IdeConfig
LazConf, EnvironmentOpts, SearchPathProcs, IdeXmlConfigProcs, TransferMacros,
IDEProcs, ModeMatrixOpts, CompOptsModes,
// IDE
LazarusIDEStrConsts, IDEProcs, etFPCMsgParser, ModeMatrixOpts, CompOptsModes;
LazarusIDEStrConsts, etFPCMsgParser;
const
DefaultCompilerPath = '$(CompPath)';

8
ide/editdefinetree.pas
View File

@ -40,10 +40,10 @@ uses
FileUtil, LazTracer,
// CodeTools
FileProcs, CodeToolManager, DefineTemplates, LinkScanner,
// IdeIntf
// BuildIntf
CompOptsIntf,
// IDE
IDEProcs, CompilerOptions, LazarusIDEStrConsts;
CompilerOptions, LazarusIDEStrConsts;
// global
@ -213,7 +213,7 @@ var
begin
Count:=0;
for i:=1 to length(s)-1 do begin
if ((i=1) or (s[i-1]<>FileProcs.SpecialChar))
if ((i=1) or (s[i-1]<>SpecialChar))
and (s[i]='$') and (s[i+1] in ['(','{']) then
inc(Count);
end;
@ -227,7 +227,7 @@ begin
while (i<=length(s)) do begin
if (i<length(s))
and ((s[i]='$') and (s[i+1] in ['(','{']))
and ((i=1) or (s[i-1]<>FileProcs.SpecialChar))
and ((i=1) or (s[i-1]<>SpecialChar))
then begin
Result[j]:=s[i];
Result[j+1]:='(';

4
ide/etfpcmsgparser.pas
View File

@ -45,9 +45,9 @@ uses
// IDEIntf
LazIDEIntf, IDEUtils,
// IdeConfig
EnvironmentOpts, LazConf, TransferMacros,
EnvironmentOpts, LazConf, TransferMacros, IDECmdLine,
// IDE
IDECmdLine, LazarusIDEStrConsts, etMakeMsgParser, EnvGuiOptions;
LazarusIDEStrConsts, etMakeMsgParser, EnvGuiOptions;
const
FPCMsgIDCompiling = 3104;

2
ide/exttools.pas
View File

@ -44,7 +44,7 @@ uses
// IdeConfig
TransferMacros,
// IDE
IDECmdLine, LazarusIDEStrConsts;
LazarusIDEStrConsts;
type
TLMVToolState = (

4
ide/findinfilesdlg.pas
View File

@ -27,9 +27,11 @@ uses
// IdeIntf
MacroIntf, IDEWindowIntf, SrcEditorIntf, IDEHelpIntf, IDEDialogs,
IdeIntfStrConsts, ProjectGroupIntf, InputHistory,
// IdeConfig
EnvironmentOpts, SearchPathProcs,
// IDE
LazarusIDEStrConsts, InputhistoryWithSearchOpt, EditorOptions, Project,
IDEProcs, SearchFrm, SearchResultView, EnvironmentOpts, SearchPathProcs;
SearchFrm, SearchResultView;
type
{ TLazFindInFilesDialog }

12
ide/findoverloadsdlg.pas
View File

@ -37,16 +37,20 @@ unit FindOverloadsDlg;
interface
uses
Classes, SysUtils, AVL_Tree,
Classes, SysUtils, AVL_Tree, System.UITypes,
// LCL
Forms, Controls, StdCtrls, ButtonPanel, ComCtrls,
Forms, StdCtrls, ButtonPanel, ComCtrls,
// LazUtils
LazFileUtils, LazLoggerBase,
// codetools
FindDeclarationTool, PascalParserTool, CodeTree, CodeCache, CodeToolManager,
FindOverloads,
// IDE
LazIDEIntf, ProjectIntf, SrcEditorIntf, IDEProcs;
// BuildIntf
ProjectIntf,
// IdeIntf
SrcEditorIntf, LazIDEIntf,
// IdeConfig
IDEProcs;
type

5
ide/findrenameidentifier.pas
View File

@ -42,10 +42,9 @@ uses
IdeIntfStrConsts, LazIDEIntf, IDEWindowIntf, SrcEditorIntf, PackageIntf,
IDEDialogs, InputHistory,
// LazConfig
TransferMacros,
TransferMacros, IDEProcs,
// IDE
LazarusIDEStrConsts, IDEProcs, MiscOptions, DialogProcs,
SearchResultView, CodeHelp;
LazarusIDEStrConsts, MiscOptions, DialogProcs, SearchResultView, CodeHelp;
type

2
ide/findunitdlg.pas
View File

@ -44,7 +44,7 @@ uses
// IDEIntf
IdeIntfStrConsts, LazIDEIntf, IDEMsgIntf, PackageLinkIntf, PackageIntf, IDEExternToolIntf,
// IDE
DialogProcs, PackageDefs, Project, IDEProcs, LazarusIDEStrConsts,
DialogProcs, PackageDefs, Project, LazarusIDEStrConsts,
etFPCMsgParser, SearchPathProcs, PackageLinks, PackageSystem, BasePkgManager;
type

3
ide/fpmake.pp
View File

@ -235,7 +235,6 @@ begin
P.Sources.AddSrc('compiler.pp');
P.Sources.AddSrc('componentlist.pas');
P.Sources.AddSrc('componentpalette.pas');
P.Sources.AddSrc('compoptsmodes.pas');
P.Sources.AddSrc('customformeditor.pp');
P.Sources.AddSrc('debugmanager.pas');
P.Sources.AddSrc('dialogprocs.pas');
@ -317,13 +316,11 @@ begin
P.Sources.AddSrc('gotofrm.pas');
P.Sources.AddSrc('helpfpcmessages.pas');
P.Sources.AddSrc('helpoptions.pas');
P.Sources.AddSrc('idecmdline.pas');
P.Sources.AddSrc('idecontexthelpedit.pas');
P.Sources.AddSrc('idedefs.pas');
P.Sources.AddSrc('idefpcinfo.pas');
P.Sources.AddSrc('ideoptiondefs.pas');
P.Sources.AddSrc('ideoptionsdlg.pas');
P.Sources.AddSrc('ideprocs.pp');
P.Sources.AddSrc('ideprotocol.pas');
P.Sources.AddSrc('idetranslations.pas');
P.Sources.AddSrc('idewindowhelp.pas');

6
ide/frames/compiler_path_options.pas
View File

@ -12,9 +12,11 @@ uses
LazFileUtils, LazFileCache, LazLoggerBase,
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, CompOptsIntf, IDEImagesIntf, IDEDialogs,
// IdeConfig
SearchPathProcs,
// IDE
Project, CompilerOptions, LazarusIDEStrConsts, PathEditorDlg, IDEProcs,
CheckCompilerOpts, ShowCompilerOpts, ImExportCompilerOpts, SearchPathProcs;
Project, CompilerOptions, LazarusIDEStrConsts, PathEditorDlg,
CheckCompilerOpts, ShowCompilerOpts, ImExportCompilerOpts;
type

5
ide/frames/editor_color_options.pas
View File

@ -38,9 +38,10 @@ uses
SynColorAttribEditor,
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf, IDEUtils,
// IdeConfig
IDEProcs, LazConf,
// IDE
EditorOptions, editor_general_options, LazarusIDEStrConsts, IDEProcs, LazConf,
SourceMarks;
EditorOptions, editor_general_options, LazarusIDEStrConsts, SourceMarks;
type

7
ide/frames/editor_general_misc_options.pas
View File

@ -182,7 +182,12 @@ begin
EditorTrimSpaceTypeComboBox.ItemIndex := ord(TrimSpaceType);
end;
end;
{
function CheckGroupItemChecked(CheckGroup: TCheckGroup; const Caption: string): Boolean;
begin
Result := CheckGroup.Checked[CheckGroup.Items.IndexOf(Caption)];
end;
}
procedure TEditorGeneralMiscOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
procedure UpdateOptionFromBool(AValue: Boolean; AnOption: TSynEditorOption); overload;

5
ide/generatefppkgconfigurationdlg.pas
View File

@ -47,12 +47,11 @@ uses
ExtCtrls,
// Codetools
CodeToolManager, DefineTemplates,
// IdeConfig
IDEProcs, LazConf, EnvironmentOpts,
// IDE
IDEProcs,
LazConf,
LazarusIDEStrConsts,
InitialSetupProc,
EnvironmentOpts,
// Packager
FppkgHelper,
// Ideintf

9
ide/ideinfoneedbuild.pas
View File

@ -35,11 +35,14 @@ uses
Forms, Controls, StdCtrls, ButtonPanel, LCLType,
// LazUtils
LazUtilities, LazUTF8,
// BuildIntf
ProjectIntf, PackageIntf,
// IdeIntf
IDEWindowIntf, LazIDEIntf, ProjectIntf, PackageIntf, InputHistory,
IDEWindowIntf, LazIDEIntf, InputHistory,
// IdeConfig
EnvironmentOpts, IDEProcs,
// IDE
LazarusIDEStrConsts, PackageDefs, PackageSystem, Project,
EnvironmentOpts, IDEProcs, BuildManager;
LazarusIDEStrConsts, PackageDefs, PackageSystem, Project, BuildManager;
type
TINeedBuild = (

6
ide/ideinstances.pas
View File

@ -41,8 +41,10 @@ uses
Controls, Dialogs, ExtCtrls, LCLIntf, LCLType,
LazFileUtils, FileUtil, Laz2_XMLRead, Laz2_XMLWrite, Laz2_DOM, LazUTF8,
UTF8Process, LazLoggerBase,
EnvironmentOpts, IDEOptionsIntf, IDEOptEditorIntf,
LazarusIDEStrConsts, IDECmdLine, LazConf;
IDEOptionsIntf,
IDEOptEditorIntf,
EnvironmentOpts, IDECmdLine, LazConf,
LazarusIDEStrConsts;
type
TStartNewInstanceResult = (ofrStartNewInstance, ofrDoNotStart, ofrModalError,

4
ide/imexportcompileropts.pas
View File

@ -40,7 +40,9 @@ uses
// IdeIntf
IDEOptEditorIntf, IDEImagesIntf, InputHistory,
// IdeConfig
IDEProcs, LazarusIDEStrConsts, Project, CompilerOptions, RecentListProcs;
RecentListProcs,
// IDE
LazarusIDEStrConsts, Project, CompilerOptions;
type
{ TImExportCompOptsDlg }

5
ide/initialsetupdlgs.pas
View File

@ -55,11 +55,10 @@ uses
// LazDebuggerGdbmi
GDBMIDebugger,
// IdeConfig
LazConf, EnvironmentOpts, TransferMacros,
LazConf, EnvironmentOpts, TransferMacros, IDEProcs,
// IDE
LazarusIDEStrConsts, AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc,
GenerateFppkgConfigurationDlg, IDEProcs, InitialSetupDlgDebuggerFrame,
IdeDebuggerOpts;
GenerateFppkgConfigurationDlg, InitialSetupDlgDebuggerFrame, IdeDebuggerOpts;
type
TInitialSetupDialog = class;

56
ide/lazarus.lpi
View File

@ -376,7 +376,9 @@
<Filename Value="../designer/askcompnamedlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="AskCompNameDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="AskCompNameDlg"/>
</Unit>
<Unit>
<Filename Value="frames/project_application_options.pas"/>
@ -500,7 +502,9 @@
<Filename Value="buildmodediffdlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="BuildModeDiffDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="BuildModeDiffDlg"/>
</Unit>
<Unit>
<Filename Value="checkcompoptsfornewunitdlg.pas"/>
@ -548,6 +552,7 @@
<Filename Value="../packager/frames/package_integration_options.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="PackageIntegrationOptionsFrame"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
</Unit>
<Unit>
@ -565,14 +570,11 @@
<Unit>
<Filename Value="buildprojectdlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="CleanBuildProjectDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="BuildProjectDlg"/>
</Unit>
<Unit>
<Filename Value="ideguicmdline.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="IDEGuiCmdLine"/>
</Unit>
<Unit>
<Filename Value="frames/env_file_filters.pas"/>
<IsPartOfProject Value="True"/>
@ -604,6 +606,7 @@
<Filename Value="ideinfoneedbuild.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="IDEInfoNeedBuildDlg"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="IDEInfoNeedBuild"/>
</Unit>
@ -687,6 +690,7 @@
<Unit>
<Filename Value="etmakemsgparser.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="etMakeMsgParser"/>
</Unit>
<Unit>
<Filename Value="etmessageframe.pas"/>
@ -747,15 +751,12 @@
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
</Unit>
<Unit>
<Filename Value="idecmdline.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="IDECmdLine"/>
</Unit>
<Unit>
<Filename Value="initialsetupdlgs.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="InitialSetupDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="InitialSetupDlgs"/>
</Unit>
<Unit>
@ -809,14 +810,11 @@
<Unit>
<Filename Value="makeresstrdlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="MakeResStrDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="MakeResStrDlg"/>
</Unit>
<Unit>
<Filename Value="ideprocs.pp"/>
<IsPartOfProject Value="True"/>
<UnitName Value="IDEProcs"/>
</Unit>
<Unit>
<Filename Value="lazarusidestrconsts.pas"/>
<IsPartOfProject Value="True"/>
@ -887,6 +885,7 @@
<Unit>
<Filename Value="projectuserresources.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ProjectUserResources"/>
</Unit>
<Unit>
<Filename Value="buildfiledlg.pas"/>
@ -915,7 +914,9 @@
<Unit>
<Filename Value="searchfrm.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="SearchProgressForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="SearchFrm"/>
</Unit>
<Unit>
@ -1017,7 +1018,9 @@
<Unit>
<Filename Value="checkcompileropts.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="CheckCompilerOptsDlg"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="CheckCompilerOpts"/>
</Unit>
<Unit>
@ -1028,7 +1031,10 @@
<Unit>
<Filename Value="buildprofilemanager.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="BuildProfileManagerForm"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="BuildProfileManager"/>
</Unit>
<Unit>
<Filename Value="comppagespopup.pas"/>
@ -1070,11 +1076,15 @@
<Unit>
<Filename Value="findoverloadsdlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="FindOverloadsDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="FindOverloadsDlg"/>
</Unit>
<Unit>
<Filename Value="codeexplopts.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="CodeExplOpts"/>
</Unit>
<Unit>
<Filename Value="encloseselectiondlg.pas"/>
@ -1091,6 +1101,7 @@
<Unit>
<Filename Value="miscoptions.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="MiscOptions"/>
</Unit>
<Unit>
<Filename Value="codeexplorer.pas"/>
@ -1141,10 +1152,6 @@
<IsPartOfProject Value="True"/>
<HasResources Value="True"/>
</Unit>
<Unit>
<Filename Value="compoptsmodes.pas"/>
<IsPartOfProject Value="True"/>
</Unit>
<Unit>
<Filename Value="applicationbundle.pas"/>
<IsPartOfProject Value="True"/>
@ -1166,7 +1173,9 @@
<Unit>
<Filename Value="codetoolsdefines.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="CodeToolsDefinesEditor"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="CodeToolsDefines"/>
</Unit>
<Unit>
@ -1243,7 +1252,10 @@
<Unit>
<Filename Value="findunitdlg.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="FindUnitDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="FindUnitDlg"/>
</Unit>
<Unit>
<Filename Value="idewindowhelp.pas"/>
@ -1279,6 +1291,7 @@
<Unit>
<Filename Value="editdefinetree.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="EditDefineTree"/>
</Unit>
<Unit>
<Filename Value="runparamsopts.pas"/>
@ -1340,7 +1353,9 @@
<Unit>
<Filename Value="findrenameidentifier.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="FindRenameIdentifierDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="FindRenameIdentifier"/>
</Unit>
<Unit>
@ -1384,7 +1399,10 @@
<Unit>
<Filename Value="../packager/interpkgconflictfiles.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="PGIPConflictsDialog"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="InterPkgConflictFiles"/>
</Unit>
<Unit>
<Filename Value="encloseifdef.pas"/>

2
ide/lazarusidestrconsts.pas
View File

@ -928,8 +928,6 @@ resourcestring
lisNoResourceStringSectionFound = 'No ResourceString Section found';
lisUnableToFindAResourceStringSectionInThisOrAnyOfThe = 'Unable to find a '
+'ResourceString section in this or any of the used units.';
lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier';
lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.';
lisOwnerIsAlreadyUsedByTReaderTWriterPleaseChooseAnot = '''Owner'' is '
+'already used by TReader/TWriter. Please choose another name.';
lisDuplicateNameAComponentNamedAlreadyExistsInTheInhe = 'Duplicate name: A '

6
ide/lazarusmanager.pas
View File

@ -98,10 +98,12 @@ uses
UTF8Process, FileUtil, LazFileUtils, LazUtilities, LazUTF8,
// CodeTools
FileProcs,
// IdeIntf
// BuildIntf
BaseIDEIntf,
// IdeConfig
LazConf, IDECmdLine,
// IDE
IDECmdLine, LazConf, Splash, IDEInstances;
Splash, IDEInstances;
type

4
ide/lazbuild.lpr
View File

@ -40,10 +40,12 @@ uses
// BuildIntf
BaseIDEIntf, MacroIntf, PackageIntf, LazMsgWorker, ProjectIntf, IDEExternToolIntf,
CompOptsIntf, IDEOptionsIntf, PackageDependencyIntf,
// IdeConfig
LazConf, IDECmdLine,
// IDE
InitialSetupProc, ExtToolsConsole, CompilerOptions,
ApplicationBundle, TransferMacros, EnvironmentOpts, IDETranslations,
LazarusIDEStrConsts, IDECmdLine, MiscOptions, Project, LazConf, PackageDefs,
LazarusIDEStrConsts, MiscOptions, Project, PackageDefs,
PackageLinks, PackageSystem, InterPkgConflictFiles, BuildLazDialog,
BuildProfileManager, BuildManager, BaseBuildManager, ModeMatrixOpts;

6
ide/main.pp
View File

@ -114,7 +114,7 @@ uses
// converter
ChgEncodingDlg, ConvertDelphi, MissingPropertiesDlg, LazXMLForms,
// IdeConfig
IdeConfig, LazConf, EnvironmentOpts, TransferMacros,
IdeConfig, LazConf, EnvironmentOpts, TransferMacros, IDECmdLine, IDEGuiCmdLine, IDEProcs,
// environment option frames
editor_general_options, componentpalette_options, formed_options, OI_options,
MsgWnd_Options, Files_Options, Desktop_Options, window_options, IdeStartup_Options,
@ -150,7 +150,7 @@ uses
Splash, IDEDefs, LazarusIDEStrConsts, SearchResultView,
CodeTemplatesDlg, CodeBrowser, FindUnitDlg, InspectChksumChangedDlg,
IdeOptionsDlg, EditDefineTree, KeyMapping,
IDETranslations, IDEProcs, ExtToolDialog, ExtToolEditDlg, JumpHistoryView,
IDETranslations, ExtToolDialog, ExtToolEditDlg, JumpHistoryView,
DesktopManager, DiskDiffsDialog, BuildLazDialog, BuildProfileManager,
BuildManager, CheckCompOptsForNewUnitDlg, MiscOptions,
InputhistoryWithSearchOpt, UnitDependencies, IDEFPCInfo, IDEInfoDlg,
@ -161,7 +161,7 @@ uses
FindRenameIdentifier, AbstractsMethodsDlg, EmptyMethodsDlg, UnusedUnitsDlg,
UseUnitDlg, FindOverloadsDlg, EditorFileManager, CleanDirDlg, CodeContextForm,
AboutFrm, CompatibilityRestrictions, RestrictionBrowser, ProjectWizardDlg,
IDECmdLine, IDEGuiCmdLine, CodeExplOpts, EditorMacroListViewer,
CodeExplOpts, EditorMacroListViewer,
SourceFileManager, EditorToolbarStatic, IDEInstances, NotifyProcessEnd,
WordCompletion, EnvGuiOptions, EnvDebuggerOptions,
// main ide

4
ide/makeresstrdlg.pas
View File

@ -48,8 +48,10 @@ uses
CodeToolManager, CodeToolsStructs, CodeCache,
// IdeIntf
IdeIntfStrConsts, IDEWindowIntf, IDEHelpIntf, IDEDialogs, InputHistory,
// IdeConfig
RecentListProcs,
// IDE
LazarusIDEStrConsts, EditorOptions, MiscOptions, IDEProcs, RecentListProcs;
LazarusIDEStrConsts, EditorOptions, MiscOptions;
type

15
ide/miscoptions.pas
View File

@ -30,8 +30,19 @@ unit MiscOptions;
interface
uses
Classes, SysUtils, LCLProc, BuildProfileManager, CodeToolsStructs, TextTools,
LazFileUtils, Laz2_XMLCfg, LazFileCache, LazConf, IDEProcs, IdeXmlConfigProcs;
Classes, SysUtils,
// LCL
LCLProc,
// LazUtils
LazFileUtils, Laz2_XMLCfg, LazFileCache, LazLoggerBase,
// CodeTools
CodeToolsStructs,
// IdeIntf
TextTools,
// IdeConfig
LazConf, IDEProcs, IdeXmlConfigProcs,
// IDE
BuildProfileManager;
type
{ TFindRenameIdentifierOptions }

4
ide/multipastedlg.pas
View File

@ -46,8 +46,10 @@ uses
SynEdit,
// IdeIntf
IDEHelpIntf, InputHistory,
// IdeConfig
EnvironmentOpts, RecentListProcs,
// IDE
IDEProcs, LazarusIDEStrConsts, EnvironmentOpts, RecentListProcs;
LazarusIDEStrConsts;
const
hlFormatPasteTxtBefore = 'FormatPasteTxtBefore';

8
ide/compoptsmodes.pas → ide/packages/ideconfig/compoptsmodes.pas
View File

@ -33,16 +33,12 @@ unit CompOptsModes;
{$mode objfpc}{$H+}
{$i ide.inc}
interface
uses
Classes, SysUtils,
ExprEval,
LazLoggerBase,
ProjectIntf,
IDEProcs;
// LazUtils
LazLoggerBase;
type

48
ide/packages/ideconfig/fpmake.pp
View File

@ -3,7 +3,7 @@
fpmake.pp for IdeConfig 1.0
This file was generated on 11.06.2023
This file was generated on 23.07.2023
}
{$ifndef ALLPACKAGES}
@ -34,10 +34,10 @@ begin
P.Flags.Add('LazarusDsgnPkg');
D := P.Dependencies.Add('codetools');
D := P.Dependencies.Add('debuggerintf');
D := P.Dependencies.Add('buildintf');
D := P.Dependencies.Add('lazutils');
D := P.Dependencies.Add('codetools');
D := P.Dependencies.Add('fcl');
P.Options.Add('-MObjFPC');
P.Options.Add('-Scghi');
@ -50,37 +50,45 @@ begin
P.IncludePath.Add('include/$(OS)');
P.UnitPath.Add('.');
T:=P.Targets.AddUnit('ideconfig.pas');
t.Dependencies.AddUnit('searchpathprocs');
t.Dependencies.AddUnit('recentlistprocs');
t.Dependencies.AddUnit('compoptsmodes');
t.Dependencies.AddUnit('coolbaroptions');
t.Dependencies.AddUnit('diffpatch');
t.Dependencies.AddUnit('editortoolbaroptions');
t.Dependencies.AddUnit('environmentopts');
t.Dependencies.AddUnit('idecmdline');
t.Dependencies.AddUnit('ideconfstrconsts');
t.Dependencies.AddUnit('ideguicmdline');
t.Dependencies.AddUnit('ideoptiondefs');
t.Dependencies.AddUnit('ideprocs');
t.Dependencies.AddUnit('idexmlconfigprocs');
t.Dependencies.AddUnit('lazconf');
t.Dependencies.AddUnit('ideoptiondefs');
t.Dependencies.AddUnit('modematrixopts');
t.Dependencies.AddUnit('editortoolbaroptions');
t.Dependencies.AddUnit('recentlistprocs');
t.Dependencies.AddUnit('searchpathprocs');
t.Dependencies.AddUnit('toolbaroptionsbase');
t.Dependencies.AddUnit('coolbaroptions');
t.Dependencies.AddUnit('environmentopts');
t.Dependencies.AddUnit('diffpatch');
t.Dependencies.AddUnit('transfermacros');
t.Dependencies.AddUnit('ideconfstrconsts');
T:=P.Targets.AddUnit('searchpathprocs.pas');
T:=P.Targets.AddUnit('recentlistprocs.pas');
T:=P.Targets.AddUnit('compoptsmodes.pas');
T:=P.Targets.AddUnit('coolbaroptions.pas');
T:=P.Targets.AddUnit('diffpatch.pas');
T:=P.Targets.AddUnit('editortoolbaroptions.pas');
T:=P.Targets.AddUnit('environmentopts.pp');
T:=P.Targets.AddUnit('idecmdline.pas');
T:=P.Targets.AddUnit('ideconfstrconsts.pas');
T:=P.Targets.AddUnit('ideguicmdline.pas');
T:=P.Targets.AddUnit('ideoptiondefs.pas');
T:=P.Targets.AddUnit('ideprocs.pp');
T:=P.Targets.AddUnit('idexmlconfigprocs.pas');
T:=P.Targets.AddUnit('lazconf.pp');
T:=P.Targets.AddUnit('ideoptiondefs.pas');
T:=P.Targets.AddUnit('modematrixopts.pas');
T:=P.Targets.AddUnit('editortoolbaroptions.pas');
T:=P.Targets.AddUnit('recentlistprocs.pas');
T:=P.Targets.AddUnit('searchpathprocs.pas');
T:=P.Targets.AddUnit('toolbaroptionsbase.pas');
T:=P.Targets.AddUnit('coolbaroptions.pas');
T:=P.Targets.AddUnit('environmentopts.pp');
T:=P.Targets.AddUnit('diffpatch.pas');
T:=P.Targets.AddUnit('transfermacros.pp');
T:=P.Targets.AddUnit('ideconfstrconsts.pas');
// copy the compiled file, so the IDE knows how the package was compiled
P.Sources.AddSrc('IdeConfig.compiled');
P.InstallFiles.Add('IdeConfig.compiled',AllOSes,'$(unitinstalldir)');
P.Sources.AddSrc('ideconfig.compiled');
P.InstallFiles.Add('ideconfig.compiled',AllOSes,'$(unitinstalldir)');
end;
end;

0
ide/idecmdline.pas → ide/packages/ideconfig/idecmdline.pas
View File

72
ide/packages/ideconfig/ideconfig.lpk
View File

@ -24,12 +24,44 @@ Files in this package are for the main configuration of the IDE."/>
<Version Major="1"/>
<Files>
<Item>
<Filename Value="searchpathprocs.pas"/>
<UnitName Value="SearchPathProcs"/>
<Filename Value="compoptsmodes.pas"/>
<UnitName Value="CompOptsModes"/>
</Item>
<Item>
<Filename Value="recentlistprocs.pas"/>
<UnitName Value="RecentListProcs"/>
<Filename Value="coolbaroptions.pas"/>
<UnitName Value="CoolBarOptions"/>
</Item>
<Item>
<Filename Value="diffpatch.pas"/>
<UnitName Value="DiffPatch"/>
</Item>
<Item>
<Filename Value="editortoolbaroptions.pas"/>
<UnitName Value="EditorToolBarOptions"/>
</Item>
<Item>
<Filename Value="environmentopts.pp"/>
<UnitName Value="EnvironmentOpts"/>
</Item>
<Item>
<Filename Value="idecmdline.pas"/>
<UnitName Value="IDECmdLine"/>
</Item>
<Item>
<Filename Value="ideconfstrconsts.pas"/>
<UnitName Value="IdeConfStrConsts"/>
</Item>
<Item>
<Filename Value="ideguicmdline.pas"/>
<UnitName Value="IDEGuiCmdLine"/>
</Item>
<Item>
<Filename Value="ideoptiondefs.pas"/>
<UnitName Value="IDEOptionDefs"/>
</Item>
<Item>
<Filename Value="ideprocs.pp"/>
<UnitName Value="IDEProcs"/>
</Item>
<Item>
<Filename Value="idexmlconfigprocs.pas"/>
@ -39,45 +71,29 @@ Files in this package are for the main configuration of the IDE."/>
<Filename Value="lazconf.pp"/>
<UnitName Value="LazConf"/>
</Item>
<Item>
<Filename Value="version.inc"/>
<Type Value="Include"/>
</Item>
<Item>
<Filename Value="ideoptiondefs.pas"/>
<UnitName Value="IDEOptionDefs"/>
</Item>
<Item>
<Filename Value="modematrixopts.pas"/>
<UnitName Value="ModeMatrixOpts"/>
</Item>
<Item>
<Filename Value="editortoolbaroptions.pas"/>
<UnitName Value="EditorToolBarOptions"/>
<Filename Value="recentlistprocs.pas"/>
<UnitName Value="RecentListProcs"/>
</Item>
<Item>
<Filename Value="searchpathprocs.pas"/>
<UnitName Value="SearchPathProcs"/>
</Item>
<Item>
<Filename Value="toolbaroptionsbase.pas"/>
<UnitName Value="ToolBarOptionsBase"/>
</Item>
<Item>
<Filename Value="coolbaroptions.pas"/>
<UnitName Value="CoolBarOptions"/>
</Item>
<Item>
<Filename Value="environmentopts.pp"/>
<UnitName Value="EnvironmentOpts"/>
</Item>
<Item>
<Filename Value="diffpatch.pas"/>
<UnitName Value="DiffPatch"/>
</Item>
<Item>
<Filename Value="transfermacros.pp"/>
<UnitName Value="TransferMacros"/>
</Item>
<Item>
<Filename Value="ideconfstrconsts.pas"/>
<UnitName Value="IdeConfStrConsts"/>
<Filename Value="version.inc"/>
<Type Value="Include"/>
</Item>
</Files>
<i18n>

8
ide/packages/ideconfig/ideconfig.pas
View File

@ -8,10 +8,10 @@ unit IdeConfig;
interface
uses
SearchPathProcs, RecentListProcs, IdeXmlConfigProcs, LazConf, IDEOptionDefs,
ModeMatrixOpts, EditorToolBarOptions, ToolBarOptionsBase, CoolBarOptions,
EnvironmentOpts, DiffPatch, TransferMacros, IdeConfStrConsts,
LazarusPackageIntf;
CompOptsModes, CoolBarOptions, DiffPatch, EditorToolBarOptions,
EnvironmentOpts, IDECmdLine, IdeConfStrConsts, IDEGuiCmdLine, IDEOptionDefs,
IDEProcs, IdeXmlConfigProcs, LazConf, ModeMatrixOpts, RecentListProcs,
SearchPathProcs, ToolBarOptionsBase, TransferMacros, LazarusPackageIntf;
implementation

2
ide/packages/ideconfig/ideconfstrconsts.pas
View File

@ -22,6 +22,8 @@ resourcestring
lisTMFunctionAppendPathDelimiter = 'Function: append path delimiter';
lisTMFunctionChompPathDelimiter = 'Function: remove trailing path delimiter';
lisTMunknownMacro = '(unknown macro: %s)';
lisComponentNameIsNotAValidIdentifier = 'Component name "%s" is not a valid identifier';
lisComponentNameIsAPascalKeyword = 'Component name "%s" is a Pascal keyword.';
implementation

4
ide/ideguicmdline.pas → ide/packages/ideconfig/ideguicmdline.pas
View File

@ -1,6 +1,6 @@
{
/***************************************************************************
idecmdline.pas
ideguicmdline.pas
--------------------
A unit to manage command lines issue used inside the ide
@ -45,7 +45,7 @@ uses
LazUtilities, LazFileUtils, LazStringUtils,
// Codetools
FileProcs,
// IDE
// IdeConfig
LazConf, IDECmdLine;
procedure ParseGuiCmdLineParams(var SkipAutoLoadingLastProject,

12
ide/ideprocs.pp → ide/packages/ideconfig/ideprocs.pp
View File

@ -35,17 +35,13 @@ uses
// LazUtils
FileUtil, LazFileUtils, LazUtilities, LazFileCache, LazUTF8,
Laz2_XMLCfg, LazLoggerBase, LazTracer,
// LCL
StdCtrls, ExtCtrls,
// CodeTools
BasicCodeTools, CodeToolManager, CodeToolsConfig, CodeCache, KeywordFuncLists,
FileProcs,
// BuildIntf
PackageIntf,
// IdeConfig
TransferMacros, LazConf,
// IDE
LazarusIDEStrConsts;
TransferMacros, LazConf, IdeConfStrConsts;
const
SBuildMethod: array[TBuildMethod] of string = (
@ -98,7 +94,6 @@ procedure ReverseList(List: TFPList);
procedure FreeListObjects(List: TList; FreeList: boolean);
procedure FreeListObjects(List: TFPList; FreeList: boolean);
function CompareMemStreamText(s1, s2: TMemoryStream): Boolean;
function CheckGroupItemChecked(CheckGroup: TCheckGroup; const Caption: string): Boolean;
procedure CheckCompNameValidity(const AName: string);
@ -687,11 +682,6 @@ begin
end;
end;
function CheckGroupItemChecked(CheckGroup: TCheckGroup; const Caption: string): Boolean;
begin
Result := CheckGroup.Checked[CheckGroup.Items.IndexOf(Caption)];
end;
procedure CheckCompNameValidity(const AName: string);
// Raises an exception if not valid.
begin

4
ide/project.pp
View File

@ -65,9 +65,9 @@ uses
{$IFnDEF LCLNOGUI} IdeDebuggerOpts, IdeDebuggerBackendValueConv, Debugger,{$EndIf}
// IdeConfig
EnvironmentOpts, LazConf, TransferMacros, SearchPathProcs, IdeXmlConfigProcs,
IDECmdLine, IDEProcs, CompOptsModes, ModeMatrixOpts,
// IDE
CompOptsModes, ProjectResources, ProjectIcon,
IDECmdLine, IDEProcs, CompilerOptions, RunParamsOpts, ModeMatrixOpts,
ProjectResources, ProjectIcon, CompilerOptions, RunParamsOpts,
ProjectDefs, EditDefineTree, LazarusIDEStrConsts,
ProjPackCommon, PackageDefs, PackageSystem;

4
ide/projectinspector.pas
View File

@ -71,9 +71,9 @@ uses
IDEHelpIntf, IDECommands, IDEDialogs, IDEImagesIntf, LazIDEIntf, ToolBarIntf,
IdeIntfStrConsts, MenuIntf, InputHistory,
// IdeConfig
EnvironmentOpts, IDEOptionDefs, TransferMacros,
EnvironmentOpts, IDEOptionDefs, TransferMacros, IDEProcs,
// IDE
LazarusIDEStrConsts, MainBase, MainBar, IDEProcs, DialogProcs, Project,
LazarusIDEStrConsts, MainBase, MainBar, DialogProcs, Project,
BuildManager, AddToProjectDlg, EnvGuiOptions,
BasePkgManager, ProjPackChecks, ProjPackEditing, ProjPackFilePropGui, PackageDefs,
AddPkgDependencyDlg, AddFPMakeDependencyDlg;

6
ide/searchfrm.pas
View File

@ -42,8 +42,10 @@ uses
// IDEIntf
IdeIntfStrConsts, IDEWindowIntf, LazIDEIntf, SrcEditorIntf, IDEDialogs,
ProjectGroupIntf, InputHistory,
// ide
LazarusIDEStrConsts, IDEProcs, SearchResultView, Project, SearchPathProcs;
// IdeConfig
SearchPathProcs,
// IDE
LazarusIDEStrConsts, SearchResultView, Project;
type

9
ide/sourceeditor.pp
View File

@ -69,15 +69,14 @@ uses
IDEWindowIntf, ProjectIntf, MacroDefIntf, ToolBarIntf, IDEDialogs, IDECommands,
EditorSyntaxHighlighterDef, IdeIntfStrConsts,
// DebuggerIntf
DbgIntfDebuggerBase, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
DbgIntfDebuggerBase, LazDebuggerIntfBaseTypes,
// IdeDebugger
BaseDebugManager, Debugger, IdeDebuggerStringConstants,
// IdeConfig
EnvironmentOpts, IDEOptionDefs, TransferMacros,
EnvironmentOpts, IDEOptionDefs, TransferMacros, IDECmdLine, IDEProcs,
// IDE units
IDECmdLine, LazarusIDEStrConsts, EditorOptions, EnvGuiOptions,
WordCompletion, FindReplaceDialog, IDEProcs,
IDEHelpManager, MacroPromptDlg, CodeContextForm,
LazarusIDEStrConsts, EditorOptions, EnvGuiOptions,
WordCompletion, FindReplaceDialog, IDEHelpManager, MacroPromptDlg, CodeContextForm,
SrcEditHintFrm, etMessagesWnd, etSrcEditMarks, CodeMacroPrompt,
CodeTemplatesDlg, CodeToolsOptions, editor_general_options, SortSelectionDlg,
EncloseSelectionDlg, EncloseIfDef, InvertAssignTool, SourceEditProcs,

4
ide/sourcefilemanager.pas
View File

@ -52,9 +52,9 @@ uses
IdeIntfStrConsts, ObjectInspector, SrcEditorIntf, EditorSyntaxHighlighterDef,
UnitResources, ComponentReg, InputHistory,
// IdeConfig
EnvironmentOpts, SearchPathProcs, TransferMacros, RecentListProcs,
EnvironmentOpts, SearchPathProcs, TransferMacros, RecentListProcs, IDEProcs,
// IDE
IDEProcs, DialogProcs, IDEProtocol, LazarusIDEStrConsts, NewDialog,
DialogProcs, IDEProtocol, LazarusIDEStrConsts, NewDialog,
NewProjectDlg, MainBase, MainBar, MainIntf, Project, ProjectDefs,
ProjectInspector, CompilerOptions, SourceSynEditor, SourceEditor,
EditorOptions, CustomFormEditor, ControlSelection,

4
ide/viewunit_dlg.pp
View File

@ -52,8 +52,10 @@ uses
ListFilterEdit,
// IdeIntf
IdeIntfStrConsts, IDEWindowIntf, IDEHelpIntf, IDEImagesIntf, TextTools,
// IdeConfig
SearchPathProcs,
// IDE
LazarusIdeStrConsts, IDEProcs, CustomFormEditor, SearchPathProcs, PackageDefs;
LazarusIdeStrConsts, CustomFormEditor, PackageDefs;
type
TIDEProjectItem = (

11
packager/fppkghelper.pas
View File

@ -5,14 +5,11 @@ unit FppkgHelper;
interface
uses
Classes,
SysUtils,
pkgFppkg,
fpmkunit,
fprepos,
LazarusIDEStrConsts,
Classes, SysUtils, pkgFppkg, fpmkunit, fprepos,
// LazUtils
LazLogger, LazFileCache, FileUtil, LazFileUtils;
LazLogger, LazFileCache, FileUtil, LazFileUtils,
// IDE
LazarusIDEStrConsts;
type

5
packager/frames/package_integration_options.pas
View File

@ -12,9 +12,10 @@ uses
LazFileUtils,
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf, MacroIntf, PackageIntf,
// IdeConfig
IDEProcs,
// IDE
PackageDefs, LazarusIDEStrConsts, PathEditorDlg, IDEProcs, CodeHelp,
SearchPathProcs;
PackageDefs, LazarusIDEStrConsts, PathEditorDlg, CodeHelp, SearchPathProcs;
type

4
packager/frames/package_usage_options.pas
View File

@ -12,8 +12,10 @@ uses
Forms, Controls, StdCtrls, Dialogs,
// IdeIntf
IDEOptionsIntf, IDEOptEditorIntf, MacroIntf,
// IdeConfic
IDEProcs,
// IDE
PathEditorDlg, LazarusIDEStrConsts, IDEProcs, SearchPathProcs, PackageDefs;
PathEditorDlg, LazarusIDEStrConsts, SearchPathProcs, PackageDefs;
type

5
packager/interpkgconflictfiles.pas
View File

@ -64,10 +64,9 @@ uses
// IDEIntf
ProjectIntf, CompOptsIntf, IDEWindowIntf, LazIDEIntf, IDEMsgIntf, IDEExternToolIntf,
// IdeConfig
EnvironmentOpts, TransferMacros,
EnvironmentOpts, TransferMacros, IDEProcs, SearchPathProcs,
// IDE
CompilerOptions, IDEProcs, DialogProcs, LazarusIDEStrConsts,
SearchPathProcs, PackageDefs, PackageSystem;
CompilerOptions, DialogProcs, LazarusIDEStrConsts, PackageDefs, PackageSystem;
type
TPGInterPkgOwnerInfo = class

5
packager/packagedefs.pas
View File

@ -54,10 +54,9 @@ uses
// IDEIntf
LazIDEIntf, IDEOptEditorIntf, IDEDialogs, ComponentReg, IDEImagesIntf,
// IdeConfig
TransferMacros,
TransferMacros, IDEProcs, IDEOptionDefs, CompOptsModes, SearchPathProcs, IdeXmlConfigProcs,
// IDE
EditDefineTree, CompilerOptions, CompOptsModes, IDEOptionDefs, ProjPackCommon,
LazarusIDEStrConsts, IDEProcs, SearchPathProcs, IdeXmlConfigProcs, FppkgHelper;
EditDefineTree, CompilerOptions, ProjPackCommon, LazarusIDEStrConsts, FppkgHelper;
type
TLazPackage = class;

4
packager/packagelinks.pas
View File

@ -49,8 +49,10 @@ uses
FileProcs, CodeToolManager,
// BuildIntf
PackageDependencyIntf, PackageLinkIntf, PackageIntf, MacroIntf,
// IdeConfig
EnvironmentOpts, LazConf, IDEProcs,
// IDE
IDEProcs, EnvironmentOpts, LazConf, IDECmdLine, PackageDefs;
PackageDefs;
const
PkgLinksFileVersion = 3;

4
packager/packagesystem.pas
View File

@ -62,9 +62,9 @@ uses
// Package registration
LazarusPackageIntf,
// IdeConfig
EnvironmentOpts, LazConf, TransferMacros,
EnvironmentOpts, LazConf, TransferMacros, IDEProcs,
// IDE
LazarusIDEStrConsts, IDECmdLine, IDEProcs, DialogProcs, IDETranslations,
LazarusIDEStrConsts, DialogProcs, IDETranslations,
CompilerOptions, SearchPathProcs, PackageLinks, PackageDefs, ComponentReg,
FppkgHelper, PkgSysBasePkgs;

4
packager/pkgmanager.pas
View File

@ -65,11 +65,11 @@ uses
UnitResources, InputHistory,
// IdeConfig
EnvironmentOpts, IDEOptionDefs, ModeMatrixOpts, RecentListProcs,
SearchPathProcs, TransferMacros,
SearchPathProcs, TransferMacros, IDECmdLine, IDEProcs,
// FCL registration
LazarusPackageIntf,
// IDE
IDECmdLine, LazarusIDEStrConsts, IDEProcs, DialogProcs, MiscOptions,
LazarusIDEStrConsts, DialogProcs, MiscOptions,
Project, ProjPackEditing, AddToPackageDlg, PackageDefs, PackageLinks, PackageSystem,
OpenInstalledPkgDlg, PkgGraphExplorer, BrokenDependenciesDlg, CompilerOptions,
IDETranslations, BuildLazDialog, NewDialog, FindInFilesDlg,