From 265891c7dad822f8c729c4a8500cb45a316e4345 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Fri, 29 Jan 2010 18:00:11 +0000
Subject: [PATCH] ide: editor general mist: don't rely on captions since they
 can change after language switch (issue #0015559)

git-svn-id: trunk@23597 -
---
 ide/frames/editor_general_misc_options.lfm | 11 ++-----
 ide/frames/editor_general_misc_options.pas | 38 ++++++++--------------
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/ide/frames/editor_general_misc_options.lfm b/ide/frames/editor_general_misc_options.lfm
index 858b91da0d..1e7055fd2f 100644
--- a/ide/frames/editor_general_misc_options.lfm
+++ b/ide/frames/editor_general_misc_options.lfm
@@ -3,7 +3,6 @@ inherited EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
   Width = 459
   ClientHeight = 186
   ClientWidth = 459
-  TabOrder = 0
   Visible = False
   DesignLeft = 138
   DesignTop = 138
@@ -13,9 +12,9 @@ inherited EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
     AnchorSideTop.Control = EditorTrimSpaceTypeCheckBox
     AnchorSideTop.Side = asrCenter
     Left = 156
-    Height = 16
-    Top = 160
-    Width = 142
+    Height = 14
+    Top = 161
+    Width = 127
     BorderSpacing.Left = 6
     Caption = 'EditorTrimSpaceTypeLabel'
     ParentColor = False
@@ -45,7 +44,6 @@ inherited EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
     ChildSizing.ControlsPerLine = 1
     ColumnLayout = clVerticalThenHorizontal
     Columns = 2
-    Ctl3D = False
     OnItemClick = EditorOptionsGroupBoxItemClick
     TabOrder = 0
   end
@@ -57,11 +55,8 @@ inherited EditorGeneralMiscOptionsFrame: TEditorGeneralMiscOptionsFrame
     Height = 21
     Top = 158
     Width = 150
-    AutoComplete = False
     BorderSpacing.Top = 6
-    Ctl3D = False
     ItemHeight = 13
-    ItemWidth = 0
     Style = csDropDownList
     TabOrder = 1
   end
diff --git a/ide/frames/editor_general_misc_options.pas b/ide/frames/editor_general_misc_options.pas
index 9ff44b0151..4026442950 100644
--- a/ide/frames/editor_general_misc_options.pas
+++ b/ide/frames/editor_general_misc_options.pas
@@ -90,15 +90,15 @@ begin
   begin
     with EditorOptionsGroupBox do
     begin
-      Checked[Items.IndexOf(lisShowSpecialCharacters)] := eoShowSpecialChars in SynEditOptions;
-      Checked[Items.IndexOf(dlgTrimTrailingSpaces)] := eoTrimTrailingSpaces in SynEditOptions;
-      Checked[Items.IndexOf(dlgCloseButtonsNotebook)] := ShowTabCloseButtons;
+      Checked[0] := eoShowSpecialChars in SynEditOptions;
+      Checked[1] := eoTrimTrailingSpaces in SynEditOptions;
+      Checked[2] := ShowTabCloseButtons;
       //Checked[Items.IndexOf(dlgShowGutterHints)] := ShowGutterHints;
-      Checked[Items.IndexOf(dlgFindTextatCursor)] := FindTextAtCursor;
-      Checked[Items.IndexOf(dlgCopyWordAtCursorOnCopyNone)] := CopyWordAtCursorOnCopyNone;
-      Checked[Items.IndexOf(dlgCopyPasteKeepFolds)] := eoFoldedCopyPaste in SynEditOptions2;
+      Checked[3] := FindTextAtCursor;
+      Checked[4] := CopyWordAtCursorOnCopyNone;
+      Checked[5] := eoFoldedCopyPaste in SynEditOptions2;
     end;
-    EditorTrimSpaceTypeCheckBox.ItemIndex :=  ord(TrimSpaceType);
+    EditorTrimSpaceTypeCheckBox.ItemIndex := ord(TrimSpaceType);
   end;
 end;
 
@@ -112,30 +112,20 @@ procedure TEditorGeneralMiscOptionsFrame.WriteSettings(AOptions: TAbstractIDEOpt
       TEditorOptions(AOptions).SynEditOptions := TEditorOptions(AOptions).SynEditOptions - [AnOption];
   end;
 
-  procedure UpdateOption(const CheckBoxName: String; AnOption: TSynEditorOption);
-  var
-    i: integer;
-  begin
-    i := EditorOptionsGroupBox.Items.IndexOf(CheckBoxName);
-    UpdateOptionFromBool(EditorOptionsGroupBox.Checked[i], AnOption);
-  end;
-
 begin
   with AOptions as TEditorOptions do
   begin
-    UpdateOption(lisShowSpecialCharacters, eoShowSpecialChars);
-    UpdateOption(dlgTrimTrailingSpaces, eoTrimTrailingSpaces);
-    ShowTabCloseButtons := CheckGroupItemChecked(EditorOptionsGroupBox, dlgCloseButtonsNotebook);
-    CopyWordAtCursorOnCopyNone := CheckGroupItemChecked(EditorOptionsGroupBox, dlgCopyWordAtCursorOnCopyNone);
+    UpdateOptionFromBool(EditorOptionsGroupBox.Checked[0], eoShowSpecialChars);
+    UpdateOptionFromBool(EditorOptionsGroupBox.Checked[1], eoTrimTrailingSpaces);
+    ShowTabCloseButtons := EditorOptionsGroupBox.Checked[2];
     //ShowGutterHints := CheckGroupItemChecked(EditorOptionsGroupBox, dlgShowGutterHints);
-    FindTextAtCursor := CheckGroupItemChecked(EditorOptionsGroupBox, dlgFindTextatCursor);
-    TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeCheckBox.ItemIndex);
-    if EditorOptionsGroupBox.Checked[EditorOptionsGroupBox.Items.IndexOf
-                                     (dlgCopyPasteKeepFolds)]
-    then
+    FindTextAtCursor := EditorOptionsGroupBox.Checked[3];
+    CopyWordAtCursorOnCopyNone := EditorOptionsGroupBox.Checked[4];
+    if EditorOptionsGroupBox.Checked[5] then
       SynEditOptions2 := SynEditOptions2 + [eoFoldedCopyPaste]
     else
       SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste];
+    TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeCheckBox.ItemIndex);
   end;
 end;