diff --git a/ComponentProgramming/ComponentProgramming/ComponentProgramming.csproj b/ComponentProgramming/ComponentProgramming/ComponentProgramming.csproj index f0d4be0..67c5cf8 100644 --- a/ComponentProgramming/ComponentProgramming/ComponentProgramming.csproj +++ b/ComponentProgramming/ComponentProgramming/ComponentProgramming.csproj @@ -5,6 +5,7 @@ enable true enable + True diff --git a/ComponentProgramming/ComponentProgramming/Components/testComp.Designer.cs b/ComponentProgramming/ComponentProgramming/Components/testComp.Designer.cs deleted file mode 100644 index 1e9a77b..0000000 --- a/ComponentProgramming/ComponentProgramming/Components/testComp.Designer.cs +++ /dev/null @@ -1,36 +0,0 @@ -namespace ComponentProgramming -{ - partial class testComp - { - /// - /// Обязательная переменная конструктора. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Освободить все используемые ресурсы. - /// - /// истинно, если управляемый ресурс должен быть удален; иначе ложно. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Код, автоматически созданный конструктором компонентов - - /// - /// Требуемый метод для поддержки конструктора — не изменяйте - /// содержимое этого метода с помощью редактора кода. - /// - private void InitializeComponent() - { - components = new System.ComponentModel.Container(); - } - - #endregion - } -} diff --git a/ComponentProgramming/ComponentProgramming/Components/testComp.cs b/ComponentProgramming/ComponentProgramming/Components/testComp.cs deleted file mode 100644 index e30d048..0000000 --- a/ComponentProgramming/ComponentProgramming/Components/testComp.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ComponentProgramming -{ - public partial class testComp : Component - { - - private string _fileName; - - public string FileName - { - set - { - if (string.IsNullOrEmpty(value)) return; - if (!value.EndsWith(".txt")) - { - throw new ArgumentException("No txt file"); - } - _fileName = value; - } - } - - public testComp() - { - InitializeComponent(); - _fileName = string.Empty; - } - - public testComp(IContainer container) - { - container.Add(this); - - InitializeComponent(); - _fileName = string.Empty; - } - - public bool saveToFile(string[] texts) - { - CheckFileExist(); - using var writer = new StreamWriter(_fileName, true); - foreach (var text in texts) - { - writer.WriteLine(text); - } - writer.Flush(); - return true; - } - - private void CheckFileExist() - { - if (string.IsNullOrEmpty(_fileName)) - { - throw new ArgumentNullException(_fileName); - } - if(!File.Exists("../"+_fileName)) - { - throw new FileNotFoundException(_fileName); - } - } - } -} diff --git a/ComponentProgramming/ComponentProgramming/Control/ControlImage.Designer.cs b/ComponentProgramming/ComponentProgramming/Control/ControlImage.Designer.cs deleted file mode 100644 index 9df1a7c..0000000 --- a/ComponentProgramming/ComponentProgramming/Control/ControlImage.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -namespace ComponentProgramming -{ - partial class ControlImage - { - /// - /// Обязательная переменная конструктора. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Освободить все используемые ресурсы. - /// - /// истинно, если управляемый ресурс должен быть удален; иначе ложно. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Код, автоматически созданный конструктором компонентов - - /// - /// Требуемый метод для поддержки конструктора — не изменяйте - /// содержимое этого метода с помощью редактора кода. - /// - private void InitializeComponent() - { - pictureBoxAvatar = new PictureBox(); - buttonLoad = new Button(); - ((System.ComponentModel.ISupportInitialize)pictureBoxAvatar).BeginInit(); - SuspendLayout(); - // - // pictureBoxAvatar - // - pictureBoxAvatar.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - pictureBoxAvatar.Location = new Point(3, 3); - pictureBoxAvatar.Name = "pictureBoxAvatar"; - pictureBoxAvatar.Size = new Size(144, 115); - pictureBoxAvatar.TabIndex = 0; - pictureBoxAvatar.TabStop = false; - // - // buttonLoad - // - buttonLoad.Anchor = AnchorStyles.Bottom; - buttonLoad.Location = new Point(35, 124); - buttonLoad.Name = "buttonLoad"; - buttonLoad.Size = new Size(75, 23); - buttonLoad.TabIndex = 1; - buttonLoad.Text = "Загрузить"; - buttonLoad.UseVisualStyleBackColor = true; - buttonLoad.Click += buttonLoad_Click; - // - // Control - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - Controls.Add(buttonLoad); - Controls.Add(pictureBoxAvatar); - Name = "Control"; - ((System.ComponentModel.ISupportInitialize)pictureBoxAvatar).EndInit(); - ResumeLayout(false); - } - - #endregion - - private PictureBox pictureBoxAvatar; - private Button buttonLoad; - } -} diff --git a/ComponentProgramming/ComponentProgramming/Control/ControlImage.cs b/ComponentProgramming/ComponentProgramming/Control/ControlImage.cs deleted file mode 100644 index 2f81f49..0000000 --- a/ComponentProgramming/ComponentProgramming/Control/ControlImage.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ComponentProgramming -{ - public partial class ControlImage : UserControl - { - private event EventHandler? _avatarChanged; - private event Action? _errorOccured; - public string Error { get; private set; } - public Image Avatar - { - get - { - return pictureBoxAvatar.Image; - } - set - { - pictureBoxAvatar.Image = value; - } - } - - public event EventHandler AvatarChanged - { - add { _avatarChanged += value; } - remove { _avatarChanged -= value; } - } - - public event Action AnErrorOccured - { - add { _errorOccured += value; } - remove { _errorOccured -= value; } - } - - public ControlImage() - { - InitializeComponent(); - Error = string.Empty; - } - - private void buttonLoad_Click(object sender, EventArgs e) - { - var ofd = new OpenFileDialog(); - if(ofd.ShowDialog() == DialogResult.OK) - { - try - { - pictureBoxAvatar.Image = Image.FromFile(ofd.FileName); - pictureBoxAvatar.Width = pictureBoxAvatar.Image.Width; - _avatarChanged?.Invoke(this, e); - } - catch( Exception ex) - { - Error = ex.Message; - _errorOccured?.Invoke(); - } - } - } - } -} diff --git a/ComponentProgramming/ComponentProgramming/Control/ControlImage.resx b/ComponentProgramming/ComponentProgramming/Control/ControlImage.resx deleted file mode 100644 index af32865..0000000 --- a/ComponentProgramming/ComponentProgramming/Control/ControlImage.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/ComponentProgramming/ComponentProgramming/Control/Person.cs b/ComponentProgramming/ComponentProgramming/Control/Person.cs deleted file mode 100644 index feaeacc..0000000 --- a/ComponentProgramming/ComponentProgramming/Control/Person.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ComponentProgramming.Control -{ - public class Person - { - public int Id { get; set; } - public string Name { get; set; } - public string Surname { get; set; } - - public Person() { } - - public Person(int id, string name, string surname) - { - Name = name; - Id = id; - Surname = surname; - } - } -} diff --git a/ComponentProgramming/Forms/Form.Designer.cs b/ComponentProgramming/Forms/Form.Designer.cs index c5ab029..36f4ca9 100644 --- a/ComponentProgramming/Forms/Form.Designer.cs +++ b/ComponentProgramming/Forms/Form.Designer.cs @@ -106,7 +106,6 @@ #endregion - private ComponentProgramming.ControlImage control; private ComponentProgramming.ControlComboBox controlComboBox; private ComponentProgramming.ControlTextBox controlTextBox; private Button buttonGetObj; diff --git a/ComponentProgramming/Forms/Forms.csproj b/ComponentProgramming/Forms/Forms.csproj index 212408f..8a9f1ad 100644 --- a/ComponentProgramming/Forms/Forms.csproj +++ b/ComponentProgramming/Forms/Forms.csproj @@ -9,6 +9,8 @@ + +