Изменен алгоритм инсталляции gonfig - файла - он устанавливается только если установлен .NET 4.7.1. Надо бы еще проверять все последующие - по крайней мере 4.7.2
This commit is contained in:
parent
bd78e1a969
commit
b81d1f328e
|
|
@ -15,7 +15,7 @@ internal static class RevisionClass
|
|||
public const string Major = "3";
|
||||
public const string Minor = "4";
|
||||
public const string Build = "2";
|
||||
public const string Revision = "1933";
|
||||
public const string Revision = "1936";
|
||||
|
||||
public const string MainVersion = Major + "." + Minor;
|
||||
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%COREVERSION%=2
|
||||
%REVISION%=1933
|
||||
%MINOR%=4
|
||||
%REVISION%=1936
|
||||
%COREVERSION%=2
|
||||
%MAJOR%=3
|
||||
|
|
|
|||
141
ReleaseGenerators/DotNetChecker.nsh
Normal file
141
ReleaseGenerators/DotNetChecker.nsh
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
!macro CheckNetFramework FrameworkVersion
|
||||
Var /GLOBAL dotNetUrl${FrameworkVersion}
|
||||
Var /GLOBAL dotNetReadableVersion${FrameworkVersion}
|
||||
|
||||
!ifndef DOTNET472_URL
|
||||
!define DOTNET472_URL "https://go.microsoft.com/fwlink/?LinkId=863265"
|
||||
!define DOTNET471_URL "https://go.microsoft.com/fwlink/?LinkId=852104"
|
||||
!define DOTNET47_URL "https://go.microsoft.com/fwlink/?LinkId=825302"
|
||||
!define DOTNET462_URL "https://go.microsoft.com/fwlink/?LinkId=780600"
|
||||
!define DOTNET461_URL "https://go.microsoft.com/fwlink/?LinkId=671743"
|
||||
!define DOTNET46_URL "https://go.microsoft.com/fwlink/?LinkId=528232"
|
||||
!define DOTNET452_URL "https://go.microsoft.com/fwlink/?LinkId=397708"
|
||||
!define DOTNET451_URL "https://go.microsoft.com/fwlink/?LinkId=322116"
|
||||
!define DOTNET45_URL "https://go.microsoft.com/fwlink/?LinkId=225702"
|
||||
!define DOTNET40Full_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=0a391abd-25c1-4fc0-919f-b21f31ab88b7&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f9%2f5%2fA%2f95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE%2fdotNetFx40_Full_x86_x64.exe"
|
||||
!define DOTNET40Client_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe"
|
||||
!define DOTNET35_URL "https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe"
|
||||
!define DOTNET30_URL "https://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe"
|
||||
!define DOTNET20_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=0856eacb-4362-4b0d-8edd-aab15c5e04f5&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f7%2f567758a3-759e-473e-bf8f-52154438565a%2fdotnetfx.exe"
|
||||
!define DOTNET11_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=262d25e3-f589-4842-8157-034d1e7cf3a3&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2fa%2fa%2fc%2faac39226-8825-44ce-90e3-bf8203e74006%2fdotnetfx.exe"
|
||||
!define DOTNET10_URL "https://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=262d25e3-f589-4842-8157-034d1e7cf3a3&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2fa%2fa%2fc%2faac39226-8825-44ce-90e3-bf8203e74006%2fdotnetfx.exe"
|
||||
!endif
|
||||
|
||||
${If} ${FrameworkVersion} == "472"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET472_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.7.2"
|
||||
${ElseIf} ${FrameworkVersion} == "471"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET471_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.7.1"
|
||||
${ElseIf} ${FrameworkVersion} == "47"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET47_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.7"
|
||||
${ElseIf} ${FrameworkVersion} == "462"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET462_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.6.2"
|
||||
${ElseIf} ${FrameworkVersion} == "461"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET461_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.6.1"
|
||||
${ElseIf} ${FrameworkVersion} == "46"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET46_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.6"
|
||||
${ElseIf} ${FrameworkVersion} == "452"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET452_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.52"
|
||||
${ElseIf} ${FrameworkVersion} == "451"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET451_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.51"
|
||||
${ElseIf} ${FrameworkVersion} == "45"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET45_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.5"
|
||||
${ElseIf} ${FrameworkVersion} == "40Full"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET40Full_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.0 Full"
|
||||
${ElseIf} ${FrameworkVersion} == "40Client"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET40Client_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "4.0 Client"
|
||||
${ElseIf} ${FrameworkVersion} == "35"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET35_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "3.5"
|
||||
${ElseIf} ${FrameworkVersion} == "30"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET30_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "3.0"
|
||||
${ElseIf} ${FrameworkVersion} == "20"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET20_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "2.0"
|
||||
${ElseIf} ${FrameworkVersion} == "11"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET11_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "1.1"
|
||||
${ElseIf} ${FrameworkVersion} == "10"
|
||||
StrCpy $dotNetUrl${FrameworkVersion} ${DOTNET10_URL}
|
||||
StrCpy $dotNetReadableVersion${FrameworkVersion} "1.0"
|
||||
${EndIf}
|
||||
|
||||
DetailPrint "Checking .NET Framework version..."
|
||||
|
||||
Push $0
|
||||
Push $1
|
||||
Push $2
|
||||
Push $3
|
||||
Push $4
|
||||
Push $5
|
||||
Push $6
|
||||
Push $7
|
||||
|
||||
DotNetChecker::IsDotNet${FrameworkVersion}Installed
|
||||
Pop $0
|
||||
|
||||
${If} $0 == "false"
|
||||
${OrIf} $0 == "f" ; if script is compiled in ANSI mode then we get only an "f" https://github.com/ReVolly/NsisDotNetChecker/issues/4
|
||||
DetailPrint ".NET Framework $dotNetReadableVersion${FrameworkVersion} not found, download is required for program to run."
|
||||
Goto NoDotNET${FrameworkVersion}
|
||||
${Else}
|
||||
DetailPrint ".NET Framework $dotNetReadableVersion${FrameworkVersion} found, no need to install."
|
||||
Goto NewDotNET${FrameworkVersion}
|
||||
${EndIf}
|
||||
|
||||
NoDotNET${FrameworkVersion}:
|
||||
MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION \
|
||||
".NET Framework not installed. Required version: $dotNetReadableVersion${FrameworkVersion}.$\nDownload .NET Framework $dotNetReadableVersion${FrameworkVersion} from microsoft.com?" \
|
||||
/SD IDYES IDYES DownloadDotNET${FrameworkVersion} IDNO NewDotNET${FrameworkVersion}
|
||||
goto GiveUpDotNET${FrameworkVersion} ;IDCANCEL
|
||||
|
||||
DownloadDotNET${FrameworkVersion}:
|
||||
DetailPrint "Beginning download of .NET Framework $dotNetReadableVersion${FrameworkVersion}."
|
||||
NSISDL::download $dotNetUrl${FrameworkVersion} "$TEMP\dotnetfx.exe"
|
||||
DetailPrint "Completed download."
|
||||
|
||||
Pop $0
|
||||
${If} $0 == "cancel"
|
||||
MessageBox MB_YESNO|MB_ICONEXCLAMATION \
|
||||
"Download canceled. Continue Installation?" \
|
||||
IDYES NewDotNET${FrameworkVersion} IDNO GiveUpDotNET${FrameworkVersion}
|
||||
${ElseIf} $0 != "success"
|
||||
MessageBox MB_YESNO|MB_ICONEXCLAMATION \
|
||||
"Download failed:$\n$0$\n$\nContinue Installation?" \
|
||||
IDYES NewDotNET${FrameworkVersion} IDNO GiveUpDotNET${FrameworkVersion}
|
||||
${EndIf}
|
||||
|
||||
DetailPrint "Pausing installation while downloaded .NET Framework installer runs."
|
||||
ExecWait '$TEMP\dotnetfx.exe /q /c:"install /q"'
|
||||
|
||||
DetailPrint "Completed .NET Framework install/update. Removing .NET Framework installer."
|
||||
Delete "$TEMP\dotnetfx.exe"
|
||||
DetailPrint ".NET Framework installer removed."
|
||||
goto NewDotNet${FrameworkVersion}
|
||||
|
||||
GiveUpDotNET${FrameworkVersion}:
|
||||
Abort "Installation canceled by user."
|
||||
|
||||
NewDotNET${FrameworkVersion}:
|
||||
DetailPrint "Proceeding with remainder of installation."
|
||||
Pop $7
|
||||
Pop $6
|
||||
Pop $5
|
||||
Pop $4
|
||||
Pop $3
|
||||
Pop $2
|
||||
Pop $1
|
||||
Pop $0
|
||||
|
||||
!macroend
|
||||
|
|
@ -1 +1 @@
|
|||
!define VERSION '3.4.2.1933'
|
||||
!define VERSION '3.4.2.1936'
|
||||
|
|
|
|||
|
|
@ -35,7 +35,19 @@
|
|||
File "copyright.txt"
|
||||
File "..\bin\pabcnetc.exe.config"
|
||||
File "..\bin\pabcnetcclear.exe.config"
|
||||
File "..\bin\PascalABCNET.exe.config"
|
||||
|
||||
|
||||
; main config - only .NET 4.7.1 and above
|
||||
DotNetChecker::IsDotNet471Installed
|
||||
Pop $0
|
||||
|
||||
${If} $0 == "false"
|
||||
${OrIf} $0 == "f" ; if script is compiled in ANSI mode then we get only an "f" https://github.com/ReVolly/NsisDotNetChecker/issues/4
|
||||
${Else}
|
||||
File "..\bin\PascalABCNET.exe.config"
|
||||
${AddFile} "PascalABCNET.exe.config"
|
||||
${EndIf}
|
||||
|
||||
|
||||
;dobavljaem fajly v uninst.log
|
||||
${AddFile} "Compiler.dll"
|
||||
|
|
@ -57,7 +69,7 @@
|
|||
${AddFile} "copyright.txt"
|
||||
${AddFile} "pabcnetc.exe.config"
|
||||
${AddFile} "pabcnetcclear.exe.config"
|
||||
${AddFile} "PascalABCNET.exe.config"
|
||||
|
||||
Delete "$INSTDIR\Lib\*.pas"
|
||||
SetOutPath "$INSTDIR\Lib"
|
||||
;File ..\bin\Lib\*.pcu; eto ploho nuzhno kazhdyj pcu raspisyvat
|
||||
|
|
|
|||
BIN
Utils/NSIS/Unicode/Plugins/DotNetChecker.dll
Normal file
BIN
Utils/NSIS/Unicode/Plugins/DotNetChecker.dll
Normal file
Binary file not shown.
130
VisualPascalABCNET/AboutBox.Designer.cs
generated
130
VisualPascalABCNET/AboutBox.Designer.cs
generated
|
|
@ -66,11 +66,9 @@
|
|||
// groupBox1
|
||||
//
|
||||
this.groupBox1.Controls.Add(this.dgvModules);
|
||||
this.groupBox1.Location = new System.Drawing.Point(11, 180);
|
||||
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBox1.Location = new System.Drawing.Point(8, 146);
|
||||
this.groupBox1.Name = "groupBox1";
|
||||
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBox1.Size = new System.Drawing.Size(693, 169);
|
||||
this.groupBox1.Size = new System.Drawing.Size(520, 137);
|
||||
this.groupBox1.TabIndex = 12;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "COMPONENTS";
|
||||
|
|
@ -90,11 +88,10 @@
|
|||
this.dgvModules.GridLines = true;
|
||||
this.dgvModules.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
|
||||
this.dgvModules.HideSelection = false;
|
||||
this.dgvModules.Location = new System.Drawing.Point(4, 19);
|
||||
this.dgvModules.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.dgvModules.Location = new System.Drawing.Point(3, 16);
|
||||
this.dgvModules.MultiSelect = false;
|
||||
this.dgvModules.Name = "dgvModules";
|
||||
this.dgvModules.Size = new System.Drawing.Size(685, 146);
|
||||
this.dgvModules.Size = new System.Drawing.Size(514, 118);
|
||||
this.dgvModules.TabIndex = 3;
|
||||
this.dgvModules.UseCompatibleStateImageBehavior = false;
|
||||
this.dgvModules.View = System.Windows.Forms.View.Details;
|
||||
|
|
@ -121,10 +118,9 @@
|
|||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Location = new System.Drawing.Point(296, 356);
|
||||
this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.button1.Location = new System.Drawing.Point(222, 289);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(143, 28);
|
||||
this.button1.Size = new System.Drawing.Size(107, 23);
|
||||
this.button1.TabIndex = 13;
|
||||
this.button1.Text = "!OK";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
|
|
@ -133,10 +129,9 @@
|
|||
// linkLabel1
|
||||
//
|
||||
this.linkLabel1.AutoSize = true;
|
||||
this.linkLabel1.Location = new System.Drawing.Point(15, 129);
|
||||
this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.linkLabel1.Location = new System.Drawing.Point(11, 105);
|
||||
this.linkLabel1.Name = "linkLabel1";
|
||||
this.linkLabel1.Size = new System.Drawing.Size(157, 17);
|
||||
this.linkLabel1.Size = new System.Drawing.Size(124, 13);
|
||||
this.linkLabel1.TabIndex = 20;
|
||||
this.linkLabel1.TabStop = true;
|
||||
this.linkLabel1.Text = "!PASCALABCNET_SITE";
|
||||
|
|
@ -145,10 +140,9 @@
|
|||
// linkLabel2
|
||||
//
|
||||
this.linkLabel2.AutoSize = true;
|
||||
this.linkLabel2.Location = new System.Drawing.Point(15, 150);
|
||||
this.linkLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.linkLabel2.Location = new System.Drawing.Point(11, 122);
|
||||
this.linkLabel2.Name = "linkLabel2";
|
||||
this.linkLabel2.Size = new System.Drawing.Size(177, 17);
|
||||
this.linkLabel2.Size = new System.Drawing.Size(139, 13);
|
||||
this.linkLabel2.TabIndex = 21;
|
||||
this.linkLabel2.TabStop = true;
|
||||
this.linkLabel2.Text = "!PASCALABCNET_FORUM";
|
||||
|
|
@ -159,10 +153,10 @@
|
|||
this.lVersion.AutoSize = true;
|
||||
this.lVersion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
|
||||
this.lVersion.ForeColor = System.Drawing.Color.DarkGreen;
|
||||
this.lVersion.Location = new System.Drawing.Point(80, 0);
|
||||
this.lVersion.Margin = new System.Windows.Forms.Padding(0, 0, 4, 0);
|
||||
this.lVersion.Location = new System.Drawing.Point(65, 0);
|
||||
this.lVersion.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.lVersion.Name = "lVersion";
|
||||
this.lVersion.Size = new System.Drawing.Size(55, 17);
|
||||
this.lVersion.Size = new System.Drawing.Size(44, 13);
|
||||
this.lVersion.TabIndex = 5;
|
||||
this.lVersion.Text = "vesion";
|
||||
//
|
||||
|
|
@ -170,21 +164,19 @@
|
|||
//
|
||||
this.label12.AutoSize = true;
|
||||
this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
|
||||
this.label12.Location = new System.Drawing.Point(4, 0);
|
||||
this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label12.Location = new System.Drawing.Point(3, 0);
|
||||
this.label12.Name = "label12";
|
||||
this.label12.Size = new System.Drawing.Size(410, 17);
|
||||
this.label12.Size = new System.Drawing.Size(311, 13);
|
||||
this.label12.TabIndex = 17;
|
||||
this.label12.Text = "Copyright (c) 2005, 2018 Ivan Bondarev, Stanislav Mihalkovich";
|
||||
this.label12.Text = "Copyright (c) 2005, 2019 Ivan Bondarev, Stanislav Mihalkovich";
|
||||
this.label12.Click += new System.EventHandler(this.label12_Click);
|
||||
//
|
||||
// label9
|
||||
//
|
||||
this.label9.AutoSize = true;
|
||||
this.label9.Location = new System.Drawing.Point(4, 0);
|
||||
this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label9.Location = new System.Drawing.Point(3, 0);
|
||||
this.label9.Name = "label9";
|
||||
this.label9.Size = new System.Drawing.Size(60, 17);
|
||||
this.label9.Size = new System.Drawing.Size(49, 13);
|
||||
this.label9.TabIndex = 22;
|
||||
this.label9.Text = "MADEIN";
|
||||
//
|
||||
|
|
@ -192,10 +184,10 @@
|
|||
//
|
||||
this.lVersionText.AutoSize = true;
|
||||
this.lVersionText.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
|
||||
this.lVersionText.Location = new System.Drawing.Point(4, 0);
|
||||
this.lVersionText.Margin = new System.Windows.Forms.Padding(4, 0, 0, 0);
|
||||
this.lVersionText.Location = new System.Drawing.Point(3, 0);
|
||||
this.lVersionText.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
|
||||
this.lVersionText.Name = "lVersionText";
|
||||
this.lVersionText.Size = new System.Drawing.Size(76, 17);
|
||||
this.lVersionText.Size = new System.Drawing.Size(62, 13);
|
||||
this.lVersionText.TabIndex = 4;
|
||||
this.lVersionText.Text = "VERSION";
|
||||
//
|
||||
|
|
@ -204,10 +196,9 @@
|
|||
this.label1.AutoSize = true;
|
||||
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
|
||||
this.label1.ForeColor = System.Drawing.Color.Black;
|
||||
this.label1.Location = new System.Drawing.Point(4, 0);
|
||||
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label1.Location = new System.Drawing.Point(3, 0);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(122, 17);
|
||||
this.label1.Size = new System.Drawing.Size(98, 13);
|
||||
this.label1.TabIndex = 3;
|
||||
this.label1.Text = "PascalABC.NET";
|
||||
//
|
||||
|
|
@ -219,8 +210,7 @@
|
|||
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel3, 0, 1);
|
||||
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel2, 0, 3);
|
||||
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel4, 0, 2);
|
||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(7, 10);
|
||||
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(5, 8);
|
||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||
this.tableLayoutPanel1.RowCount = 4;
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
|
||||
|
|
@ -228,17 +218,16 @@
|
|||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
|
||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(443, 117);
|
||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(332, 95);
|
||||
this.tableLayoutPanel1.TabIndex = 23;
|
||||
//
|
||||
// flowLayoutPanel1
|
||||
//
|
||||
this.flowLayoutPanel1.Controls.Add(this.label1);
|
||||
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(4, 4);
|
||||
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 3);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(435, 21);
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(326, 17);
|
||||
this.flowLayoutPanel1.TabIndex = 0;
|
||||
//
|
||||
// flowLayoutPanel3
|
||||
|
|
@ -246,40 +235,38 @@
|
|||
this.flowLayoutPanel3.Controls.Add(this.lVersionText);
|
||||
this.flowLayoutPanel3.Controls.Add(this.lVersion);
|
||||
this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flowLayoutPanel3.Location = new System.Drawing.Point(4, 29);
|
||||
this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 4);
|
||||
this.flowLayoutPanel3.Location = new System.Drawing.Point(3, 23);
|
||||
this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
|
||||
this.flowLayoutPanel3.Name = "flowLayoutPanel3";
|
||||
this.flowLayoutPanel3.Size = new System.Drawing.Size(435, 25);
|
||||
this.flowLayoutPanel3.Size = new System.Drawing.Size(326, 20);
|
||||
this.flowLayoutPanel3.TabIndex = 2;
|
||||
//
|
||||
// flowLayoutPanel2
|
||||
//
|
||||
this.flowLayoutPanel2.Controls.Add(this.label9);
|
||||
this.flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flowLayoutPanel2.Location = new System.Drawing.Point(4, 87);
|
||||
this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 4);
|
||||
this.flowLayoutPanel2.Location = new System.Drawing.Point(3, 69);
|
||||
this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
|
||||
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
|
||||
this.flowLayoutPanel2.Size = new System.Drawing.Size(435, 26);
|
||||
this.flowLayoutPanel2.Size = new System.Drawing.Size(326, 23);
|
||||
this.flowLayoutPanel2.TabIndex = 1;
|
||||
//
|
||||
// flowLayoutPanel4
|
||||
//
|
||||
this.flowLayoutPanel4.Controls.Add(this.label12);
|
||||
this.flowLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.flowLayoutPanel4.Location = new System.Drawing.Point(4, 62);
|
||||
this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.flowLayoutPanel4.Location = new System.Drawing.Point(3, 49);
|
||||
this.flowLayoutPanel4.Name = "flowLayoutPanel4";
|
||||
this.flowLayoutPanel4.Size = new System.Drawing.Size(435, 21);
|
||||
this.flowLayoutPanel4.Size = new System.Drawing.Size(326, 17);
|
||||
this.flowLayoutPanel4.TabIndex = 3;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
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(13, 60);
|
||||
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label4.Location = new System.Drawing.Point(10, 49);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(115, 17);
|
||||
this.label4.Size = new System.Drawing.Size(93, 13);
|
||||
this.label4.TabIndex = 22;
|
||||
this.label4.Text = "!DEVELOPERS";
|
||||
//
|
||||
|
|
@ -287,10 +274,9 @@
|
|||
//
|
||||
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(31, 76);
|
||||
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label5.Location = new System.Drawing.Point(23, 62);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(109, 17);
|
||||
this.label5.Size = new System.Drawing.Size(85, 13);
|
||||
this.label5.TabIndex = 23;
|
||||
this.label5.Text = "DEVELOPERS1";
|
||||
//
|
||||
|
|
@ -298,10 +284,9 @@
|
|||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
|
||||
this.label2.Location = new System.Drawing.Point(13, 20);
|
||||
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label2.Location = new System.Drawing.Point(10, 16);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(136, 17);
|
||||
this.label2.Size = new System.Drawing.Size(110, 13);
|
||||
this.label2.TabIndex = 26;
|
||||
this.label2.Text = "PROJECT_ADMIN";
|
||||
//
|
||||
|
|
@ -309,10 +294,9 @@
|
|||
//
|
||||
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(31, 37);
|
||||
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label3.Location = new System.Drawing.Point(23, 30);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(153, 17);
|
||||
this.label3.Size = new System.Drawing.Size(120, 13);
|
||||
this.label3.TabIndex = 16;
|
||||
this.label3.Text = "PROJECT_ADMIN_FIO";
|
||||
//
|
||||
|
|
@ -326,11 +310,9 @@
|
|||
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(457, 10);
|
||||
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBox2.Location = new System.Drawing.Point(343, 8);
|
||||
this.groupBox2.Name = "groupBox2";
|
||||
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.groupBox2.Size = new System.Drawing.Size(247, 162);
|
||||
this.groupBox2.Size = new System.Drawing.Size(185, 132);
|
||||
this.groupBox2.TabIndex = 14;
|
||||
this.groupBox2.TabStop = false;
|
||||
this.groupBox2.Text = "DEVELOPERS";
|
||||
|
|
@ -339,10 +321,9 @@
|
|||
//
|
||||
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(31, 94);
|
||||
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label6.Location = new System.Drawing.Point(23, 76);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(109, 17);
|
||||
this.label6.Size = new System.Drawing.Size(85, 13);
|
||||
this.label6.TabIndex = 29;
|
||||
this.label6.Text = "DEVELOPERS2";
|
||||
//
|
||||
|
|
@ -350,10 +331,9 @@
|
|||
//
|
||||
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(13, 138);
|
||||
this.linkLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.linkLabel3.Location = new System.Drawing.Point(10, 112);
|
||||
this.linkLabel3.Name = "linkLabel3";
|
||||
this.linkLabel3.Size = new System.Drawing.Size(244, 17);
|
||||
this.linkLabel3.Size = new System.Drawing.Size(196, 13);
|
||||
this.linkLabel3.TabIndex = 24;
|
||||
this.linkLabel3.TabStop = true;
|
||||
this.linkLabel3.Text = "!PASCALABCNET_DEVELOPERS";
|
||||
|
|
@ -363,18 +343,17 @@
|
|||
//
|
||||
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(31, 111);
|
||||
this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||
this.label13.Location = new System.Drawing.Point(23, 90);
|
||||
this.label13.Name = "label13";
|
||||
this.label13.Size = new System.Drawing.Size(109, 17);
|
||||
this.label13.Size = new System.Drawing.Size(85, 13);
|
||||
this.label13.TabIndex = 28;
|
||||
this.label13.Text = "DEVELOPERS3";
|
||||
//
|
||||
// AboutBox
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(712, 426);
|
||||
this.ClientSize = new System.Drawing.Size(534, 346);
|
||||
this.Controls.Add(this.tableLayoutPanel1);
|
||||
this.Controls.Add(this.linkLabel2);
|
||||
this.Controls.Add(this.linkLabel1);
|
||||
|
|
@ -382,11 +361,10 @@
|
|||
this.Controls.Add(this.button1);
|
||||
this.Controls.Add(this.groupBox1);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
|
||||
this.MaximizeBox = false;
|
||||
this.MinimizeBox = false;
|
||||
this.Name = "AboutBox";
|
||||
this.Padding = new System.Windows.Forms.Padding(12, 11, 12, 11);
|
||||
this.Padding = new System.Windows.Forms.Padding(9, 9, 9, 9);
|
||||
this.ShowIcon = false;
|
||||
this.ShowInTaskbar = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||
|
|
|
|||
Loading…
Reference in a new issue