From bd4dd717977e0e348a9f9ed3122d51a6347b60d1 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Mon, 7 Dec 2009 20:13:52 +0000 Subject: [PATCH] Remember state of "Stop on errors in batch mode" button/action. Fixes issue #1128. --- source/const.inc | 2 ++ source/main.dfm | 1 - source/main.pas | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/const.inc b/source/const.inc index b73529cc..ddbb2dca 100644 --- a/source/const.inc +++ b/source/const.inc @@ -97,6 +97,8 @@ const REGNAME_DBTREEWIDTH = 'dbtreewidth'; REGNAME_SQLOUTHEIGHT = 'sqloutheight'; REGNAME_QUERYHELPERSWIDTH = 'queryhelperswidth'; + REGNAME_STOPONERRORSINBATCH = 'StopOnErrorsInBatchMode'; + DEFAULT_STOPONERRORSINBATCH = True; REGNAME_EDITOR_WIDTH = 'MemoEditorWidth'; DEFAULT_EDITOR_WIDTH = 100; REGNAME_EDITOR_HEIGHT = 'MemoEditorHeight'; diff --git a/source/main.dfm b/source/main.dfm index 31a4d476..9e055c1d 100644 --- a/source/main.dfm +++ b/source/main.dfm @@ -2111,7 +2111,6 @@ object MainForm: TMainForm AutoCheck = True Caption = 'Stop on errors in batch mode' Checked = True - Enabled = False Hint = 'Stop on errors in batch mode' ImageIndex = 63 OnExecute = actQueryStopOnErrorsExecute diff --git a/source/main.pas b/source/main.pas index 0d3f192b..55f33ea0 100644 --- a/source/main.pas +++ b/source/main.pas @@ -1064,6 +1064,7 @@ begin MainReg.WriteInteger(REGNAME_TOOLBARDATATOP, ToolBarData.Top); MainReg.WriteInteger(REGNAME_TOOLBARQUERYLEFT, ToolBarQuery.Left); MainReg.WriteInteger(REGNAME_TOOLBARQUERYTOP, ToolBarQuery.Top); + MainReg.WriteBool(REGNAME_STOPONERRORSINBATCH, actQueryStopOnErrors.Checked); // Save delimiter MainReg.WriteString( REGNAME_DELIMITER, Delimiter ); @@ -1205,6 +1206,7 @@ begin ToolBarData.Top := GetRegValue(REGNAME_TOOLBARDATATOP, ToolBarData.Top); ToolBarQuery.Left := GetRegValue(REGNAME_TOOLBARQUERYLEFT, ToolBarQuery.Left); ToolBarQuery.Top := GetRegValue(REGNAME_TOOLBARQUERYTOP, ToolBarQuery.Top); + actQueryStopOnErrors.Checked := GetRegValue(REGNAME_STOPONERRORSINBATCH, DEFAULT_STOPONERRORSINBATCH); pnlQueryMemo.Height := GetRegValue(REGNAME_QUERYMEMOHEIGHT, pnlQueryMemo.Height); pnlQueryHelpers.Width := GetRegValue(REGNAME_QUERYHELPERSWIDTH, pnlQueryHelpers.Width); @@ -3843,7 +3845,8 @@ begin actSaveSQLSelectionSnippet.Enabled := QueryTabActive and HasSelection; actQueryFind.Enabled := QueryTabActive and NotEmpty; actQueryReplace.Enabled := QueryTabActive and NotEmpty; - actQueryStopOnErrors.Enabled := QueryTabActive; + // We need a pressed button which somehow does not work in conjunction with Enabled=False + // actQueryStopOnErrors.Enabled := QueryTabActive; actQueryWordWrap.Enabled := QueryTabActive; actClearQueryEditor.Enabled := QueryTabActive and NotEmpty; actSetDelimiter.Enabled := QueryTabActive;