mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2026-01-06 02:00:44 +01:00
fixed missing result
git-svn-id: trunk@9320 -
This commit is contained in:
parent
0fe3331886
commit
3787720bcf
@ -1135,6 +1135,7 @@ begin
|
||||
ANode:=ANode.Parent;
|
||||
end;
|
||||
end;
|
||||
Result:=nil;
|
||||
end;
|
||||
|
||||
function TPascalReaderTool.FindClassNode(CursorNode: TCodeTreeNode
|
||||
|
||||
@ -99,6 +99,7 @@ resourcestring
|
||||
lisMakeExe = 'Make Executable';
|
||||
lisProjectMacroProperties = 'Project macro properties';
|
||||
lisOpenProject2 = 'Open project';
|
||||
lisOpenTheFileAsNormalSource = 'Open the file as normal source';
|
||||
lisOpenAsXmlFile = 'Open as XML file';
|
||||
lisAnErrorOccuredAtLastStartupWhileLoadingLoadThisPro = 'An error occured '
|
||||
+'at last startup while loading %s!%s%sLoad this project again?';
|
||||
@ -385,10 +386,9 @@ resourcestring
|
||||
lisFileNotFound2 = 'File %s%s%s not found.%s';
|
||||
lisFileNotFoundDoYouWantToCreateIt = 'File %s%s%s not found.%sDo you want '
|
||||
+'to create it?%s';
|
||||
lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarus = 'The file %s%s%s%'
|
||||
+'sseems to be the program file of an existing lazarus Project1.%sOpen '
|
||||
+'project?%sCancel will load the file as normal source.';
|
||||
lisProjectInfoFileDetected = 'Project info file detected';
|
||||
lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarusP = 'The file %s seems '
|
||||
+'to be the program file of an existing lazarus Project.';
|
||||
lisTheFileSeemsToBeAProgramCloseCurrentProject = 'The file %s%s%s%sseems to '
|
||||
+'be a program. Close current project and create a new lazarus project '
|
||||
+'for this program?%s"No" will load the file as normal source.';
|
||||
|
||||
10
ide/main.pp
10
ide/main.pp
@ -4542,11 +4542,11 @@ begin
|
||||
// or it is not yet a lazarus project ;)
|
||||
LPIFilename:=ChangeFileExt(AFilename,'.lpi');
|
||||
if FileExists(LPIFilename) then begin
|
||||
AText:=Format(lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarus, [
|
||||
'"', AFilename, '"', #13, #13, #13]);
|
||||
ACaption:=lisProjectInfoFileDetected;
|
||||
if MessageDlg(ACaption, AText, mtconfirmation,
|
||||
[mbok, mbcancel], 0)=mrOk then
|
||||
if QuestionDlg(lisProjectInfoFileDetected,
|
||||
Format(lisTheFileSeemsToBeTheProgramFileOfAnExistingLazarusP, [
|
||||
AFilename]), mtConfirmation,
|
||||
[mrOk, lisOpenProject2, mrCancel, lisOpenTheFileAsNormalSource], 0)
|
||||
=mrOk then
|
||||
begin
|
||||
Result:=DoOpenProjectFile(LPIFilename,[]);
|
||||
Handled:=true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user