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

IDE: further migration external tools

Browse Source 
git-svn-id: trunk@44182 -
This commit is contained in:
mattias 2014-02-20 18:30:05 +00:00
parent 75e113064e
commit d2a52610bd
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/ideintf/lazideintf.pas
View File

@ -17,7 +17,11 @@ interface
uses
Classes, SysUtils, LCLProc, Forms, Controls, Dialogs, PropEdits, LazHelpHTML,
IDEOptionsIntf, CompOptsIntf, ProjectIntf, SrcEditorIntf;
IDEOptionsIntf, CompOptsIntf, ProjectIntf,
{$IFDEF EnableNewExtTools}
IDEExternToolIntf,
{$ENDIF}
SrcEditorIntf;
type
// open file flags

2
ide/buildlazdialog.pas
View File

@ -740,7 +740,7 @@ begin
debugln(['CreateAppleBundle CreateAppBundleSymbolicLink failed']);
if IDEMessagesWindow<>nil then
{$IFDEF EnableNewExtTools}
IDEMessagesWindow.AddCustomMessage(mluError,'to create application bundle symlink to '+TargetFile);
IDEMessagesWindow.AddCustomMessage(mluError,'failed to create application bundle symlink to '+fTargetFilename);
{$ELSE}
IDEMessagesWindow.AddMsg('Error: failed to create application bundle symlink to '+fTargetFilename,fTargetDir,-1);
{$ENDIF}

5
ide/environmentopts.pp
View File

@ -180,7 +180,7 @@ type
end;
TExternalToolMenuItemsClass = class of TBaseExternalToolMenuItems;
var
ExternalToolMenuItemsClass: TExternalToolMenuItemsClass; // set by ExtToolDialog
ExternalToolMenuItemsClass: TExternalToolMenuItemsClass; // set by ExtToolEditDlg to TExternalToolMenuItems
{$ELSE}
type
TBaseExternalToolList = class(TList)
@ -353,7 +353,7 @@ type
// external tools
{$IFDEF EnableNewExtTools}
fExternalToolMenuItems: TBaseExternalToolMenuItems;
fExternalToolMenuItems: TBaseExternalToolMenuItems; // see ExtToolEditDlg.TExternalToolMenuItems
{$ELSE}
fExternalTools: TBaseExternalToolList;
{$ENDIF}
@ -959,6 +959,7 @@ begin
// external tools
{$IFDEF EnableNewExtTools}
fExternalToolMenuItems:=ExternalToolMenuItemsClass.Create;
debugln(['TEnvironmentOptions.Create ',DbgSName(fExternalToolMenuItems),' Class=',DbgSName(ExternalToolMenuItemsClass)]);
{$ELSE}
fExternalTools:=ExternalToolListClass.Create;
{$ENDIF}

15
ide/exttooleditdlg.pas
View File

@ -42,11 +42,11 @@ uses
{$IFDEF IDE_MEM_CHECK}
MemCheck,
{$ENDIF}
Classes, SysUtils, FileUtil, LazUTF8, LCLType,
Controls, Forms, Buttons, StdCtrls, Dialogs, ExtCtrls, LCLProc, ButtonPanel,
IDEMsgIntf, IDEExternToolIntf, IDEHelpIntf, PropEdits, IDEDialogs,
IDECommands, FileProcs, TransferMacros, LazarusIDEStrConsts, EnvironmentOpts,
KeyMapping, IDEProcs
Classes, SysUtils, FileUtil, LazUTF8, LCLType, Controls, Forms, Buttons,
StdCtrls, Dialogs, ExtCtrls, LCLProc, ButtonPanel, IDEMsgIntf,
IDEExternToolIntf, IDEHelpIntf, PropEdits, IDEDialogs, IDECommands, IDEUtils,
FileProcs, TransferMacros, LazarusIDEStrConsts, EnvironmentOpts, KeyMapping,
IDEProcs
{$IFDEF EnableNewExtTools}
,LazConfigStorage, contnrs
{$ELSE}
@ -997,4 +997,9 @@ begin
end;
end;
initialization
{$IFDEF EnableNewExtTools}
ExternalToolMenuItemsClass := TExternalToolMenuItems;
{$ENDIF}
end.

12
ide/projectuserresources.pas
View File

@ -35,10 +35,14 @@ unit ProjectUserResources;
interface
uses
Classes, SysUtils, FileUtil, Laz2_XMLCfg, Process, LCLProc,
Controls, Graphics, Forms, CodeToolManager, FileProcs, LazConf, LResources,
ProjectIntf, ProjectResourcesIntf, IDEMsgIntf, MacroIntf, LazarusIDEStrConsts,
resource, bitmapresource, groupresource, groupiconresource, groupcursorresource;
Classes, SysUtils, FileUtil, Laz2_XMLCfg, Process, LCLProc, Controls,
Graphics, Forms, CodeToolManager, FileProcs, LazConf, LResources, ProjectIntf,
ProjectResourcesIntf, IDEMsgIntf, MacroIntf,
{$IFDEF EnableNewExtTools}
IDEExternToolIntf,
{$ENDIF}
LazarusIDEStrConsts, resource, bitmapresource, groupresource,
groupiconresource, groupcursorresource;
type
TUserResourceType = (