opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-14 10:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add option to support completion proposal with matching in middle of entered text. Closes #126

Browse Source
This commit is contained in:
Ansgar Becker
2020-04-12 15:03:47 +02:00
parent bce6796693
commit 3a29a2086e
5 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
out/locale/en/LC_MESSAGES/default.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2020-04-05 13:09+0200\n"
"PO-Revision-Date: 2020-04-12 15:03+0200\n"
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
"MIME-Version: 1.0\n"
@ -6453,3 +6453,6 @@ msgstr "Note: The database file will not get deleted."
msgid "Show SQL completion proposal"
msgstr "Show SQL completion proposal"
msgid "Find matches in middle of entered text"
msgstr "Find matches in middle of entered text"

3
source/apphelpers.pas
View File

@ -177,7 +177,7 @@ type
asConnectCount, asRefusedCount, asSessionCreated, asDoUsageStatistics,
asLastUsageStatisticCall, asWheelZoom, asDisplayBars, asMySQLBinaries, asCustomSnippetsDirectory,
asPromptSaveFileOnTabClose, asRestoreTabs, asWarnUnsafeUpdates, asQueryWarningsMessage,
asCompletionProposal, asCompletionProposalWidth, asCompletionProposalNbLinesInWindow, asAutoUppercase,
asCompletionProposal, asCompletionProposalSearchOnMid, asCompletionProposalWidth, asCompletionProposalNbLinesInWindow, asAutoUppercase,
asTabsToSpaces, asFilterPanel, asAllowMultipleInstances, asFindDialogSearchHistory, asGUIFontName, asGUIFontSize,
asTheme, asIconPack, asWebSearchBaseUrl,
asFindDialogReplaceHistory, asMaxQueryResults, asLogErrors,
@ -3655,6 +3655,7 @@ begin
InitSetting(asWarnUnsafeUpdates, 'WarnUnsafeUpdates', 0, True);
InitSetting(asQueryWarningsMessage, 'QueryWarningsMessage', 0, True);
InitSetting(asCompletionProposal, 'CompletionProposal', 0, True);
InitSetting(asCompletionProposalSearchOnMid, 'CompletionProposalSearchOnMid', 0, False);
InitSetting(asCompletionProposalWidth, 'CompletionProposalWidth', 350);
InitSetting(asCompletionProposalNbLinesInWindow,'CompletionProposalNbLinesInWindow', 12);
InitSetting(asAutoUppercase, 'AutoUppercase', 0, True);

5
source/main.pas
View File

@ -11782,6 +11782,11 @@ begin
Attri.Background := AppSettings.ReadInt(asHighlighterBackground, Attri.Name, Attri.Background);
Attri.IntegerStyle := AppSettings.ReadInt(asHighlighterStyle, Attri.Name, Attri.IntegerStyle);
end;
// Completion proposal
if AppSettings.ReadBool(asCompletionProposalSearchOnMid) then
SynCompletionProposal.Options := SynCompletionProposal.Options + [scoLimitToMatchedTextAnywhere]
else
SynCompletionProposal.Options := SynCompletionProposal.Options - [scoLimitToMatchedTextAnywhere];
end;

16
source/options.dfm
View File

@ -643,12 +643,11 @@ object optionsform: Toptionsform
object chkCompletionProposal: TCheckBox
Left = 180
Top = 87
Width = 508
Width = 158
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Enable autocompletion'
TabOrder = 8
OnClick = Modified
OnClick = chkCompletionProposalClick
end
object chkTabsToSpaces: TCheckBox
Left = 254
@ -819,6 +818,17 @@ object optionsform: Toptionsform
Items.Strings = (
'Current custom settings')
end
object chkCompletionProposalSearchOnMid: TCheckBox
Left = 331
Top = 87
Width = 357
Height = 17
Anchors = [akLeft, akTop, akRight]
Caption = 'Find matches in middle of entered text'
Enabled = False
TabOrder = 18
OnClick = Modified
end
end
object tabGridFormatting: TTabSheet
Caption = 'Grid formatting'

10
source/options.pas
View File

@ -169,6 +169,7 @@ type
lblWebSearchBaseUrl: TLabel;
comboWebSearchBaseUrl: TComboBox;
chkThemePreview: TCheckBox;
chkCompletionProposalSearchOnMid: TCheckBox;
procedure FormShow(Sender: TObject);
procedure Modified(Sender: TObject);
procedure Apply(Sender: TObject);
@ -213,6 +214,7 @@ type
procedure comboThemeSelect(Sender: TObject);
procedure FormDestroy(Sender: TObject);
procedure chkThemePreviewClick(Sender: TObject);
procedure chkCompletionProposalClick(Sender: TObject);
private
{ Private declarations }
FWasModified: Boolean;
@ -374,6 +376,7 @@ begin
end;
AppSettings.WriteBool(asCompletionProposal, chkCompletionProposal.Checked);
AppSettings.WriteBool(asCompletionProposalSearchOnMid, chkCompletionProposalSearchOnMid.Checked);
AppSettings.WriteBool(asAutoUppercase, chkAutoUppercase.Checked);
AppSettings.WriteBool(asTabsToSpaces, chkTabsToSpaces.Checked);
@ -681,6 +684,7 @@ begin
updownSQLFontSize.Position := SynMemoSQLSample.Font.Size;
updownSQLTabWidth.Position := SynMemoSQLSample.TabWidth;
chkCompletionProposal.Checked := AppSettings.ReadBool(asCompletionProposal);
chkCompletionProposalSearchOnMid.Checked := AppSettings.ReadBool(asCompletionProposalSearchOnMid);
chkAutoUppercase.Checked := AppSettings.ReadBool(asAutoUppercase);
chkTabsToSpaces.Checked := AppSettings.ReadBool(asTabsToSpaces);
comboSQLColElementChange(Sender);
@ -845,6 +849,12 @@ begin
end;
procedure Toptionsform.chkCompletionProposalClick(Sender: TObject);
begin
chkCompletionProposalSearchOnMid.Enabled := TCheckBox(Sender).Checked;
Modified(Sender);
end;
procedure Toptionsform.chkLogToFileClick(Sender: TObject);
begin
editLogDir.Enabled := TCheckBox(Sender).Checked;