opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provide option "tabs to spaces" in preferences dialog. For space reasons, move highlighter options to new tab "Highlighter". Also, unify padding on tab sheets, and move "Ask for saving files" option to "SQL" tab.

Browse Source
This commit is contained in:
Ansgar Becker
2011-11-10 23:27:02 +00:00
parent cb4775c328
commit d07cfcb7c6
4 changed files with 357 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/const.inc
View File

@ -221,6 +221,8 @@ const
DEFAULT_PROMPTFILESAVE = True; DEFAULT_PROMPTFILESAVE = True;
REGNAME_COMPLETIONPROPOSAL = 'CompletionProposal'; REGNAME_COMPLETIONPROPOSAL = 'CompletionProposal';
DEFAULT_COMPLETIONPROPOSAL = True; DEFAULT_COMPLETIONPROPOSAL = True;
REGNAME_TABSTOSPACES = 'TabsToSpaces';
DEFAULT_TABSTOSPACES = False;
REGNAME_FILTERACTIVE = 'FilterPanel'; REGNAME_FILTERACTIVE = 'FilterPanel';
DEFAULT_FILTERACTIVE = False; DEFAULT_FILTERACTIVE = False;
REGNAME_MULTI_INSTANCES = 'AllowMultipleInstances'; REGNAME_MULTI_INSTANCES = 'AllowMultipleInstances';

4
source/main.pas
View File

@ -9287,6 +9287,10 @@ begin
FontName := GetRegValue(REGNAME_FONTNAME, DEFAULT_FONTNAME); FontName := GetRegValue(REGNAME_FONTNAME, DEFAULT_FONTNAME);
FontSize := GetRegValue(REGNAME_FONTSIZE, DEFAULT_FONTSIZE); FontSize := GetRegValue(REGNAME_FONTSIZE, DEFAULT_FONTSIZE);
TabWidth := GetRegValue(REGNAME_TABWIDTH, DEFAULT_TABWIDTH); TabWidth := GetRegValue(REGNAME_TABWIDTH, DEFAULT_TABWIDTH);
if GetRegValue(REGNAME_TABSTOSPACES, DEFAULT_TABSTOSPACES) then
BaseEditor.Options := BaseEditor.Options + [eoTabsToSpaces]
else
BaseEditor.Options := BaseEditor.Options - [eoTabsToSpaces];
ActiveLineColor := StringToColor(GetRegValue(REGNAME_SQLCOLACTIVELINE, ColorToString(DEFAULT_SQLCOLACTIVELINE))); ActiveLineColor := StringToColor(GetRegValue(REGNAME_SQLCOLACTIVELINE, ColorToString(DEFAULT_SQLCOLACTIVELINE)));
for i:=0 to Editors.Count-1 do begin for i:=0 to Editors.Count-1 do begin
Editor := Editors[i] as TSynMemo; Editor := Editors[i] as TSynMemo;

482
source/options.dfm
View File

