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

Исправлены RobotField, DrawmanField - в CorrectWHLT

Browse source 
Поправлено окно About - улучшено оформление и добавлена гипетрссылка на Telegram канал
This commit is contained in:
Mikhalkovich Stanislav 2022-12-21 00:12:59 +03:00
parent 1e1a309d29
commit c1c4e4499a
19 changed files with 104 additions and 49 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 Minor = "8";
public const string Build = "3";
public const string Revision = "3212";
public const string Revision = "3214";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

2
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=3212
%REVISION%=3214
%MINOR%=8
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.8.3.3212
3.8.3.3214

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.8.3.3212'
!define VERSION '3.8.3.3214'

9
TestSuite/CompilationSamples/DrawManField.pas
View file

@ -644,12 +644,15 @@ begin
end;
procedure CorrectWHLT;
var mw,mh: integer;
begin
if DMField = nil then
exit;
if GraphABCControl = nil then
exit;
if (DMField.DimX=0) or (DMField.DimY=0) then
exit;
mw := (GraphABCControl.Width - Zazx1 - ZazX2 - 30) div DMField.DimX;
mh := (GraphABCControl.Height - ZazY1 - ZazY2 - 20) div DMField.DimY;
var mw := (GraphABCControl.Width - Zazx1 - ZazX2 - 30) div DMField.DimX;
var mh := (GraphABCControl.Height - ZazY1 - ZazY2 - 20) div DMField.DimY;
DMField.CellSize := min(mw,mh);
{ if DMField.CellSize mod 2 = 1 then
DMField.CellSize := DMField.CellSize - 1;}

2
TestSuite/CompilationSamples/GraphWPF.pas
View file

@ -643,7 +643,7 @@ var OnMouseDown: procedure(x, y: real; mousebutton: integer);
var OnMouseUp: procedure(x, y: real; mousebutton: integer);
/// Событие перемещения мыши. (x,y) - координаты курсора мыши в момент наступления события, mousebutton = 0, если кнопка мыши не нажата, 1, если нажата левая кнопка мыши, и 2, если нажата правая кнопка мыши
var OnMouseMove: procedure(x, y: real; mousebutton: integer);
/// Событие поворота колёсика мыши. delta - величина поворота: delta > 0 - от пользователя, delta < 0 - к пользователю
/// Событие прокрутки колёсика мыши. delta - величина прокрутки: delta > 0 - от пользователя, delta < 0 - к пользователю
var OnMouseWheel: procedure(delta: real);
/// Событие нажатия клавиши
var OnKeyDown: procedure(k: Key);

4
TestSuite/CompilationSamples/RobotField.pas
View file

@ -782,6 +782,10 @@ end;
procedure CorrectWHLT;
begin
if RobField = nil then
exit;
if GraphABCControl = nil then
exit;
if (RobField.DimX=0) or (RobField.DimY=0) then
exit;
var mw := (GraphABCControl.Width - 30) div RobField.DimX;

42
VisualPascalABCNET/AboutBox.Designer.cs generated
View file

