paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 18:39:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDEIntf: deprecated TLazProject.ShortDescription

Browse Source 
git-svn-id: trunk@35045 -
This commit is contained in:
mattias 2012-01-31 00:29:20 +00:00
parent c9ffd2f60c
commit 4dcfd331ed
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ide/frames/project_application_options.pas
View File

@ -215,7 +215,7 @@ begin
FProject := AOptions as TProject; FProject := AOptions as TProject;
with FProject do with FProject do
begin begin
TitleEdit.Text := Title2; TitleEdit.Text := Title;
UseAppBundleCheckBox.Checked := UseAppBundle; UseAppBundleCheckBox.Checked := UseAppBundle;
UseXPManifestCheckBox.Checked := TProjectXPManifest(ProjResources[TProjectXPManifest]).UseManifest; UseXPManifestCheckBox.Checked := TProjectXPManifest(ProjResources[TProjectXPManifest]).UseManifest;
DpiAwareCheckBox.Checked := TProjectXPManifest(ProjResources[TProjectXPManifest]).DpiAware; DpiAwareCheckBox.Checked := TProjectXPManifest(ProjResources[TProjectXPManifest]).DpiAware;
@ -235,7 +235,7 @@ var
begin begin
with AOptions as TProject do with AOptions as TProject do
begin begin
Title2 := TitleEdit.Text; Title := TitleEdit.Text;
AStream := GetIconAsStream; AStream := GetIconAsStream;
try try
TProjectIcon(ProjResources[TProjectIcon]).SetStream(AStream); TProjectIcon(ProjResources[TProjectIcon]).SetStream(AStream);

2
ide/main.pp
View File

@ -8398,7 +8398,7 @@ begin
// change title // change title
if TitleWasDefault then begin if TitleWasDefault then begin
Project1.Title2:=Project1.GetDefaultTitle; Project1.Title:=Project1.GetDefaultTitle;
// title does not need to be removed from source, because it was default // title does not need to be removed from source, because it was default
end; end;

24
ide/project.pp
View File

