mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-20 22:21:37 +02:00
Options / Editor: Allow multiline tab, move tab related options to correct frame
git-svn-id: trunk@48126 -
This commit is contained in:
parent
880871e653
commit
e636205034
@ -1299,6 +1299,7 @@ type
|
|||||||
// general options
|
// general options
|
||||||
fFindTextAtCursor: Boolean;
|
fFindTextAtCursor: Boolean;
|
||||||
fShowTabCloseButtons: Boolean;
|
fShowTabCloseButtons: Boolean;
|
||||||
|
FMultiLineTab: Boolean;
|
||||||
fShowTabNumbers: Boolean;
|
fShowTabNumbers: Boolean;
|
||||||
fUseTabHistory: Boolean;
|
fUseTabHistory: Boolean;
|
||||||
fTabPosition: TTabPosition;
|
fTabPosition: TTabPosition;
|
||||||
@ -1453,6 +1454,10 @@ type
|
|||||||
read fSynEditOptions2 write fSynEditOptions2 default SynEditDefaultOptions2;
|
read fSynEditOptions2 write fSynEditOptions2 default SynEditDefaultOptions2;
|
||||||
property ShowTabCloseButtons: Boolean
|
property ShowTabCloseButtons: Boolean
|
||||||
read fShowTabCloseButtons write fShowTabCloseButtons;
|
read fShowTabCloseButtons write fShowTabCloseButtons;
|
||||||
|
published
|
||||||
|
property MultiLineTab: Boolean
|
||||||
|
read FMultiLineTab write FMultiLineTab default False;
|
||||||
|
public
|
||||||
property HideSingleTabInWindow: Boolean
|
property HideSingleTabInWindow: Boolean
|
||||||
read FHideSingleTabInWindow write FHideSingleTabInWindow;
|
read FHideSingleTabInWindow write FHideSingleTabInWindow;
|
||||||
property ShowTabNumbers: Boolean read fShowTabNumbers write fShowTabNumbers;
|
property ShowTabNumbers: Boolean read fShowTabNumbers write fShowTabNumbers;
|
||||||
@ -4380,6 +4385,7 @@ procedure TEditorOptions.Init;
|
|||||||
begin
|
begin
|
||||||
// General options
|
// General options
|
||||||
fShowTabCloseButtons := True;
|
fShowTabCloseButtons := True;
|
||||||
|
FMultiLineTab := False;
|
||||||
FHideSingleTabInWindow := False;
|
FHideSingleTabInWindow := False;
|
||||||
fTabPosition := tpTop;
|
fTabPosition := tpTop;
|
||||||
FCopyWordAtCursorOnCopyNone := True;
|
FCopyWordAtCursorOnCopyNone := True;
|
||||||
|
@ -15,9 +15,9 @@ object EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
|
|||||||
AnchorSideTop.Control = EditorTrimSpaceTypeCheckBox
|
AnchorSideTop.Control = EditorTrimSpaceTypeCheckBox
|
||||||
AnchorSideTop.Side = asrCenter
|
AnchorSideTop.Side = asrCenter
|
||||||
Left = 156
|
Left = 156
|
||||||
Height = 16
|
Height = 15
|
||||||
Top = 161
|
Top = 29
|
||||||
Width = 142
|
Width = 141
|
||||||
BorderSpacing.Left = 6
|
BorderSpacing.Left = 6
|
||||||
Caption = 'EditorTrimSpaceTypeLabel'
|
Caption = 'EditorTrimSpaceTypeLabel'
|
||||||
ParentColor = False
|
ParentColor = False
|
||||||
@ -30,7 +30,7 @@ object EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
|
|||||||
AnchorSideBottom.Control = Owner
|
AnchorSideBottom.Control = Owner
|
||||||
AnchorSideBottom.Side = asrBottom
|
AnchorSideBottom.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 152
|
Height = 19
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 460
|
Width = 460
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
@ -56,37 +56,11 @@ object EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
|
|||||||
AnchorSideTop.Side = asrBottom
|
AnchorSideTop.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 23
|
Height = 23
|
||||||
Top = 158
|
Top = 25
|
||||||
Width = 150
|
Width = 150
|
||||||
BorderSpacing.Top = 6
|
BorderSpacing.Top = 6
|
||||||
ItemHeight = 15
|
ItemHeight = 15
|
||||||
Style = csDropDownList
|
Style = csDropDownList
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
end
|
end
|
||||||
object EditorTabPositionCheckBox: TComboBox
|
|
||||||
AnchorSideLeft.Control = Owner
|
|
||||||
AnchorSideTop.Control = EditorTrimSpaceTypeCheckBox
|
|
||||||
AnchorSideTop.Side = asrBottom
|
|
||||||
Left = 0
|
|
||||||
Height = 23
|
|
||||||
Top = 187
|
|
||||||
Width = 150
|
|
||||||
BorderSpacing.Top = 6
|
|
||||||
ItemHeight = 15
|
|
||||||
Style = csDropDownList
|
|
||||||
TabOrder = 2
|
|
||||||
end
|
|
||||||
object EditorTabPositionLabel: TLabel
|
|
||||||
AnchorSideLeft.Control = EditorTrimSpaceTypeCheckBox
|
|
||||||
AnchorSideLeft.Side = asrBottom
|
|
||||||
AnchorSideTop.Control = EditorTabPositionCheckBox
|
|
||||||
AnchorSideTop.Side = asrCenter
|
|
||||||
Left = 156
|
|
||||||
Height = 16
|
|
||||||
Top = 190
|
|
||||||
Width = 142
|
|
||||||
BorderSpacing.Left = 6
|
|
||||||
Caption = 'EditorTrimSpaceTypeLabel'
|
|
||||||
ParentColor = False
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
@ -41,9 +41,7 @@ type
|
|||||||
TEditorGeneralMiscOptionsFrame = class(TAbstractIDEOptionsEditor)
|
TEditorGeneralMiscOptionsFrame = class(TAbstractIDEOptionsEditor)
|
||||||
EditorTrimSpaceTypeCheckBox: TComboBox;
|
EditorTrimSpaceTypeCheckBox: TComboBox;
|
||||||
EditorOptionsGroupBox: TCheckGroup;
|
EditorOptionsGroupBox: TCheckGroup;
|
||||||
EditorTabPositionCheckBox: TComboBox;
|
|
||||||
EditorTrimSpaceTypeLabel: TLabel;
|
EditorTrimSpaceTypeLabel: TLabel;
|
||||||
EditorTabPositionLabel: TLabel;
|
|
||||||
procedure EditorOptionsGroupBoxItemClick(Sender: TObject; Index: integer);
|
procedure EditorOptionsGroupBoxItemClick(Sender: TObject; Index: integer);
|
||||||
private
|
private
|
||||||
FDialog: TAbstractOptionsEditorDialog;
|
FDialog: TAbstractOptionsEditorDialog;
|
||||||
@ -94,16 +92,9 @@ begin
|
|||||||
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypeCaretMove);
|
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypeCaretMove);
|
||||||
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypePosOnly);
|
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypePosOnly);
|
||||||
EditorTrimSpaceTypeLabel.Caption := dlgTrimSpaceTypeCaption;
|
EditorTrimSpaceTypeLabel.Caption := dlgTrimSpaceTypeCaption;
|
||||||
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosTop);
|
|
||||||
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosBottom);
|
|
||||||
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosLeft);
|
|
||||||
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosRight);
|
|
||||||
EditorTabPositionLabel.Caption := dlgNotebookTabPos;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TEditorGeneralMiscOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
|
procedure TEditorGeneralMiscOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
|
||||||
const
|
|
||||||
TabPosToIndex : Array [TTabPosition] of Integer = (0, 1, 2, 3);
|
|
||||||
begin
|
begin
|
||||||
with AOptions as TEditorOptions do
|
with AOptions as TEditorOptions do
|
||||||
begin
|
begin
|
||||||
@ -120,7 +111,6 @@ begin
|
|||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
end;
|
end;
|
||||||
EditorTrimSpaceTypeCheckBox.ItemIndex := ord(TrimSpaceType);
|
EditorTrimSpaceTypeCheckBox.ItemIndex := ord(TrimSpaceType);
|
||||||
EditorTabPositionCheckBox.ItemIndex := TabPosToIndex[TabPosition];
|
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -134,8 +124,6 @@ procedure TEditorGeneralMiscOptionsFrame.WriteSettings(AOptions: TAbstractIDEOpt
|
|||||||
TEditorOptions(AOptions).SynEditOptions := TEditorOptions(AOptions).SynEditOptions - [AnOption];
|
TEditorOptions(AOptions).SynEditOptions := TEditorOptions(AOptions).SynEditOptions - [AnOption];
|
||||||
end;
|
end;
|
||||||
|
|
||||||
const
|
|
||||||
TabIndexToPos : Array [0..3] of TTabPosition = (tpTop, tpBottom, tpLeft, tpRight);
|
|
||||||
begin
|
begin
|
||||||
with AOptions as TEditorOptions do
|
with AOptions as TEditorOptions do
|
||||||
begin
|
begin
|
||||||
@ -149,7 +137,6 @@ begin
|
|||||||
else
|
else
|
||||||
SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste];
|
SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste];
|
||||||
TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeCheckBox.ItemIndex);
|
TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeCheckBox.ItemIndex);
|
||||||
TabPosition := TabIndexToPos[EditorTabPositionCheckBox.ItemIndex];
|
|
||||||
{$IFDEF WinIME}
|
{$IFDEF WinIME}
|
||||||
UseMinimumIme := EditorOptionsGroupBox.Checked[5];
|
UseMinimumIme := EditorOptionsGroupBox.Checked[5];
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
object EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 415
|
Height = 415
|
||||||
Top = 0
|
Top = 0
|
||||||
@ -21,15 +21,15 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideBottom.Control = Owner
|
AnchorSideBottom.Control = Owner
|
||||||
AnchorSideBottom.Side = asrBottom
|
AnchorSideBottom.Side = asrBottom
|
||||||
Left = 6
|
Left = 6
|
||||||
Height = 214
|
Height = 192
|
||||||
Top = 201
|
Top = 223
|
||||||
Width = 509
|
Width = 509
|
||||||
Anchors = [akTop, akLeft, akRight, akBottom]
|
Anchors = [akTop, akLeft, akRight, akBottom]
|
||||||
BorderSpacing.Left = 6
|
BorderSpacing.Left = 6
|
||||||
BorderSpacing.Top = 6
|
BorderSpacing.Top = 6
|
||||||
BorderSpacing.Right = 6
|
BorderSpacing.Right = 6
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
ClientHeight = 214
|
ClientHeight = 192
|
||||||
ClientWidth = 509
|
ClientWidth = 509
|
||||||
TabOrder = 0
|
TabOrder = 0
|
||||||
object listAccessType: TCheckListBox
|
object listAccessType: TCheckListBox
|
||||||
@ -62,7 +62,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
object lblAccessTypeDesc: TLabel
|
object lblAccessTypeDesc: TLabel
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 16
|
Height = 15
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 509
|
Width = 509
|
||||||
Align = alTop
|
Align = alTop
|
||||||
@ -89,7 +89,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 3
|
Height = 3
|
||||||
Top = 92
|
Top = 116
|
||||||
Width = 60
|
Width = 60
|
||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
end
|
end
|
||||||
@ -99,9 +99,9 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideTop.Control = pnlNBTabs
|
AnchorSideTop.Control = pnlNBTabs
|
||||||
AnchorSideTop.Side = asrBottom
|
AnchorSideTop.Side = asrBottom
|
||||||
Left = 70
|
Left = 70
|
||||||
Height = 16
|
Height = 15
|
||||||
Top = 85
|
Top = 110
|
||||||
Width = 167
|
Width = 166
|
||||||
BorderSpacing.Left = 10
|
BorderSpacing.Left = 10
|
||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
Caption = 'lblEditActivationOrderSection'
|
Caption = 'lblEditActivationOrderSection'
|
||||||
@ -116,10 +116,10 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideTop.Side = asrCenter
|
AnchorSideTop.Side = asrCenter
|
||||||
AnchorSideRight.Control = Owner
|
AnchorSideRight.Control = Owner
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 247
|
Left = 246
|
||||||
Height = 3
|
Height = 3
|
||||||
Top = 92
|
Top = 116
|
||||||
Width = 274
|
Width = 275
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
BorderSpacing.Left = 10
|
BorderSpacing.Left = 10
|
||||||
end
|
end
|
||||||
@ -130,8 +130,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Control = Owner
|
AnchorSideRight.Control = Owner
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 6
|
Left = 6
|
||||||
Height = 66
|
Height = 65
|
||||||
Top = 107
|
Top = 131
|
||||||
Width = 509
|
Width = 509
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
@ -139,12 +139,12 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
BorderSpacing.Right = 6
|
BorderSpacing.Right = 6
|
||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
ClientHeight = 66
|
ClientHeight = 65
|
||||||
ClientWidth = 509
|
ClientWidth = 509
|
||||||
TabOrder = 1
|
TabOrder = 1
|
||||||
object lblAccessOrder: TLabel
|
object lblAccessOrder: TLabel
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 16
|
Height = 15
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 509
|
Width = 509
|
||||||
Align = alTop
|
Align = alTop
|
||||||
@ -161,7 +161,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 19
|
Height = 19
|
||||||
Top = 22
|
Top = 21
|
||||||
Width = 509
|
Width = 509
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
Caption = 'radioAccessOrderEdit'
|
Caption = 'radioAccessOrderEdit'
|
||||||
@ -178,7 +178,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 19
|
Height = 19
|
||||||
Top = 41
|
Top = 40
|
||||||
Width = 509
|
Width = 509
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
@ -194,8 +194,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Control = Owner
|
AnchorSideRight.Control = Owner
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 16
|
Height = 15
|
||||||
Top = 179
|
Top = 202
|
||||||
Width = 521
|
Width = 521
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
Caption = 'lblAccessType'
|
Caption = 'lblAccessType'
|
||||||
@ -209,7 +209,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 0
|
Left = 0
|
||||||
Height = 3
|
Height = 3
|
||||||
Top = 7
|
Top = 6
|
||||||
Width = 60
|
Width = 60
|
||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
end
|
end
|
||||||
@ -218,9 +218,9 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideLeft.Side = asrBottom
|
AnchorSideLeft.Side = asrBottom
|
||||||
AnchorSideTop.Control = Owner
|
AnchorSideTop.Control = Owner
|
||||||
Left = 70
|
Left = 70
|
||||||
Height = 16
|
Height = 15
|
||||||
Top = 0
|
Top = 0
|
||||||
Width = 127
|
Width = 126
|
||||||
BorderSpacing.Left = 10
|
BorderSpacing.Left = 10
|
||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
Caption = 'lblMultiWinTabSection'
|
Caption = 'lblMultiWinTabSection'
|
||||||
@ -235,10 +235,10 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideTop.Side = asrCenter
|
AnchorSideTop.Side = asrCenter
|
||||||
AnchorSideRight.Control = Owner
|
AnchorSideRight.Control = Owner
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 207
|
Left = 206
|
||||||
Height = 3
|
Height = 3
|
||||||
Top = 7
|
Top = 6
|
||||||
Width = 314
|
Width = 315
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
BorderSpacing.Left = 10
|
BorderSpacing.Left = 10
|
||||||
end
|
end
|
||||||
@ -249,8 +249,8 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
AnchorSideRight.Control = Owner
|
AnchorSideRight.Control = Owner
|
||||||
AnchorSideRight.Side = asrBottom
|
AnchorSideRight.Side = asrBottom
|
||||||
Left = 6
|
Left = 6
|
||||||
Height = 57
|
Height = 83
|
||||||
Top = 22
|
Top = 21
|
||||||
Width = 509
|
Width = 509
|
||||||
Anchors = [akTop, akLeft, akRight]
|
Anchors = [akTop, akLeft, akRight]
|
||||||
AutoSize = True
|
AutoSize = True
|
||||||
@ -259,7 +259,7 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
BorderSpacing.Bottom = 6
|
BorderSpacing.Bottom = 6
|
||||||
BevelOuter = bvNone
|
BevelOuter = bvNone
|
||||||
ChildSizing.ControlsPerLine = 2
|
ChildSizing.ControlsPerLine = 2
|
||||||
ClientHeight = 57
|
ClientHeight = 83
|
||||||
ClientWidth = 509
|
ClientWidth = 509
|
||||||
TabOrder = 2
|
TabOrder = 2
|
||||||
object chkShowCloseBtn: TCheckBox
|
object chkShowCloseBtn: TCheckBox
|
||||||
@ -338,5 +338,41 @@ inherited EditorMultiWindowOptionsFrame: TEditorMultiWindowOptionsFrame
|
|||||||
Width = 1
|
Width = 1
|
||||||
ParentColor = False
|
ParentColor = False
|
||||||
end
|
end
|
||||||
|
object chkMultiLine: TCheckBox
|
||||||
|
AnchorSideLeft.Control = CenterLabel
|
||||||
|
AnchorSideTop.Control = chkUseTabHistory
|
||||||
|
AnchorSideTop.Side = asrBottom
|
||||||
|
Left = 254
|
||||||
|
Height = 19
|
||||||
|
Top = 38
|
||||||
|
Width = 89
|
||||||
|
Caption = 'chkMultiLine'
|
||||||
|
TabOrder = 5
|
||||||
|
end
|
||||||
|
object EditorTabPositionLabel: TLabel
|
||||||
|
AnchorSideLeft.Side = asrBottom
|
||||||
|
AnchorSideTop.Control = EditorTabPositionCheckBox
|
||||||
|
AnchorSideTop.Side = asrCenter
|
||||||
|
Left = 156
|
||||||
|
Height = 15
|
||||||
|
Top = 64
|
||||||
|
Width = 122
|
||||||
|
BorderSpacing.Left = 6
|
||||||
|
Caption = 'EditorTabPositionLabel'
|
||||||
|
ParentColor = False
|
||||||
|
end
|
||||||
|
object EditorTabPositionCheckBox: TComboBox
|
||||||
|
AnchorSideLeft.Control = pnlNBTabs
|
||||||
|
AnchorSideTop.Control = chkCtrlMiddleCloseOthers
|
||||||
|
AnchorSideTop.Side = asrBottom
|
||||||
|
Left = 0
|
||||||
|
Height = 23
|
||||||
|
Top = 60
|
||||||
|
Width = 150
|
||||||
|
BorderSpacing.Top = 3
|
||||||
|
ItemHeight = 15
|
||||||
|
Style = csDropDownList
|
||||||
|
TabOrder = 6
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -38,11 +38,14 @@ type
|
|||||||
Bevel2a: TBevel;
|
Bevel2a: TBevel;
|
||||||
Bevel2: TBevel;
|
Bevel2: TBevel;
|
||||||
CenterLabel: TLabel;
|
CenterLabel: TLabel;
|
||||||
|
chkMultiLine: TCheckBox;
|
||||||
chkCtrlMiddleCloseOthers: TCheckBox;
|
chkCtrlMiddleCloseOthers: TCheckBox;
|
||||||
chkUseTabHistory: TCheckBox;
|
chkUseTabHistory: TCheckBox;
|
||||||
chkShowCloseBtn: TCheckBox;
|
chkShowCloseBtn: TCheckBox;
|
||||||
chkShowNumbers: TCheckBox;
|
chkShowNumbers: TCheckBox;
|
||||||
chkHideSingleTab: TCheckBox;
|
chkHideSingleTab: TCheckBox;
|
||||||
|
EditorTabPositionCheckBox: TComboBox;
|
||||||
|
EditorTabPositionLabel: TLabel;
|
||||||
lblAccessTypeDesc: TLabel;
|
lblAccessTypeDesc: TLabel;
|
||||||
lblMultiWinTabSection: TLabel;
|
lblMultiWinTabSection: TLabel;
|
||||||
listAccessType: TCheckListBox;
|
listAccessType: TCheckListBox;
|
||||||
@ -140,11 +143,19 @@ begin
|
|||||||
chkShowCloseBtn.Caption := dlgCloseButtonsNotebook;
|
chkShowCloseBtn.Caption := dlgCloseButtonsNotebook;
|
||||||
chkUseTabHistory.Caption := dlgUseTabsHistory;
|
chkUseTabHistory.Caption := dlgUseTabsHistory;
|
||||||
chkCtrlMiddleCloseOthers.Caption := dlgCtrlMiddleTabCloseOtherPages;
|
chkCtrlMiddleCloseOthers.Caption := dlgCtrlMiddleTabCloseOtherPages;
|
||||||
|
chkMultiLine.Caption := dlgSourceEditTabMultiLine;
|
||||||
|
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosTop);
|
||||||
|
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosBottom);
|
||||||
|
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosLeft);
|
||||||
|
EditorTabPositionCheckBox.Items.Add(lisNotebookTabPosRight);
|
||||||
|
EditorTabPositionLabel.Caption := dlgNotebookTabPos;
|
||||||
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TEditorMultiWindowOptionsFrame.ReadSettings(
|
procedure TEditorMultiWindowOptionsFrame.ReadSettings(
|
||||||
AOptions: TAbstractIDEOptions);
|
AOptions: TAbstractIDEOptions);
|
||||||
|
const
|
||||||
|
TabPosToIndex : Array [TTabPosition] of Integer = (0, 1, 2, 3);
|
||||||
var
|
var
|
||||||
i: Integer;
|
i: Integer;
|
||||||
begin
|
begin
|
||||||
@ -154,6 +165,8 @@ begin
|
|||||||
chkShowCloseBtn.Checked := ShowTabCloseButtons and chkShowCloseBtn.Enabled;
|
chkShowCloseBtn.Checked := ShowTabCloseButtons and chkShowCloseBtn.Enabled;
|
||||||
chkUseTabHistory.Checked := UseTabHistory;
|
chkUseTabHistory.Checked := UseTabHistory;
|
||||||
chkCtrlMiddleCloseOthers.Checked := CtrlMiddleTabClickClosesOthers;
|
chkCtrlMiddleCloseOthers.Checked := CtrlMiddleTabClickClosesOthers;
|
||||||
|
chkMultiLine.Checked := MultiLineTab;
|
||||||
|
EditorTabPositionCheckBox.ItemIndex := TabPosToIndex[TabPosition];
|
||||||
end;
|
end;
|
||||||
FMultiWinEditAccessOrder.Assign(TEditorOptions(AOptions).MultiWinEditAccessOrder);
|
FMultiWinEditAccessOrder.Assign(TEditorOptions(AOptions).MultiWinEditAccessOrder);
|
||||||
|
|
||||||
@ -171,6 +184,8 @@ end;
|
|||||||
|
|
||||||
procedure TEditorMultiWindowOptionsFrame.WriteSettings(
|
procedure TEditorMultiWindowOptionsFrame.WriteSettings(
|
||||||
AOptions: TAbstractIDEOptions);
|
AOptions: TAbstractIDEOptions);
|
||||||
|
const
|
||||||
|
TabIndexToPos : Array [0..3] of TTabPosition = (tpTop, tpBottom, tpLeft, tpRight);
|
||||||
begin
|
begin
|
||||||
TEditorOptions(AOptions).MultiWinEditAccessOrder.Assign(FMultiWinEditAccessOrder);
|
TEditorOptions(AOptions).MultiWinEditAccessOrder.Assign(FMultiWinEditAccessOrder);
|
||||||
with TEditorOptions(AOptions) do begin
|
with TEditorOptions(AOptions) do begin
|
||||||
@ -179,6 +194,8 @@ begin
|
|||||||
ShowTabCloseButtons := chkShowCloseBtn.Checked;
|
ShowTabCloseButtons := chkShowCloseBtn.Checked;
|
||||||
UseTabHistory := chkUseTabHistory.Checked;
|
UseTabHistory := chkUseTabHistory.Checked;
|
||||||
CtrlMiddleTabClickClosesOthers := chkCtrlMiddleCloseOthers.Checked;
|
CtrlMiddleTabClickClosesOthers := chkCtrlMiddleCloseOthers.Checked;
|
||||||
|
MultiLineTab := chkMultiLine.Checked;
|
||||||
|
TabPosition := TabIndexToPos[EditorTabPositionCheckBox.ItemIndex];
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
@ -1490,6 +1490,7 @@ resourcestring
|
|||||||
lisShowSpecialCharacters = 'Show special characters';
|
lisShowSpecialCharacters = 'Show special characters';
|
||||||
dlgCloseButtonsNotebook = 'Show close buttons in notebook';
|
dlgCloseButtonsNotebook = 'Show close buttons in notebook';
|
||||||
dlgCtrlMiddleTabCloseOtherPages = 'Ctrl-middle-click on tab closes all others';
|
dlgCtrlMiddleTabCloseOtherPages = 'Ctrl-middle-click on tab closes all others';
|
||||||
|
dlgSourceEditTabMultiLine = 'Multiline tabs';
|
||||||
dlgHideSingleTabInNotebook = 'Hide tab in single page windows';
|
dlgHideSingleTabInNotebook = 'Hide tab in single page windows';
|
||||||
dlgTabNumbersNotebook = 'Show tab numbers in notebook';
|
dlgTabNumbersNotebook = 'Show tab numbers in notebook';
|
||||||
dlgNotebookTabPos = 'Source notebook tabs position';
|
dlgNotebookTabPos = 'Source notebook tabs position';
|
||||||
|
@ -5783,6 +5783,7 @@ Begin
|
|||||||
Options:=Options+[nboShowCloseButtons]
|
Options:=Options+[nboShowCloseButtons]
|
||||||
else
|
else
|
||||||
Options:=Options-[nboShowCloseButtons];
|
Options:=Options-[nboShowCloseButtons];
|
||||||
|
MultiLine := EditorOpts.MultiLineTab;
|
||||||
TabPosition := EditorOpts.TabPosition;
|
TabPosition := EditorOpts.TabPosition;
|
||||||
OnChange := @NotebookPageChanged;
|
OnChange := @NotebookPageChanged;
|
||||||
OnCloseTabClicked := @CloseTabClicked;
|
OnCloseTabClicked := @CloseTabClicked;
|
||||||
@ -8152,6 +8153,7 @@ Begin
|
|||||||
FNoteBook.Options:=FNoteBook.Options+[nboShowCloseButtons]
|
FNoteBook.Options:=FNoteBook.Options+[nboShowCloseButtons]
|
||||||
else
|
else
|
||||||
FNoteBook.Options:=FNoteBook.Options-[nboShowCloseButtons];
|
FNoteBook.Options:=FNoteBook.Options-[nboShowCloseButtons];
|
||||||
|
FNoteBook.MultiLine := EditorOpts.MultiLineTab;
|
||||||
FNotebook.TabPosition := EditorOpts.TabPosition;
|
FNotebook.TabPosition := EditorOpts.TabPosition;
|
||||||
|
|
||||||
Exclude(States,snWarnedFont);
|
Exclude(States,snWarnedFont);
|
||||||
|
Loading…
Reference in New Issue
Block a user