@ -54,6 +54,7 @@
this.label6 = new System.Windows.Forms.Label();
this.linkLabel3 = new System.Windows.Forms.LinkLabel();
this.label13 = new System.Windows.Forms.Label();
this.linkLabel4 = new System.Windows.Forms.LinkLabel();
this.groupBox1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
@ -66,9 +67,9 @@
// groupBox1
//
this.groupBox1.Controls.Add(this.dgvModules);
this.groupBox1.Location = new System.Drawing.Point(8, 146);
this.groupBox1.Location = new System.Drawing.Point(8, 160);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(520, 137);
this.groupBox1.Size = new System.Drawing.Size(530, 137);
this.groupBox1.TabIndex = 12;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "COMPONENTS";
@ -91,7 +92,7 @@
this.dgvModules.Location = new System.Drawing.Point(3, 16);
this.dgvModules.MultiSelect = false;
this.dgvModules.Name = "dgvModules";
this.dgvModules.Size = new System.Drawing.Size(514, 118);
this.dgvModules.Size = new System.Drawing.Size(524, 118);
this.dgvModules.TabIndex = 3;
this.dgvModules.UseCompatibleStateImageBehavior = false;
this.dgvModules.View = System.Windows.Forms.View.Details;
@ -118,7 +119,7 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(222, 289);
this.button1.Location = new System.Drawing.Point(220, 308);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(107, 23);
this.button1.TabIndex = 13;
@ -263,7 +264,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label4.Location = new System.Drawing.Point(10, 49);
this.label4.Location = new System.Drawing.Point(10, 50);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(93, 13);
this.label4.TabIndex = 22;
@ -273,7 +274,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label5.Location = new System.Drawing.Point(23, 63);
this.label5.Location = new System.Drawing.Point(20, 65);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(85, 13);
this.label5.TabIndex = 23;
@ -293,7 +294,7 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label3.Location = new System.Drawing.Point(23, 30);
this.label3.Location = new System.Drawing.Point(20, 31);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(120, 13);
this.label3.TabIndex = 16;
@ -301,17 +302,17 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.linkLabel3);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.label13);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.groupBox2.Location = new System.Drawing.Point(343, 8);
this.groupBox2.Location = new System.Drawing.Point(337, 8);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(190, 132);
this.groupBox2.Size = new System.Drawing.Size(201, 132);
this.groupBox2.TabIndex = 14;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "DEVELOPERS";
@ -320,7 +321,7 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label6.Location = new System.Drawing.Point(23, 77);
this.label6.Location = new System.Drawing.Point(20, 79);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(85, 13);
this.label6.TabIndex = 29;
@ -330,7 +331,7 @@
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.linkLabel3.Location = new System.Drawing.Point(10, 112);
this.linkLabel3.Location = new System.Drawing.Point(10, 84);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(196, 13);
this.linkLabel3.TabIndex = 24;
@ -342,17 +343,29 @@
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label13.Location = new System.Drawing.Point(23, 91);
this.label13.Location = new System.Drawing.Point(20, 93);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(85, 13);
this.label13.TabIndex = 28;
this.label13.Text = "DEVELOPERS3";
//
// linkLabel4
//
this.linkLabel4.AutoSize = true;
this.linkLabel4.Location = new System.Drawing.Point(11, 139);
this.linkLabel4.Name = "linkLabel4";
this.linkLabel4.Size = new System.Drawing.Size(159, 13);
this.linkLabel4.TabIndex = 25;
this.linkLabel4.TabStop = true;
this.linkLabel4.Text = "!PASCALABCNET_TELEGRAM";
this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked);
//
// AboutBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(539, 346);
this.ClientSize = new System.Drawing.Size(546, 345);
this.Controls.Add(this.linkLabel4);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.linkLabel2);
this.Controls.Add(this.linkLabel1);
@ -417,5 +430,6 @@
private System.Windows.Forms.LinkLabel linkLabel3;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.LinkLabel linkLabel4;
}
}

5
VisualPascalABCNET/AboutBox.cs
View file

@ -230,5 +230,10 @@ namespace VisualPascalABC
{
System.Diagnostics.Process.Start(PascalABCCompiler.StringResources.Get("!PASCALABCNET_DEVELOPERS_LINK"));
}
private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start(PascalABCCompiler.StringResources.Get("!PASCALABCNET_TELEGRAM_CHANNEL_LINK"));
}
}
}

42
VisualPascalABCNETLinux/AboutBox.Designer.cs generated
View file

