diff --git a/WinFormsLibrary1.sln b/ComponentsProgramming.sln
similarity index 62%
rename from WinFormsLibrary1.sln
rename to ComponentsProgramming.sln
index 497a321..d8c418e 100644
--- a/WinFormsLibrary1.sln
+++ b/ComponentsProgramming.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34728.123
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinFormsLibrary1", "WinFormsLibrary1\WinFormsLibrary1.csproj", "{260D3E8C-3599-49F1-BF42-64A92DD0FB62}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsMain", "WinFormsMain\WinFormsMain.csproj", "{D671A342-9B1B-4662-B7CB-9E7382CCFBC7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualComponents", "WinFormsLibrary1\VisualComponents.csproj", "{260D3E8C-3599-49F1-BF42-64A92DD0FB62}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +15,6 @@ Global
{260D3E8C-3599-49F1-BF42-64A92DD0FB62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{260D3E8C-3599-49F1-BF42-64A92DD0FB62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{260D3E8C-3599-49F1-BF42-64A92DD0FB62}.Release|Any CPU.Build.0 = Release|Any CPU
- {D671A342-9B1B-4662-B7CB-9E7382CCFBC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D671A342-9B1B-4662-B7CB-9E7382CCFBC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D671A342-9B1B-4662-B7CB-9E7382CCFBC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D671A342-9B1B-4662-B7CB-9E7382CCFBC7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/WinFormsLibrary1/ColumnInfo.cs b/VisualComponents/ColumnInfo.cs
similarity index 100%
rename from WinFormsLibrary1/ColumnInfo.cs
rename to VisualComponents/ColumnInfo.cs
diff --git a/WinFormsLibrary1/UncheckedNullException.cs b/VisualComponents/UncheckedNullException.cs
similarity index 100%
rename from WinFormsLibrary1/UncheckedNullException.cs
rename to VisualComponents/UncheckedNullException.cs
diff --git a/WinFormsLibrary1/UnexpectedTypeException.cs b/VisualComponents/UnexpectedTypeException.cs
similarity index 100%
rename from WinFormsLibrary1/UnexpectedTypeException.cs
rename to VisualComponents/UnexpectedTypeException.cs
diff --git a/WinFormsLibrary1/User.cs b/VisualComponents/User.cs
similarity index 100%
rename from WinFormsLibrary1/User.cs
rename to VisualComponents/User.cs
diff --git a/WinFormsLibrary1/UserControlIntegerInput.Designer.cs b/VisualComponents/UserControlIntegerInput.Designer.cs
similarity index 100%
rename from WinFormsLibrary1/UserControlIntegerInput.Designer.cs
rename to VisualComponents/UserControlIntegerInput.Designer.cs
diff --git a/WinFormsLibrary1/UserControlIntegerInput.cs b/VisualComponents/UserControlIntegerInput.cs
similarity index 100%
rename from WinFormsLibrary1/UserControlIntegerInput.cs
rename to VisualComponents/UserControlIntegerInput.cs
diff --git a/WinFormsLibrary1/UserControlIntegerInput.resx b/VisualComponents/UserControlIntegerInput.resx
similarity index 100%
rename from WinFormsLibrary1/UserControlIntegerInput.resx
rename to VisualComponents/UserControlIntegerInput.resx
diff --git a/WinFormsLibrary1/UserControlStringsListBox.Designer.cs b/VisualComponents/UserControlStringsListBox.Designer.cs
similarity index 100%
rename from WinFormsLibrary1/UserControlStringsListBox.Designer.cs
rename to VisualComponents/UserControlStringsListBox.Designer.cs
diff --git a/WinFormsLibrary1/UserControlStringsListBox.cs b/VisualComponents/UserControlStringsListBox.cs
similarity index 100%
rename from WinFormsLibrary1/UserControlStringsListBox.cs
rename to VisualComponents/UserControlStringsListBox.cs
diff --git a/WinFormsLibrary1/UserControlStringsListBox.resx b/VisualComponents/UserControlStringsListBox.resx
similarity index 100%
rename from WinFormsLibrary1/UserControlStringsListBox.resx
rename to VisualComponents/UserControlStringsListBox.resx
diff --git a/WinFormsLibrary1/UserControlTable.Designer.cs b/VisualComponents/UserControlTable.Designer.cs
similarity index 100%
rename from WinFormsLibrary1/UserControlTable.Designer.cs
rename to VisualComponents/UserControlTable.Designer.cs
diff --git a/WinFormsLibrary1/UserControlTable.cs b/VisualComponents/UserControlTable.cs
similarity index 100%
rename from WinFormsLibrary1/UserControlTable.cs
rename to VisualComponents/UserControlTable.cs
diff --git a/WinFormsLibrary1/UserControlTable.resx b/VisualComponents/UserControlTable.resx
similarity index 100%
rename from WinFormsLibrary1/UserControlTable.resx
rename to VisualComponents/UserControlTable.resx
diff --git a/WinFormsLibrary1/WinFormsLibrary1.csproj b/VisualComponents/VisualComponents.csproj
similarity index 100%
rename from WinFormsLibrary1/WinFormsLibrary1.csproj
rename to VisualComponents/VisualComponents.csproj
diff --git a/WinFormsMain/Form1.Designer.cs b/WinFormsMain/Form1.Designer.cs
deleted file mode 100644
index 6712231..0000000
--- a/WinFormsMain/Form1.Designer.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-namespace WinFormsMain
-{
- partial class Form1
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- groupBox1 = new GroupBox();
- buttonSetList = new Button();
- textBoxList = new TextBox();
- buttonCheckSelected = new Button();
- labelListStatus = new Label();
- label1 = new Label();
- buttonAddTestList = new Button();
- buttonClearList = new Button();
- userControlStringsListBox = new WinFormsLibrary1.UserControlStringsListBox();
- groupBox2 = new GroupBox();
- userControlTable = new WinFormsLibrary1.UserControlTable();
- groupBox3 = new GroupBox();
- buttonSetInputtedInteger = new Button();
- textBoxInputtedInteger = new TextBox();
- buttonGetInputtedValue = new Button();
- userControlIntegerInput = new WinFormsLibrary1.UserControlIntegerInput();
- groupBox1.SuspendLayout();
- groupBox2.SuspendLayout();
- groupBox3.SuspendLayout();
- SuspendLayout();
- //
- // groupBox1
- //
- groupBox1.Controls.Add(buttonSetList);
- groupBox1.Controls.Add(textBoxList);
- groupBox1.Controls.Add(buttonCheckSelected);
- groupBox1.Controls.Add(labelListStatus);
- groupBox1.Controls.Add(label1);
- groupBox1.Controls.Add(buttonAddTestList);
- groupBox1.Controls.Add(buttonClearList);
- groupBox1.Controls.Add(userControlStringsListBox);
- groupBox1.Location = new Point(12, 12);
- groupBox1.Name = "groupBox1";
- groupBox1.Size = new Size(225, 413);
- groupBox1.TabIndex = 0;
- groupBox1.TabStop = false;
- groupBox1.Text = "Визуальный компонент выбора";
- //
- // buttonSetList
- //
- buttonSetList.Location = new Point(144, 300);
- buttonSetList.Name = "buttonSetList";
- buttonSetList.Size = new Size(75, 23);
- buttonSetList.TabIndex = 7;
- buttonSetList.Text = "Выбрать";
- buttonSetList.UseVisualStyleBackColor = true;
- buttonSetList.Click += buttonSetList_Click;
- //
- // textBoxList
- //
- textBoxList.Location = new Point(6, 300);
- textBoxList.Name = "textBoxList";
- textBoxList.Size = new Size(132, 23);
- textBoxList.TabIndex = 6;
- //
- // buttonCheckSelected
- //
- buttonCheckSelected.Location = new Point(6, 256);
- buttonCheckSelected.Name = "buttonCheckSelected";
- buttonCheckSelected.Size = new Size(213, 33);
- buttonCheckSelected.TabIndex = 5;
- buttonCheckSelected.Text = "Выбранный элемент";
- buttonCheckSelected.UseVisualStyleBackColor = true;
- buttonCheckSelected.Click += buttonCheckSelected_Click;
- //
- // labelListStatus
- //
- labelListStatus.AutoSize = true;
- labelListStatus.Location = new Point(22, 387);
- labelListStatus.Name = "labelListStatus";
- labelListStatus.Size = new Size(0, 15);
- labelListStatus.TabIndex = 4;
- //
- // label1
- //
- label1.AutoSize = true;
- label1.Location = new Point(6, 360);
- label1.Name = "label1";
- label1.Size = new Size(87, 15);
- label1.TabIndex = 3;
- label1.Text = "Статус списка:";
- //
- // buttonAddTestList
- //
- buttonAddTestList.Location = new Point(6, 178);
- buttonAddTestList.Name = "buttonAddTestList";
- buttonAddTestList.Size = new Size(213, 33);
- buttonAddTestList.TabIndex = 2;
- buttonAddTestList.Text = "Добавить список из 5 элементов";
- buttonAddTestList.UseVisualStyleBackColor = true;
- buttonAddTestList.Click += buttonAddTestList_Click;
- //
- // buttonClearList
- //
- buttonClearList.Location = new Point(6, 217);
- buttonClearList.Name = "buttonClearList";
- buttonClearList.Size = new Size(213, 33);
- buttonClearList.TabIndex = 1;
- buttonClearList.Text = "Очистить";
- buttonClearList.UseVisualStyleBackColor = true;
- buttonClearList.Click += buttonClearList_Click;
- //
- // userControlStringsListBox
- //
- userControlStringsListBox.ListElement = "";
- userControlStringsListBox.Location = new Point(6, 22);
- userControlStringsListBox.Name = "userControlStringsListBox";
- userControlStringsListBox.Size = new Size(213, 150);
- userControlStringsListBox.TabIndex = 0;
- userControlStringsListBox.ListChanged += userControlStringsListBox_ListChanged;
- //
- // groupBox2
- //
- groupBox2.Controls.Add(userControlTable);
- groupBox2.Location = new Point(496, 12);
- groupBox2.Name = "groupBox2";
- groupBox2.Size = new Size(344, 323);
- groupBox2.TabIndex = 1;
- groupBox2.TabStop = false;
- groupBox2.Text = "Визуальный компонент вывода списков";
- //
- // userControlTable
- //
- userControlTable.index = -1;
- userControlTable.Location = new Point(7, 22);
- userControlTable.Name = "userControlTable";
- userControlTable.Size = new Size(331, 157);
- userControlTable.TabIndex = 0;
- //
- // groupBox3
- //
- groupBox3.Controls.Add(buttonSetInputtedInteger);
- groupBox3.Controls.Add(textBoxInputtedInteger);
- groupBox3.Controls.Add(buttonGetInputtedValue);
- groupBox3.Controls.Add(userControlIntegerInput);
- groupBox3.Location = new Point(243, 12);
- groupBox3.Name = "groupBox3";
- groupBox3.Size = new Size(247, 384);
- groupBox3.TabIndex = 2;
- groupBox3.TabStop = false;
- groupBox3.Text = "Визуальный компонент ввода";
- //
- // buttonSetInputtedInteger
- //
- buttonSetInputtedInteger.Location = new Point(166, 115);
- buttonSetInputtedInteger.Name = "buttonSetInputtedInteger";
- buttonSetInputtedInteger.Size = new Size(75, 23);
- buttonSetInputtedInteger.TabIndex = 8;
- buttonSetInputtedInteger.Text = "Заменить";
- buttonSetInputtedInteger.UseVisualStyleBackColor = true;
- buttonSetInputtedInteger.Click += buttonSetInputtedInteger_Click;
- //
- // textBoxInputtedInteger
- //
- textBoxInputtedInteger.Location = new Point(6, 115);
- textBoxInputtedInteger.Name = "textBoxInputtedInteger";
- textBoxInputtedInteger.Size = new Size(154, 23);
- textBoxInputtedInteger.TabIndex = 2;
- //
- // buttonGetInputtedValue
- //
- buttonGetInputtedValue.Location = new Point(6, 58);
- buttonGetInputtedValue.Name = "buttonGetInputtedValue";
- buttonGetInputtedValue.Size = new Size(235, 42);
- buttonGetInputtedValue.TabIndex = 1;
- buttonGetInputtedValue.Text = "Получить значение";
- buttonGetInputtedValue.UseVisualStyleBackColor = true;
- buttonGetInputtedValue.Click += buttonGetInputtedValue_Click;
- //
- // userControlIntegerInput
- //
- userControlIntegerInput.Location = new Point(6, 22);
- userControlIntegerInput.Name = "userControlIntegerInput";
- userControlIntegerInput.Size = new Size(235, 30);
- userControlIntegerInput.TabIndex = 0;
- //
- // Form1
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(849, 437);
- Controls.Add(groupBox3);
- Controls.Add(groupBox2);
- Controls.Add(groupBox1);
- Name = "Form1";
- Text = "Основная форма";
- groupBox1.ResumeLayout(false);
- groupBox1.PerformLayout();
- groupBox2.ResumeLayout(false);
- groupBox3.ResumeLayout(false);
- groupBox3.PerformLayout();
- ResumeLayout(false);
- }
-
- #endregion
-
- private GroupBox groupBox1;
- private WinFormsLibrary1.UserControlStringsListBox userControlStringsListBox;
- private GroupBox groupBox2;
- private WinFormsLibrary1.UserControlTable userControlTable;
- private GroupBox groupBox3;
- private WinFormsLibrary1.UserControlIntegerInput userControlIntegerInput;
- private Button buttonAddTestList;
- private Button buttonClearList;
- private Label labelListStatus;
- private Label label1;
- private Button buttonCheckSelected;
- private Button buttonGetInputtedValue;
- private Button buttonSetList;
- private TextBox textBoxList;
- private Button buttonSetInputtedInteger;
- private TextBox textBoxInputtedInteger;
- }
-}
diff --git a/WinFormsMain/Form1.cs b/WinFormsMain/Form1.cs
deleted file mode 100644
index 75abb3f..0000000
--- a/WinFormsMain/Form1.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-namespace WinFormsMain
-{
- public partial class Form1 : Form
- {
- private Random rnd = new Random();
- public Form1()
- {
- InitializeComponent();
- }
-
- private void buttonAddTestList_Click(object sender, EventArgs e)
- {
- List testList = new List();
- for (int i = 0; i < 5; i++)
- {
- testList.Add("test " + i);
- }
- userControlStringsListBox.AddList(testList);
- }
-
- private void buttonClearList_Click(object sender, EventArgs e)
- {
- userControlStringsListBox.ClearList();
- }
-
- private void userControlStringsListBox_ListChanged(object sender, EventArgs e)
- {
- labelListStatus.Text = userControlStringsListBox.ListElement;
- }
-
- private void buttonCheckSelected_Click(object sender, EventArgs e)
- {
- MessageBox.Show(" \"" + userControlStringsListBox.ListElement + "\"");
- }
-
- private void buttonSetList_Click(object sender, EventArgs e)
- {
- userControlStringsListBox.ListElement = textBoxList.Text;
- }
-
- private void buttonSetInputtedInteger_Click(object sender, EventArgs e)
- {
- try
- {
- userControlIntegerInput.InputtedInteger = Convert.ToInt32(textBoxInputtedInteger.Text);
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
-
- private void buttonGetInputtedValue_Click(object sender, EventArgs e)
- {
- int? i;
- try
- {
- i = userControlIntegerInput.InputtedInteger;
- MessageBox.Show(": \"" + i + "\"");
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- }
- }
-}
diff --git a/WinFormsMain/Form1.resx b/WinFormsMain/Form1.resx
deleted file mode 100644
index af32865..0000000
--- a/WinFormsMain/Form1.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/WinFormsMain/Program.cs b/WinFormsMain/Program.cs
deleted file mode 100644
index d7087fc..0000000
--- a/WinFormsMain/Program.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace WinFormsMain
-{
- internal static class Program
- {
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- static void Main()
- {
- // To customize application configuration such as set high DPI settings or default font,
- // see https://aka.ms/applicationconfiguration.
- ApplicationConfiguration.Initialize();
- Application.Run(new Form1());
- }
- }
-}
\ No newline at end of file
diff --git a/WinFormsMain/WinFormsMain.csproj b/WinFormsMain/WinFormsMain.csproj
deleted file mode 100644
index be88b1e..0000000
--- a/WinFormsMain/WinFormsMain.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- WinExe
- net7.0-windows
- enable
- true
- enable
-
-
-
-
-
-
-
\ No newline at end of file