diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 6fe6e8721..ad386a0c9 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 = "9"; public const string Build = "0"; - public const string Revision = "3343"; + public const string Revision = "3346"; 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 60df0bc42..f293ab2ed 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=9 -%REVISION%=3343 %COREVERSION%=0 +%REVISION%=3346 +%MINOR%=9 %MAJOR%=3 diff --git a/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/00_Введение.pas b/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/00_Введение.pas new file mode 100644 index 000000000..5464f200c --- /dev/null +++ b/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/00_Введение.pas @@ -0,0 +1,4 @@ +// Запустите программу +begin + +end. \ No newline at end of file diff --git a/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/Tasks.pas b/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/Tasks.pas index b7ace82c7..4ed1a4a58 100644 --- a/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/Tasks.pas +++ b/InstallerSamples/CheckedTasks/LightPT/УрокМассивы/Tasks.pas @@ -11,6 +11,10 @@ begin TasksArr.CheckTaskT(name) else case name of + 'Введение': begin + ColoredMessage('Данный урок посвящён массивам в PascalABC.NET'); + ColoredMessage('Ознакомьтесь предварительно с теорией: https://pascalabcnet.github.io/school_arrays.html',MsgColorGray); + end; 'HW2': begin ClearOutputListFromSpaces; ConvertStringsToNumbersInOutputList; diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 6b5ab331c..612f9db18 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3343 +3.9.0.3346 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index c9cdd0ff6..fe0c11f47 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3343' +!define VERSION '3.9.0.3346' diff --git a/TestSuite/CompilationSamples/LightPT.pas b/TestSuite/CompilationSamples/LightPT.pas index a5e61c853..27655c5f3 100644 --- a/TestSuite/CompilationSamples/LightPT.pas +++ b/TestSuite/CompilationSamples/LightPT.pas @@ -2853,8 +2853,12 @@ begin begin foreach var x in e.InnerExceptions do if x is HTTPRequestException then - ColoredMessage(x.InnerException?.Message??'',MsgColorGray) - else ColoredMessage(x.Message,MsgColorGray); + begin + if x.InnerException<>nil then + ColoredMessage('Ошибка сервера: '+x.InnerException.Message,MsgColorGray) + else ColoredMessage('Неизвестная ошибка сервера',MsgColorGray) + end + else ColoredMessage('Ошибка сервера: '+x.Message,MsgColorGray); end; on e: Exception do ColoredMessage(e.Message,MsgColorGray); diff --git a/VisualPascalABCNET/DockContent/OutputWindowForm.cs b/VisualPascalABCNET/DockContent/OutputWindowForm.cs index 1dc02ca1e..be4ffd0b2 100644 --- a/VisualPascalABCNET/DockContent/OutputWindowForm.cs +++ b/VisualPascalABCNET/DockContent/OutputWindowForm.cs @@ -22,7 +22,7 @@ namespace VisualPascalABC outputTextBox.LinkClicked += outputTextBox_LinkClicked; } - private void outputTextBox_LinkClicked(object sender, LinkClickedEventArgs e) + public void outputTextBox_LinkClicked(object sender, LinkClickedEventArgs e) { try { diff --git a/VisualPascalABCNET/Workbench/WindowOperations.cs b/VisualPascalABCNET/Workbench/WindowOperations.cs index 6b8810371..03be33e1c 100644 --- a/VisualPascalABCNET/Workbench/WindowOperations.cs +++ b/VisualPascalABCNET/Workbench/WindowOperations.cs @@ -313,6 +313,8 @@ namespace VisualPascalABC res.BackColor = orig.BackColor; res.Parent = orig.Parent; res.ContextMenuStrip = orig.ContextMenuStrip; + res.DetectUrls = true; + res.LinkClicked += OutputWindow.outputTextBox_LinkClicked; return res; } diff --git a/bin/Lib/LightPT.pas b/bin/Lib/LightPT.pas index a5e61c853..27655c5f3 100644 --- a/bin/Lib/LightPT.pas +++ b/bin/Lib/LightPT.pas @@ -2853,8 +2853,12 @@ begin begin foreach var x in e.InnerExceptions do if x is HTTPRequestException then - ColoredMessage(x.InnerException?.Message??'',MsgColorGray) - else ColoredMessage(x.Message,MsgColorGray); + begin + if x.InnerException<>nil then + ColoredMessage('Ошибка сервера: '+x.InnerException.Message,MsgColorGray) + else ColoredMessage('Неизвестная ошибка сервера',MsgColorGray) + end + else ColoredMessage('Ошибка сервера: '+x.Message,MsgColorGray); end; on e: Exception do ColoredMessage(e.Message,MsgColorGray);