@ -54,6 +54,7 @@
this.label6 = new System.Windows.Forms.Label();
this.linkLabel3 = new System.Windows.Forms.LinkLabel();
this.label13 = new System.Windows.Forms.Label();
this.linkLabel4 = new System.Windows.Forms.LinkLabel();
this.groupBox1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
@ -66,9 +67,9 @@
// groupBox1
//
this.groupBox1.Controls.Add(this.dgvModules);
this.groupBox1.Location = new System.Drawing.Point(8, 146);
this.groupBox1.Location = new System.Drawing.Point(8, 160);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(520, 137);
this.groupBox1.Size = new System.Drawing.Size(530, 137);
this.groupBox1.TabIndex = 12;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "COMPONENTS";
@ -91,7 +92,7 @@
this.dgvModules.Location = new System.Drawing.Point(3, 16);
this.dgvModules.MultiSelect = false;
this.dgvModules.Name = "dgvModules";
this.dgvModules.Size = new System.Drawing.Size(514, 118);
this.dgvModules.Size = new System.Drawing.Size(524, 118);
this.dgvModules.TabIndex = 3;
this.dgvModules.UseCompatibleStateImageBehavior = false;
this.dgvModules.View = System.Windows.Forms.View.Details;
@ -118,7 +119,7 @@
//
// button1
//
this.button1.Location = new System.Drawing.Point(222, 289);
this.button1.Location = new System.Drawing.Point(220, 308);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(107, 23);
this.button1.TabIndex = 13;
@ -264,7 +265,7 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label4.Location = new System.Drawing.Point(10, 49);
this.label4.Location = new System.Drawing.Point(10, 50);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(93, 13);
this.label4.TabIndex = 22;
@ -274,7 +275,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label5.Location = new System.Drawing.Point(23, 62);
this.label5.Location = new System.Drawing.Point(20, 65);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(85, 13);
this.label5.TabIndex = 23;
@ -294,7 +295,7 @@
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label3.Location = new System.Drawing.Point(23, 30);
this.label3.Location = new System.Drawing.Point(20, 31);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(120, 13);
this.label3.TabIndex = 16;
@ -302,17 +303,17 @@
//
// groupBox2
//
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.linkLabel3);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.label13);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.groupBox2.Location = new System.Drawing.Point(343, 8);
this.groupBox2.Location = new System.Drawing.Point(337, 8);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(190, 132);
this.groupBox2.Size = new System.Drawing.Size(201, 132);
this.groupBox2.TabIndex = 14;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "DEVELOPERS";
@ -321,7 +322,7 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label6.Location = new System.Drawing.Point(23, 76);
this.label6.Location = new System.Drawing.Point(20, 79);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(85, 13);
this.label6.TabIndex = 29;
@ -331,7 +332,7 @@
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.linkLabel3.Location = new System.Drawing.Point(10, 112);
this.linkLabel3.Location = new System.Drawing.Point(10, 84);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(196, 13);
this.linkLabel3.TabIndex = 24;
@ -343,17 +344,29 @@
//
this.label13.AutoSize = true;
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.label13.Location = new System.Drawing.Point(23, 90);
this.label13.Location = new System.Drawing.Point(20, 93);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(85, 13);
this.label13.TabIndex = 28;
this.label13.Text = "DEVELOPERS3";
//
// linkLabel4
//
this.linkLabel4.AutoSize = true;
this.linkLabel4.Location = new System.Drawing.Point(11, 139);
this.linkLabel4.Name = "linkLabel4";
this.linkLabel4.Size = new System.Drawing.Size(159, 13);
this.linkLabel4.TabIndex = 24;
this.linkLabel4.TabStop = true;
this.linkLabel4.Text = "!PASCALABCNET_TELEGRAM";
this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked);
//
// AboutBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(539, 346);
this.ClientSize = new System.Drawing.Size(546, 345);
this.Controls.Add(this.linkLabel4);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.linkLabel2);
this.Controls.Add(this.linkLabel1);
@ -418,5 +431,6 @@
private System.Windows.Forms.LinkLabel linkLabel3;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.LinkLabel linkLabel4;
}
}

5
VisualPascalABCNETLinux/AboutBox.cs
View file

@ -241,5 +241,10 @@ namespace VisualPascalABC
{
System.Diagnostics.Process.Start(PascalABCCompiler.StringResources.Get("!PASCALABCNET_DEVELOPERS_LINK"));
}
private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
System.Diagnostics.Process.Start(PascalABCCompiler.StringResources.Get("!PASCALABCNET_TELEGRAM_CHANNEL_LINK"));
}
}
}

9
bin/Lib/DrawManField.pas
View file

@ -644,12 +644,15 @@ begin
end;
procedure CorrectWHLT;
var mw,mh: integer;
begin
if DMField = nil then
exit;
if GraphABCControl = nil then
exit;
if (DMField.DimX=0) or (DMField.DimY=0) then
exit;
mw := (GraphABCControl.Width - Zazx1 - ZazX2 - 30) div DMField.DimX;
mh := (GraphABCControl.Height - ZazY1 - ZazY2 - 20) div DMField.DimY;
var mw := (GraphABCControl.Width - Zazx1 - ZazX2 - 30) div DMField.DimX;
var mh := (GraphABCControl.Height - ZazY1 - ZazY2 - 20) div DMField.DimY;
DMField.CellSize := min(mw,mh);
{ if DMField.CellSize mod 2 = 1 then
DMField.CellSize := DMField.CellSize - 1;}

