From cb4dbb3cf3b68e40bece670442efacd624ea4816 Mon Sep 17 00:00:00 2001
From: rosenfield <rosenfield@40cadd2d-89a2-4482-8f20-0232d845d7e3>
Date: Thu, 28 Jun 2007 00:02:15 +0000
Subject: [PATCH] Remove 'always in edit mode' option because it supposedly
 breaks clipboard copy via CTRL-C if disabled.

---
 options.dfm | 26 ++++++++------------------
 options.pas | 19 +++----------------
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/options.dfm b/options.dfm
index ffc588b4..1929fd64 100644
--- a/options.dfm
+++ b/options.dfm
@@ -439,17 +439,6 @@ object optionsform: Toptionsform
           TabOrder = 3
         end
       end
-      object CheckBoxDataAlwaysEditMode: TCheckBox
-        Left = 8
-        Top = 16
-        Width = 337
-        Height = 17
-        Caption = 'Data-grid always in editor-mode'
-        Checked = True
-        State = cbChecked
-        TabOrder = 1
-        OnClick = Modified
-      end
       object Panel9: TPanel
         Left = 190
         Top = 91
@@ -459,7 +448,7 @@ object optionsform: Toptionsform
         BevelOuter = bvLowered
         Color = clAqua
         ParentBackground = False
-        TabOrder = 2
+        TabOrder = 1
         OnClick = CallColorDialog
       end
       object CheckBoxlimit: TCheckBox
@@ -470,7 +459,7 @@ object optionsform: Toptionsform
         Caption = 'View data by default limited to'
         Checked = True
         State = cbChecked
-        TabOrder = 3
+        TabOrder = 2
         OnClick = CheckBoxlimitClick
       end
       object EditLimit: TEdit
@@ -478,8 +467,8 @@ object optionsform: Toptionsform
         Top = 37
         Width = 41
         Height = 21
-        TabOrder = 4
-        Text = '0'
+        TabOrder = 3
+        Text = '50'
         OnChange = Modified
       end
       object UpDownLimit: TUpDown
@@ -489,7 +478,8 @@ object optionsform: Toptionsform
         Height = 21
         Associate = EditLimit
         Max = 32767
-        TabOrder = 5
+        Position = 50
+        TabOrder = 4
         OnChanging = anyUpDownLimitChanging
       end
       object editDefaultColWidth: TEdit
@@ -497,7 +487,7 @@ object optionsform: Toptionsform
         Top = 65
         Width = 42
         Height = 21
-        TabOrder = 6
+        TabOrder = 5
         Text = '0'
         OnChange = Modified
       end
@@ -508,7 +498,7 @@ object optionsform: Toptionsform
         Height = 21
         Associate = editDefaultColWidth
         Max = 1000
-        TabOrder = 7
+        TabOrder = 6
         OnChanging = anyUpDownLimitChanging
       end
     end
diff --git a/options.pas b/options.pas
index 5fc999ab..2b0d50e1 100644
--- a/options.pas
+++ b/options.pas
@@ -70,7 +70,6 @@ type
     Label22: TLabel;
     EditFontSize: TEdit;
     UpDownFontSize: TUpDown;
-    CheckBoxDataAlwaysEditMode: TCheckBox;
     Label27: TLabel;
     Panel9: TPanel;
     CheckBoxlimit: TCheckBox;
@@ -169,7 +168,6 @@ begin
     WriteString('DataFontName', Panel8.Font.Name);
     WriteInteger('DataFontSize', UpDownDataFontSize.Position);
     WriteString('DataNullBackground', ColorToString(Panel9.color));
-    WriteBool('DataAlwaysEditMode', CheckBoxDataAlwaysEditMode.Checked);
   end;
   ButtonApply.Enabled := false;
 
@@ -194,17 +192,9 @@ begin
       DBMemo1.Font := self.Panel8.font;
       gridData.Refresh;
 //      DBMemo1.Font.Charset := tfontcharset(177);
-      // Set the grid-cells to always-edit-mode if set
-      if CheckBoxDataAlwaysEditMode.Checked then
-      begin
-        gridData.Options := gridData.Options + [dgAlwaysShowEditor];
-        gridQuery.Options := gridQuery.Options + [dgAlwaysShowEditor];
-      end
-      else
-      begin
-        gridData.Options := gridData.Options - [dgAlwaysShowEditor];
-        gridQuery.Options := gridQuery.Options - [dgAlwaysShowEditor];
-      end;
+      // Set the grid-cells to always-edit-mode
+      gridData.Options := gridData.Options + [dgAlwaysShowEditor];
+      gridQuery.Options := gridQuery.Options + [dgAlwaysShowEditor];
     end;
   end;
 
@@ -218,7 +208,6 @@ begin
     ConvertHTMLEntities := self.CheckBoxConvertHTMLEntities.Checked;
     CheckBoxLimit.Checked := self.CheckBoxLimit.Checked;
     UpDownLimitEnd.Position := UpDownLimit.Position;
-    DataAlwaysEditMode := CheckBoxDataAlwaysEditMode.Checked;
     DataNullBackground := Panel9.color;
   end;
 
@@ -320,8 +309,6 @@ begin
     if ValueExists('CSVTerminator') then
       Edit3.Text := ReadString('CSVTerminator');
 
-    if ValueExists('DataAlwaysEditMode') then
-      CheckBoxDataAlwaysEditMode.Checked := ReadBool('DataAlwaysEditMode');
     if ValueExists('DataNullBackground') then
       Panel9.Color := StringToColor(ReadString('DataNullBackground'))
     else