The new inplace editor neutralizes the need for a preference option "Enable popup text editor". Remove it.

This commit is contained in:
Ansgar Becker
2008-11-25 19:35:02 +00:00
parent f685567d12
commit 32fad96276
4 changed files with 10 additions and 27 deletions

View File

@@ -209,13 +209,11 @@ const
COLORSHIFT_NULLFIELDS = 45; // Percentage of brightness to add to normal field colors for NULL values
REGNAME_FIELDEDITOR_NUMERIC = 'FieldEditor_Numeric';
REGNAME_FIELDEDITOR_TEXT = 'FieldEditor_Text';
REGNAME_FIELDEDITOR_BINARY = 'FieldEditor_Binary';
REGNAME_FIELDEDITOR_DATETIME = 'FieldEditor_Datetime';
REGNAME_FIELDEDITOR_ENUM = 'FieldEditor_Enum';
REGNAME_FIELDEDITOR_SET = 'FieldEditor_Set';
DEFAULT_FIELDEDITOR_NUMERIC = True;
DEFAULT_FIELDEDITOR_TEXT = True;
DEFAULT_FIELDEDITOR_BINARY = True;
DEFAULT_FIELDEDITOR_DATETIME = True;
DEFAULT_FIELDEDITOR_ENUM = True;

View File

@@ -530,7 +530,6 @@ type
prefCSVTerminator : String[10];
prefLogToFile,
prefPreferShowTables,
prefEnableTextEditor,
prefEnableBinaryEditor,
prefEnableDatetimeEditor,
prefEnableEnumEditor,
@@ -962,7 +961,6 @@ begin
prefNullBG := Mainform.GetRegValue(REGNAME_BG_NULL, DEFAULT_BG_NULL);
CalcNullColors;
// Editor enablings
prefEnableTextEditor := Mainform.GetRegValue(REGNAME_FIELDEDITOR_TEXT, DEFAULT_FIELDEDITOR_TEXT);
prefEnableBinaryEditor := Mainform.GetRegValue(REGNAME_FIELDEDITOR_BINARY, DEFAULT_FIELDEDITOR_BINARY);
prefEnableDatetimeEditor := Mainform.GetRegValue(REGNAME_FIELDEDITOR_DATETIME, DEFAULT_FIELDEDITOR_DATETIME);
prefEnableEnumEditor := Mainform.GetRegValue(REGNAME_FIELDEDITOR_ENUM, DEFAULT_FIELDEDITOR_ENUM);

View File

@@ -470,15 +470,6 @@ object optionsform: Toptionsform
TabOrder = 1
OnChange = Modified
end
object chkEditorText: TCheckBox
Left = 234
Top = 47
Width = 154
Height = 17
Caption = 'Enable popup text editor'
TabOrder = 2
OnClick = Modified
end
object cboxBinary: TColorBox
Left = 100
Top = 69
@@ -486,7 +477,7 @@ object optionsform: Toptionsform
Height = 22
Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors]
ItemHeight = 16
TabOrder = 3
TabOrder = 2
OnChange = Modified
end
object cboxDatetime: TColorBox
@@ -496,7 +487,7 @@ object optionsform: Toptionsform
Height = 22
Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors]
ItemHeight = 16
TabOrder = 5
TabOrder = 4
OnChange = Modified
end
object cboxNumeric: TColorBox
@@ -516,7 +507,7 @@ object optionsform: Toptionsform
Height = 22
Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors]
ItemHeight = 16
TabOrder = 7
TabOrder = 6
OnChange = Modified
end
object chkEditorBinary: TCheckBox
@@ -525,7 +516,7 @@ object optionsform: Toptionsform
Width = 154
Height = 17
Caption = 'Enable popup HEX editor'
TabOrder = 4
TabOrder = 3
OnClick = Modified
end
object chkEditorDatetime: TCheckBox
@@ -534,7 +525,7 @@ object optionsform: Toptionsform
Width = 154
Height = 17
Caption = 'Enable calendar editor'
TabOrder = 6
TabOrder = 5
OnClick = Modified
end
object chkEditorEnum: TCheckBox
@@ -543,7 +534,7 @@ object optionsform: Toptionsform
Width = 154
Height = 17
Caption = 'Enable pulldown editor'
TabOrder = 8
TabOrder = 7
OnClick = Modified
end
object cboxSet: TColorBox
@@ -553,7 +544,7 @@ object optionsform: Toptionsform
Height = 22
Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors]
ItemHeight = 16
TabOrder = 9
TabOrder = 8
OnChange = Modified
end
object chkEditorSet: TCheckBox
@@ -562,7 +553,7 @@ object optionsform: Toptionsform
Width = 154
Height = 17
Caption = 'Enable checkbox editor'
TabOrder = 10
TabOrder = 9
OnClick = Modified
end
object chkNullBG: TCheckBox
@@ -571,7 +562,7 @@ object optionsform: Toptionsform
Width = 154
Height = 17
Caption = 'Enable background color'
TabOrder = 12
TabOrder = 11
OnClick = chkNullBGClick
end
object cboxNullBG: TColorBox
@@ -582,7 +573,7 @@ object optionsform: Toptionsform
Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors]
Enabled = False
ItemHeight = 16
TabOrder = 11
TabOrder = 10
OnChange = Modified
end
end