@ -34,8 +34,8 @@ object optionsform: Toptionsform
object tabMisc: TTabSheet object tabMisc: TTabSheet
Caption = 'Miscellaneous' Caption = 'Miscellaneous'
object chkAutoReconnect: TCheckBox object chkAutoReconnect: TCheckBox
Left = 16 Left = 8
Top = 32 Top = 31
Width = 417 Width = 417
Height = 17 Height = 17
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -44,8 +44,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkRestoreLastDB: TCheckBox object chkRestoreLastDB: TCheckBox
Left = 16 Left = 8
Top = 56 Top = 55
Width = 417 Width = 417
Height = 17 Height = 17
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -56,8 +56,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkUpdatecheck: TCheckBox object chkUpdatecheck: TCheckBox
Left = 16 Left = 8
Top = 78 Top = 77
Width = 300 Width = 300
Height = 28 Height = 28
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -70,7 +70,7 @@ object optionsform: Toptionsform
end end
object editUpdatecheckInterval: TEdit object editUpdatecheckInterval: TEdit
Left = 374 Left = 374
Top = 78 Top = 77
Width = 43 Width = 43
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -81,7 +81,7 @@ object optionsform: Toptionsform
end end
object updownUpdatecheckInterval: TUpDown object updownUpdatecheckInterval: TUpDown
Left = 417 Left = 417
Top = 78 Top = 77
Width = 16 Width = 16
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -93,8 +93,8 @@ object optionsform: Toptionsform
OnChanging = anyUpDownLimitChanging OnChanging = anyUpDownLimitChanging
end end
object chkUpdateCheckBuilds: TCheckBox object chkUpdateCheckBuilds: TCheckBox
Left = 34 Left = 26
Top = 112 Top = 111
Width = 399 Width = 399
Height = 17 Height = 17
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -104,8 +104,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkDoStatistics: TCheckBox object chkDoStatistics: TCheckBox
Left = 16 Left = 8
Top = 135 Top = 134
Width = 417 Width = 417
Height = 48 Height = 48
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -118,8 +118,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkAllowMultiInstances: TCheckBox object chkAllowMultiInstances: TCheckBox
Left = 16 Left = 8
Top = 9 Top = 8
Width = 417 Width = 417
Height = 17 Height = 17
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -129,8 +129,8 @@ object optionsform: Toptionsform
TabOrder = 0 TabOrder = 0
end end
object chkColorBars: TCheckBox object chkColorBars: TCheckBox
Left = 16 Left = 8
Top = 189 Top = 188
Width = 201 Width = 201
Height = 17 Height = 17
Caption = 'Display bars in various list columns' Caption = 'Display bars in various list columns'
@ -139,7 +139,7 @@ object optionsform: Toptionsform
end end
object cboxColorBars: TColorBox object cboxColorBars: TColorBox
Left = 249 Left = 249
Top = 187 Top = 186
Width = 184 Width = 184
Height = 22 Height = 22
Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors] Style = [cbStandardColors, cbExtendedColors, cbCustomColor, cbPrettyNames, cbCustomColors]
@ -147,59 +147,48 @@ object optionsform: Toptionsform
TabOrder = 9 TabOrder = 9
OnClick = Modified OnClick = Modified
end end
object chkAskFileSave: TCheckBox
Left = 16
Top = 213
Width = 417
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Prompt to save modified files on tab close'
Checked = True
State = cbChecked
TabOrder = 10
end
end end
object tabLogging: TTabSheet object tabLogging: TTabSheet
Caption = 'Logging' Caption = 'Logging'
ImageIndex = 5 ImageIndex = 5
object Label4: TLabel object Label4: TLabel
Left = 16 Left = 8
Top = 18 Top = 11
Width = 37 Width = 37
Height = 13 Height = 13
Caption = 'Log last' Caption = 'Log last'
end end
object lblLogLinesHint: TLabel object lblLogLinesHint: TLabel
Left = 240 Left = 226
Top = 18 Top = 11
Width = 71 Width = 71
Height = 13 Height = 13
Caption = 'lines in SQL log' Caption = 'lines in SQL log'
end end
object lblLogSnipHint: TLabel object lblLogSnipHint: TLabel
Left = 238 Left = 226
Top = 45 Top = 38
Width = 139 Width = 139
Height = 13 Height = 13
Caption = 'characters (0 = no snipping)' Caption = 'characters (0 = no snipping)'
end end
object lblLogSnip: TLabel object lblLogSnip: TLabel
Left = 16 Left = 8
Top = 45 Top = 38
Width = 96 Width = 96
Height = 13 Height = 13
Caption = 'Snip SQL log lines to' Caption = 'Snip SQL log lines to'
end end
object lblLogLevel: TLabel object lblLogLevel: TLabel
Left = 16 Left = 8
Top = 102 Top = 95
Width = 57 Width = 57
Height = 13 Height = 13
Caption = 'Log events:' Caption = 'Log events:'
end end
object editLogLines: TEdit object editLogLines: TEdit
Left = 159 Left = 150
Top = 15 Top = 8
Width = 53 Width = 53
Height = 21 Height = 21
TabOrder = 0 TabOrder = 0
@ -207,8 +196,8 @@ object optionsform: Toptionsform
OnChange = Modified OnChange = Modified
end end
object updownLogLines: TUpDown object updownLogLines: TUpDown
Left = 212 Left = 203
Top = 15 Top = 8
Width = 16 Width = 16
Height = 21 Height = 21
Associate = editLogLines Associate = editLogLines
@ -220,8 +209,8 @@ object optionsform: Toptionsform
OnChanging = anyUpDownLimitChanging OnChanging = anyUpDownLimitChanging
end end
object updownLogSnip: TUpDown object updownLogSnip: TUpDown
Left = 212 Left = 203
Top = 42 Top = 35
Width = 16 Width = 16
Height = 21 Height = 21
Associate = editLogSnip Associate = editLogSnip
@ -231,8 +220,8 @@ object optionsform: Toptionsform
OnChanging = anyUpDownLimitChanging OnChanging = anyUpDownLimitChanging
end end
object editLogSnip: TEdit object editLogSnip: TEdit
Left = 159 Left = 150
Top = 42 Top = 35
Width = 53 Width = 53
Height = 21 Height = 21
TabOrder = 2 TabOrder = 2
@ -240,8 +229,8 @@ object optionsform: Toptionsform
OnChange = Modified OnChange = Modified
end end
object chkLogToFile: TCheckBox object chkLogToFile: TCheckBox
Left = 16 Left = 8
Top = 71 Top = 64
Width = 182 Width = 182
Height = 17 Height = 17
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -250,8 +239,8 @@ object optionsform: Toptionsform
OnClick = chkLogToFileClick OnClick = chkLogToFileClick
end end
object chkLogEventErrors: TCheckBox object chkLogEventErrors: TCheckBox
Left = 159 Left = 150
Top = 101 Top = 94
Width = 150 Width = 150
Height = 17 Height = 17
Caption = 'Errors' Caption = 'Errors'
@ -259,8 +248,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkLogEventUserFiredSQL: TCheckBox object chkLogEventUserFiredSQL: TCheckBox
Left = 159 Left = 150
Top = 120 Top = 113
Width = 150 Width = 150
Height = 17 Height = 17
Caption = 'User fired SQL queries' Caption = 'User fired SQL queries'
@ -268,8 +257,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkLogEventSQL: TCheckBox object chkLogEventSQL: TCheckBox
Left = 159 Left = 150
Top = 139 Top = 132
Width = 150 Width = 150
Height = 17 Height = 17
Caption = 'Internal SQL queries' Caption = 'Internal SQL queries'
@ -277,8 +266,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkLogEventInfo: TCheckBox object chkLogEventInfo: TCheckBox
Left = 159 Left = 150
Top = 158 Top = 151
Width = 150 Width = 150
Height = 17 Height = 17
Caption = 'Information messages' Caption = 'Information messages'
@ -286,8 +275,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object chkLogEventDebug: TCheckBox object chkLogEventDebug: TCheckBox
Left = 159 Left = 150
Top = 177 Top = 170
Width = 150 Width = 150
Height = 17 Height = 17
Caption = 'Debug messages' Caption = 'Debug messages'
@ -295,8 +284,8 @@ object optionsform: Toptionsform
OnClick = Modified OnClick = Modified
end end
object editLogDir: TButtonedEdit object editLogDir: TButtonedEdit
Left = 159 Left = 150
Top = 69 Top = 62
Width = 282 Width = 282
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -312,29 +301,41 @@ object optionsform: Toptionsform
end end
end end
object tabSQL: TTabSheet object tabSQL: TTabSheet
BorderWidth = 5
Caption = 'SQL' Caption = 'SQL'
ImageIndex = 1 ImageIndex = 1
object grpSQLFont: TGroupBox object lblFont: TLabel
Left = 1 Left = 8
Top = 1 Top = 11
Width = 329 Width = 55
Height = 56 Height = 13
Anchors = [akLeft, akTop, akRight] Caption = 'Editor font:'
Caption = 'Editor font' end
TabOrder = 0
object lblSQLFontSize: TLabel object lblSQLFontSize: TLabel
Left = 307 Left = 213
Top = 26 Top = 38
Width = 10 Width = 10
Height = 13 Height = 13
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'pt' Caption = 'pt'
end end
object Label1: TLabel
Left = 8
Top = 65
Width = 51
Height = 13
Caption = 'Tab width:'
end
object lblMaxQueryResults: TLabel
Left = 8
Top = 92
Width = 101
Height = 13
Caption = 'Maximum result sets:'
end
object comboSQLFontName: TComboBox object comboSQLFontName: TComboBox
Left = 3 Left = 150
Top = 23 Top = 8
Width = 238 Width = 289
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
@ -342,8 +343,8 @@ object optionsform: Toptionsform
OnChange = SQLFontChange OnChange = SQLFontChange
end end
object editSQLFontSize: TEdit object editSQLFontSize: TEdit
Left = 244 Left = 150
Top = 23 Top = 35
Width = 41 Width = 41
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -352,8 +353,8 @@ object optionsform: Toptionsform
OnExit = SQLFontChange OnExit = SQLFontChange
end end
object updownSQLFontSize: TUpDown object updownSQLFontSize: TUpDown
Left = 285 Left = 191
Top = 23 Top = 35
Width = 16 Width = 16
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -362,25 +363,92 @@ object optionsform: Toptionsform
TabOrder = 2 TabOrder = 2
OnClick = updownSQLFontSizeClick OnClick = updownSQLFontSizeClick
end end
object chkCompletionProposal: TCheckBox
Left = 8
Top = 118
Width = 431
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Enable completion proposal'
TabOrder = 5
OnClick = Modified
end end
object grpSQLColors: TGroupBox object chkTabsToSpaces: TCheckBox
Left = 1 Left = 8
Top = 86 Top = 142
Width = 438 Width = 431
Height = 254 Height = 17
Anchors = [akLeft, akTop, akRight, akBottom] Caption = 'Tabs to spaces'
Caption = 'Syntax' TabOrder = 6
OnClick = Modified
end
object editSQLTabWidth: TEdit
Left = 150
Top = 62
Width = 41
Height = 21
TabOrder = 3 TabOrder = 3
Text = '0'
OnExit = SQLFontChange
end
object updownSQLTabWidth: TUpDown
Left = 191
Top = 62
Width = 16
Height = 21
Associate = editSQLTabWidth
TabOrder = 4
OnClick = updownSQLFontSizeClick
end
object chkAskFileSave: TCheckBox
Left = 8
Top = 166
Width = 431
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Prompt to save modified files on tab close'
Checked = True
State = cbChecked
TabOrder = 7
OnClick = Modified
end
object editMaxQueryResults: TEdit
Left = 150
Top = 89
Width = 41
Height = 21
TabOrder = 8
Text = '1'
OnChange = Modified
end
object updownMaxQueryResults: TUpDown
Left = 191
Top = 89
Width = 16
Height = 21
Associate = editMaxQueryResults
Min = 1
Position = 1
TabOrder = 9
OnChanging = anyUpDownLimitChanging
end
end
object tabHighlighter: TTabSheet
Caption = 'Highlighter'
ImageIndex = 5
DesignSize = (
450
353)
object lblSQLColElement: TLabel object lblSQLColElement: TLabel
Left = 3 Left = 8
Top = 17 Top = 11
Width = 42 Width = 42
Height = 13 Height = 13
Caption = 'Element:' Caption = 'Element:'
end end
object lblSQLColForeground: TLabel object lblSQLColForeground: TLabel
Left = 234 Left = 234
Top = 16 Top = 11
Width = 60 Width = 60
Height = 13 Height = 13
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -388,67 +456,67 @@ object optionsform: Toptionsform
end end
object lblSQLColBackground: TLabel object lblSQLColBackground: TLabel
Left = 234 Left = 234
Top = 42 Top = 37
Width = 60 Width = 60
Height = 13 Height = 13
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Background:' Caption = 'Background:'
end end
object chkSQLBold: TCheckBox
Left = 8
Top = 35
Width = 57
Height = 17
Caption = 'Bold'
TabOrder = 1
OnClick = SQLFontChange
end
object chkSQLItalic: TCheckBox
Left = 71
Top = 35
Width = 91
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Italic'
TabOrder = 2
OnClick = SQLFontChange
end
object comboSQLColElement: TComboBox object comboSQLColElement: TComboBox
Left = 55 Left = 64
Top = 13 Top = 8
Width = 164 Width = 155
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
TabOrder = 0 TabOrder = 0
OnChange = comboSQLColElementChange OnChange = comboSQLColElementChange
end end
object cboxSQLColForeground: TColorBox
Left = 305
Top = 13
Width = 130
Height = 22
Style = [cbStandardColors, cbExtendedColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors]
Anchors = [akTop, akRight]
TabOrder = 1
OnChange = SQLFontChange
end
object chkSQLBold: TCheckBox
Left = 55
Top = 41
Width = 57
Height = 17
Caption = 'Bold'
TabOrder = 2
OnClick = SQLFontChange
end
object chkSQLItalic: TCheckBox
Left = 118
Top = 41
Width = 91
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Italic'
TabOrder = 3
OnClick = SQLFontChange
end
object cboxSQLColBackground: TColorBox object cboxSQLColBackground: TColorBox
Left = 305 Left = 302
Top = 39 Top = 34
Width = 130 Width = 139
Height = 22 Height = 22
Style = [cbStandardColors, cbExtendedColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors] Style = [cbStandardColors, cbExtendedColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors]
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
TabOrder = 4 TabOrder = 4
OnChange = SQLFontChange OnChange = SQLFontChange
end end
object cboxSQLColForeground: TColorBox
Left = 302
Top = 8
Width = 139
Height = 22
Style = [cbStandardColors, cbExtendedColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors]
Anchors = [akTop, akRight]
TabOrder = 3
OnChange = SQLFontChange
end
object SynMemoSQLSample: TSynMemo object SynMemoSQLSample: TSynMemo
AlignWithMargins = True AlignWithMargins = True
Left = 3 Left = 8
Top = 67 Top = 67
Width = 432 Width = 433
Height = 184 Height = 278
Cursor = crHandPoint Cursor = crHandPoint
SingleLineMode = False SingleLineMode = False
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
@ -477,94 +545,49 @@ object optionsform: Toptionsform
OnChange = SQLFontChange OnChange = SQLFontChange
end end
end end
object grpSQLTabWidth: TGroupBox
Left = 336
Top = 1
Width = 102
Height = 56
Anchors = [akTop, akRight]
Caption = 'Tab width'
TabOrder = 1
object editSQLTabWidth: TEdit
Left = 14
Top = 23
Width = 43
Height = 21
TabOrder = 0
Text = '0'
OnExit = SQLFontChange
end
object updownSQLTabWidth: TUpDown
Left = 57
Top = 23
Width = 16
Height = 21
Associate = editSQLTabWidth
TabOrder = 1
OnClick = updownSQLFontSizeClick
end
end
object chkCompletionProposal: TCheckBox
Left = 3
Top = 63
Width = 434
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Enable SQL completion proposal'
TabOrder = 2
end
end
object tabData: TTabSheet object tabData: TTabSheet
BorderWidth = 5
Caption = 'Data' Caption = 'Data'
ImageIndex = 4 ImageIndex = 4
object lblMaxColWidth: TLabel object lblMaxColWidth: TLabel
Left = 4 Left = 8
Top = 8 Top = 11
Width = 177 Width = 177
Height = 13 Height = 13
Caption = 'Maximum column-width in data-grids:' Caption = 'Maximum column-width in data-grids:'
end end
object lblDataFontHint: TLabel object lblDataFontHint: TLabel
Left = 362 Left = 372
Top = 84 Top = 87
Width = 29 Width = 10
Height = 13 Height = 13
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'points' Caption = 'pt'
end end
object lblDataFont: TLabel object lblDataFont: TLabel
Left = 4 Left = 8
Top = 84 Top = 87
Width = 26 Width = 26
Height = 13 Height = 13
Caption = '&Font:' Caption = '&Font:'
FocusControl = comboDataFontName FocusControl = comboDataFontName
end end
object lblMaxTotalRows: TLabel object lblMaxTotalRows: TLabel
Left = 4 Left = 8
Top = 33 Top = 36
Width = 267 Width = 267
Height = 13 Height = 13
Caption = 'Number of rows displayed in data tab (Step, Maximum):' Caption = 'Number of rows displayed in data tab (Step, Maximum):'
end end
object lblGridRowsLinecount: TLabel object lblGridRowsLinecount: TLabel
Left = 4 Left = 8
Top = 58 Top = 61
Width = 122 Width = 122
Height = 13 Height = 13
Caption = 'Lines of text in grid rows:' Caption = 'Lines of text in grid rows:'
end end
object lblMaxQueryResults: TLabel
Left = 4
Top = 108
Width = 166
Height = 13
Caption = 'Maximum number of query results:'
end
object editMaxColWidth: TEdit object editMaxColWidth: TEdit
Left = 299 Left = 309
Top = 5 Top = 8
Width = 42 Width = 42
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -573,8 +596,8 @@ object optionsform: Toptionsform
OnChange = Modified OnChange = Modified
end end
object updownMaxColWidth: TUpDown object updownMaxColWidth: TUpDown
Left = 341 Left = 351
Top = 5 Top = 8
Width = 16 Width = 16
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
@ -587,42 +610,42 @@ object optionsform: Toptionsform
end end
object comboDataFontName: TComboBox object comboDataFontName: TComboBox
Left = 59 Left = 59
Top = 80 Top = 83
Width = 234 Width = 244
Height = 21 Height = 21
Style = csDropDownList Style = csDropDownList
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
TabOrder = 2 TabOrder = 6
OnChange = DataFontsChange OnChange = DataFontsChange
end end
object editDataFontSize: TEdit object editDataFontSize: TEdit
Left = 299 Left = 309
Top = 80 Top = 83
Width = 42 Width = 42
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
TabOrder = 3 TabOrder = 7
Text = '8' Text = '8'
OnChange = DataFontsChange OnChange = DataFontsChange
end end
object updownDataFontSize: TUpDown object updownDataFontSize: TUpDown
Left = 341 Left = 351
Top = 80 Top = 83
Width = 16 Width = 16
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Associate = editDataFontSize Associate = editDataFontSize
Position = 8 Position = 8
TabOrder = 4 TabOrder = 8
end end
object grpFieldLayout: TGroupBox object grpFieldLayout: TGroupBox
Left = 4 Left = 8
Top = 136 Top = 120
Width = 433 Width = 433
Height = 200 Height = 226
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
Caption = 'Field colors and editors' Caption = 'Field colors and editors'
TabOrder = 5 TabOrder = 9
object lblFieldDatetime: TLabel object lblFieldDatetime: TLabel
Left = 12 Left = 12
Top = 96 Top = 96
@ -788,63 +811,44 @@ object optionsform: Toptionsform
end end
end end
object editGridRowCountMax: TEdit object editGridRowCountMax: TEdit
Left = 364 Left = 374
Top = 30 Top = 33
Width = 73 Width = 67
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
NumbersOnly = True NumbersOnly = True
TabOrder = 6 TabOrder = 3
OnChange = Modified OnChange = Modified
end end
object editGridRowCountStep: TEdit object editGridRowCountStep: TEdit
Left = 299 Left = 309
Top = 30 Top = 33
Width = 57 Width = 57
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
NumbersOnly = True NumbersOnly = True
TabOrder = 7 TabOrder = 2
end end
object editGridRowsLineCount: TEdit object editGridRowsLineCount: TEdit
Left = 299 Left = 309
Top = 55 Top = 58
Width = 42 Width = 42
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
TabOrder = 8 TabOrder = 4
Text = '1' Text = '1'
OnChange = Modified OnChange = Modified
end end
object updownGridRowsLineCount: TUpDown object updownGridRowsLineCount: TUpDown
Left = 341 Left = 351
Top = 55 Top = 58
Width = 16 Width = 16
Height = 21 Height = 21
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Associate = editGridRowsLineCount Associate = editGridRowsLineCount
Min = 1 Min = 1
Position = 1 Position = 1
TabOrder = 9 TabOrder = 5
OnChanging = anyUpDownLimitChanging
end
object editMaxQueryResults: TEdit
Left = 299
Top = 105
Width = 42
Height = 21
TabOrder = 10
Text = '0'
OnChange = Modified
end
object updownMaxQueryResults: TUpDown
Left = 341
Top = 105
Width = 16
Height = 21
Associate = editMaxQueryResults
Min = 1
TabOrder = 11
OnChanging = anyUpDownLimitChanging OnChanging = anyUpDownLimitChanging
end end
end end
@ -856,7 +860,7 @@ object optionsform: Toptionsform
353) 353)
object lblShortcut1: TLabel object lblShortcut1: TLabel
Left = 199 Left = 199
Top = 62 Top = 69
Width = 45 Width = 45
Height = 13 Height = 13
Anchors = [akLeft, akTop, akBottom] Anchors = [akLeft, akTop, akBottom]
@ -864,9 +868,9 @@ object optionsform: Toptionsform
end end
object lblShortcutHint: TLabel object lblShortcutHint: TLabel
Left = 199 Left = 199
Top = 3 Top = 8
Width = 211 Width = 211
Height = 101 Height = 55
Anchors = [akLeft, akTop, akBottom] Anchors = [akLeft, akTop, akBottom]
AutoSize = False AutoSize = False
Caption = 'Please select a shortcut item in the tree.' Caption = 'Please select a shortcut item in the tree.'
@ -874,7 +878,7 @@ object optionsform: Toptionsform
end end
object lblShortcut2: TLabel object lblShortcut2: TLabel
Left = 199 Left = 199
Top = 107 Top = 112
Width = 98 Width = 98
Height = 13 Height = 13
Anchors = [akLeft, akTop, akBottom] Anchors = [akLeft, akTop, akBottom]
@ -905,7 +909,7 @@ object optionsform: Toptionsform
end end
object Shortcut1: TSynHotKey object Shortcut1: TSynHotKey
Left = 199 Left = 199
Top = 81 Top = 86
Width = 207 Width = 207
Height = 19 Height = 19
HotKey = 0 HotKey = 0
@ -916,7 +920,7 @@ object optionsform: Toptionsform
end end
object Shortcut2: TSynHotKey object Shortcut2: TSynHotKey
Left = 199 Left = 199
Top = 125 Top = 130
Width = 207 Width = 207
Height = 19 Height = 19
HotKey = 0 HotKey = 0

