From 9e96681e74dc8f646057716fbe150ab8e224cd7e Mon Sep 17 00:00:00 2001
From: maxnes3 <112558334+maxnes3@users.noreply.github.com>
Date: Thu, 2 Nov 2023 08:06:06 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
=?UTF-8?q?=D0=BD=D0=B0=D0=B3=D0=B5=D1=82=D1=81=20=D0=90=D1=80=D1=82=D1=91?=
=?UTF-8?q?=D0=BC=D0=B0=20=D0=B5=D0=B5=D0=B5=D0=B5=D0=B5=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WinForm/AppView/AppView.csproj | 1 +
WinForm/AppView/FormMain.Designer.cs | 2 ++
WinForm/AppView/FormMain.resx | 3 +++
.../PdfFormsLibrary/ListBoxValues.Designer.cs | 20 +++----------------
.../PdfFormsLibrary/NumberTextBox.Designer.cs | 20 ++++---------------
.../PdfFormsLibrary/PdfFormsLibrary.csproj | 1 +
6 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/WinForm/AppView/AppView.csproj b/WinForm/AppView/AppView.csproj
index e11cd51..d4b9c57 100644
--- a/WinForm/AppView/AppView.csproj
+++ b/WinForm/AppView/AppView.csproj
@@ -15,6 +15,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/WinForm/AppView/FormMain.Designer.cs b/WinForm/AppView/FormMain.Designer.cs
index 6d4e1ec..6203a93 100644
--- a/WinForm/AppView/FormMain.Designer.cs
+++ b/WinForm/AppView/FormMain.Designer.cs
@@ -42,6 +42,7 @@
componentDocumentWithChartPieWord = new ComponentsLibraryNet60.DocumentWithChart.ComponentDocumentWithChartPieWord(components);
componentDocumentWithChartBarWord = new ComponentsLibraryNet60.DocumentWithChart.ComponentDocumentWithChartBarWord(components);
pdfGeneratorControl = new PdfFormsLibrary.PdfGeneratorControl(components);
+ circleDiagram = new WinFormsLibrary.CircleDiagram(components);
contextMenuStrip.SuspendLayout();
SuspendLayout();
//
@@ -141,5 +142,6 @@
private ComponentsLibraryNet60.DocumentWithChart.ComponentDocumentWithChartBarWord componentDocumentWithChartBarWord;
private ToolStripMenuItem открытьСправочникToolStripMenuItem;
private PdfFormsLibrary.PdfGeneratorControl pdfGeneratorControl;
+ private WinFormsLibrary.CircleDiagram circleDiagram;
}
}
\ No newline at end of file
diff --git a/WinForm/AppView/FormMain.resx b/WinForm/AppView/FormMain.resx
index 0a30cfe..cd80a44 100644
--- a/WinForm/AppView/FormMain.resx
+++ b/WinForm/AppView/FormMain.resx
@@ -72,4 +72,7 @@
291, 54
+
+ 456, 54
+
\ No newline at end of file
diff --git a/WinForm/PdfFormsLibrary/ListBoxValues.Designer.cs b/WinForm/PdfFormsLibrary/ListBoxValues.Designer.cs
index 9c07d6b..05170d4 100644
--- a/WinForm/PdfFormsLibrary/ListBoxValues.Designer.cs
+++ b/WinForm/PdfFormsLibrary/ListBoxValues.Designer.cs
@@ -29,43 +29,29 @@
private void InitializeComponent()
{
listBox = new ListBox();
- componentTitleLabel = new Label();
SuspendLayout();
//
// listBox
//
listBox.FormattingEnabled = true;
listBox.ItemHeight = 15;
- listBox.Location = new Point(12, 39);
+ listBox.Location = new Point(3, 3);
listBox.Name = "listBox";
- listBox.Size = new Size(172, 154);
+ listBox.Size = new Size(194, 154);
listBox.TabIndex = 0;
//
- // componentTitleLabel
- //
- componentTitleLabel.AutoSize = true;
- componentTitleLabel.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
- componentTitleLabel.Location = new Point(12, 12);
- componentTitleLabel.Name = "componentTitleLabel";
- componentTitleLabel.Size = new Size(108, 15);
- componentTitleLabel.TabIndex = 1;
- componentTitleLabel.Text = "Список занчений";
- //
// ListBoxValues
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(componentTitleLabel);
Controls.Add(listBox);
Name = "ListBoxValues";
- Size = new Size(200, 206);
+ Size = new Size(200, 160);
ResumeLayout(false);
- PerformLayout();
}
#endregion
private ListBox listBox;
- private Label componentTitleLabel;
}
}
diff --git a/WinForm/PdfFormsLibrary/NumberTextBox.Designer.cs b/WinForm/PdfFormsLibrary/NumberTextBox.Designer.cs
index 96dec40..f17eb2d 100644
--- a/WinForm/PdfFormsLibrary/NumberTextBox.Designer.cs
+++ b/WinForm/PdfFormsLibrary/NumberTextBox.Designer.cs
@@ -28,25 +28,15 @@
///
private void InitializeComponent()
{
- componentTitleLabel = new Label();
textBox = new TextBox();
SuspendLayout();
//
- // componentTitleLabel
- //
- componentTitleLabel.AutoSize = true;
- componentTitleLabel.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
- componentTitleLabel.Location = new Point(13, 12);
- componentTitleLabel.Name = "componentTitleLabel";
- componentTitleLabel.Size = new Size(154, 15);
- componentTitleLabel.TabIndex = 1;
- componentTitleLabel.Text = "Введите номер телефона";
- //
// textBox
//
- textBox.Location = new Point(13, 41);
+ textBox.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+ textBox.Location = new Point(3, 3);
textBox.Name = "textBox";
- textBox.Size = new Size(234, 23);
+ textBox.Size = new Size(254, 23);
textBox.TabIndex = 2;
textBox.TextChanged += TextBox_TextChanged;
textBox.Enter += TextBox_Enter;
@@ -56,9 +46,8 @@
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(textBox);
- Controls.Add(componentTitleLabel);
Name = "NumberTextBox";
- Size = new Size(260, 80);
+ Size = new Size(260, 29);
ResumeLayout(false);
PerformLayout();
}
@@ -66,7 +55,6 @@
#endregion
private TextBox numberTextBox;
- private Label componentTitleLabel;
private TextBox textBox;
}
}
diff --git a/WinForm/PdfFormsLibrary/PdfFormsLibrary.csproj b/WinForm/PdfFormsLibrary/PdfFormsLibrary.csproj
index 8a056da..d2f0064 100644
--- a/WinForm/PdfFormsLibrary/PdfFormsLibrary.csproj
+++ b/WinForm/PdfFormsLibrary/PdfFormsLibrary.csproj
@@ -5,6 +5,7 @@
enable
true
enable
+ True