@ -2571,7 +2571,7 @@ begin
UpdateProjectDirectory; UpdateProjectDirectory;
FPublishOptions:=TPublishProjectOptions.Create(Self); FPublishOptions:=TPublishProjectOptions.Create(Self);
FRunParameters:=TRunParamsOptions.Create; FRunParameters:=TRunParamsOptions.Create;
Title2 := ''; Title := '';
FUnitList := TFPList.Create; // list of TUnitInfo FUnitList := TFPList.Create; // list of TUnitInfo
FResources := TProjectResources.Create(Self); FResources := TProjectResources.Create(Self);
@ -2848,7 +2848,7 @@ begin
xmlconfig.SetValue(Path+'General/MainUnit/Value', MainUnitID); // always write a value to support opening by older IDEs (<=0.9.28). This can be changed in a few released. xmlconfig.SetValue(Path+'General/MainUnit/Value', MainUnitID); // always write a value to support opening by older IDEs (<=0.9.28). This can be changed in a few released.
xmlconfig.SetDeleteValue(Path+'General/AutoCreateForms/Value', xmlconfig.SetDeleteValue(Path+'General/AutoCreateForms/Value',
AutoCreateForms,true); AutoCreateForms,true);
xmlconfig.SetDeleteValue(Path+'General/Title/Value', Title2,''); xmlconfig.SetDeleteValue(Path+'General/Title/Value', Title,'');
xmlconfig.SetDeleteValue(Path+'General/UseAppBundle/Value', UseAppBundle, True); xmlconfig.SetDeleteValue(Path+'General/UseAppBundle/Value', UseAppBundle, True);
// fpdoc // fpdoc
@ -3058,14 +3058,14 @@ end;
function TProject.GetTitle: string; function TProject.GetTitle: string;
begin begin
Result:=Title2; Result:=Title;
MacroEngine.SubstituteStr(Result); MacroEngine.SubstituteStr(Result);
end; end;
function TProject.TitleIsDefault(Fuzzy: boolean): boolean; function TProject.TitleIsDefault(Fuzzy: boolean): boolean;
begin begin
Result:=(Title2='') or (Title2=GetDefaultTitle) Result:=(Title='') or (Title=GetDefaultTitle)
or (Fuzzy and (SysUtils.CompareText(Title2,GetDefaultTitle)=0)); or (Fuzzy and (SysUtils.CompareText(Title,GetDefaultTitle)=0));
end; end;
function TProject.IDAsString: string; function TProject.IDAsString: string;
@ -3415,7 +3415,7 @@ begin
// automatically fixes broken lpi files. // automatically fixes broken lpi files.
if not LoadParts then begin if not LoadParts then begin
NewMainUnitID := xmlconfig.GetValue(Path+'General/MainUnit/Value', 0); NewMainUnitID := xmlconfig.GetValue(Path+'General/MainUnit/Value', 0);
Title2 := xmlconfig.GetValue(Path+'General/Title/Value', ''); Title := xmlconfig.GetValue(Path+'General/Title/Value', '');
UseAppBundle := xmlconfig.GetValue(Path+'General/UseAppBundle/Value', True); UseAppBundle := xmlconfig.GetValue(Path+'General/UseAppBundle/Value', True);
AutoCreateForms := xmlconfig.GetValue( AutoCreateForms := xmlconfig.GetValue(
Path+'General/AutoCreateForms/Value', true); Path+'General/AutoCreateForms/Value', true);
@ -3752,7 +3752,7 @@ begin
ClearSourceDirectories; ClearSourceDirectories;
UpdateProjectDirectory; UpdateProjectDirectory;
FPublishOptions.Clear; FPublishOptions.Clear;
Title2 := ''; Title := '';
Modified := false; Modified := false;
SessionModified := false; SessionModified := false;
@ -4312,19 +4312,17 @@ end;
procedure TProject.SetProjectInfoFile(const NewFilename:string); procedure TProject.SetProjectInfoFile(const NewFilename:string);
var var
NewProjectInfoFile: String; NewProjectInfoFile: String;
OldProjectInfoFile: String; TitleWasDefault: Boolean;
DefaultTitle: String;
begin begin
NewProjectInfoFile:=TrimFilename(NewFilename); NewProjectInfoFile:=TrimFilename(NewFilename);
if NewProjectInfoFile='' then exit; if NewProjectInfoFile='' then exit;
DoDirSeparators(NewProjectInfoFile); DoDirSeparators(NewProjectInfoFile);
if fProjectInfoFile=NewProjectInfoFile then exit; if fProjectInfoFile=NewProjectInfoFile then exit;
BeginUpdate(true); BeginUpdate(true);
OldProjectInfoFile:=fProjectInfoFile; TitleWasDefault:=(Title<>'') and TitleIsDefault(true);
fProjectInfoFile:=NewProjectInfoFile; fProjectInfoFile:=NewProjectInfoFile;
DefaultTitle:=ExtractFileNameOnly(OldProjectInfoFile); if TitleWasDefault then
if TitleIsDefault(true) then Title:=GetDefaultTitle;
Title2:=DefaultTitle;
UpdateProjectDirectory; UpdateProjectDirectory;
UpdateSessionFilename; UpdateSessionFilename;
if Assigned(OnChangeProjectInfoFile) then if Assigned(OnChangeProjectInfoFile) then

2
ide/projectdefs.pas
View File

@ -1672,7 +1672,7 @@ begin
If (T<>'') then If (T<>'') then
begin begin
AProject.Flags:=AProject.Flags+[pfMainUnitHasTitleStatement]; AProject.Flags:=AProject.Flags+[pfMainUnitHasTitleStatement];
AProject.Title2:=T; AProject.Title:=T;
NewSource.Add(' Application.Title:='''+T+''';'); NewSource.Add(' Application.Title:='''+T+''';');
end; end;
NewSource.Add(' Application.Run;'); NewSource.Add(' Application.Run;');

4
ideintf/projectintf.pas
View File

@ -442,7 +442,7 @@ type
property Files[Index: integer]: TLazProjectFile read GetFiles; property Files[Index: integer]: TLazProjectFile read GetFiles;
property FileCount: integer read GetFileCount; property FileCount: integer read GetFileCount;
property MainFile: TLazProjectFile read GetMainFile; property MainFile: TLazProjectFile read GetMainFile;
property Title2: String read FTitle write SetTitle; property Title: String read FTitle write SetTitle;
property Flags: TProjectFlags read FFlags write SetFlags; property Flags: TProjectFlags read FFlags write SetFlags;
property ExecutableType: TProjectExecutableType read FExecutableType property ExecutableType: TProjectExecutableType read FExecutableType
write SetExecutableType;// read from MainFile, not saved to lpi write SetExecutableType;// read from MainFile, not saved to lpi
@ -1009,7 +1009,7 @@ end;
function TProjectDescriptor.InitProject(AProject: TLazProject): TModalResult; function TProjectDescriptor.InitProject(AProject: TLazProject): TModalResult;
begin begin
AProject.Title2:='project1'; AProject.Title:='project1';
AProject.Flags:=Flags; AProject.Flags:=Flags;
Result:=mrOk; Result:=mrOk;
end; end;