administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Исправлена ошибка с окном About в Линукс-версии

Browse source 
В Модуле Исполнители написана директива {$savepcu false}
This commit is contained in:
Mikhalkovich Stanislav 2022-11-19 21:00:11 +03:00
parent d6dce4769e
commit 9b673bba2f
6 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3"; public const string Major = "3";
public const string Minor = "8"; public const string Minor = "8";
public const string Build = "3"; public const string Build = "3";
public const string Revision = "3204"; public const string Revision = "3205";
public const string MainVersion = Major + "." + Minor; public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=3204
%MINOR%=8 %MINOR%=8
%REVISION%=3205
%COREVERSION%=3
%MAJOR%=3 %MAJOR%=3

2
InstallerSamples/!РусскиеИсполнители/Исполнители.pas
View file

@ -2,6 +2,8 @@
/// Описывает ряд Исполнителей, которые могут выполнять команды /// Описывает ряд Исполнителей, которые могут выполнять команды
unit Исполнители; unit Исполнители;
{$savepcu false}
type type
///!# ///!#
целое = integer; целое = integer;

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.8.3.3204 3.8.3.3205

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.8.3.3204' !define VERSION '3.8.3.3205'

50
VisualPascalABCNETLinux/AboutBox.cs
View file

@ -119,31 +119,37 @@ namespace VisualPascalABC
private void AboutBox_Shown(object sender, EventArgs e) private void AboutBox_Shown(object sender, EventArgs e)
{ {
try
lVersion.Text = string.Format("{0}, сборка {1} ({2})", PascalABCCompiler.Compiler.ShortVersion, RevisionClass.Revision, PascalABCCompiler.Compiler.VersionDateTime.ToShortDateString()); {
dgvModules.Items.Clear(); lVersion.Text = string.Format("{0}, сборка {1} ({2})", PascalABCCompiler.Compiler.ShortVersion, RevisionClass.Revision, PascalABCCompiler.Compiler.VersionDateTime.ToShortDateString());
dgvModules.Items.Clear();
string apppatch = Path.GetDirectoryName(Application.ExecutablePath);
string apppatch = Path.GetDirectoryName(Application.ExecutablePath);
VisualEnvironmentCompiler vec = (Owner as Form1).VisualEnvironmentCompiler;
PascalABCCompiler.ICompiler comp = vec.StandartCompiler; VisualEnvironmentCompiler vec = (Owner as Form1).VisualEnvironmentCompiler;
if (comp != null) PascalABCCompiler.ICompiler comp = vec.StandartCompiler;
if (comp != null)
{
Assembly a = Assembly.GetAssembly(comp.GetType());
dgvModules.Items.Add(MakeItem("Core", "PascalABCCompiler.Core", a.GetName().Version.ToString(), "Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich"));
foreach (PascalABCCompiler.Parsers.IParser parser in comp.ParsersController.Parsers)
dgvModules.Items.Add(MakeItem("Parser", parser.Name, parser.Version, parser.Copyright));
foreach (PascalABCCompiler.SemanticTreeConverters.ISemanticTreeConverter conv in comp.SemanticTreeConvertersController.SemanticTreeConverters)
dgvModules.Items.Add(MakeItem("Converter", conv.Name, conv.Version, conv.Copyright));
foreach (VisualPascalABCPlugins.IVisualPascalABCPlugin plugin in vec.PluginsController.Plugins)
dgvModules.Items.Add(MakeItem("Plugin", plugin.Name, plugin.Version, plugin.Copyright));
}
//dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"ICSharpCode.TextEditor.dll"))));
//dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"Debugger.Core.dll"))));
//dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"WeifenLuo.WinFormsUI.Docking.dll"))));
ActiveControl = button1;
}
catch
{ {
Assembly a = Assembly.GetAssembly(comp.GetType());
dgvModules.Items.Add(MakeItem("Core", "PascalABCCompiler.Core", a.GetName().Version.ToString(), "Copyright © 2005-2022 by Ivan Bondarev, Stanislav Mikhalkovich"));
foreach (PascalABCCompiler.Parsers.IParser parser in comp.ParsersController.Parsers)
dgvModules.Items.Add(MakeItem("Parser",parser.Name, parser.Version, parser.Copyright));
foreach (PascalABCCompiler.SemanticTreeConverters.ISemanticTreeConverter conv in comp.SemanticTreeConvertersController.SemanticTreeConverters)
dgvModules.Items.Add(MakeItem("Converter", conv.Name, conv.Version, conv.Copyright));
foreach (VisualPascalABCPlugins.IVisualPascalABCPlugin plugin in vec.PluginsController.Plugins)
dgvModules.Items.Add(MakeItem("Plugin",plugin.Name, plugin.Version, plugin.Copyright));
} }
dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"ICSharpCode.TextEditor.dll"))));
dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"Debugger.Core.dll"))));
dgvModules.Items.Add(MakeItem(Assembly.LoadFile(Path.Combine(apppatch,"WeifenLuo.WinFormsUI.Docking.dll"))));
ActiveControl = button1;
/*lbComponents.Items.Clear(); /*lbComponents.Items.Clear();
PascalABCCompiler.Compiler comp = (Owner as Form1).VisualEnvironmentCompiler.Compiler; PascalABCCompiler.Compiler comp = (Owner as Form1).VisualEnvironmentCompiler.Compiler;
if (comp != null) if (comp != null)