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

IDE: make the main title setting texts consistent. "IDE title shows...". Also formatting.

Browse Source 
git-svn-id: trunk@43956 -
This commit is contained in:
juha 2014-02-08 17:15:03 +00:00
parent aaebc58e05
commit 7653aab9b6
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/frames/window_options.pas
View File

@ -116,14 +116,11 @@ begin
HideIDEOnRunCheckBox.Caption := dlgHideIDEOnRun; HideIDEOnRunCheckBox.Caption := dlgHideIDEOnRun;
HideMessagesIconsCheckBox.Caption := dlgHideMessagesIcons; HideMessagesIconsCheckBox.Caption := dlgHideMessagesIcons;
TitleStartsWithProjectCheckBox.Caption:=lisIDETitleStartsWithProjectName; TitleStartsWithProjectCheckBox.Caption:=lisIDETitleStartsWithProjectName;
TitleStartsWithProjectCheckBox.Hint:= TitleStartsWithProjectCheckBox.Hint:=lisTitleInTaskbarShowsForExampleProject1LpiLazarus;
lisTitleInTaskbarShowsForExampleProject1LpiLazarus; TitleIncludesBuildMode.Caption:=lisIDETitleShowsBuildMode;
TitleIncludesBuildMode.Caption:=lisIDETitleIncludeBuildMode; TitleIncludesBuildMode.Hint:=lisBuildModeInTitleInExample;
TitleIncludesBuildMode.Hint:= ProjectDirInIdeTitleCheckBox.Caption:=lisIDETitleShowsProjectDir;
lisBuildModeInTitleInExample; ProjectDirInIdeTitleCheckBox.Hint:=lisProjectDirectoryIsShowedInIdeTitleBar;
ProjectDirInIdeTitleCheckBox.Caption:=lisIDEProjectDirInIdeTitle;
ProjectDirInIdeTitleCheckBox.Hint:=
lisProjectDirectoryIsShowedInIdeTitleBar;
end; end;
procedure TWindowOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TWindowOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);

4
ide/lazarusidestrconsts.pas
View File

@ -1174,8 +1174,8 @@ resourcestring
dlgHideIDEOnRun = 'Hide IDE windows on run'; dlgHideIDEOnRun = 'Hide IDE windows on run';
dlgHideMessagesIcons = 'Hide Messages Icons'; dlgHideMessagesIcons = 'Hide Messages Icons';
lisIDETitleStartsWithProjectName = 'IDE title starts with project name'; lisIDETitleStartsWithProjectName = 'IDE title starts with project name';
lisIDETitleIncludeBuildMode = 'IDE title shows selected build mode'; lisIDETitleShowsProjectDir = 'IDE title shows project directory';
lisIDEProjectDirInIdeTitle = 'Show project directory in IDE title'; lisIDETitleShowsBuildMode = 'IDE title shows selected build mode';
dlgDesktopHints = 'Hints'; dlgDesktopHints = 'Hints';
dlgPalHints = 'Hints for component palette'; dlgPalHints = 'Hints for component palette';
dlgSpBHints = 'Hints for main speed buttons (open, save, ...)'; dlgSpBHints = 'Hints for main speed buttons (open, save, ...)';

7
ide/main.pp
View File

@ -8688,8 +8688,6 @@ begin
end; end;
procedure TMainIDE.UpdateCaption; procedure TMainIDE.UpdateCaption;
var
NewCaption: String;
function AddToCaption(const CurrentCaption, CaptAddition: string): String; function AddToCaption(const CurrentCaption, CaptAddition: string): String;
begin begin
@ -8700,7 +8698,7 @@ var
end; end;
var var
NewTitle, ProjectName, DirName: String; NewCaption, NewTitle, ProjectName, DirName: String;
begin begin
if MainIDEBar = nil then Exit; if MainIDEBar = nil then Exit;
if ToolStatus = itExiting then Exit; if ToolStatus = itExiting then Exit;
@ -8725,8 +8723,7 @@ begin
else else
ProjectName := lisnewProject; ProjectName := lisnewProject;
NewTitle := AddToCaption(NewCaption, ProjectName); NewTitle := AddToCaption(NewCaption, ProjectName);
if EnvironmentOptions.IDETitleIncludesBuildMode and if EnvironmentOptions.IDETitleIncludesBuildMode and (Project1.BuildModes.Count > 1)
(Project1.BuildModes.Count > 1)
then then
ProjectName:= ProjectName + ' - ' +Project1.ActiveBuildMode.GetCaption; ProjectName:= ProjectName + ' - ' +Project1.ActiveBuildMode.GetCaption;
NewCaption := AddToCaption(NewCaption, ProjectName); NewCaption := AddToCaption(NewCaption, ProjectName);