Revert r47571 #74d2ec821a "IDE: New project description for UTF8 ...". Build mode cannot be set in project description.

git-svn-id: trunk@47594 -
This commit is contained in:
juha 2015-02-05 16:05:09 +00:00
parent 9569ce56d2
commit d2dc7a43e6
4 changed files with 2 additions and 41 deletions

View File

@ -32,7 +32,6 @@ const
ProjDescGroupName = 'Project';
ProjDescNameApplication = 'Application';
ProjDescNameUtf8Application = 'UTF-8 Application';
ProjDescNameSimpleProgram = 'Simple Program';
ProjDescNameProgram = 'Program';
ProjDescNameConsoleApplication = 'Console application';

View File

@ -2328,7 +2328,6 @@ resourcestring
dlgProjectOptions = 'Project Options';
dlgProjectOptionsFor = 'Options for Project: %s';
dlgPOApplication = 'Application';
dlgPOUtf8Application = 'UTF-8 Application';
dlgPOFroms = 'Forms';
dlgPOResources = 'Resources';
rsResourceFileName = 'File name';
@ -4650,8 +4649,6 @@ resourcestring
lisApplicationProgramDescriptor = 'A graphical Free Pascal application using'
+' the cross-platform LCL library for its GUI.';
lisUtf8ApplicationProgramDescriptor = 'A graphical application for FPC 3.0 and higher using'
+' the cross-platform LCL library for its GUI and mapping FPC default String to UTF-8 encoding.';
lisSimpleProgramProgramDescriptor = 'A most simple Free Pascal command line program.';
lisProgramProgramDescriptor = 'A Free Pascal command line program with some useful settings added.';
lisConsoleApplicationProgramDescriptor = 'A Free Pascal command line program using'

View File

@ -2568,7 +2568,6 @@ begin
// project descriptors
LazProjectDescriptors:=TLazProjectDescriptors.Create;
RegisterProjectDescriptor(TProjectApplicationDescriptor.Create);
RegisterProjectDescriptor(TProjectUtf8ApplicationDescriptor.Create);
RegisterProjectDescriptor(TProjectSimpleProgramDescriptor.Create);
RegisterProjectDescriptor(TProjectProgramDescriptor.Create);
RegisterProjectDescriptor(TProjectConsoleApplicationDescriptor.Create);

View File

@ -315,14 +315,6 @@ type
function CreateStartFiles({%H-}AProject: TLazProject): TModalResult; override;
end;
TProjectUtf8ApplicationDescriptor = class(TProjectApplicationDescriptor)
public
constructor Create; override;
function GetLocalizedName: string; override;
function GetLocalizedDescription: string; override;
function InitProject(AProject: TLazProject): TModalResult; override;
end;
{ TProjectSimpleProgramDescriptor }
TProjectSimpleProgramDescriptor = class(TProjectDescriptor)
@ -1269,7 +1261,8 @@ begin
Result := GetLocalizedName + LineEnding+LineEnding + lisApplicationProgramDescriptor;
end;
function TProjectApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
function TProjectApplicationDescriptor.InitProject(
AProject: TLazProject): TModalResult;
var
NewSource: String;
MainFile: TLazProjectFile;
@ -1319,33 +1312,6 @@ begin
[nfIsPartOfProject,nfOpenInEditor,nfCreateDefaultSrc]);
end;
{ TProjectUtf8ApplicationDescriptor }
constructor TProjectUtf8ApplicationDescriptor.Create;
begin
inherited Create;
Name:=ProjDescNameUtf8Application;
end;
function TProjectUtf8ApplicationDescriptor.GetLocalizedName: string;
begin
Result:=dlgPOUtf8Application;
end;
function TProjectUtf8ApplicationDescriptor.GetLocalizedDescription: string;
begin
Result := GetLocalizedName + LineEnding+LineEnding + lisUtf8ApplicationProgramDescriptor;
end;
function TProjectUtf8ApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
begin
Result := inherited InitProject(AProject);
Assert(AProject.LazCompilerOptions.CustomOptions='',
'TProjectUtf8ApplicationDescriptor.InitProject: CustomOptions<>''');
AProject.LazCompilerOptions.CustomOptions := '-dEnableUTF8RTL' + LineEnding
+ '-FcUTF8' + LineEnding;
end;
{ TProjectSimpleProgramDescriptor }
constructor TProjectSimpleProgramDescriptor.Create;