From 362e1e80c50093d222bb7192dd2c78bd4805e6ed Mon Sep 17 00:00:00 2001 From: Mikhalkovich Stanislav Date: Tue, 22 Nov 2022 21:21:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20Linux-=D0=B2=D0=B5=D1=80=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=B2=D0=B0=D1=82=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF?= =?UTF-8?q?=D0=BE=20Ctrl-V?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configuration/GlobalAssemblyInfo.cs | 2 +- Configuration/Version.defs | 4 ++-- Release/pabcversion.txt | 2 +- ReleaseGenerators/PascalABCNET_version.nsh | 2 +- .../DockContent/CodeFileDocument.cs | 19 +++++++++++++------ .../Workbench/EditorServices.cs | 9 ++++++++- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 850d103c9..ba304f922 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "8"; public const string Build = "3"; - public const string Revision = "3205"; + public const string Revision = "3206"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index f3803cf8f..dfb9563fe 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=8 -%REVISION%=3205 %COREVERSION%=3 +%REVISION%=3206 +%MINOR%=8 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 5b517e281..7efa49507 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.8.3.3205 +3.8.3.3206 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 7c972376f..6494ef38f 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.8.3.3205' +!define VERSION '3.8.3.3206' diff --git a/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs b/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs index bbc8d32f6..b3f762a62 100644 --- a/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs +++ b/VisualPascalABCNETLinux/DockContent/CodeFileDocument.cs @@ -224,14 +224,21 @@ namespace VisualPascalABC public void Paste(bool canInsertInInputBox) { - if (MainForm.OutputWindow != null && MainForm.OutputWindow.InputTextBox != null && - MainForm.OutputWindow.InputTextBox.Focused && canInsertInInputBox) + try { - MainForm.OutputWindow.InputTextBox.Paste(); - return; + if (MainForm.OutputWindow != null && MainForm.OutputWindow.InputTextBox != null && + MainForm.OutputWindow.InputTextBox.Focused && canInsertInInputBox) + { + MainForm.OutputWindow.InputTextBox.Paste(); + return; + } + ICSharpCode.TextEditor.Actions.Paste paste = new ICSharpCode.TextEditor.Actions.Paste(); + paste.Execute(TextEditor.ActiveTextAreaControl.TextArea); + } + catch (Exception) + { + } - ICSharpCode.TextEditor.Actions.Paste paste = new ICSharpCode.TextEditor.Actions.Paste(); - paste.Execute(TextEditor.ActiveTextAreaControl.TextArea); } public void SetText(string text) diff --git a/VisualPascalABCNETLinux/Workbench/EditorServices.cs b/VisualPascalABCNETLinux/Workbench/EditorServices.cs index 4ebe7821e..3cd242413 100644 --- a/VisualPascalABCNETLinux/Workbench/EditorServices.cs +++ b/VisualPascalABCNETLinux/Workbench/EditorServices.cs @@ -156,7 +156,14 @@ namespace VisualPascalABC public void ExecPaste() { - CurrentCodeFileDocument.Paste(true); + try + { + CurrentCodeFileDocument.Paste(true); + } + catch (Exception) + { + + } } internal void NavigationLocationChanged()