mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-08 09:38:12 +02:00
Merged revision(s) 47490-47494 #bd0bafb893-#bd0bafb893 from trunk:
IDE: Improve TPathEditorButton class, handle Templates better. ........ IDE: Refactor TPathEditorButton more. Copy values between dialog and edit here instead of clients' code. ........ IDE: in Compiler_path_options, turn method CheckSearchPath into a function. Harmonize. ........ IDE: Let TPathEditorButton show the list of paths in edit control's hint. ........ IDE: Fix a layout error in TPathEditorDialog where TemplateGroupBox went under ButtonPanel. ........ git-svn-id: branches/fixes_1_4@47501 -
This commit is contained in:
maxim
parent
8085015aab
commit
f661e77efd
@ -320,8 +320,7 @@ begin
|
||||
Result := lisGeneral;
|
||||
end;
|
||||
|
||||
procedure TDebuggerGeneralOptionsFrame.Setup(
|
||||
ADialog: TAbstractOptionsEditorDialog);
|
||||
procedure TDebuggerGeneralOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
|
||||
begin
|
||||
gbDebuggerType.Caption := dlgDebugType;
|
||||
gbAdditionalSearchPath.Caption := lisDebugOptionsFrmAdditionalSearchPath;
|
||||
|
||||
@ -46,14 +46,12 @@ type
|
||||
btnLoadSave: TBitBtn;
|
||||
btnExport: TBitBtn;
|
||||
chkUseAsDefault: TCheckBox;
|
||||
function CheckSearchPath(const Context, ExpandedPath: string;
|
||||
Level: TCheckCompileOptionsMsgLvl): boolean;
|
||||
function CheckSrcPathInUnitPath(OldParsedSrcPath, NewParsedSrcPath,
|
||||
OldParsedUnitPath, NewParsedUnitPath: string;
|
||||
out SrcPathChanged: boolean): boolean;
|
||||
procedure FileBrowseBtnClick(Sender: TObject);
|
||||
procedure PathEditBtnClick(Sender: TObject);
|
||||
procedure PathEditBtnExecuted(Sender: TObject);
|
||||
function PathEditBtnExecuted(Context: String; var NewPath: String): Boolean;
|
||||
procedure DoShowOptions(Sender: TObject);
|
||||
procedure DoCheck(Sender: TObject);
|
||||
procedure DoImport(Sender: TObject);
|
||||
@ -75,6 +73,70 @@ implementation
|
||||
|
||||
{$R *.lfm}
|
||||
|
||||
function CheckSearchPath(const Context, ExpandedPath: string; Level: TCheckCompileOptionsMsgLvl): boolean;
|
||||
var
|
||||
CurPath: string;
|
||||
p: integer;
|
||||
HasChars: TCCOSpecialChars;
|
||||
ErrorMsg: string;
|
||||
begin
|
||||
Result := False;
|
||||
|
||||
// check for *
|
||||
if Ord(Level) <= Ord(ccomlHints) then
|
||||
begin
|
||||
if System.Pos('*', ExpandedPath) > 0 then
|
||||
begin
|
||||
if IDEMessageDialog(lisHint, Format(
|
||||
lisTheContainsAStarCharacterLazarusUsesThisAsNormalCh, [Context, LineEnding]),
|
||||
mtWarning, [mbOK, mbCancel]) <> mrOk then
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
|
||||
// check for non existing directories
|
||||
if Ord(Level) <= Ord(ccomlWarning) then
|
||||
begin
|
||||
p := 1;
|
||||
repeat
|
||||
//DebugLn(['CheckSearchPath ',ExpandedPath,' ',p,' ',length(ExpandedPath)]);
|
||||
CurPath := GetNextDirectoryInSearchPath(ExpandedPath, p);
|
||||
if (CurPath <> '') and (not IDEMacros.StrHasMacros(CurPath)) and
|
||||
(FilenameIsAbsolute(CurPath)) then
|
||||
begin
|
||||
if not DirPathExistsCached(CurPath) then
|
||||
begin
|
||||
if IDEMessageDialog(lisCCOWarningCaption, Format(
|
||||
lisTheContainsANotExistingDirectory, [Context, LineEnding, CurPath]),
|
||||
mtWarning, [mbIgnore, mbCancel]) <> mrIgnore then
|
||||
Exit;
|
||||
end;
|
||||
end;
|
||||
until p > length(ExpandedPath);
|
||||
end;
|
||||
|
||||
// check for special characters
|
||||
if (not IDEMacros.StrHasMacros(ExpandedPath)) then
|
||||
begin
|
||||
FindSpecialCharsInPath(ExpandedPath, HasChars);
|
||||
if Ord(Level) <= Ord(ccomlWarning) then
|
||||
begin
|
||||
if Ord(Level) >= Ord(ccomlErrors) then
|
||||
ErrorMsg := SpecialCharsToStr(HasChars * [ccoscSpecialChars, ccoscNewLine])
|
||||
else
|
||||
ErrorMsg := SpecialCharsToStr(HasChars);
|
||||
if ErrorMsg <> '' then
|
||||
begin
|
||||
if IDEMessageDialog(lisCCOWarningCaption, Context + LineEnding + ErrorMsg,
|
||||
mtWarning, [mbOK, mbCancel]) <> mrOk then
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
{ TCompilerPathOptionsFrame }
|
||||
|
||||
function TCompilerPathOptionsFrame.Check: boolean;
|
||||
@ -285,71 +347,6 @@ begin
|
||||
UpdateTargetFileLabel;
|
||||
end;
|
||||
|
||||
function TCompilerPathOptionsFrame.CheckSearchPath(const Context, ExpandedPath: string;
|
||||
Level: TCheckCompileOptionsMsgLvl): boolean;
|
||||
var
|
||||
CurPath: string;
|
||||
p: integer;
|
||||
HasChars: TCCOSpecialChars;
|
||||
ErrorMsg: string;
|
||||
begin
|
||||
Result := False;
|
||||
|
||||
// check for *
|
||||
if Ord(Level) <= Ord(ccomlHints) then
|
||||
begin
|
||||
if System.Pos('*', ExpandedPath) > 0 then
|
||||
begin
|
||||
if IDEMessageDialog(lisHint, Format(
|
||||
lisTheContainsAStarCharacterLazarusUsesThisAsNormalCh, [Context, LineEnding]),
|
||||
mtWarning, [mbOK, mbCancel]) <> mrOk then
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
|
||||
// check for non existing directories
|
||||
if Ord(Level) <= Ord(ccomlWarning) then
|
||||
begin
|
||||
p := 1;
|
||||
repeat
|
||||
//DebugLn(['CheckSearchPath ',ExpandedPath,' ',p,' ',length(ExpandedPath)]);
|
||||
CurPath := GetNextDirectoryInSearchPath(ExpandedPath, p);
|
||||
if (CurPath <> '') and (not IDEMacros.StrHasMacros(CurPath)) and
|
||||
(FilenameIsAbsolute(CurPath)) then
|
||||
begin
|
||||
if not DirPathExistsCached(CurPath) then
|
||||
begin
|
||||
if IDEMessageDialog(lisCCOWarningCaption, Format(
|
||||
lisTheContainsANotExistingDirectory, [Context, LineEnding, CurPath]),
|
||||
mtWarning, [mbIgnore, mbCancel]) <> mrIgnore then
|
||||
Exit;
|
||||
end;
|
||||
end;
|
||||
until p > length(ExpandedPath);
|
||||
end;
|
||||
|
||||
// check for special characters
|
||||
if (not IDEMacros.StrHasMacros(ExpandedPath)) then
|
||||
begin
|
||||
FindSpecialCharsInPath(ExpandedPath, HasChars);
|
||||
if Ord(Level) <= Ord(ccomlWarning) then
|
||||
begin
|
||||
if Ord(Level) >= Ord(ccomlErrors) then
|
||||
ErrorMsg := SpecialCharsToStr(HasChars * [ccoscSpecialChars, ccoscNewLine])
|
||||
else
|
||||
ErrorMsg := SpecialCharsToStr(HasChars);
|
||||
if ErrorMsg <> '' then
|
||||
begin
|
||||
if IDEMessageDialog(lisCCOWarningCaption, Context + LineEnding + ErrorMsg,
|
||||
mtWarning, [mbOK, mbCancel]) <> mrOk then
|
||||
exit;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
function TCompilerPathOptionsFrame.CheckSrcPathInUnitPath(OldParsedSrcPath,
|
||||
NewParsedSrcPath, OldParsedUnitPath, NewParsedUnitPath: string; out
|
||||
SrcPathChanged: boolean): boolean;
|
||||
@ -429,112 +426,18 @@ begin
|
||||
end;
|
||||
|
||||
procedure TCompilerPathOptionsFrame.PathEditBtnClick(Sender: TObject);
|
||||
var
|
||||
AButton: TPathEditorButton;
|
||||
OldPath, Templates: string;
|
||||
begin
|
||||
if Sender is TPathEditorButton then
|
||||
begin
|
||||
AButton := TPathEditorButton(Sender);
|
||||
if AButton = OtherUnitsPathEditBtn then
|
||||
begin
|
||||
OldPath := OtherUnitsEdit.Text;
|
||||
Templates := SetDirSeparators(
|
||||
'$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/components/custom' +
|
||||
';$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)');
|
||||
end
|
||||
else
|
||||
if AButton = IncludeFilesPathEditBtn then
|
||||
begin
|
||||
OldPath := IncludeFilesEdit.Text;
|
||||
Templates := 'include' + ';inc';
|
||||
end
|
||||
else
|
||||
if AButton = OtherSourcesPathEditBtn then
|
||||
begin
|
||||
OldPath := OtherSourcesEdit.Text;
|
||||
Templates := SetDirSeparators('$(LazarusDir)/lcl' +
|
||||
';$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/components/synedit' + ';$(LazarusDir)/components/codetools');
|
||||
end
|
||||
else
|
||||
if AButton = LibrariesPathEditBtn then
|
||||
begin
|
||||
OldPath := LibrariesEdit.Text;
|
||||
Templates := SetDirSeparators('/usr/X11R6/lib;/sw/lib');
|
||||
end
|
||||
else
|
||||
if AButton = DebugPathEditBtn then
|
||||
begin
|
||||
OldPath := DebugPathEdit.Text;
|
||||
Templates := SetDirSeparators('$(LazarusDir)/lcl/include' +
|
||||
';$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/include');
|
||||
end
|
||||
else
|
||||
Exit;
|
||||
AButton.CurrentPathEditor.BaseDirectory := FCompilerOpts.BaseDirectory;
|
||||
AButton.CurrentPathEditor.Path := OldPath;
|
||||
AButton.CurrentPathEditor.Templates := SetDirSeparators(Templates);
|
||||
end;
|
||||
TPathEditorButton(Sender).CurrentPathEditor.BaseDirectory := FCompilerOpts.BaseDirectory;
|
||||
end;
|
||||
|
||||
procedure TCompilerPathOptionsFrame.PathEditBtnExecuted(Sender: TObject);
|
||||
|
||||
function CheckPath(const Context, NewPath: string): boolean;
|
||||
var
|
||||
ExpandedPath: string;
|
||||
BaseDir: string;
|
||||
begin
|
||||
BaseDir := FCompilerOpts.BaseDirectory;
|
||||
ExpandedPath := TrimSearchPath(NewPath, BaseDir, true);
|
||||
Result := CheckSearchPath(Context, ExpandedPath, ccomlHints);
|
||||
end;
|
||||
|
||||
function TCompilerPathOptionsFrame.PathEditBtnExecuted(Context: String; var NewPath: String): Boolean;
|
||||
var
|
||||
AButton: TPathEditorButton;
|
||||
NewPath: string;
|
||||
ExpandedPath: string;
|
||||
begin
|
||||
if Sender is TPathEditorButton then
|
||||
begin
|
||||
AButton := TPathEditorButton(Sender);
|
||||
if AButton.CurrentPathEditor.ModalResult <> mrOk then
|
||||
Exit;
|
||||
NewPath := AButton.CurrentPathEditor.Path;
|
||||
NewPath := FCompilerOpts.ShortenPath(NewPath, False);
|
||||
if AButton = OtherUnitsPathEditBtn then
|
||||
begin
|
||||
if CheckPath(OtherUnitsLabel.Caption, NewPath) then
|
||||
OtherUnitsEdit.Text := NewPath;
|
||||
end
|
||||
else
|
||||
if AButton = IncludeFilesPathEditBtn then
|
||||
begin
|
||||
if CheckPath(IncludeFilesLabel.Caption, NewPath) then
|
||||
IncludeFilesEdit.Text := NewPath;
|
||||
end
|
||||
else
|
||||
if AButton = OtherSourcesPathEditBtn then
|
||||
begin
|
||||
if CheckPath(OtherSourcesLabel.Caption, NewPath) then
|
||||
OtherSourcesEdit.Text := NewPath;
|
||||
end
|
||||
else
|
||||
if AButton = LibrariesPathEditBtn then
|
||||
begin
|
||||
if CheckPath(LibrariesLabel.Caption, NewPath) then
|
||||
LibrariesEdit.Text := NewPath;
|
||||
end
|
||||
else
|
||||
if AButton = DebugPathEditBtn then
|
||||
begin
|
||||
if CheckPath(DebugPathLabel.Caption, NewPath) then
|
||||
DebugPathEdit.Text := NewPath;
|
||||
end;
|
||||
end;
|
||||
NewPath := FCompilerOpts.ShortenPath(NewPath, False);
|
||||
ExpandedPath := TrimSearchPath(NewPath, FCompilerOpts.BaseDirectory, true);
|
||||
Result := CheckSearchPath(Context, ExpandedPath, ccomlHints);
|
||||
end;
|
||||
|
||||
procedure TCompilerPathOptionsFrame.FileBrowseBtnClick(Sender: TObject);
|
||||
@ -591,18 +494,24 @@ begin
|
||||
begin
|
||||
Name := 'OtherUnitsPathEditBtn';
|
||||
Caption := '...';
|
||||
Parent := Self;
|
||||
TabOrder := 1;
|
||||
Anchors := [akRight, akTop, akBottom];
|
||||
AnchorParallel(akTop, 0, OtherUnitsEdit);
|
||||
AnchorParallel(akBottom, 0, OtherUnitsEdit);
|
||||
AnchorParallel(akRight, 0, Self);
|
||||
AutoSize := True;
|
||||
AssociatedEdit := OtherUnitsEdit;
|
||||
ContextCaption := OtherUnitsLabel.Caption;
|
||||
Templates:='$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/components/custom' +
|
||||
';$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)';
|
||||
OnClick := @PathEditBtnClick;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
Parent := Self;
|
||||
TabOrder:=1;
|
||||
end;
|
||||
OtherUnitsEdit.AnchorToNeighbour(akRight, 0, OtherUnitsPathEditBtn);
|
||||
OtherUnitsEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
{------------------------------------------------------------}
|
||||
|
||||
@ -611,19 +520,21 @@ begin
|
||||
with IncludeFilesPathEditBtn do
|
||||
begin
|
||||
Name := 'IncludeFilesPathEditBtn';
|
||||
Caption := '...';
|
||||
Parent := Self;
|
||||
TabOrder := 3;
|
||||
Anchors := [akRight, akTop, akBottom];
|
||||
AnchorParallel(akTop, 0, IncludeFilesEdit);
|
||||
AnchorParallel(akBottom, 0, IncludeFilesEdit);
|
||||
AnchorParallel(akRight, 0, Self);
|
||||
AutoSize := True;
|
||||
Caption := '...';
|
||||
AssociatedEdit := IncludeFilesEdit;
|
||||
ContextCaption := IncludeFilesLabel.Caption;
|
||||
Templates := 'include;inc';
|
||||
OnClick := @PathEditBtnClick;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
Parent := Self;
|
||||
TabOrder:=3;
|
||||
end;
|
||||
IncludeFilesEdit.AnchorToNeighbour(akRight, 0, IncludeFilesPathEditBtn);
|
||||
IncludeFilesEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
{------------------------------------------------------------}
|
||||
|
||||
@ -632,19 +543,24 @@ begin
|
||||
with OtherSourcesPathEditBtn do
|
||||
begin
|
||||
Name := 'OtherSourcesPathEditBtn';
|
||||
Caption := '...';
|
||||
Parent := Self;
|
||||
TabOrder := 9;
|
||||
Anchors := [akRight, akTop, akBottom];
|
||||
AnchorParallel(akTop, 0, OtherSourcesEdit);
|
||||
AnchorParallel(akBottom, 0, OtherSourcesEdit);
|
||||
AnchorParallel(akRight, 0, Self);
|
||||
AutoSize := True;
|
||||
Caption := '...';
|
||||
AssociatedEdit := OtherSourcesEdit;
|
||||
ContextCaption := OtherSourcesLabel.Caption;
|
||||
Templates := '$(LazarusDir)/lcl' +
|
||||
';$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/components/synedit' +
|
||||
';$(LazarusDir)/components/codetools';
|
||||
OnClick := @PathEditBtnClick;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
Parent := Self;
|
||||
TabOrder:=9;
|
||||
end;
|
||||
OtherSourcesEdit.AnchorToNeighbour(akRight, 0, OtherSourcesPathEditBtn);
|
||||
OtherSourcesEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
{------------------------------------------------------------}
|
||||
|
||||
@ -653,19 +569,21 @@ begin
|
||||
with LibrariesPathEditBtn do
|
||||
begin
|
||||
Name := 'LibrariesPathEditBtn';
|
||||
Caption := '...';
|
||||
Parent := Self;
|
||||
TabOrder := 5;
|
||||
Anchors := [akRight, akTop, akBottom];
|
||||
AnchorParallel(akTop, 0, LibrariesEdit);
|
||||
AnchorParallel(akBottom, 0, LibrariesEdit);
|
||||
AnchorParallel(akRight, 0, Self);
|
||||
AutoSize := True;
|
||||
Caption := '...';
|
||||
AssociatedEdit := LibrariesEdit;
|
||||
ContextCaption := LibrariesLabel.Caption;
|
||||
Templates := '/usr/X11R6/lib;/sw/lib';
|
||||
OnClick := @PathEditBtnClick;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
Parent := Self;
|
||||
TabOrder:=5;
|
||||
end;
|
||||
LibrariesEdit.AnchorToNeighbour(akRight, 0, LibrariesPathEditBtn);
|
||||
LibrariesEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
{------------------------------------------------------------}
|
||||
|
||||
@ -674,20 +592,17 @@ begin
|
||||
with btnUnitOutputDir do
|
||||
begin
|
||||
Name := 'btnUnitOutputDir';
|
||||
Caption := '...';
|
||||
Parent := Self;
|
||||
TabOrder := 7;
|
||||
Anchors := [akRight, akTop, akBottom];
|
||||
AnchorParallel(akTop, 0, UnitOutputDirEdit);
|
||||
AnchorParallel(akBottom, 0, UnitOutputDirEdit);
|
||||
AnchorParallel(akRight, 0, Self);
|
||||
AutoSize := True;
|
||||
Caption := '...';
|
||||
OnClick := @FileBrowseBtnClick;
|
||||
Parent := Self;
|
||||
TabOrder:=7;
|
||||
end;
|
||||
UnitOutputDirEdit.AnchorToNeighbour(akRight, 0, btnUnitOutputDir);
|
||||
UnitOutputDirEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
ProjTargetFileEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
{------------------------------------------------------------}
|
||||
|
||||
@ -696,19 +611,23 @@ begin
|
||||
with DebugPathEditBtn do
|
||||
begin
|
||||
Name := 'DebugPathEditBtn';
|
||||
Caption := '...';
|
||||
Parent := Self;
|
||||
TabOrder := 13;
|
||||
Anchors := [akRight, akTop, akBottom];
|
||||
AnchorParallel(akTop, 0, DebugPathEdit);
|
||||
AnchorParallel(akBottom, 0, DebugPathEdit);
|
||||
AnchorParallel(akRight, 0, Self);
|
||||
AutoSize := True;
|
||||
Caption := '...';
|
||||
AssociatedEdit := DebugPathEdit;
|
||||
ContextCaption := DebugPathLabel.Caption;
|
||||
Templates := '$(LazarusDir)/lcl/include' +
|
||||
';$(LazarusDir)/lcl/interfaces/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/include';
|
||||
OnClick := @PathEditBtnClick;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
Parent := Self;
|
||||
TabOrder:=13;
|
||||
end;
|
||||
DebugPathEdit.AnchorToNeighbour(akRight, 0, DebugPathEditBtn);
|
||||
DebugPathEdit.Hint := lisDelimiterIsSemicolon;
|
||||
|
||||
{------------------------------------------------------------}
|
||||
|
||||
@ -767,12 +686,12 @@ begin
|
||||
ProjTargetApplyConventionsCheckBox.Visible:=false;
|
||||
end;
|
||||
|
||||
OtherUnitsEdit.Text := FCompilerOpts.OtherUnitFiles;
|
||||
IncludeFilesEdit.Text := FCompilerOpts.IncludePath;
|
||||
LibrariesEdit.Text := FCompilerOpts.Libraries;
|
||||
OtherSourcesEdit.Text := FCompilerOpts.SrcPath;
|
||||
SetPathTextAndHint(FCompilerOpts.OtherUnitFiles, OtherUnitsEdit);
|
||||
SetPathTextAndHint(FCompilerOpts.IncludePath, IncludeFilesEdit);
|
||||
SetPathTextAndHint(FCompilerOpts.Libraries, LibrariesEdit);
|
||||
SetPathTextAndHint(FCompilerOpts.SrcPath, OtherSourcesEdit);
|
||||
UnitOutputDirEdit.Text := FCompilerOpts.UnitOutputDirectory;
|
||||
DebugPathEdit.Text := FCompilerOpts.DebugPath;
|
||||
SetPathTextAndHint(FCompilerOpts.DebugPath, DebugPathEdit);
|
||||
|
||||
chkUseAsDefault.Visible := FCompilerOpts.CanBeDefaulForProject;
|
||||
end;
|
||||
|
||||
@ -82,7 +82,6 @@ type
|
||||
FEffectiveBaseDirectory: string;
|
||||
function GetPath: string;
|
||||
function GetTemplates: string;
|
||||
function PathToText(const APath: string): string;
|
||||
function BaseRelative(const APath: string): String;
|
||||
function PathAsAbsolute(const APath: string): String;
|
||||
function PathMayExist(APath: string): TObject;
|
||||
@ -90,7 +89,6 @@ type
|
||||
procedure SetBaseDirectory(const AValue: string);
|
||||
procedure SetPath(const AValue: string);
|
||||
procedure SetTemplates(const AValue: string);
|
||||
function TextToPath(const AText: string): string;
|
||||
procedure UpdateButtons;
|
||||
procedure WriteHelper(Paths: TStringList);
|
||||
public
|
||||
@ -100,21 +98,30 @@ type
|
||||
property Templates: string read GetTemplates write SetTemplates;
|
||||
end;
|
||||
|
||||
TOnPathEditorExecuted = TNotifyEvent;
|
||||
TOnPathEditorExecuted = function (Context: String; var NewPath: String): Boolean of object;
|
||||
|
||||
{ TPathEditorButton }
|
||||
|
||||
TPathEditorButton = class(TButton)
|
||||
private
|
||||
FCurrentPathEditor: TPathEditorDialog;
|
||||
FAssociatedEdit: TCustomEdit;
|
||||
FContextCaption: String;
|
||||
FTemplates: String;
|
||||
FOnExecuted: TOnPathEditorExecuted;
|
||||
protected
|
||||
procedure DoOnPathEditorExecuted;
|
||||
public
|
||||
procedure Click; override;
|
||||
property CurrentPathEditor: TPathEditorDialog read FCurrentPathEditor;
|
||||
property AssociatedEdit: TCustomEdit read FAssociatedEdit write FAssociatedEdit;
|
||||
property ContextCaption: String read FContextCaption write FContextCaption;
|
||||
property Templates: String read FTemplates write FTemplates;
|
||||
property OnExecuted: TOnPathEditorExecuted read FOnExecuted write FOnExecuted;
|
||||
end;
|
||||
|
||||
function PathEditorDialog: TPathEditorDialog;
|
||||
procedure SetPathTextAndHint(aPath: String; aEdit: TCustomEdit);
|
||||
|
||||
|
||||
implementation
|
||||
@ -130,6 +137,71 @@ begin
|
||||
Result:=PathEditor;
|
||||
end;
|
||||
|
||||
function TextToPath(const AText: string): string;
|
||||
var
|
||||
i, j: integer;
|
||||
begin
|
||||
Result:=AText;
|
||||
// convert all line ends to semicolons, remove empty paths and trailing spaces
|
||||
i:=1;
|
||||
j:=1;
|
||||
while i<=length(AText) do begin
|
||||
if AText[i] in [#10,#13] then begin
|
||||
// new line -> new path
|
||||
inc(i);
|
||||
if (i<=length(AText)) and (AText[i] in [#10,#13])
|
||||
and (AText[i]<>AText[i-1]) then
|
||||
inc(i);
|
||||
// skip spaces at end of path
|
||||
while (j>1) and (Result[j-1]=' ') do
|
||||
dec(j);
|
||||
// skip empty paths
|
||||
if (j=1) or (Result[j-1]<>';') then begin
|
||||
Result[j]:=';';
|
||||
inc(j);
|
||||
end;
|
||||
end else if ord(AText[i])<32 then begin
|
||||
// skip trailing spaces
|
||||
inc(i)
|
||||
end else if AText[i]=' ' then begin
|
||||
// space -> skip spaces at beginning of path
|
||||
if (j>1) and (Result[j-1]<>';') then begin
|
||||
Result[j]:=AText[i];
|
||||
inc(j);
|
||||
end;
|
||||
inc(i);
|
||||
end else begin
|
||||
// path char -> just copy
|
||||
Result[j]:=AText[i];
|
||||
inc(j);
|
||||
inc(i);
|
||||
end;
|
||||
end;
|
||||
if (j>1) and (Result[j-1]=';') then dec(j);
|
||||
SetLength(Result,j-1);
|
||||
end;
|
||||
|
||||
function PathToText(const APath: string): string;
|
||||
var
|
||||
i: integer;
|
||||
begin
|
||||
Result:='';
|
||||
for i:=1 to length(APath) do
|
||||
if APath[i]=';' then
|
||||
Result:=Result+LineEnding
|
||||
else
|
||||
Result:=Result+APath[i];
|
||||
end;
|
||||
|
||||
procedure SetPathTextAndHint(aPath: String; aEdit: TCustomEdit);
|
||||
begin
|
||||
aEdit.Text := aPath;
|
||||
if Pos(';', aPath) > 0 then // Zero or one separate paths.
|
||||
aEdit.Hint := PathToText(aPath)
|
||||
else
|
||||
aEdit.Hint := lisDelimiterIsSemicolon;
|
||||
end;
|
||||
|
||||
{ TPathEditorDialog }
|
||||
|
||||
function TPathEditorDialog.BaseRelative(const APath: string): String;
|
||||
@ -443,7 +515,7 @@ end;
|
||||
procedure TPathEditorDialog.PathListBoxKeyDown(Sender: TObject; var Key: Word;
|
||||
Shift: TShiftState);
|
||||
begin
|
||||
if (ssCtrl in shift ) and ((Key = VK_UP) or (Key = VK_DOWN)) then begin
|
||||
if (ssCtrl in shift) and ((Key = VK_UP) or (Key = VK_DOWN)) then begin
|
||||
if Key = VK_UP then
|
||||
MoveUpButtonClick(Nil)
|
||||
else
|
||||
@ -481,67 +553,15 @@ begin
|
||||
end;
|
||||
|
||||
procedure TPathEditorDialog.SetTemplates(const AValue: string);
|
||||
begin
|
||||
TemplatesListBox.Items.Text:=PathToText(AValue);
|
||||
TemplateGroupBox.Visible:=TemplatesListBox.Count>0;
|
||||
end;
|
||||
|
||||
function TPathEditorDialog.TextToPath(const AText: string): string;
|
||||
var
|
||||
i, j: integer;
|
||||
PathAsText: string;
|
||||
NewVis: Boolean;
|
||||
begin
|
||||
PathAsText:=AText;
|
||||
Result:=PathAsText;
|
||||
// convert all line ends to semicolons, remove empty paths and trailing spaces
|
||||
i:=1;
|
||||
j:=1;
|
||||
while i<=length(PathAsText) do begin
|
||||
if PathAsText[i] in [#10,#13] then begin
|
||||
// new line -> new path
|
||||
inc(i);
|
||||
if (i<=length(PathAsText)) and (PathAsText[i] in [#10,#13])
|
||||
and (PathAsText[i]<>PathAsText[i-1]) then
|
||||
inc(i);
|
||||
// skip spaces at end of path
|
||||
while (j>1) and (Result[j-1]=' ') do
|
||||
dec(j);
|
||||
// skip empty paths
|
||||
if (j=1) or (Result[j-1]<>';') then begin
|
||||
Result[j]:=';';
|
||||
inc(j);
|
||||
end;
|
||||
end else if ord(PathAsText[i])<32 then begin
|
||||
// skip trailing spaces
|
||||
inc(i)
|
||||
end else if PathAsText[i]=' ' then begin
|
||||
// space -> skip spaces at beginning of path
|
||||
if (j>1) and (Result[j-1]<>';') then begin
|
||||
Result[j]:=PathAsText[i];
|
||||
inc(j);
|
||||
end;
|
||||
inc(i);
|
||||
end else begin
|
||||
// path char -> just copy
|
||||
Result[j]:=PathAsText[i];
|
||||
inc(j);
|
||||
inc(i);
|
||||
end;
|
||||
end;
|
||||
if (j>1) and (Result[j-1]=';') then dec(j);
|
||||
SetLength(Result,j-1);
|
||||
end;
|
||||
|
||||
function TPathEditorDialog.PathToText(const APath: string): string;
|
||||
var
|
||||
i: integer;
|
||||
NewPath: string;
|
||||
begin
|
||||
NewPath:=APath;
|
||||
for i:=1 to length(NewPath) do
|
||||
if NewPath[i]=';' then
|
||||
NewPath[i]:=#13;
|
||||
Result:=NewPath;
|
||||
TemplatesListBox.Items.Text := PathToText(AValue);
|
||||
NewVis := TemplatesListBox.Count > 0;
|
||||
if NewVis = TemplateGroupBox.Visible then Exit;
|
||||
TemplateGroupBox.Visible := NewVis;
|
||||
if NewVis then
|
||||
TemplateGroupBox.Top:=0;
|
||||
end;
|
||||
|
||||
procedure TPathEditorDialog.UpdateButtons;
|
||||
@ -586,6 +606,8 @@ begin
|
||||
FCurrentPathEditor:=PathEditorDialog;
|
||||
try
|
||||
inherited Click;
|
||||
FCurrentPathEditor.Templates := SetDirSeparators(FTemplates);
|
||||
FCurrentPathEditor.Path := AssociatedEdit.Text;
|
||||
FCurrentPathEditor.ShowModal;
|
||||
DoOnPathEditorExecuted;
|
||||
finally
|
||||
@ -594,8 +616,17 @@ begin
|
||||
end;
|
||||
|
||||
procedure TPathEditorButton.DoOnPathEditorExecuted;
|
||||
var
|
||||
Ok: Boolean;
|
||||
NewPath: String;
|
||||
begin
|
||||
if Assigned(OnExecuted) then OnExecuted(Self);
|
||||
NewPath := FCurrentPathEditor.Path;
|
||||
Ok := (FCurrentPathEditor.ModalResult = mrOk) and (AssociatedEdit.Text <> NewPath);
|
||||
if Ok and Assigned(OnExecuted) then
|
||||
Ok := OnExecuted(ContextCaption, NewPath);
|
||||
// Assign value only if old <> new and OnExecuted allows it.
|
||||
if Ok then
|
||||
SetPathTextAndHint(NewPath, AssociatedEdit);
|
||||
end;
|
||||
|
||||
end.
|
||||
|
||||
@ -33,8 +33,7 @@ type
|
||||
FPDocPathButton: TPathEditorButton;
|
||||
FStoredPkgType: TLazPackageType;
|
||||
function GetSelectedPkgType: TLazPackageType;
|
||||
procedure PathEditBtnClick(Sender: TObject);
|
||||
procedure PathEditBtnExecuted(Sender: TObject);
|
||||
function PathEditBtnExecuted(Context: String; var NewPath: String): Boolean;
|
||||
procedure SetSelectedPkgType(PkgType: TLazPackageType);
|
||||
function ShowMsgPackageTypeMustBeDesign: boolean;
|
||||
function GetFPDocPkgNameEditValue: string;
|
||||
@ -83,14 +82,6 @@ begin
|
||||
FPDocPackageNameEdit.Text:=GetFPDocPkgNameEditValue;
|
||||
end;
|
||||
|
||||
procedure TPackageIntegrationOptionsFrame.PathEditBtnClick(Sender: TObject);
|
||||
var
|
||||
AButton: TPathEditorButton absolute Sender;
|
||||
begin
|
||||
AButton.CurrentPathEditor.Path := FPDocSearchPathsEdit.Text;
|
||||
AButton.CurrentPathEditor.Templates := '';
|
||||
end;
|
||||
|
||||
function TPackageIntegrationOptionsFrame.GetSelectedPkgType: TLazPackageType;
|
||||
begin
|
||||
if RunTimeOnlyRadioButton.Checked then
|
||||
@ -103,59 +94,44 @@ begin
|
||||
Result:=lptRunAndDesignTime;
|
||||
end;
|
||||
|
||||
procedure TPackageIntegrationOptionsFrame.PathEditBtnExecuted(Sender: TObject);
|
||||
function TPackageIntegrationOptionsFrame.PathEditBtnExecuted(Context: String;
|
||||
var NewPath: String): Boolean;
|
||||
var
|
||||
AButton: TPathEditorButton absolute Sender;
|
||||
NewPath: string;
|
||||
OldPath: string;
|
||||
CurDir: string;
|
||||
StartPos: integer;
|
||||
StartPos, OldStartPos: integer;
|
||||
DlgResult: TModalResult;
|
||||
OldStartPos: longint;
|
||||
begin
|
||||
if AButton.CurrentPathEditor.ModalResult <> mrOk then
|
||||
Exit;
|
||||
NewPath := AButton.CurrentPathEditor.Path;
|
||||
OldPath := FPDocSearchPathsEdit.Text;
|
||||
if OldPath <> NewPath then
|
||||
begin
|
||||
// check NewPath
|
||||
StartPos := 1;
|
||||
repeat
|
||||
OldStartPos := StartPos;
|
||||
CurDir := GetNextDirectoryInSearchPath(NewPath, StartPos);
|
||||
if CurDir <> '' then
|
||||
// check NewPath
|
||||
StartPos := 1;
|
||||
repeat
|
||||
OldStartPos := StartPos;
|
||||
CurDir := GetNextDirectoryInSearchPath(NewPath, StartPos);
|
||||
if CurDir <> '' then
|
||||
begin
|
||||
IDEMacros.SubstituteMacros(CurDir);
|
||||
FLazPackage.LongenFilename(CurDir);
|
||||
if not DirPathExists(CurDir) then
|
||||
begin
|
||||
IDEMacros.SubstituteMacros(CurDir);
|
||||
FLazPackage.LongenFilename(CurDir);
|
||||
if not DirPathExists(CurDir) then
|
||||
begin
|
||||
DlgResult := QuestionDlg(lisEnvOptDlgDirectoryNotFound,
|
||||
Format(lisDirectoryNotFound, [CurDir]),
|
||||
mtError, [mrIgnore, mrYes, lisRemoveFromSearchPath, mrCancel], 0);
|
||||
case DlgResult of
|
||||
mrIgnore: ;
|
||||
mrYes:
|
||||
begin
|
||||
// remove directory from search path
|
||||
NewPath := copy(NewPath, 1, OldStartPos - 1) +
|
||||
copy(NewPath, StartPos, length(NewPath));
|
||||
StartPos := OldStartPos;
|
||||
end;
|
||||
else
|
||||
// undo
|
||||
NewPath := OldPath;
|
||||
break;
|
||||
DlgResult := QuestionDlg(lisEnvOptDlgDirectoryNotFound,
|
||||
Format(lisDirectoryNotFound, [CurDir]),
|
||||
mtError, [mrIgnore, mrYes, lisRemoveFromSearchPath, mrCancel], 0);
|
||||
case DlgResult of
|
||||
mrIgnore: ;
|
||||
mrYes:
|
||||
begin // remove directory from search path
|
||||
NewPath := copy(NewPath,1,OldStartPos-1) + copy(NewPath,StartPos,length(NewPath));
|
||||
StartPos := OldStartPos;
|
||||
end;
|
||||
else // undo
|
||||
Exit(False);
|
||||
end;
|
||||
end;
|
||||
until StartPos > length(NewPath);
|
||||
end;
|
||||
FPDocSearchPathsEdit.Text := NewPath;
|
||||
end;
|
||||
until StartPos > length(NewPath);
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
procedure TPackageIntegrationOptionsFrame.SetSelectedPkgType(
|
||||
PkgType: TLazPackageType);
|
||||
procedure TPackageIntegrationOptionsFrame.SetSelectedPkgType(PkgType: TLazPackageType);
|
||||
begin
|
||||
case PkgType of
|
||||
lptRunTime: RunTimeRadioButton.Checked:=true;
|
||||
@ -192,7 +168,8 @@ begin
|
||||
FPDocPackageNameLabel.Caption := lisPckPackage;
|
||||
FPDocPackageNameEdit.Hint := lisPckClearToUseThePackageName;
|
||||
FPDocSearchPathsLabel.Caption := lisPathEditSearchPaths;
|
||||
FPDocSearchPathsEdit.Hint := lisPckSearchPathsForFpdocXmlFilesMultiplePathsMustBeSepa;
|
||||
// ToDo: remove the resource string later.
|
||||
//FPDocSearchPathsEdit.Hint := lisPckSearchPathsForFpdocXmlFilesMultiplePathsMustBeSepa;
|
||||
|
||||
FPDocPathButton := TPathEditorButton.Create(Self);
|
||||
with FPDocPathButton do
|
||||
@ -204,7 +181,7 @@ begin
|
||||
AnchorParallel(akRight, 6, DocGroupBox);
|
||||
AnchorParallel(akTop, 0, FPDocSearchPathsEdit);
|
||||
AnchorParallel(akBottom, 0, FPDocSearchPathsEdit);
|
||||
OnClick := @PathEditBtnClick;
|
||||
AssociatedEdit := FPDocSearchPathsEdit;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
Parent := DocGroupBox;
|
||||
end;
|
||||
@ -222,7 +199,7 @@ begin
|
||||
else
|
||||
UpdateRadioGroup.ItemIndex := 2;
|
||||
end;
|
||||
FPDocSearchPathsEdit.Text:=FLazPackage.FPDocPaths;
|
||||
SetPathTextAndHint(FLazPackage.FPDocPaths, FPDocSearchPathsEdit);
|
||||
if FLazPackage.FPDocPackageName='' then
|
||||
FPDocPackageNameEdit.Text:=lisDefaultPlaceholder
|
||||
else
|
||||
|
||||
@ -14,13 +14,13 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Control = Owner
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 147
|
||||
Height = 133
|
||||
Top = 0
|
||||
Width = 535
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
AutoSize = True
|
||||
Caption = 'Add paths to dependent packages/projects'
|
||||
ClientHeight = 130
|
||||
ClientHeight = 114
|
||||
ClientWidth = 531
|
||||
TabOrder = 0
|
||||
object UnitPathLabel: TLabel
|
||||
@ -29,8 +29,8 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 11
|
||||
Width = 23
|
||||
Top = 9
|
||||
Width = 26
|
||||
BorderSpacing.Left = 6
|
||||
Caption = 'Unit'
|
||||
ParentColor = False
|
||||
@ -41,8 +41,8 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 42
|
||||
Width = 40
|
||||
Top = 36
|
||||
Width = 45
|
||||
BorderSpacing.Left = 6
|
||||
Caption = 'Include'
|
||||
ParentColor = False
|
||||
@ -53,8 +53,8 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 73
|
||||
Width = 37
|
||||
Top = 63
|
||||
Width = 41
|
||||
BorderSpacing.Left = 6
|
||||
Caption = 'Object'
|
||||
ParentColor = False
|
||||
@ -65,8 +65,8 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideTop.Side = asrCenter
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 104
|
||||
Width = 39
|
||||
Top = 90
|
||||
Width = 43
|
||||
BorderSpacing.Left = 6
|
||||
Caption = 'Library'
|
||||
ParentColor = False
|
||||
@ -77,12 +77,14 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Control = AddPathsGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 80
|
||||
Height = 25
|
||||
Height = 21
|
||||
Top = 6
|
||||
Width = 401
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Right = 50
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 0
|
||||
end
|
||||
object IncludePathEdit: TEdit
|
||||
@ -92,12 +94,14 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Control = AddPathsGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 80
|
||||
Height = 25
|
||||
Top = 37
|
||||
Height = 21
|
||||
Top = 33
|
||||
Width = 401
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Right = 50
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 1
|
||||
end
|
||||
object ObjectPathEdit: TEdit
|
||||
@ -107,12 +111,14 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Control = AddPathsGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 80
|
||||
Height = 25
|
||||
Top = 68
|
||||
Height = 21
|
||||
Top = 60
|
||||
Width = 401
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Right = 50
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 2
|
||||
end
|
||||
object LibraryPathEdit: TEdit
|
||||
@ -122,14 +128,16 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Control = AddPathsGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 80
|
||||
Height = 25
|
||||
Top = 99
|
||||
Height = 21
|
||||
Top = 87
|
||||
Width = 401
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Left = 80
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Right = 50
|
||||
BorderSpacing.Bottom = 6
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 3
|
||||
end
|
||||
end
|
||||
@ -141,12 +149,12 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 171
|
||||
Top = 153
|
||||
Top = 139
|
||||
Width = 535
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
Caption = 'Add options to dependent packages and projects'
|
||||
ClientHeight = 154
|
||||
ClientHeight = 152
|
||||
ClientWidth = 531
|
||||
TabOrder = 1
|
||||
object LinkerOptionsLabel: TLabel
|
||||
@ -155,7 +163,7 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 6
|
||||
Width = 34
|
||||
Width = 38
|
||||
BorderSpacing.Left = 6
|
||||
Caption = 'Linker'
|
||||
ParentColor = False
|
||||
@ -166,7 +174,7 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 74
|
||||
Width = 41
|
||||
Width = 46
|
||||
BorderSpacing.Left = 6
|
||||
Caption = 'Custom'
|
||||
ParentColor = False
|
||||
@ -176,10 +184,10 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideTop.Control = AddOptionsGroupBox
|
||||
AnchorSideRight.Control = AddOptionsGroupBox
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 57
|
||||
Left = 62
|
||||
Height = 62
|
||||
Top = 6
|
||||
Width = 468
|
||||
Width = 463
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Top = 6
|
||||
BorderSpacing.Right = 6
|
||||
@ -195,10 +203,10 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Side = asrBottom
|
||||
AnchorSideBottom.Control = AddOptionsGroupBox
|
||||
AnchorSideBottom.Side = asrBottom
|
||||
Left = 57
|
||||
Height = 74
|
||||
Left = 62
|
||||
Height = 72
|
||||
Top = 74
|
||||
Width = 468
|
||||
Width = 463
|
||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||
BorderSpacing.Left = 10
|
||||
BorderSpacing.Top = 6
|
||||
@ -215,19 +223,19 @@ object PackageUsageOptionsFrame: TPackageUsageOptionsFrame
|
||||
AnchorSideRight.Control = Owner
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 53
|
||||
Top = 330
|
||||
Height = 57
|
||||
Top = 316
|
||||
Width = 535
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
AutoSize = True
|
||||
BorderSpacing.Top = 6
|
||||
Caption = 'ProjectGroupBox'
|
||||
ClientHeight = 36
|
||||
ClientHeight = 38
|
||||
ClientWidth = 531
|
||||
TabOrder = 2
|
||||
object AddPackageUnitToProjectCheckBox: TCheckBox
|
||||
Left = 6
|
||||
Height = 24
|
||||
Height = 20
|
||||
Top = 6
|
||||
Width = 519
|
||||
Align = alTop
|
||||
|
||||
@ -36,9 +36,7 @@ type
|
||||
ObjectPathButton: TPathEditorButton;
|
||||
LibraryPathButton: TPathEditorButton;
|
||||
FLazPackage: TLazPackage;
|
||||
procedure PathEditBtnClick(Sender: TObject);
|
||||
procedure PathEditBtnExecuted(Sender: TObject);
|
||||
function GetEditForPathButton(AButton: TPathEditorButton): TEdit;
|
||||
function PathEditBtnExecuted(Context: String; var NewPath: String): Boolean;
|
||||
public
|
||||
function GetTitle: string; override;
|
||||
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
|
||||
@ -53,114 +51,40 @@ implementation
|
||||
|
||||
{ TPackageUsageOptionsFrame }
|
||||
|
||||
procedure TPackageUsageOptionsFrame.PathEditBtnClick(Sender: TObject);
|
||||
function TPackageUsageOptionsFrame.PathEditBtnExecuted(Context: String; var NewPath: String): Boolean;
|
||||
var
|
||||
AButton: TPathEditorButton;
|
||||
OldPath: string;
|
||||
AnEdit: TEdit;
|
||||
Templates: string;
|
||||
begin
|
||||
if not (Sender is TPathEditorButton) then
|
||||
exit;
|
||||
AButton := TPathEditorButton(Sender);
|
||||
AnEdit := GetEditForPathButton(AButton);
|
||||
OldPath := AnEdit.Text;
|
||||
if AButton = UnitPathButton then
|
||||
begin
|
||||
Templates := SetDirSeparators('$(PkgOutDir)' +
|
||||
'$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/components/custom' +
|
||||
';$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)');
|
||||
end
|
||||
else if AButton = IncludePathButton then
|
||||
begin
|
||||
Templates := 'include';
|
||||
end
|
||||
else
|
||||
if AButton = ObjectPathButton then
|
||||
begin
|
||||
Templates := 'objects';
|
||||
end
|
||||
else
|
||||
if AButton = LibraryPathButton then
|
||||
begin
|
||||
Templates := '';
|
||||
end;
|
||||
AButton.CurrentPathEditor.Path := OldPath;
|
||||
AButton.CurrentPathEditor.Templates := SetDirSeparators(Templates);
|
||||
end;
|
||||
|
||||
procedure TPackageUsageOptionsFrame.PathEditBtnExecuted(Sender: TObject);
|
||||
var
|
||||
AButton: TPathEditorButton;
|
||||
NewPath: string;
|
||||
AnEdit: TEdit;
|
||||
OldPath: string;
|
||||
CurDir: string;
|
||||
StartPos: integer;
|
||||
StartPos, OldStartPos: integer;
|
||||
DlgResult: TModalResult;
|
||||
OldStartPos: longint;
|
||||
begin
|
||||
if not (Sender is TPathEditorButton) then
|
||||
exit;
|
||||
AButton := TPathEditorButton(Sender);
|
||||
if AButton.CurrentPathEditor.ModalResult <> mrOk then
|
||||
exit;
|
||||
NewPath := AButton.CurrentPathEditor.Path;
|
||||
AnEdit := GetEditForPathButton(AButton);
|
||||
OldPath := AnEdit.Text;
|
||||
if OldPath <> NewPath then
|
||||
begin
|
||||
// check NewPath
|
||||
StartPos := 1;
|
||||
repeat
|
||||
OldStartPos := StartPos;
|
||||
CurDir := GetNextDirectoryInSearchPath(NewPath, StartPos);
|
||||
if CurDir <> '' then
|
||||
// check NewPath
|
||||
StartPos := 1;
|
||||
repeat
|
||||
OldStartPos := StartPos;
|
||||
CurDir := GetNextDirectoryInSearchPath(NewPath, StartPos);
|
||||
if CurDir <> '' then
|
||||
begin
|
||||
IDEMacros.SubstituteMacros(CurDir);
|
||||
FLazPackage.LongenFilename(CurDir);
|
||||
if not DirPathExists(CurDir) then
|
||||
begin
|
||||
IDEMacros.SubstituteMacros(CurDir);
|
||||
FLazPackage.LongenFilename(CurDir);
|
||||
if not DirPathExists(CurDir) then
|
||||
begin
|
||||
DlgResult := QuestionDlg(lisEnvOptDlgDirectoryNotFound,
|
||||
Format(lisDirectoryNotFound, [CurDir]),
|
||||
mtError, [mrIgnore, mrYes, lisRemoveFromSearchPath, mrCancel], 0);
|
||||
case DlgResult of
|
||||
mrIgnore: ;
|
||||
mrYes:
|
||||
begin
|
||||
// remove directory from search path
|
||||
NewPath := copy(NewPath, 1, OldStartPos - 1) +
|
||||
copy(NewPath, StartPos, length(NewPath));
|
||||
StartPos := OldStartPos;
|
||||
end;
|
||||
else
|
||||
// undo
|
||||
NewPath := OldPath;
|
||||
break;
|
||||
DlgResult := QuestionDlg(lisEnvOptDlgDirectoryNotFound,
|
||||
Format(lisDirectoryNotFound, [CurDir]),
|
||||
mtError, [mrIgnore, mrYes, lisRemoveFromSearchPath, mrCancel], 0);
|
||||
case DlgResult of
|
||||
mrIgnore: ;
|
||||
mrYes:
|
||||
begin // remove directory from search path
|
||||
NewPath := copy(NewPath,1,OldStartPos-1) + copy(NewPath,StartPos,length(NewPath));
|
||||
StartPos := OldStartPos;
|
||||
end;
|
||||
else // undo
|
||||
Exit(False);
|
||||
end;
|
||||
end;
|
||||
until StartPos > length(NewPath);
|
||||
end;
|
||||
AnEdit.Text := NewPath;
|
||||
end;
|
||||
|
||||
function TPackageUsageOptionsFrame.GetEditForPathButton(
|
||||
AButton: TPathEditorButton): TEdit;
|
||||
begin
|
||||
if AButton = UnitPathButton then
|
||||
Result := UnitPathEdit
|
||||
else if AButton = IncludePathButton then
|
||||
Result := IncludePathEdit
|
||||
else if AButton = ObjectPathButton then
|
||||
Result := ObjectPathEdit
|
||||
else if AButton = LibraryPathButton then
|
||||
Result := LibraryPathEdit
|
||||
else
|
||||
Result := nil;
|
||||
end;
|
||||
until StartPos > length(NewPath);
|
||||
Result := True;
|
||||
end;
|
||||
|
||||
function TPackageUsageOptionsFrame.GetTitle: string;
|
||||
@ -190,7 +114,13 @@ begin
|
||||
AnchorParallel(akRight, 6, AddPathsGroupBox);
|
||||
AnchorParallel(akTop, 0, UnitPathEdit);
|
||||
AnchorParallel(akBottom, 0, UnitPathEdit);
|
||||
OnClick := @PathEditBtnClick;
|
||||
AssociatedEdit := UnitPathEdit;
|
||||
Templates := '$(PkgOutDir)' +
|
||||
'$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)' +
|
||||
';$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)' +
|
||||
';$(LazarusDir)/components/custom' +
|
||||
';$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)';
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
end;
|
||||
UnitPathEdit.AnchorToNeighbour(akRight,0,UnitPathButton);
|
||||
@ -206,7 +136,8 @@ begin
|
||||
AnchorParallel(akRight, 6, AddPathsGroupBox);
|
||||
AnchorParallel(akTop, 0, IncludePathEdit);
|
||||
AnchorParallel(akBottom, 0, IncludePathEdit);
|
||||
OnClick := @PathEditBtnClick;
|
||||
AssociatedEdit := IncludePathEdit;
|
||||
Templates := 'include';
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
end;
|
||||
IncludePathEdit.AnchorToNeighbour(akRight,0,IncludePathButton);
|
||||
@ -222,7 +153,8 @@ begin
|
||||
AnchorParallel(akRight, 6, AddPathsGroupBox);
|
||||
AnchorParallel(akTop, 0, ObjectPathEdit);
|
||||
AnchorParallel(akBottom, 0, ObjectPathEdit);
|
||||
OnClick := @PathEditBtnClick;
|
||||
AssociatedEdit := ObjectPathEdit;
|
||||
Templates := 'objects';
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
end;
|
||||
ObjectPathEdit.AnchorToNeighbour(akRight,0,ObjectPathButton);
|
||||
@ -238,7 +170,7 @@ begin
|
||||
AnchorParallel(akRight, 6, AddPathsGroupBox);
|
||||
AnchorParallel(akTop, 0, LibraryPathEdit);
|
||||
AnchorParallel(akBottom, 0, LibraryPathEdit);
|
||||
OnClick := @PathEditBtnClick;
|
||||
AssociatedEdit := LibraryPathEdit;
|
||||
OnExecuted := @PathEditBtnExecuted;
|
||||
end;
|
||||
LibraryPathEdit.AnchorToNeighbour(akRight,0,LibraryPathButton);
|
||||
@ -252,10 +184,10 @@ begin
|
||||
FLazPackage := (AOptions as TPackageIDEOptions).Package;
|
||||
with FLazPackage.UsageOptions do
|
||||
begin
|
||||
UnitPathEdit.Text := UnitPath;
|
||||
IncludePathEdit.Text := IncludePath;
|
||||
ObjectPathEdit.Text := ObjectPath;
|
||||
LibraryPathEdit.Text := LibraryPath;
|
||||
SetPathTextAndHint(UnitPath, UnitPathEdit);
|
||||
SetPathTextAndHint(IncludePath, IncludePathEdit);
|
||||
SetPathTextAndHint(ObjectPath, ObjectPathEdit);
|
||||
SetPathTextAndHint(LibraryPath, LibraryPathEdit);
|
||||
LinkerOptionsMemo.Text := LinkerOptions;
|
||||
CustomOptionsMemo.Text := CustomOptions;
|
||||
end;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user