diff --git a/PluginsSupport/Interfaces.cs b/PluginsSupport/Interfaces.cs index 0a018cd33..a54fb52d7 100644 --- a/PluginsSupport/Interfaces.cs +++ b/PluginsSupport/Interfaces.cs @@ -232,7 +232,7 @@ namespace VisualPascalABCPlugins bool RedirectConsoleIO { get; set; } bool ShowLineNums { get; set; } bool EnableFolding { get; set; } - bool ShowMatchBraket { get; set; } + bool ShowMatchBracket { get; set; } bool ConverTabsToSpaces { get; set; } bool DeleteEXEAfterExecute { get; set; } bool DeletePDBAfterExecute { get; set; } diff --git a/PluginsSupportLinux/Interfaces.cs b/PluginsSupportLinux/Interfaces.cs index 8adadb92a..1484dba8e 100644 --- a/PluginsSupportLinux/Interfaces.cs +++ b/PluginsSupportLinux/Interfaces.cs @@ -223,7 +223,7 @@ namespace VisualPascalABCPlugins bool RedirectConsoleIO { get; set; } bool ShowLineNums { get; set; } bool EnableFolding { get; set; } - bool ShowMatchBraket { get; set; } + bool ShowMatchBracket { get; set; } bool ConverTabsToSpaces { get; set; } bool DeleteEXEAfterExecute { get; set; } bool DeletePDBAfterExecute { get; set; } diff --git a/VisualPascalABCNET/DockContent/CodeFileDocument.cs b/VisualPascalABCNET/DockContent/CodeFileDocument.cs index 447ac6b0a..8b8f9db7f 100644 --- a/VisualPascalABCNET/DockContent/CodeFileDocument.cs +++ b/VisualPascalABCNET/DockContent/CodeFileDocument.cs @@ -71,7 +71,7 @@ namespace VisualPascalABC TextEditor.EnableFolding = MainForm.UserOptions.EnableFolding; // SSM 4.09.08 // TextEditor.EnableFolding = MainForm.UserOptions.ShowLineNums; - TextEditor.ShowMatchingBracket = MainForm.UserOptions.ShowMatchBraket; + TextEditor.ShowMatchingBracket = MainForm.UserOptions.ShowMatchBracket; TextEditor.ActiveTextAreaControl.TextArea.MouseClick += new MouseEventHandler(edit_MouseClick); TextEditor.Document.DocumentChanged += new ICSharpCode.TextEditor.Document.DocumentEventHandler(Document_DocumentChanged); TextEditor.ActiveTextAreaControl.SelectionManager.SelectionChanged += new EventHandler(SelectionManager_SelectionChanged); diff --git a/VisualPascalABCNET/OptionsContent/EditorOptionsContent.cs b/VisualPascalABCNET/OptionsContent/EditorOptionsContent.cs index f331cc657..9a9a68d2e 100644 --- a/VisualPascalABCNET/OptionsContent/EditorOptionsContent.cs +++ b/VisualPascalABCNET/OptionsContent/EditorOptionsContent.cs @@ -74,7 +74,7 @@ namespace VisualPascalABC.OptionsContent { cbShowLinesNum.Checked = MainForm.UserOptions.ShowLineNums; cbEnableFolding.Checked = MainForm.UserOptions.EnableFolding; // SSM 4.09.08 - cbShowMatchBracket.Checked = MainForm.UserOptions.ShowMatchBraket; + cbShowMatchBracket.Checked = MainForm.UserOptions.ShowMatchBracket; cbConvertTabsToSpaces.Checked = MainForm.UserOptions.ConverTabsToSpaces; cbEnableMatchOperBrackets.Checked = MainForm.UserOptions.HighlightOperatorBrackets; nudTabIndent.Value = MainForm.UserOptions.TabIndent; @@ -110,7 +110,7 @@ namespace VisualPascalABC.OptionsContent MainForm.UserOptions.TabIndent = (int)nudTabIndent.Value; MainForm.UserOptions.ShowLineNums = cbShowLinesNum.Checked; MainForm.UserOptions.EnableFolding = cbEnableFolding.Checked; // SSM 4.09.08 - MainForm.UserOptions.ShowMatchBraket = cbShowMatchBracket.Checked; + MainForm.UserOptions.ShowMatchBracket = cbShowMatchBracket.Checked; MainForm.UserOptions.HighlightOperatorBrackets = cbEnableMatchOperBrackets.Checked; MainForm.ErrorCursorPosStrategy = SourceLocationAction.GotoBeg;//(SourceLocationAction)(cbErrorPos.SelectedItem as ObjectLocalisator).Value; if (fcbFont.SelectedItem != null) diff --git a/VisualPascalABCNET/UserOptions.cs b/VisualPascalABCNET/UserOptions.cs index eb0078447..b11d239f2 100644 --- a/VisualPascalABCNET/UserOptions.cs +++ b/VisualPascalABCNET/UserOptions.cs @@ -11,7 +11,7 @@ namespace VisualPascalABC public bool RedirectConsoleIO = false; public bool ShowLineNums = false; public bool EnableFolding = false; // SSM 4.09.08 - public bool ShowMatchBraket = false; + public bool ShowMatchBracket = false; public bool ConverTabsToSpaces = true; public bool deleteEXEAfterExecute = false; public bool deletePDBAfterExecute = true; @@ -226,10 +226,10 @@ namespace VisualPascalABC set { ShowLineNums = value; } } - bool VisualPascalABCPlugins.IUserOptions.ShowMatchBraket + bool VisualPascalABCPlugins.IUserOptions.ShowMatchBracket { - get { return ShowMatchBraket; } - set { ShowMatchBraket = value; } + get { return ShowMatchBracket; } + set { ShowMatchBracket = value; } } bool VisualPascalABCPlugins.IUserOptions.ShowQuickClassBrowserPanel diff --git a/VisualPascalABCNET/Workbench/OptionsManager.cs b/VisualPascalABCNET/Workbench/OptionsManager.cs index aa315d77f..7a07dbbef 100644 --- a/VisualPascalABCNET/Workbench/OptionsManager.cs +++ b/VisualPascalABCNET/Workbench/OptionsManager.cs @@ -171,7 +171,7 @@ namespace VisualPascalABC if ((value = (string)Options[OptionsItemNameDeletePDBAfterExecute]) != null) UserOptions.DeletePDBAfterExecute = Convert.ToBoolean(value); if ((value = (string)Options[OptionsItemNameShowMatchBracket]) != null) - UserOptions.ShowMatchBraket = Convert.ToBoolean(value); + UserOptions.ShowMatchBracket = Convert.ToBoolean(value); if ((value = (string)Options[OptionsItemNameShowMatchOperatorBracket]) != null) UserOptions.HighlightOperatorBrackets = Convert.ToBoolean(value); if ((value = (string)Options[OptionsItemNameEditorFontFamily]) != null) @@ -301,7 +301,7 @@ namespace VisualPascalABC Options.Add(OptionsItemNameTabIdent, UserOptions.TabIndent); Options.Add(OptionsItemNameShowLinesNum, UserOptions.ShowLineNums); Options.Add(OptionsItemNameEnableFolding, UserOptions.EnableFolding); // SSM 4.09.08 - Options.Add(OptionsItemNameShowMatchBracket, UserOptions.ShowMatchBraket); + Options.Add(OptionsItemNameShowMatchBracket, UserOptions.ShowMatchBracket); Options.Add(OptionsItemNameShowMatchOperatorBracket, UserOptions.HighlightOperatorBrackets); Options.Add(OptionsItemNameEditorFontFamily, UserOptions.CurrentFontFamily); Options.Add(OptionsItemNameEditorFontSize, UserOptions.EditorFontSize); @@ -339,8 +339,8 @@ namespace VisualPascalABC si.TextEditor.EnableFolding = UserOptions.EnableFolding; si.TextEditor.UpdateFolding(); } - if (si.TextEditor.ShowMatchingBracket != UserOptions.ShowMatchBraket) - si.TextEditor.ShowMatchingBracket = UserOptions.ShowMatchBraket; + if (si.TextEditor.ShowMatchingBracket != UserOptions.ShowMatchBracket) + si.TextEditor.ShowMatchingBracket = UserOptions.ShowMatchBracket; if (si.FontSize != UserOptions.EditorFontSize) si.FontSize = UserOptions.EditorFontSize; if (si.TextEditor.ConvertTabsToSpaces != UserOptions.ConverTabsToSpaces) diff --git a/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs b/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs index 0391fafde..5b535aeca 100644 --- a/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs +++ b/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs @@ -71,7 +71,7 @@ namespace VisualPascalABC TextEditor.EnableFolding = MainForm.UserOptions.EnableFolding; // SSM 4.09.08 // TextEditor.EnableFolding = MainForm.UserOptions.ShowLineNums; - TextEditor.ShowMatchingBracket = MainForm.UserOptions.ShowMatchBraket; + TextEditor.ShowMatchingBracket = MainForm.UserOptions.ShowMatchBracket; TextEditor.ActiveTextAreaControl.TextArea.MouseClick += new MouseEventHandler(edit_MouseClick); TextEditor.Document.DocumentChanged += new ICSharpCode.TextEditor.Document.DocumentEventHandler(Document_DocumentChanged); TextEditor.ActiveTextAreaControl.SelectionManager.SelectionChanged += new EventHandler(SelectionManager_SelectionChanged); diff --git a/VisualPascalABCNETLinux/OptionsContent/EditorOptionsContent.cs b/VisualPascalABCNETLinux/OptionsContent/EditorOptionsContent.cs index f331cc657..9a9a68d2e 100644 --- a/VisualPascalABCNETLinux/OptionsContent/EditorOptionsContent.cs +++ b/VisualPascalABCNETLinux/OptionsContent/EditorOptionsContent.cs @@ -74,7 +74,7 @@ namespace VisualPascalABC.OptionsContent { cbShowLinesNum.Checked = MainForm.UserOptions.ShowLineNums; cbEnableFolding.Checked = MainForm.UserOptions.EnableFolding; // SSM 4.09.08 - cbShowMatchBracket.Checked = MainForm.UserOptions.ShowMatchBraket; + cbShowMatchBracket.Checked = MainForm.UserOptions.ShowMatchBracket; cbConvertTabsToSpaces.Checked = MainForm.UserOptions.ConverTabsToSpaces; cbEnableMatchOperBrackets.Checked = MainForm.UserOptions.HighlightOperatorBrackets; nudTabIndent.Value = MainForm.UserOptions.TabIndent; @@ -110,7 +110,7 @@ namespace VisualPascalABC.OptionsContent MainForm.UserOptions.TabIndent = (int)nudTabIndent.Value; MainForm.UserOptions.ShowLineNums = cbShowLinesNum.Checked; MainForm.UserOptions.EnableFolding = cbEnableFolding.Checked; // SSM 4.09.08 - MainForm.UserOptions.ShowMatchBraket = cbShowMatchBracket.Checked; + MainForm.UserOptions.ShowMatchBracket = cbShowMatchBracket.Checked; MainForm.UserOptions.HighlightOperatorBrackets = cbEnableMatchOperBrackets.Checked; MainForm.ErrorCursorPosStrategy = SourceLocationAction.GotoBeg;//(SourceLocationAction)(cbErrorPos.SelectedItem as ObjectLocalisator).Value; if (fcbFont.SelectedItem != null) diff --git a/VisualPascalABCNETLinux/UserOptions.cs b/VisualPascalABCNETLinux/UserOptions.cs index eb0078447..b11d239f2 100644 --- a/VisualPascalABCNETLinux/UserOptions.cs +++ b/VisualPascalABCNETLinux/UserOptions.cs @@ -11,7 +11,7 @@ namespace VisualPascalABC public bool RedirectConsoleIO = false; public bool ShowLineNums = false; public bool EnableFolding = false; // SSM 4.09.08 - public bool ShowMatchBraket = false; + public bool ShowMatchBracket = false; public bool ConverTabsToSpaces = true; public bool deleteEXEAfterExecute = false; public bool deletePDBAfterExecute = true; @@ -226,10 +226,10 @@ namespace VisualPascalABC set { ShowLineNums = value; } } - bool VisualPascalABCPlugins.IUserOptions.ShowMatchBraket + bool VisualPascalABCPlugins.IUserOptions.ShowMatchBracket { - get { return ShowMatchBraket; } - set { ShowMatchBraket = value; } + get { return ShowMatchBracket; } + set { ShowMatchBracket = value; } } bool VisualPascalABCPlugins.IUserOptions.ShowQuickClassBrowserPanel diff --git a/VisualPascalABCNETLinux/Workbench/OptionsManager.cs b/VisualPascalABCNETLinux/Workbench/OptionsManager.cs index aa315d77f..7a07dbbef 100644 --- a/VisualPascalABCNETLinux/Workbench/OptionsManager.cs +++ b/VisualPascalABCNETLinux/Workbench/OptionsManager.cs @@ -171,7 +171,7 @@ namespace VisualPascalABC if ((value = (string)Options[OptionsItemNameDeletePDBAfterExecute]) != null) UserOptions.DeletePDBAfterExecute = Convert.ToBoolean(value); if ((value = (string)Options[OptionsItemNameShowMatchBracket]) != null) - UserOptions.ShowMatchBraket = Convert.ToBoolean(value); + UserOptions.ShowMatchBracket = Convert.ToBoolean(value); if ((value = (string)Options[OptionsItemNameShowMatchOperatorBracket]) != null) UserOptions.HighlightOperatorBrackets = Convert.ToBoolean(value); if ((value = (string)Options[OptionsItemNameEditorFontFamily]) != null) @@ -301,7 +301,7 @@ namespace VisualPascalABC Options.Add(OptionsItemNameTabIdent, UserOptions.TabIndent); Options.Add(OptionsItemNameShowLinesNum, UserOptions.ShowLineNums); Options.Add(OptionsItemNameEnableFolding, UserOptions.EnableFolding); // SSM 4.09.08 - Options.Add(OptionsItemNameShowMatchBracket, UserOptions.ShowMatchBraket); + Options.Add(OptionsItemNameShowMatchBracket, UserOptions.ShowMatchBracket); Options.Add(OptionsItemNameShowMatchOperatorBracket, UserOptions.HighlightOperatorBrackets); Options.Add(OptionsItemNameEditorFontFamily, UserOptions.CurrentFontFamily); Options.Add(OptionsItemNameEditorFontSize, UserOptions.EditorFontSize); @@ -339,8 +339,8 @@ namespace VisualPascalABC si.TextEditor.EnableFolding = UserOptions.EnableFolding; si.TextEditor.UpdateFolding(); } - if (si.TextEditor.ShowMatchingBracket != UserOptions.ShowMatchBraket) - si.TextEditor.ShowMatchingBracket = UserOptions.ShowMatchBraket; + if (si.TextEditor.ShowMatchingBracket != UserOptions.ShowMatchBracket) + si.TextEditor.ShowMatchingBracket = UserOptions.ShowMatchBracket; if (si.FontSize != UserOptions.EditorFontSize) si.FontSize = UserOptions.EditorFontSize; if (si.TextEditor.ConvertTabsToSpaces != UserOptions.ConverTabsToSpaces)