mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-22 13:59:31 +02:00
IDE: Show the project name and build mode by default in the IDE title. Name variables and properties consistently.
This commit is contained in:
Juha
parent
e1b8361cdb
commit
8c1e7bc4b0
@ -148,8 +148,8 @@ type
|
||||
FCompletionWindowHeight: Integer;
|
||||
// title
|
||||
FIDETitleStartsWithProject: boolean;
|
||||
FIDETitleIncludesBuildMode: boolean;
|
||||
FIDEProjectDirectoryInIdeTitle: boolean;
|
||||
FIDETitleShowsBuildMode: boolean;
|
||||
FIDETitleShowsProjectDir: boolean;
|
||||
// IDE Coolbar
|
||||
FIDECoolBarOptions: TIDECoolBarOptions;
|
||||
// Editor Toolbar
|
||||
@ -187,10 +187,10 @@ type
|
||||
property CompletionWindowHeight: Integer read FCompletionWindowHeight write FCompletionWindowHeight;
|
||||
property IDETitleStartsWithProject: boolean read FIDETitleStartsWithProject
|
||||
write FIDETitleStartsWithProject;
|
||||
property IDETitleIncludesBuildMode: boolean read FIDETitleIncludesBuildMode
|
||||
write FIDETitleIncludesBuildMode;
|
||||
property IDEProjectDirectoryInIdeTitle: boolean read FIDEProjectDirectoryInIdeTitle
|
||||
write FIDEProjectDirectoryInIdeTitle;
|
||||
property IDETitleShowsBuildMode: boolean read FIDETitleShowsBuildMode
|
||||
write FIDETitleShowsBuildMode;
|
||||
property IDETitleShowsProjectDir: boolean read FIDETitleShowsProjectDir
|
||||
write FIDETitleShowsProjectDir;
|
||||
property IDECoolBarOptions: TIDECoolBarOptions read FIDECoolBarOptions;
|
||||
property EditorToolBarOptions: TEditorToolBarOptions read FEditorToolBarOptions;
|
||||
property ComponentPaletteOptions: TCompPaletteOptions read FComponentPaletteOptions;
|
||||
@ -568,9 +568,9 @@ begin
|
||||
FCompletionWindowWidth := 320 * Screen.PixelsPerInch div 96;
|
||||
FCompletionWindowHeight := 6;
|
||||
// title
|
||||
FIDETitleStartsWithProject:=false;
|
||||
FIDETitleIncludesBuildMode:=false;
|
||||
FIDEProjectDirectoryInIdeTitle:=false;
|
||||
FIDETitleStartsWithProject:=true;
|
||||
FIDETitleShowsBuildMode:=true;
|
||||
FIDETitleShowsProjectDir:=true;
|
||||
// IDE Coolbar
|
||||
FIDECoolBarOptions:=TIDECoolBarOptions.Create;
|
||||
// Editor Toolbar
|
||||
@ -636,8 +636,8 @@ begin
|
||||
FCompletionWindowHeight := Source.FCompletionWindowHeight;
|
||||
// title
|
||||
FIDETitleStartsWithProject := Source.FIDETitleStartsWithProject;
|
||||
FIDETitleIncludesBuildMode := Source.FIDETitleIncludesBuildMode;
|
||||
FIDEProjectDirectoryInIdeTitle := Source.FIDEProjectDirectoryInIdeTitle;
|
||||
FIDETitleShowsBuildMode := Source.FIDETitleShowsBuildMode;
|
||||
FIDETitleShowsProjectDir := Source.FIDETitleShowsProjectDir;
|
||||
// IDE Coolbar
|
||||
FIDECoolBarOptions.Assign(Source.FIDECoolBarOptions);
|
||||
// Editor Toolbar
|
||||
@ -668,9 +668,9 @@ begin
|
||||
// Window menu
|
||||
FIDENameForDesignedFormList:=FXMLCfg.GetValue(Path+'IDENameForDesignedFormList/Value',false);
|
||||
// title
|
||||
FIDETitleStartsWithProject:=FXMLCfg.GetValue(Path+'IDETitleStartsWithProject/Value',false);
|
||||
FIDETitleIncludesBuildMode:=FXMLCfg.GetValue(Path+'IDETitleIncludesBuildMode/Value',false);
|
||||
FIDEProjectDirectoryInIdeTitle:=FXMLCfg.GetValue(Path+'IDEProjectDirectoryInIdeTitle/Value',false);
|
||||
FIDETitleStartsWithProject:=FXMLCfg.GetValue(Path+'IDETitleStartsWithProject/Value',true);
|
||||
FIDETitleShowsBuildMode:=FXMLCfg.GetValue(Path+'IDETitleShowsBuildMode/Value',true);
|
||||
FIDETitleShowsProjectDir:=FXMLCfg.GetValue(Path+'IDETitleShowsProjectDir/Value',true);
|
||||
// CompletionWindow
|
||||
FCompletionWindowWidth:=FXMLCfg.GetValue(Path+'CompletionWindowOptions/Width/Value', FCompletionWindowWidth);
|
||||
FCompletionWindowHeight:=FXMLCfg.GetValue(Path+'CompletionWindowOptions/Height/Value', 6);
|
||||
@ -720,9 +720,9 @@ begin
|
||||
// Window menu
|
||||
FXMLCfg.SetDeleteValue(Path+'IDENameForDesignedFormList/Value',FIDENameForDesignedFormList,false);
|
||||
// title
|
||||
FXMLCfg.SetDeleteValue(Path+'IDETitleStartsWithProject/Value',FIDETitleStartsWithProject,false);
|
||||
FXMLCfg.SetDeleteValue(Path+'IDETitleIncludesBuildMode/Value',FIDETitleIncludesBuildMode,false);
|
||||
FXMLCfg.SetDeleteValue(Path+'IDEProjectDirectoryInIdeTitle/Value',FIDEProjectDirectoryInIdeTitle,false);
|
||||
FXMLCfg.SetDeleteValue(Path+'IDETitleStartsWithProject/Value',FIDETitleStartsWithProject,true);
|
||||
FXMLCfg.SetDeleteValue(Path+'IDETitleShowsBuildMode/Value',FIDETitleShowsBuildMode,true);
|
||||
FXMLCfg.SetDeleteValue(Path+'IDETitleShowsProjectDir/Value',FIDETitleShowsProjectDir,true);
|
||||
// CompletionWindow
|
||||
FXMLCfg.SetValue(Path+'CompletionWindowOptions/Width/Value',FCompletionWindowWidth);
|
||||
FXMLCfg.SetDeleteValue(Path+'CompletionWindowOptions/Height/Value',FCompletionWindowHeight, 6);
|
||||
|
||||
@ -14,9 +14,9 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 15
|
||||
Width = 181
|
||||
Height = 22
|
||||
Top = 18
|
||||
Width = 215
|
||||
Caption = 'SingleTaskBarButtonCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
@ -28,9 +28,9 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 34
|
||||
Width = 151
|
||||
Height = 22
|
||||
Top = 40
|
||||
Width = 180
|
||||
Caption = 'HideIDEOnRunCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
@ -41,49 +41,49 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
AnchorSideTop.Control = HideIDEOnRunCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 53
|
||||
Width = 186
|
||||
Height = 22
|
||||
Top = 62
|
||||
Width = 220
|
||||
Caption = 'TitleStartsWithProjectCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 2
|
||||
end
|
||||
object ProjectDirInIdeTitleCheckBox: TCheckBox
|
||||
object TitleShowsProjectDirCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = TitleStartsWithProjectCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 72
|
||||
Width = 173
|
||||
Caption = 'ProjectDirInIdeTitleCheckBox'
|
||||
Height = 22
|
||||
Top = 84
|
||||
Width = 214
|
||||
Caption = 'TitleShowsProjectDirCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 3
|
||||
end
|
||||
object TitleIncludesBuildMode: TCheckBox
|
||||
object TitleShowsBuildModeCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = ProjectDirInIdeTitleCheckBox
|
||||
AnchorSideTop.Control = TitleShowsProjectDirCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 91
|
||||
Width = 145
|
||||
Caption = 'TitleIncludesBuildMode'
|
||||
Height = 22
|
||||
Top = 106
|
||||
Width = 219
|
||||
Caption = 'TitleShowsBuildModeCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 4
|
||||
end
|
||||
object NameForDesignedFormList: TCheckBox
|
||||
object NameForDesignedFormListCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = TitleIncludesBuildMode
|
||||
AnchorSideTop.Control = TitleShowsBuildModeCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 110
|
||||
Width = 164
|
||||
Caption = 'NameForDesignedFormList'
|
||||
Height = 22
|
||||
Top = 128
|
||||
Width = 256
|
||||
Caption = 'NameForDesignedFormListCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
TabOrder = 5
|
||||
@ -94,7 +94,7 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
AnchorSideRight.Control = Owner
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 15
|
||||
Height = 18
|
||||
Top = 0
|
||||
Width = 573
|
||||
Caption = 'lblShowingWindows'
|
||||
@ -104,12 +104,12 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
end
|
||||
object AutoAdjustIDEHeightCheckBox: TCheckBox
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = NameForDesignedFormList
|
||||
AnchorSideTop.Control = NameForDesignedFormListCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 129
|
||||
Width = 185
|
||||
Height = 22
|
||||
Top = 150
|
||||
Width = 218
|
||||
Caption = 'AutoAdjustIDEHeightCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
@ -120,10 +120,9 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
AnchorSideTop.Control = AutoAdjustIDEHeightCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 19
|
||||
Top = 148
|
||||
Width = 253
|
||||
BorderSpacing.Left = 0
|
||||
Height = 22
|
||||
Top = 172
|
||||
Width = 294
|
||||
Caption = 'AutoAdjustIDEHeightFullCompPalCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
@ -134,9 +133,9 @@ object WindowOptionsFrame: TWindowOptionsFrame
|
||||
AnchorSideTop.Control = AutoAdjustIDEHeightFullCompPalCheckBox
|
||||
AnchorSideTop.Side = asrBottom
|
||||
Left = 0
|
||||
Height = 24
|
||||
Top = 211
|
||||
Width = 295
|
||||
Height = 22
|
||||
Top = 194
|
||||
Width = 257
|
||||
Caption = 'ProjectInspectorShowPropsCheckBox'
|
||||
ParentShowHint = False
|
||||
ShowHint = True
|
||||
|
||||
@ -44,13 +44,13 @@ type
|
||||
AutoAdjustIDEHeightFullCompPalCheckBox: TCheckBox;
|
||||
ProjectInspectorShowPropsCheckBox: TCheckBox;
|
||||
lblShowingWindows: TDividerBevel;
|
||||
NameForDesignedFormList: TCheckBox;
|
||||
NameForDesignedFormListCheckBox: TCheckBox;
|
||||
AutoAdjustIDEHeightCheckBox: TCheckBox;
|
||||
TitleIncludesBuildMode: TCheckBox;
|
||||
TitleShowsBuildModeCheckBox: TCheckBox;
|
||||
HideIDEOnRunCheckBox: TCheckBox;
|
||||
SingleTaskBarButtonCheckBox: TCheckBox;
|
||||
TitleStartsWithProjectCheckBox: TCheckBox;
|
||||
ProjectDirInIdeTitleCheckBox: TCheckBox;
|
||||
TitleShowsProjectDirCheckBox: TCheckBox;
|
||||
public
|
||||
function GetTitle: String; override;
|
||||
procedure Setup({%H-}ADialog: TAbstractOptionsEditorDialog); override;
|
||||
@ -82,16 +82,16 @@ begin
|
||||
HideIDEOnRunCheckBox.Hint := dlgHideIDEOnRunHint;
|
||||
TitleStartsWithProjectCheckBox.Caption:=lisIDETitleStartsWithProjectName;
|
||||
TitleStartsWithProjectCheckBox.Hint:=lisTitleInTaskbarShowsForExampleProject1LpiLazarus;
|
||||
TitleIncludesBuildMode.Caption:=lisIDETitleShowsBuildMode;
|
||||
TitleIncludesBuildMode.Hint:=lisBuildModeInTitleInExample;
|
||||
NameForDesignedFormList.Caption:=lisWindowMenuWithNameForDesignedForm;
|
||||
NameForDesignedFormList.Hint:=lisWindowMenuWithNameForDesignedFormHint;
|
||||
TitleShowsBuildModeCheckBox.Caption:=lisIDETitleShowsBuildMode;
|
||||
TitleShowsBuildModeCheckBox.Hint:=lisBuildModeInTitleInExample;
|
||||
TitleShowsProjectDirCheckBox.Caption:=lisIDETitleShowsProjectDir;
|
||||
TitleShowsProjectDirCheckBox.Hint:=lisProjectDirectoryIsShowedInIdeTitleBar;
|
||||
NameForDesignedFormListCheckBox.Caption:=lisWindowMenuWithNameForDesignedForm;
|
||||
NameForDesignedFormListCheckBox.Hint:=lisWindowMenuWithNameForDesignedFormHint;
|
||||
AutoAdjustIDEHeightCheckBox.Caption:=lisAutoAdjustIDEHeight;
|
||||
AutoAdjustIDEHeightCheckBox.Hint:=lisAutoAdjustIDEHeightHint;
|
||||
AutoAdjustIDEHeightFullCompPalCheckBox.Caption:=lisAutoAdjustIDEHeightFullComponentPalette;
|
||||
AutoAdjustIDEHeightFullCompPalCheckBox.Hint:=lisAutoAdjustIDEHeightFullComponentPaletteHint;
|
||||
ProjectDirInIdeTitleCheckBox.Caption:=lisIDETitleShowsProjectDir;
|
||||
ProjectDirInIdeTitleCheckBox.Hint:=lisProjectDirectoryIsShowedInIdeTitleBar;
|
||||
ProjectInspectorShowPropsCheckBox.Caption:=lisProjectInspectorShowProps;
|
||||
end;
|
||||
|
||||
@ -107,13 +107,13 @@ begin
|
||||
// window minimizing and hiding
|
||||
SingleTaskBarButtonCheckBox.Checked := SingleTaskBarButton;
|
||||
HideIDEOnRunCheckBox.Checked := HideIDEOnRun;
|
||||
TitleStartsWithProjectCheckBox.Checked:=IDETitleStartsWithProject;
|
||||
TitleIncludesBuildMode.Checked:=IDETitleIncludesBuildMode;
|
||||
NameForDesignedFormList.Checked:=IDENameForDesignedFormList;
|
||||
AutoAdjustIDEHeightCheckBox.Checked:=AutoAdjustIDEHeight;
|
||||
AutoAdjustIDEHeightFullCompPalCheckBox.Checked:=AutoAdjustIDEHeightFullCompPal;
|
||||
ProjectDirInIdeTitleCheckBox.Checked:=IDEProjectDirectoryInIdeTitle;
|
||||
ProjectInspectorShowPropsCheckBox.Checked:=ProjectInspectorShowProps;
|
||||
TitleStartsWithProjectCheckBox.Checked := IDETitleStartsWithProject;
|
||||
TitleShowsBuildModeCheckBox.Checked := IDETitleShowsBuildMode;
|
||||
TitleShowsProjectDirCheckBox.Checked := IDETitleShowsProjectDir;
|
||||
NameForDesignedFormListCheckBox.Checked := IDENameForDesignedFormList;
|
||||
AutoAdjustIDEHeightCheckBox.Checked := AutoAdjustIDEHeight;
|
||||
AutoAdjustIDEHeightFullCompPalCheckBox.Checked := AutoAdjustIDEHeightFullCompPal;
|
||||
ProjectInspectorShowPropsCheckBox.Checked := ProjectInspectorShowProps;
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -128,14 +128,14 @@ begin
|
||||
begin
|
||||
// window minimizing
|
||||
SingleTaskBarButton := SingleTaskBarButtonCheckBox.Checked;
|
||||
HideIDEOnRun:=HideIDEOnRunCheckBox.Checked;
|
||||
IDETitleStartsWithProject:=TitleStartsWithProjectCheckBox.Checked;
|
||||
IDETitleIncludesBuildMode := TitleIncludesBuildMode.Checked;
|
||||
IDENameForDesignedFormList := NameForDesignedFormList.Checked;
|
||||
HideIDEOnRun := HideIDEOnRunCheckBox.Checked;
|
||||
IDETitleStartsWithProject := TitleStartsWithProjectCheckBox.Checked;
|
||||
IDETitleShowsBuildMode := TitleShowsBuildModeCheckBox.Checked;
|
||||
IDETitleShowsProjectDir := TitleShowsProjectDirCheckBox.Checked;
|
||||
IDENameForDesignedFormList := NameForDesignedFormListCheckBox.Checked;
|
||||
AutoAdjustIDEHeight := AutoAdjustIDEHeightCheckBox.Checked;
|
||||
AutoAdjustIDEHeightFullCompPal := AutoAdjustIDEHeightFullCompPalCheckBox.Checked;
|
||||
IDEProjectDirectoryInIdeTitle:=ProjectDirInIdeTitleCheckBox.Checked;
|
||||
ProjectInspectorShowProps:=ProjectInspectorShowPropsCheckBox.Checked;
|
||||
ProjectInspectorShowProps := ProjectInspectorShowPropsCheckBox.Checked;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -8893,7 +8893,7 @@ begin
|
||||
ProjectName := Project1.GetTitleOrName;
|
||||
if ProjectName <> '' then
|
||||
begin
|
||||
if EnvironmentGuiOpts.Desktop.IDEProjectDirectoryInIdeTitle then
|
||||
if EnvironmentGuiOpts.Desktop.IDETitleShowsProjectDir then
|
||||
begin
|
||||
DirName := ExtractFileDir(Project1.ProjectInfoFile);
|
||||
if DirName <> '' then
|
||||
@ -8903,7 +8903,7 @@ begin
|
||||
else
|
||||
ProjectName := lisnewProject;
|
||||
NewTitle := AddToCaption(NewCaption, ProjectName);
|
||||
if EnvironmentGuiOpts.Desktop.IDETitleIncludesBuildMode
|
||||
if EnvironmentGuiOpts.Desktop.IDETitleShowsBuildMode
|
||||
and (Project1.BuildModes.Count > 1) then
|
||||
ProjectName:= ProjectName + ' - ' +Project1.ActiveBuildMode.GetCaption;
|
||||
NewCaption := AddToCaption(NewCaption, ProjectName);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user