paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 12:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Show name and description in "New Item" and "New Project" dialogs. Simplifies GetLocalizedDescription methods. Issue #37134.

Browse Source 
git-svn-id: trunk@63234 -
This commit is contained in:
juha 2020-05-27 10:30:19 +00:00
parent 5312403ae8
commit 1e444d8398
7 changed files with 62 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/fpcunit/ide/fpcunitlazideintf.pas
View File

@ -91,17 +91,12 @@ implementation
resourcestring
sFPCUnTestApp = 'FPCUnit Test Application';
sFPCUnTestAppDesc = 'FPCUnit Test Application%sAn application to run '
+'FPCUnit test cases.%sThe application source is automatically maintained by '
+'Lazarus.';
sFPCUnTestAppDesc = 'An application to run FPCUnit test cases.';
sFPCUnTestCase = 'FPCUnit Test Case';
sFPCUnTestCaseDesc = 'FPCUnit Test Case%sA unit containing a FPCUnit Test '
+'Case.';
sFPCUnTestCaseDesc = 'A unit containing a FPCUnit Test Case.';
sWriteYourOwnTest = 'Write your own test';
sFPCUnConsoleTestApp = 'FPCUnit Console Test Application';
sFPCUnConsoleTestDesc = 'FPCUnit Console Test Application%sAn application '
+'to run FPCUnit test cases in console mode.%sThe application source is '
+'automatically maintained by Lazarus.';
sFPCUnConsoleTestDesc = 'An application to run FPCUnit test cases in console mode.';
procedure Register;
begin
@ -127,11 +122,8 @@ begin
end;
function TFPCUnitApplicationDescriptor.GetLocalizedDescription: string;
var
le: string;
begin
le := System.LineEnding;
Result:=Format(sFPCUnTestAppDesc,[le+le,le]);
Result:=sFPCUnTestAppDesc;
end;
function TFPCUnitApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -255,7 +247,7 @@ end;
function TFileDescPascalUnitFPCUnitTestCase.GetLocalizedDescription: string;
begin
Result:=Format(sFPCUnTestCaseDesc,[#13]);
Result:=sFPCUnTestCaseDesc;
end;
function TFileDescPascalUnitFPCUnitTestCase.GetInterfaceSource(const Filename,
@ -331,11 +323,8 @@ begin
end;
function TFPCUnitConsoleApplicationDescriptor.GetLocalizedDescription: string;
var
le: string;
begin
le := System.LineEnding;
Result:=Format(sFPCUnConsoleTestDesc,[le+le,le]);
Result:=sFPCUnConsoleTestDesc;
end;
function TFPCUnitConsoleApplicationDescriptor.InitProject(

9
components/fpweb/fpwebtoolsunit.pas
View File

@ -773,8 +773,7 @@ begin
Result:=SHtmlFileDesc;
end;
function THtmlFileDescriptor.GetResourceSource(const ResourceName: string
): string;
function THtmlFileDescriptor.GetResourceSource(const ResourceName: string): string;
begin
Result:='';
end;
@ -819,8 +818,7 @@ begin
Result:=SJSFileDesc;
end;
function TJSFileDescriptor.GetResourceSource(const ResourceName: string
): string;
function TJSFileDescriptor.GetResourceSource(const ResourceName: string): string;
begin
Result:='';
end;
@ -859,8 +857,7 @@ begin
Result:=SCSSFileDesc;
end;
function TCSSFileDescriptor.GetResourceSource(const ResourceName: string
): string;
function TCSSFileDescriptor.GetResourceSource(const ResourceName: string): string;
begin
Result:='';
end;

73
components/fpweb/weblazideintf.pp
View File

@ -205,44 +205,32 @@ procedure Register;
resourcestring
rsCGIApplicati = 'CGI Application';
rsCGIApplicati2 = 'CGI Application%sA CGI (Common Gateway Interface) '
+'program in Free Pascal using webmodules. The program source is '
+'automatically maintained by Lazarus.';
rsCGIApplicati2 = 'A CGI (Common Gateway Interface) program in Free Pascal using webmodules.';
rsCustomCGIApp = 'Custom CGI Application';
rsCustomCGIApp2 = 'Custom CGI Application%sA CGI (Common Gateway Interface) '
+'program in Free Pascal. The program source is automatically maintained '
+'by Lazarus.';
rsCustomCGIApp2 = 'A CGI (Common Gateway Interface) program in Free Pascal.';
rsWebModule = 'Web Module';
rsWEBModuleADa = 'WEB Module%sA datamodule for WEB (HTTP) applications.';
rsWEBModuleADa = 'A datamodule for WEB (HTTP) applications.';
rsHTMLWebModul = 'HTML Web Module';
rsHTMLWEBModul2 = 'HTML WEB Module%sA Web datamodule for producing strict '
+'HTML.';
rsHTMLWEBModul2 = 'A Web datamodule for producing strict HTML.';
rsApacheModule = 'Apache Module';
rsApacheModule2 = 'Apache module%sAn Apache loadable module in Free Pascal '
+'using webmodules. The main library file is automatically maintained by '
+'Lazarus.';
rsApacheModule2 = 'An Apache loadable module in Free Pascal using webmodules. '
+'The main library file is automatically maintained by Lazarus.';
rsCustomFastCG = 'Custom FastCGI Application';
rsCustomFastCG2 = 'Custom FastCGI Application%sA FastCGI (Common Gateway '
+'Interface) program in Free Pascal. The program source is automatically '
+'maintained by Lazarus.';
rsCustomFastCG2 = 'A FastCGI (Common Gateway Interface) program in Free Pascal.';
rsFastCGIAppli = 'FastCGI Application';
rsFastCGIAppli2 = 'FastCGI Application%sA FastCGI (Common Gateway '
+'Interface) program in Free Pascal using webmodules. The program source '
+'is automatically maintained by Lazarus.';
rsFastCGIAppli2 = 'FastCGI Application%sA FastCGI (Common Gateway Interface) '
+'program in Free Pascal using webmodules.';
rsWebDataProvi = 'Web DataProvider Module';
rsWEBDataProvi2 = 'WEB DataProvider Module%sA datamodule to handle data '
+'requests for WEB (HTTP) applications using WebDataProvider components.';
rsWEBDataProvi2 = 'A datamodule to handle data requests for WEB (HTTP) '
+'applications using WebDataProvider components.';
rsWebJSONRPCMo = 'Web JSON-RPC Module';
rsWEBJSONRPCMo2 = 'WEB JSON-RPC Module%sA datamodule to dispatch JSON-RPC '
+'requests in WEB (HTTP) applications using TJSONRPCHandler components.';
rsWEBJSONRPCMo2 = 'A datamodule to dispatch JSON-RPC requests in WEB (HTTP) '
+'applications using TJSONRPCHandler components.';
rsWebExtDirect = 'Web Ext.Direct Module';
rsWEBExtDirect2 = 'WEB Ext.Direct Module%sA datamodule to dispatch Ext.'
+'Direct requests in WEB (HTTP) applications using TJSONRPCHandler '
+'components.';
rsWEBExtDirect2 = 'A datamodule to dispatch Ext.Direct requests in WEB (HTTP) '
+'applications using TJSONRPCHandler components.';
rsHTTPAppli = 'HTTP server Application';
rsHTTPAppli2 = 'HTTP server Application. Complete HTTP Server '
+'program in Free Pascal using webmodules. The program source '
+'is automatically maintained by Lazarus.';
rsHTTPAppli2 = 'Complete HTTP Server program in Free Pascal using webmodules.';
implementation
@ -366,7 +354,7 @@ end;
function TCGIApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(rsCGIApplicati2, [#13#13]);
Result:=rsCGIApplicati2;
end;
function TCGIApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -432,7 +420,7 @@ end;
function TCustomCGIApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(rsCustomCGIApp2, [#13#13]);
Result:=rsCustomCGIApp2;
end;
function TCustomCGIApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -531,7 +519,7 @@ end;
function TFileDescWebDataModule.GetLocalizedDescription: string;
begin
Result:=Format(rsWEBModuleADa, [#13]);
Result:=rsWEBModuleADa;
end;
function TFileDescWebDataModule.GetImplementationSource(const Filename, SourceName, ResourceName: string): string;
@ -568,7 +556,7 @@ end;
function TFileDescHTMLModule.GetLocalizedDescription: string;
begin
Result:=Format(rsHTMLWEBModul2, [#13]);
Result:=rsHTMLWEBModul2;
end;
function TFileDescHTMLModule.GetImplementationSource(const Filename, SourceName, ResourceName: string): string;
@ -595,7 +583,7 @@ end;
function TApacheApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(rsApacheModule2, [#13#13]);
Result:=rsApacheModule2;
end;
function TApacheApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -686,11 +674,10 @@ end;
function TCustomFCGIApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(rsCustomFastCG2, [#13#13]);
Result:=rsCustomFastCG2;
end;
function TCustomFCGIApplicationDescriptor.InitProject(AProject: TLazProject
): TModalResult;
function TCustomFCGIApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
var
le: string;
NewSource: String;
@ -769,11 +756,10 @@ end;
function TFCGIApplicationDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(rsFastCGIAppli2, [#13#13]);
Result:=rsFastCGIAppli2;
end;
function TFCGIApplicationDescriptor.InitProject(AProject: TLazProject
): TModalResult;
function TFCGIApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
var
le: string;
NewSource: String;
@ -956,7 +942,7 @@ end;
function TFileDescWebProviderDataModule.GetLocalizedDescription: string;
begin
Result:=Format(rsWEBDataProvi2, [#13]);
Result:=rsWEBDataProvi2;
end;
function TFileDescWebProviderDataModule.GetImplementationSource(const Filename,
@ -993,7 +979,7 @@ end;
function TFileDescWebJSONRPCModule.GetLocalizedDescription: string;
begin
Result:=Format(rsWEBJSONRPCMo2, [#13]);
Result:=rsWEBJSONRPCMo2;
end;
function TFileDescWebJSONRPCModule.GetImplementationSource(const Filename,
@ -1052,7 +1038,7 @@ end;
function TFileDescExtDirectModule.GetLocalizedDescription: string;
begin
Result:=Format(rsWEBExtDirect2, [#13]);
Result:=rsWEBExtDirect2;
end;
function TFileDescExtDirectModule.GetImplementationSource(const Filename,
@ -1190,8 +1176,7 @@ begin
Result:=inherited GetLocalizedDescription;
end;
function TJSFileDescriptor.GetResourceSource(const ResourceName: string
): string;
function TJSFileDescriptor.GetResourceSource(const ResourceName: string): string;
begin
Result:=inherited GetResourceSource(ResourceName);
end;

8
components/instantfpc/instantfpcregisterlaz.pas
View File

@ -33,9 +33,9 @@ type
resourcestring
rsInstantFPCPr = 'InstantFPC program';
rsSingleFileFr = '%s%sSingle file Free Pascal program executed by InstantFPC';
rsSingleFileFr = 'Single file Free Pascal program executed by InstantFPC';
rsInstantFPCSc = 'InstantFPC script';
rsSingleFilePr = '%s%sSingle file program using InstantFPC to compile and execute';
rsSingleFilePr = 'Single file program using InstantFPC to compile and execute';
const
FileDescNameInstantFPC : string = rsInstantFPCPr;
@ -68,7 +68,7 @@ end;
function TProjectInstantFPCDescriptor.GetLocalizedDescription: string;
begin
Result:=Format(rsSingleFileFr, [GetLocalizedName, LineEnding]);
Result:=rsSingleFileFr;
end;
function TProjectInstantFPCDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -136,7 +136,7 @@ end;
function TFileDescInstantFPCScript.GetLocalizedDescription: string;
begin
Result:=Format(rsSingleFilePr, [GetLocalizedName, LineEnding]);
Result:=rsSingleFilePr;
end;
function TFileDescInstantFPCScript.CreateSource(const Filename, SourceName,

3
ide/newdialog.pas
View File

@ -405,7 +405,8 @@ begin
end else
begin
aNewItemTemplate := TNewIDEItemTemplate(ANode.Data);
Desc := aNewItemTemplate.Description;
Desc := aNewItemTemplate.LocalizedName + LineEnding+LineEnding
+aNewItemTemplate.Description;
if aNewItemTemplate is TNewItemProjectFile then
begin
if TNewItemProjectFile(aNewItemTemplate).Descriptor is TFileDescInheritedComponent

15
ide/newprojectdlg.pp
View File

@ -31,9 +31,15 @@ unit NewProjectDlg;
interface
uses
Classes, SysUtils, Forms, Graphics, Controls, Project, Buttons, ButtonPanel,
StdCtrls, ProjectIntf, ExtCtrls, ComCtrls, LazarusIDEStrConsts,
IDEHelpIntf, IDEImagesIntf;
Classes, SysUtils,
// LCL
Forms, Graphics, Controls, Buttons, ButtonPanel, StdCtrls, ExtCtrls, ComCtrls,
// BuildIntf
ProjectIntf,
// IdeIntf
IDEHelpIntf, IDEImagesIntf,
// IDE
LazarusIDEStrConsts, Project;
type
@ -97,7 +103,8 @@ begin
if Assigned(ANode) and Assigned(ANode.Data) then
begin
FProjectDescriptor:=TProjectDescriptor(ANode.Data);
HelpLabel.Caption:=FProjectDescriptor.GetLocalizedDescription;
HelpLabel.Caption:=FProjectDescriptor.GetLocalizedName + LineEnding+LineEnding
+FProjectDescriptor.GetLocalizedDescription;
ButtonPanel.OKButton.Enabled:=true;
end
else

15
ide/projectdescriptors.pas
View File

@ -116,7 +116,7 @@ end;
function TProjectApplicationDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisApplicationProgramDescriptor;
Result:=lisApplicationProgramDescriptor;
end;
function TProjectApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -192,7 +192,7 @@ end;
function TProjectSimpleProgramDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisSimpleProgramProgramDescriptor;
Result:=lisSimpleProgramProgramDescriptor;
end;
function TProjectSimpleProgramDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -242,7 +242,7 @@ end;
function TProjectProgramDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisProgramProgramDescriptor;
Result:=lisProgramProgramDescriptor;
end;
function TProjectProgramDescriptor.InitProject(AProject: TLazProject): TModalResult;
@ -306,11 +306,10 @@ end;
function TProjectManualProgramDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisCustomProgramProgramDescriptor;
Result:=lisCustomProgramProgramDescriptor;
end;
function TProjectManualProgramDescriptor.InitProject(AProject: TLazProject
): TModalResult;
function TProjectManualProgramDescriptor.InitProject(AProject: TLazProject): TModalResult;
var
NewSource: String;
MainFile: TLazProjectFile;
@ -375,7 +374,7 @@ end;
function TProjectConsoleApplicationDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisConsoleApplicationProgramDescriptor;
Result:=lisConsoleApplicationProgramDescriptor;
end;
function TProjectConsoleApplicationDescriptor.InitProject(AProject: TLazProject
@ -545,7 +544,7 @@ end;
function TProjectLibraryDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisLibraryProgramDescriptor;
Result:=lisLibraryProgramDescriptor;
end;
function TProjectLibraryDescriptor.InitProject(AProject: TLazProject): TModalResult;