41
source/options.pas
View File

@ -63,22 +63,7 @@ type
chkNullBG: TCheckBox; chkNullBG: TCheckBox;
lblFieldNull: TLabel; lblFieldNull: TLabel;
cboxNullBG: TColorBox; cboxNullBG: TColorBox;
grpSQLFont: TGroupBox;
comboSQLFontName: TComboBox;
lblSQLFontSize: TLabel;
editSQLFontSize: TEdit;
updownSQLFontSize: TUpDown;
grpSQLColors: TGroupBox;
comboSQLColElement: TComboBox;
lblSQLColElement: TLabel;
lblSQLColForeground: TLabel;
cboxSQLColForeground: TColorBox;
SynMemoSQLSample: TSynMemo;
SynSQLSynSQLSample: TSynSQLSyn; SynSQLSynSQLSample: TSynSQLSyn;
chkSQLBold: TCheckBox;
chkSQLItalic: TCheckBox;
lblSQLColBackground: TLabel;
cboxSQLColBackground: TColorBox;
btnRestoreDefaults: TButton; btnRestoreDefaults: TButton;
lblMaxTotalRows: TLabel; lblMaxTotalRows: TLabel;
editGridRowCountMax: TEdit; editGridRowCountMax: TEdit;
@ -90,9 +75,6 @@ type
lblShortcutHint: TLabel; lblShortcutHint: TLabel;
Shortcut2: TSynHotKey; Shortcut2: TSynHotKey;
lblShortcut2: TLabel; lblShortcut2: TLabel;
grpSQLTabWidth: TGroupBox;
editSQLTabWidth: TEdit;
updownSQLTabWidth: TUpDown;
chkAllowMultiInstances: TCheckBox; chkAllowMultiInstances: TCheckBox;
tabLogging: TTabSheet; tabLogging: TTabSheet;
Label4: TLabel; Label4: TLabel;
@ -117,11 +99,30 @@ type
updownGridRowsLineCount: TUpDown; updownGridRowsLineCount: TUpDown;
chkColorBars: TCheckBox; chkColorBars: TCheckBox;
cboxColorBars: TColorBox; cboxColorBars: TColorBox;
tabHighlighter: TTabSheet;
lblSQLColElement: TLabel;
chkSQLBold: TCheckBox;
chkSQLItalic: TCheckBox;
comboSQLColElement: TComboBox;
lblSQLColForeground: TLabel;
lblSQLColBackground: TLabel;
cboxSQLColBackground: TColorBox;
cboxSQLColForeground: TColorBox;
SynMemoSQLSample: TSynMemo;
comboSQLFontName: TComboBox;
lblFont: TLabel;
editSQLFontSize: TEdit;
updownSQLFontSize: TUpDown;
lblSQLFontSize: TLabel;
chkCompletionProposal: TCheckBox; chkCompletionProposal: TCheckBox;
chkTabsToSpaces: TCheckBox;
editSQLTabWidth: TEdit;
updownSQLTabWidth: TUpDown;
Label1: TLabel;
chkAskFileSave: TCheckBox;
lblMaxQueryResults: TLabel; lblMaxQueryResults: TLabel;
editMaxQueryResults: TEdit; editMaxQueryResults: TEdit;
updownMaxQueryResults: TUpDown; updownMaxQueryResults: TUpDown;
chkAskFileSave: TCheckBox;
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
procedure Modified(Sender: TObject); procedure Modified(Sender: TObject);
procedure Apply(Sender: TObject); procedure Apply(Sender: TObject);
@ -266,6 +267,7 @@ begin
MainReg.WriteBool(REGNAME_BG_NULL_ENABLED, chkNullBg.Checked); MainReg.WriteBool(REGNAME_BG_NULL_ENABLED, chkNullBg.Checked);
MainReg.WriteBool(REGNAME_COMPLETIONPROPOSAL, chkCompletionProposal.Checked); MainReg.WriteBool(REGNAME_COMPLETIONPROPOSAL, chkCompletionProposal.Checked);
MainReg.WriteBool(REGNAME_TABSTOSPACES, chkTabsToSpaces.Checked);
// Shortcuts // Shortcuts
CatNode := TreeShortcutItems.GetFirst; CatNode := TreeShortcutItems.GetFirst;
@ -438,6 +440,7 @@ begin
updownSQLFontSize.Position := SynMemoSQLSample.Font.Size; updownSQLFontSize.Position := SynMemoSQLSample.Font.Size;
updownSQLTabWidth.Position := SynMemoSQLSample.TabWidth; updownSQLTabWidth.Position := SynMemoSQLSample.TabWidth;
chkCompletionProposal.Checked := GetRegValue(REGNAME_COMPLETIONPROPOSAL, DEFAULT_COMPLETIONPROPOSAL); chkCompletionProposal.Checked := GetRegValue(REGNAME_COMPLETIONPROPOSAL, DEFAULT_COMPLETIONPROPOSAL);
chkTabsToSpaces.Checked := GetRegValue(REGNAME_TABSTOSPACES, DEFAULT_TABSTOSPACES);
comboSQLColElementChange(Sender); comboSQLColElementChange(Sender);
// Data-Appearance: // Data-Appearance: