From 7e39d424c7e743bd1766b22782ab44f4b6e6dcbe Mon Sep 17 00:00:00 2001 From: "ityurner02@mail.ru" Date: Thu, 28 Sep 2023 20:53:57 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B1=D0=B8?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- COP/COP.sln | 10 +-- .../MyDropDownList.Designer.cs | 2 +- .../MyDropDownList.cs | 2 +- .../MyDropDownList.resx | 0 .../MyEmailTextBox.Designer.cs | 2 +- .../MyEmailTextBox.cs | 2 +- .../MyEmailTextBox.resx | 0 .../MyListBoxObjects.Designer.cs | 2 +- .../MyListBoxObjects.cs | 2 +- .../MyListBoxObjects.resx | 0 .../Object/Student.cs | 2 +- COP/VisualCompLib/VisualCompLib.csproj | 22 ++++++ .../Properties/AssemblyInfo.cs | 36 --------- .../VisualComponentsLib.csproj | 79 ------------------- COP/WinForms/FormForComponents.Designer.cs | 16 ++-- COP/WinForms/FormForComponents.cs | 2 +- COP/WinForms/WinForms.csproj | 2 +- 17 files changed, 44 insertions(+), 137 deletions(-) rename COP/{VisualComponentsLib => VisualCompLib}/MyDropDownList.Designer.cs (98%) rename COP/{VisualComponentsLib => VisualCompLib}/MyDropDownList.cs (97%) rename COP/{VisualComponentsLib => VisualCompLib}/MyDropDownList.resx (100%) rename COP/{VisualComponentsLib => VisualCompLib}/MyEmailTextBox.Designer.cs (98%) rename COP/{VisualComponentsLib => VisualCompLib}/MyEmailTextBox.cs (98%) rename COP/{VisualComponentsLib => VisualCompLib}/MyEmailTextBox.resx (100%) rename COP/{VisualComponentsLib => VisualCompLib}/MyListBoxObjects.Designer.cs (98%) rename COP/{VisualComponentsLib => VisualCompLib}/MyListBoxObjects.cs (99%) rename COP/{VisualComponentsLib => VisualCompLib}/MyListBoxObjects.resx (100%) rename COP/{VisualComponentsLib => VisualCompLib}/Object/Student.cs (92%) create mode 100644 COP/VisualCompLib/VisualCompLib.csproj delete mode 100644 COP/VisualComponentsLib/Properties/AssemblyInfo.cs delete mode 100644 COP/VisualComponentsLib/VisualComponentsLib.csproj diff --git a/COP/COP.sln b/COP/COP.sln index 98c48c0..021f9bf 100644 --- a/COP/COP.sln +++ b/COP/COP.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinForms", "WinForms\WinForms.csproj", "{237F8689-B952-4E4B-AA51-71F3021838BF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualComponentsLib", "VisualComponentsLib\VisualComponentsLib.csproj", "{DC3C02AA-D21D-445E-A942-EE82E7F10228}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualCompLib", "VisualCompLib\VisualCompLib.csproj", "{FC1CFC63-5739-4519-B689-E8B614A9D106}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {237F8689-B952-4E4B-AA51-71F3021838BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {237F8689-B952-4E4B-AA51-71F3021838BF}.Release|Any CPU.ActiveCfg = Release|Any CPU {237F8689-B952-4E4B-AA51-71F3021838BF}.Release|Any CPU.Build.0 = Release|Any CPU - {DC3C02AA-D21D-445E-A942-EE82E7F10228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC3C02AA-D21D-445E-A942-EE82E7F10228}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC3C02AA-D21D-445E-A942-EE82E7F10228}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC3C02AA-D21D-445E-A942-EE82E7F10228}.Release|Any CPU.Build.0 = Release|Any CPU + {FC1CFC63-5739-4519-B689-E8B614A9D106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC1CFC63-5739-4519-B689-E8B614A9D106}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC1CFC63-5739-4519-B689-E8B614A9D106}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC1CFC63-5739-4519-B689-E8B614A9D106}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/COP/VisualComponentsLib/MyDropDownList.Designer.cs b/COP/VisualCompLib/MyDropDownList.Designer.cs similarity index 98% rename from COP/VisualComponentsLib/MyDropDownList.Designer.cs rename to COP/VisualCompLib/MyDropDownList.Designer.cs index c797b53..e55909d 100644 --- a/COP/VisualComponentsLib/MyDropDownList.Designer.cs +++ b/COP/VisualCompLib/MyDropDownList.Designer.cs @@ -1,4 +1,4 @@ -namespace VisualComponentsLib +namespace VisualCompLib { partial class MyDropDownList { diff --git a/COP/VisualComponentsLib/MyDropDownList.cs b/COP/VisualCompLib/MyDropDownList.cs similarity index 97% rename from COP/VisualComponentsLib/MyDropDownList.cs rename to COP/VisualCompLib/MyDropDownList.cs index d3f3c18..8811fa6 100644 --- a/COP/VisualComponentsLib/MyDropDownList.cs +++ b/COP/VisualCompLib/MyDropDownList.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace VisualComponentsLib +namespace VisualCompLib { public partial class MyDropDownList: UserControl { diff --git a/COP/VisualComponentsLib/MyDropDownList.resx b/COP/VisualCompLib/MyDropDownList.resx similarity index 100% rename from COP/VisualComponentsLib/MyDropDownList.resx rename to COP/VisualCompLib/MyDropDownList.resx diff --git a/COP/VisualComponentsLib/MyEmailTextBox.Designer.cs b/COP/VisualCompLib/MyEmailTextBox.Designer.cs similarity index 98% rename from COP/VisualComponentsLib/MyEmailTextBox.Designer.cs rename to COP/VisualCompLib/MyEmailTextBox.Designer.cs index f83b797..f62a964 100644 --- a/COP/VisualComponentsLib/MyEmailTextBox.Designer.cs +++ b/COP/VisualCompLib/MyEmailTextBox.Designer.cs @@ -1,4 +1,4 @@ -namespace VisualComponentsLib +namespace VisualCompLib { partial class MyEmailTextBox { diff --git a/COP/VisualComponentsLib/MyEmailTextBox.cs b/COP/VisualCompLib/MyEmailTextBox.cs similarity index 98% rename from COP/VisualComponentsLib/MyEmailTextBox.cs rename to COP/VisualCompLib/MyEmailTextBox.cs index a92d2fd..9eed77a 100644 --- a/COP/VisualComponentsLib/MyEmailTextBox.cs +++ b/COP/VisualCompLib/MyEmailTextBox.cs @@ -4,7 +4,7 @@ using System.Text.RegularExpressions; using System.Windows.Forms; using System.Drawing; -namespace VisualComponentsLib +namespace VisualCompLib { public partial class MyEmailTextBox : UserControl { diff --git a/COP/VisualComponentsLib/MyEmailTextBox.resx b/COP/VisualCompLib/MyEmailTextBox.resx similarity index 100% rename from COP/VisualComponentsLib/MyEmailTextBox.resx rename to COP/VisualCompLib/MyEmailTextBox.resx diff --git a/COP/VisualComponentsLib/MyListBoxObjects.Designer.cs b/COP/VisualCompLib/MyListBoxObjects.Designer.cs similarity index 98% rename from COP/VisualComponentsLib/MyListBoxObjects.Designer.cs rename to COP/VisualCompLib/MyListBoxObjects.Designer.cs index 842600d..3e4d9b8 100644 --- a/COP/VisualComponentsLib/MyListBoxObjects.Designer.cs +++ b/COP/VisualCompLib/MyListBoxObjects.Designer.cs @@ -1,4 +1,4 @@ -namespace VisualComponentsLib +namespace VisualCompLib { partial class MyListBoxObjects { diff --git a/COP/VisualComponentsLib/MyListBoxObjects.cs b/COP/VisualCompLib/MyListBoxObjects.cs similarity index 99% rename from COP/VisualComponentsLib/MyListBoxObjects.cs rename to COP/VisualCompLib/MyListBoxObjects.cs index e65555c..a327f2d 100644 --- a/COP/VisualComponentsLib/MyListBoxObjects.cs +++ b/COP/VisualCompLib/MyListBoxObjects.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Windows.Forms; -namespace VisualComponentsLib +namespace VisualCompLib { public partial class MyListBoxObjects : UserControl { diff --git a/COP/VisualComponentsLib/MyListBoxObjects.resx b/COP/VisualCompLib/MyListBoxObjects.resx similarity index 100% rename from COP/VisualComponentsLib/MyListBoxObjects.resx rename to COP/VisualCompLib/MyListBoxObjects.resx diff --git a/COP/VisualComponentsLib/Object/Student.cs b/COP/VisualCompLib/Object/Student.cs similarity index 92% rename from COP/VisualComponentsLib/Object/Student.cs rename to COP/VisualCompLib/Object/Student.cs index 4421128..5d0c22a 100644 --- a/COP/VisualComponentsLib/Object/Student.cs +++ b/COP/VisualCompLib/Object/Student.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace VisualComponentsLib.Object +namespace VisualCompLib.Object { public class Student { diff --git a/COP/VisualCompLib/VisualCompLib.csproj b/COP/VisualCompLib/VisualCompLib.csproj new file mode 100644 index 0000000..1ce33c4 --- /dev/null +++ b/COP/VisualCompLib/VisualCompLib.csproj @@ -0,0 +1,22 @@ + + + + net6.0-windows + enable + true + enable + + + + + UserControl + + + UserControl + + + UserControl + + + + diff --git a/COP/VisualComponentsLib/Properties/AssemblyInfo.cs b/COP/VisualComponentsLib/Properties/AssemblyInfo.cs deleted file mode 100644 index f262772..0000000 --- a/COP/VisualComponentsLib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Общие сведения об этой сборке предоставляются следующим набором -// набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения, -// связанные со сборкой. -[assembly: AssemblyTitle("VisualComponentsLib")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VisualComponentsLib")] -[assembly: AssemblyCopyright("Copyright © 2023")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми -// для компонентов COM. Если необходимо обратиться к типу в этой сборке через -// компонента COM, задайте для атрибута ComVisible этого типа значение TRUE. -[assembly: ComVisible(false)] - -// Следующий идентификатор GUID представляет идентификатор typelib, если этот проект доступен через COM -[assembly: Guid("dc3c02aa-d21d-445e-a942-ee82e7f10228")] - -// Сведения о версии сборки состоят из указанных ниже четырех значений: -// -// Основной номер версии -// Дополнительный номер версии -// Номер сборки -// Номер редакции -// -// Можно задать все значения или принять номера сборки и редакции по умолчанию -// используя "*", как показано ниже: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/COP/VisualComponentsLib/VisualComponentsLib.csproj b/COP/VisualComponentsLib/VisualComponentsLib.csproj deleted file mode 100644 index dca6737..0000000 --- a/COP/VisualComponentsLib/VisualComponentsLib.csproj +++ /dev/null @@ -1,79 +0,0 @@ - - - - - Debug - AnyCPU - {DC3C02AA-D21D-445E-A942-EE82E7F10228} - Library - VisualComponentsLib - VisualComponentsLib - v4.7.2 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - UserControl - - - MyDropDownList.cs - - - UserControl - - - MyEmailTextBox.cs - - - UserControl - - - MyListBoxObjects.cs - - - - - - - - MyDropDownList.cs - - - MyEmailTextBox.cs - - - MyListBoxObjects.cs - - - - \ No newline at end of file diff --git a/COP/WinForms/FormForComponents.Designer.cs b/COP/WinForms/FormForComponents.Designer.cs index afbd80d..d9fecdc 100644 --- a/COP/WinForms/FormForComponents.Designer.cs +++ b/COP/WinForms/FormForComponents.Designer.cs @@ -28,18 +28,18 @@ /// private void InitializeComponent() { - dropDownList = new VisualComponentsLib.MyDropDownList(); + dropDownList = new VisualCompLib.MyDropDownList(); buttonAdd = new Button(); buttonInfo = new Button(); labelInfo = new Label(); buttonClear = new Button(); - emailTextBox = new VisualComponentsLib.MyEmailTextBox(); + emailTextBox = new VisualCompLib.MyEmailTextBox(); labelShow = new Label(); buttonShow = new Button(); buttonSetExample = new Button(); labelExample = new Label(); textBoxExample = new TextBox(); - listBoxObj = new VisualComponentsLib.MyListBoxObjects(); + listBoxObj = new VisualCompLib.MyListBoxObjects(); buttonAddObjects = new Button(); buttonShowItem = new Button(); labelShowInput = new Label(); @@ -185,7 +185,7 @@ labelShowInput.TabIndex = 14; labelShowInput.Text = "Вывод"; // - // Form1 + // FormForComponents // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; @@ -205,25 +205,25 @@ Controls.Add(buttonAddObjects); Controls.Add(buttonShowItem); Controls.Add(labelShowInput); - Name = "Form1"; + Name = "FormForComponents"; Text = "Form1"; ResumeLayout(false); PerformLayout(); } #endregion - private VisualComponentsLib.MyDropDownList dropDownList; + private VisualCompLib.MyDropDownList dropDownList; private Button buttonAdd; private Button buttonInfo; private Label labelInfo; private Button buttonClear; - private VisualComponentsLib.MyEmailTextBox emailTextBox; + private VisualCompLib.MyEmailTextBox emailTextBox; private TextBox textBoxExample; private Label labelExample; private Button buttonSetExample; private Label labelShow; private Button buttonShow; - private VisualComponentsLib.MyListBoxObjects listBoxObj; + private VisualCompLib.MyListBoxObjects listBoxObj; private Button buttonAddObjects; private Button buttonShowItem; private Label labelShowInput; diff --git a/COP/WinForms/FormForComponents.cs b/COP/WinForms/FormForComponents.cs index 0937c17..04e93f2 100644 --- a/COP/WinForms/FormForComponents.cs +++ b/COP/WinForms/FormForComponents.cs @@ -1,4 +1,4 @@ -using VisualComponentsLib.Object; +using VisualCompLib.Object; namespace WinForms { diff --git a/COP/WinForms/WinForms.csproj b/COP/WinForms/WinForms.csproj index 6a94a95..25a231c 100644 --- a/COP/WinForms/WinForms.csproj +++ b/COP/WinForms/WinForms.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file