4
bin/Lib/RobotField.pas
View file

@ -782,6 +782,10 @@ end;
procedure CorrectWHLT;
begin
if RobField = nil then
exit;
if GraphABCControl = nil then
exit;
if (RobField.DimX=0) or (RobField.DimY=0) then
exit;
var mw := (GraphABCControl.Width - 30) div RobField.DimX;

7
bin/Lng/Eng/Global_loc.dat
View file

@ -1,7 +1,8 @@
!PASCALABCNET_FORUM=PascalABC.NET forum
!PASCALABCNET_SITE=PascalABC.NET site
!PASCALABCNET_FORUM=PascalABC.NET Forum
!PASCALABCNET_TELEGRAM=PascalABC.NET Telegram Channel
!PASCALABCNET_SITE=PascalABC.NET Site
!PASCALABCNET_DEVELOPERS=Developers
!DEVELOPERS=Developers:
!DEVELOPERS=Lead Developer:
!OK=OK
!CANCEL=Cancel
!YES=Yes

10
bin/Lng/Eng/VisualPascalABCNET.dat
View file

@ -420,11 +420,11 @@ USE_DLL_FOR_SYSTEM_UNITS=Accelerate run from IDE
FORMTEXT=About PascalABC.NET
VERSION=Version
PROJECT_ADMIN=Project manager:
PROJECT_ADMIN_FIO=Mikhalkovich S.S.
DEVELOPERS=Developers
DEVELOPERS1=Bondarev I.V. (SFedU, Germany)
DEVELOPERS2=Tkachuk A.V.
DEVELOPERS3=Ivanov S.O.
PROJECT_ADMIN_FIO=Stanislav Mikhalkovich (SFedU)
DEVELOPERS=Lead Developer
DEVELOPERS1=Ivan Bondarev (SFedU, Germany)
DEVELOPERS2=
DEVELOPERS3=
MADEIN=Russia, SFedU, mechmath; Germany
CORE=Core:
VISUAL=Visual:

2
bin/Lng/Rus/VisualPascalABCNET.dat
View file

@ -420,7 +420,7 @@ USE_DLL_FOR_SYSTEM_UNITS=Ускорять запуск из-под оболоч
FORMTEXT=O программе
VERSION=Версия
PROJECT_ADMIN=Руководитель проекта:
PROJECT_ADMIN_FIO=Михалкович С.С.
PROJECT_ADMIN_FIO=Станислав Михалкович (ЮФУ)
DEVELOPERS=Разработчики
DEVELOPERS1=Иван Бондарев (ЮФУ, Германия)
DEVELOPERS2=

1
bin/Lng/Rus/_Global
View file

@ -1,4 +1,5 @@
!PASCALABCNET_FORUM_LINK=http://forum.mmcs.sfedu.ru/c/pascalabcnet
!PASCALABCNET_TELEGRAM_CHANNEL_LINK=https://t.me/pascalabc_official
!PASCALABCNET_SITE_LINK=http://pascalabc.net
!PASCALABCNET_DEVELOPERS_LINK=http://pascalabc.net/razrabotchiki-pascalabc-net
!STACK_OVERFLOW_EXCEPTION_TEXT=Process is terminated due to StackOverflowException.

3
bin/Lng/Rus/_Global_loc
View file

@ -1,6 +1,7 @@
!PASCALABCNET_FORUM=Форум системы программирования PascalABC.NET
!PASCALABCNET_TELEGRAM=Телеграм-канал PascalABC.NET
!PASCALABCNET_SITE=Сайт PascalABC.NET
!PASCALABCNET_DEVELOPERS=Разработчики
!PASCALABCNET_DEVELOPERS=Другие разработчики
!DEVELOPERS=Ведущий разработчик:
!OK=ОК
!CANCEL=Отмена