View File

@@ -61,7 +61,6 @@ type
grpFieldLayout: TGroupBox;
lblFieldDatetime: TLabel;
cboxText: TColorBox;
chkEditorText: TCheckBox;
lblFieldText: TLabel;
lblFieldBinary: TLabel;
lblFieldNumeric: TLabel;
@@ -212,7 +211,6 @@ begin
reg.WriteInteger(REGNAME_FIELDCOLOR_SET, cboxSet.Selected);
reg.WriteInteger(REGNAME_BG_NULL, cboxNullBg.Selected);
// Editor enablings
reg.WriteBool(REGNAME_FIELDEDITOR_TEXT, chkEditorText.Checked);
reg.WriteBool(REGNAME_FIELDEDITOR_BINARY, chkEditorBinary.Checked);
reg.WriteBool(REGNAME_FIELDEDITOR_DATETIME, chkEditorDatetime.Checked);
reg.WriteBool(REGNAME_FIELDEDITOR_ENUM, chkEditorEnum.Checked);
@@ -274,7 +272,6 @@ begin
cwin.CalcNullColors;
cwin.DataGrid.Repaint;
cwin.QueryGrid.Repaint;
cwin.prefEnableTextEditor := chkEditorText.Checked;
cwin.prefEnableBinaryEditor := chkEditorBinary.Checked;
cwin.prefEnableDatetimeEditor := chkEditorDatetime.Checked;
cwin.prefEnableEnumEditor := chkEditorEnum.Checked;
@@ -395,7 +392,6 @@ begin
cboxSet.Selected := Mainform.GetRegValue(REGNAME_FIELDCOLOR_SET, DEFAULT_FIELDCOLOR_SET);
cboxNullBG.Selected := Mainform.GetRegValue(REGNAME_BG_NULL, DEFAULT_BG_NULL);
// Editor enablings
chkEditorText.Checked := Mainform.GetRegValue(REGNAME_FIELDEDITOR_TEXT, DEFAULT_FIELDEDITOR_TEXT);
chkEditorBinary.Checked := Mainform.GetRegValue(REGNAME_FIELDEDITOR_BINARY, DEFAULT_FIELDEDITOR_BINARY);
chkEditorDatetime.Checked := Mainform.GetRegValue(REGNAME_FIELDEDITOR_DATETIME, DEFAULT_FIELDEDITOR_DATETIME);
chkEditorEnum.Checked := Mainform.GetRegValue(REGNAME_FIELDEDITOR_ENUM, DEFAULT_FIELDEDITOR_ENUM);