From df5474c8d5059e3f6f830b201bda904ab0339128 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Mon, 17 Jun 2024 16:03:13 +0200 Subject: [PATCH] Issue #1965: remove obsolete option and checkbox "Show query warnings dialog", now that warnings are always logged --- source/apphelpers.pas | 3 +-- source/preferences.dfm | 26 ++++++++------------------ source/preferences.pas | 3 --- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/source/apphelpers.pas b/source/apphelpers.pas index ba23efe1..66744f79 100644 --- a/source/apphelpers.pas +++ b/source/apphelpers.pas @@ -213,7 +213,7 @@ type asConnectCount, asRefusedCount, asSessionCreated, asDoUsageStatistics, asLastUsageStatisticCall, asWheelZoom, asDisplayBars, asMySQLBinaries, asCustomSnippetsDirectory, asPromptSaveFileOnTabClose, asRestoreTabs, asTabCloseOnDoubleClick, asTabCloseOnMiddleClick, asTabsInMultipleLines, asTabIconsGrayscaleMode, - asWarnUnsafeUpdates, asQueryWarningsMessage, asQueryGridLongSortRowNum, + asWarnUnsafeUpdates, asQueryGridLongSortRowNum, asCompletionProposal, asCompletionProposalInterval, asCompletionProposalSearchOnMid, asCompletionProposalWidth, asCompletionProposalNbLinesInWindow, asAutoUppercase, asTabsToSpaces, asFilterPanel, asAllowMultipleInstances, asFindDialogSearchHistory, asGUIFontName, asGUIFontSize, asTheme, asIconPack, asWebSearchBaseUrl, @@ -3864,7 +3864,6 @@ begin InitSetting(asTabsInMultipleLines, 'TabsInMultipleLines', 0, True); InitSetting(asTabIconsGrayscaleMode, 'TabIconsGrayscaleMode', 1); InitSetting(asWarnUnsafeUpdates, 'WarnUnsafeUpdates', 0, True); - InitSetting(asQueryWarningsMessage, 'QueryWarningsMessage', 0, True); InitSetting(asQueryGridLongSortRowNum, 'QueryGridLongSortRowNum', 10000); InitSetting(asCompletionProposal, 'CompletionProposal', 0, True); InitSetting(asCompletionProposalInterval, 'CompletionProposalInterval', 500); diff --git a/source/preferences.dfm b/source/preferences.dfm index 2460c415..5181aa53 100644 --- a/source/preferences.dfm +++ b/source/preferences.dfm @@ -727,7 +727,7 @@ object frmPreferences: TfrmPreferences Width = 145 Height = 22 Style = csDropDownList - TabOrder = 15 + TabOrder = 14 OnChange = comboSQLColElementChange end object chkSQLBold: TCheckBox @@ -736,7 +736,7 @@ object frmPreferences: TfrmPreferences Width = 61 Height = 17 Caption = 'Bold' - TabOrder = 16 + TabOrder = 15 OnClick = SQLFontChange end object chkSQLItalic: TCheckBox @@ -745,7 +745,7 @@ object frmPreferences: TfrmPreferences Width = 50 Height = 17 Caption = 'Italic' - TabOrder = 17 + TabOrder = 16 OnClick = SQLFontChange end object cboxSQLColForeground: TColorBox @@ -755,7 +755,7 @@ object frmPreferences: TfrmPreferences Height = 22 NoneColorColor = clNone Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors] - TabOrder = 18 + TabOrder = 17 OnChange = SQLFontChange end object cboxSQLColBackground: TColorBox @@ -765,7 +765,7 @@ object frmPreferences: TfrmPreferences Height = 22 NoneColorColor = clNone Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbCustomColor, cbPrettyNames, cbCustomColors] - TabOrder = 19 + TabOrder = 18 OnChange = SQLFontChange end object SynMemoSQLSample: TSynMemo @@ -782,7 +782,7 @@ object frmPreferences: TfrmPreferences Font.Height = -13 Font.Name = 'Courier New' Font.Style = [] - TabOrder = 20 + TabOrder = 19 OnClick = SynMemoSQLSampleClick CodeFolding.GutterShapeSize = 11 CodeFolding.CollapsedLineColor = clGrayText @@ -810,16 +810,6 @@ object frmPreferences: TfrmPreferences OnChange = SQLFontChange FontSmoothing = fsmNone end - object chkQueryWarningsMessage: TCheckBox - Left = 220 - Top = 110 - Width = 451 - Height = 17 - Anchors = [akLeft, akTop, akRight] - Caption = 'Show query warnings dialog' - TabOrder = 12 - OnClick = Modified - end object chkAutoUppercase: TCheckBox Left = 220 Top = 133 @@ -827,7 +817,7 @@ object frmPreferences: TfrmPreferences Height = 17 Anchors = [akLeft, akTop, akRight] Caption = 'Auto uppercase reserved words and functions' - TabOrder = 13 + TabOrder = 12 OnClick = Modified end object comboEditorColorsPreset: TComboBox @@ -837,7 +827,7 @@ object frmPreferences: TfrmPreferences Height = 22 Style = csDropDownList ItemIndex = 0 - TabOrder = 14 + TabOrder = 13 Text = 'Current custom settings' OnChange = comboEditorColorsPresetChange Items.Strings = ( diff --git a/source/preferences.pas b/source/preferences.pas index 8e6aeabc..56371b85 100644 --- a/source/preferences.pas +++ b/source/preferences.pas @@ -148,7 +148,6 @@ type Label3: TLabel; cboxRowHighlightSameText: TColorBox; chkWheelZoom: TCheckBox; - chkQueryWarningsMessage: TCheckBox; chkAutoUppercase: TCheckBox; lblTheme: TLabel; comboTheme: TComboBox; @@ -311,7 +310,6 @@ begin AppSettings.WriteBool(asAutoReconnect, chkAutoReconnect.Checked); AppSettings.WriteBool(asAllowMultipleInstances, chkAllowMultiInstances.Checked); AppSettings.WriteBool(asRestoreLastUsedDB, chkRestoreLastDB.Checked); - AppSettings.WriteBool(asQueryWarningsMessage, chkQueryWarningsMessage.Checked); AppSettings.WriteString(asFontName, comboSQLFontName.Text); AppSettings.WriteInt(asFontSize, updownSQLFontSize.Position); AppSettings.WriteInt(asTabWidth, updownSQLTabWidth.Position); @@ -720,7 +718,6 @@ begin comboTheme.ItemIndex := comboTheme.Items.IndexOf(AppSettings.ReadString(asTheme)); comboIconPack.ItemIndex := comboIconPack.Items.IndexOf(AppSettings.ReadString(asIconPack)); comboWebSearchBaseUrl.Text := AppSettings.ReadString(asWebSearchBaseUrl); - chkQueryWarningsMessage.Checked := AppSettings.ReadBool(asQueryWarningsMessage); // Logging updownLogLines.Position := AppSettings.ReadInt(asLogsqlnum);