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

IDE: Fix control's name to match its type.

Browse Source 
git-svn-id: trunk@50618 -
This commit is contained in:
juha 2015-12-04 20:04:53 +00:00
parent e7ce75b682
commit 753d444bc0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/frames/editor_general_misc_options.lfm
View File

@ -10,9 +10,9 @@ object EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
DesignLeft = 138 DesignLeft = 138
DesignTop = 138 DesignTop = 138
object EditorTrimSpaceTypeLabel: TLabel object EditorTrimSpaceTypeLabel: TLabel
AnchorSideLeft.Control = EditorTrimSpaceTypeCheckBox AnchorSideLeft.Control = EditorTrimSpaceTypeComboBox
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = EditorTrimSpaceTypeCheckBox AnchorSideTop.Control = EditorTrimSpaceTypeComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 156 Left = 156
Height = 15 Height = 15
@ -50,7 +50,7 @@ object EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
OnItemClick = EditorOptionsGroupBoxItemClick OnItemClick = EditorOptionsGroupBoxItemClick
TabOrder = 0 TabOrder = 0
end end
object EditorTrimSpaceTypeCheckBox: TComboBox object EditorTrimSpaceTypeComboBox: TComboBox
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = EditorOptionsGroupBox AnchorSideTop.Control = EditorOptionsGroupBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom

14
ide/frames/editor_general_misc_options.pas
View File

@ -39,7 +39,7 @@ type
{ TEditorGeneralMiscOptionsFrame } { TEditorGeneralMiscOptionsFrame }
TEditorGeneralMiscOptionsFrame = class(TAbstractIDEOptionsEditor) TEditorGeneralMiscOptionsFrame = class(TAbstractIDEOptionsEditor)
EditorTrimSpaceTypeCheckBox: TComboBox; EditorTrimSpaceTypeComboBox: TComboBox;
EditorOptionsGroupBox: TCheckGroup; EditorOptionsGroupBox: TCheckGroup;
EditorTrimSpaceTypeLabel: TLabel; EditorTrimSpaceTypeLabel: TLabel;
procedure EditorOptionsGroupBoxItemClick(Sender: TObject; {%H-}Index: integer); procedure EditorOptionsGroupBoxItemClick(Sender: TObject; {%H-}Index: integer);
@ -87,10 +87,10 @@ begin
Items.Add(dlgUseMinimumIme); Items.Add(dlgUseMinimumIme);
{$ENDIF} {$ENDIF}
end; end;
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypeLeaveLine); EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeLeaveLine);
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypeEditLine); EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeEditLine);
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypeCaretMove); EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeCaretMove);
EditorTrimSpaceTypeCheckBox.Items.Add(dlgTrimSpaceTypePosOnly); EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypePosOnly);
EditorTrimSpaceTypeLabel.Caption := dlgTrimSpaceTypeCaption; EditorTrimSpaceTypeLabel.Caption := dlgTrimSpaceTypeCaption;
end; end;
@ -110,7 +110,7 @@ begin
Checked[5] := UseMinimumIme; Checked[5] := UseMinimumIme;
{$ENDIF} {$ENDIF}
end; end;
EditorTrimSpaceTypeCheckBox.ItemIndex := ord(TrimSpaceType); EditorTrimSpaceTypeComboBox.ItemIndex := ord(TrimSpaceType);
end; end;
end; end;
@ -136,7 +136,7 @@ begin
SynEditOptions2 := SynEditOptions2 + [eoFoldedCopyPaste] SynEditOptions2 := SynEditOptions2 + [eoFoldedCopyPaste]
else else
SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste]; SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste];
TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeCheckBox.ItemIndex); TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeComboBox.ItemIndex);
{$IFDEF WinIME} {$IFDEF WinIME}
UseMinimumIme := EditorOptionsGroupBox.Checked[5]; UseMinimumIme := EditorOptionsGroupBox.Checked[5];
{$ENDIF} {$ENDIF}