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

IDE: need build info: escape key

Browse Source 
git-svn-id: trunk@36656 -
This commit is contained in:
mattias 2012-04-07 12:33:03 +00:00
parent 4e8e6440dc
commit 8dfdbe1013
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ide/ideinfoneedbuild.lfm
View File

@ -9,6 +9,7 @@ object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
OnClose = FormClose
OnCreate = FormCreate
OnDestroy = FormDestroy
OnKeyDown = FormKeyDown
Position = poScreenCenter
LCLVersion = '1.1'
object TargetLabel: TLabel
@ -44,7 +45,7 @@ object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
AnchorSideTop.Control = TargetComboBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 389
Height = 341
Top = 39
Width = 543
Align = alBottom
@ -57,4 +58,20 @@ object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
ScrollBars = ssAutoBoth
TabOrder = 1
end
object ButtonPanel1: TButtonPanel
Left = 6
Height = 42
Top = 386
Width = 543
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
HelpButton.DefaultCaption = True
CloseButton.Name = 'CloseButton'
CloseButton.DefaultCaption = True
CancelButton.Name = 'CancelButton'
CancelButton.DefaultCaption = True
TabOrder = 2
ShowButtons = [pbClose]
end
end

11
ide/ideinfoneedbuild.pas
View File

@ -31,7 +31,7 @@ interface
uses
Classes, SysUtils, FileUtil, AvgLvlTree, FileProcs, Forms, Controls, Graphics,
Dialogs, StdCtrls,
Dialogs, StdCtrls, Buttons, ButtonPanel, LCLType,
IDEWindowIntf, LazIDEIntf, ProjectIntf,
LazarusIDEStrConsts, PackageDefs, PackageSystem, Project, InputHistory,
EnvironmentOpts, IDEProcs, BuildManager;
@ -56,12 +56,14 @@ type
{ TIDEInfoNeedBuildDlg }
TIDEInfoNeedBuildDlg = class(TForm)
ButtonPanel1: TButtonPanel;
MainMemo: TMemo;
TargetComboBox: TComboBox;
TargetLabel: TLabel;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
procedure OnIdle(Sender: TObject; var Done: Boolean);
procedure TargetComboBoxChange(Sender: TObject);
private
@ -154,6 +156,13 @@ begin
MainTarget:=nil;
end;
procedure TIDEInfoNeedBuildDlg.FormKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
begin
if Key=VK_ESCAPE then
ModalResult:=mrCancel;
end;
procedure TIDEInfoNeedBuildDlg.OnIdle(Sender: TObject; var Done: Boolean);
begin
if CheckNeedBuild(false) then

2
packager/packagesystem.pas
View File

@ -3623,6 +3623,8 @@ begin
s:=s+' -Fi'+SwitchPathDelims(IncPath,pdsUnix);
if CustomOptions<>'' then
s:=s+' '+CustomOptions;
// do no write the unit output directory
// it is not needed because it is the location of the Makefile.compiled
s:=s+' '+SwitchPathDelims(CreateRelativePath(APackage.GetSrcFilename,APackage.Directory),pdsUnix);
//debugln(['TLazPackageGraph.WriteMakeFile IncPath="',IncPath,'" UnitPath="',UnitPath,'" Custom="',CustomOptions,'" Out="',UnitOutputPath,'"']);