diff --git a/Reseter2/Form1.Designer.cs b/Reseter2/Form1.Designer.cs index 06c5069..809c814 100644 --- a/Reseter2/Form1.Designer.cs +++ b/Reseter2/Form1.Designer.cs @@ -37,6 +37,7 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.flow_words = new System.Windows.Forms.FlowLayoutPanel(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.button1 = new System.Windows.Forms.Button(); this.label6 = new System.Windows.Forms.Label(); @@ -48,12 +49,17 @@ this.sm_RebootItem = new System.Windows.Forms.ToolStripMenuItem(); this.sm_SaveItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabPage4 = new System.Windows.Forms.TabPage(); - this.flow_words = new System.Windows.Forms.FlowLayoutPanel(); + this.cm_words = new System.Windows.Forms.ContextMenuStrip(this.components); + this.mi_newitem = new System.Windows.Forms.ToolStripMenuItem(); + this.mi_newcategory = new System.Windows.Forms.ToolStripMenuItem(); + this.mi_edit = new System.Windows.Forms.ToolStripMenuItem(); + this.mi_delete = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.tabPage3.SuspendLayout(); this.cm_history.SuspendLayout(); + this.cm_words.SuspendLayout(); this.SuspendLayout(); // // tb_comp @@ -137,6 +143,16 @@ this.tabPage2.Text = "Справочник"; this.tabPage2.UseVisualStyleBackColor = true; // + // flow_words + // + this.flow_words.AutoScroll = true; + this.flow_words.ContextMenuStrip = this.cm_words; + this.flow_words.Dock = System.Windows.Forms.DockStyle.Fill; + this.flow_words.Location = new System.Drawing.Point(3, 3); + this.flow_words.Name = "flow_words"; + this.flow_words.Size = new System.Drawing.Size(396, 682); + this.flow_words.TabIndex = 0; + // // tabPage3 // this.tabPage3.Controls.Add(this.button1); @@ -253,14 +269,40 @@ this.tabPage4.Text = "Настройки"; this.tabPage4.UseVisualStyleBackColor = true; // - // flow_words + // cm_words // - this.flow_words.AutoScroll = true; - this.flow_words.Dock = System.Windows.Forms.DockStyle.Fill; - this.flow_words.Location = new System.Drawing.Point(3, 3); - this.flow_words.Name = "flow_words"; - this.flow_words.Size = new System.Drawing.Size(396, 682); - this.flow_words.TabIndex = 0; + this.cm_words.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mi_newitem, + this.mi_newcategory, + this.mi_edit, + this.mi_delete}); + this.cm_words.Name = "cm_words"; + this.cm_words.Size = new System.Drawing.Size(181, 114); + // + // mi_newitem + // + this.mi_newitem.Name = "mi_newitem"; + this.mi_newitem.Size = new System.Drawing.Size(180, 22); + this.mi_newitem.Text = "Новый элемент"; + this.mi_newitem.Click += new System.EventHandler(this.mi_newitem_Click); + // + // mi_newcategory + // + this.mi_newcategory.Name = "mi_newcategory"; + this.mi_newcategory.Size = new System.Drawing.Size(166, 22); + this.mi_newcategory.Text = "Новая категория"; + // + // mi_edit + // + this.mi_edit.Name = "mi_edit"; + this.mi_edit.Size = new System.Drawing.Size(166, 22); + this.mi_edit.Text = "Изменить"; + // + // mi_delete + // + this.mi_delete.Name = "mi_delete"; + this.mi_delete.Size = new System.Drawing.Size(166, 22); + this.mi_delete.Text = "Удалить"; // // Form1 // @@ -279,6 +321,7 @@ this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); this.cm_history.ResumeLayout(false); + this.cm_words.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -306,6 +349,11 @@ private System.Windows.Forms.ToolStripMenuItem sm_RebootItem; private System.Windows.Forms.ToolStripMenuItem sm_SaveItem; private System.Windows.Forms.FlowLayoutPanel flow_words; + private System.Windows.Forms.ContextMenuStrip cm_words; + private System.Windows.Forms.ToolStripMenuItem mi_newitem; + private System.Windows.Forms.ToolStripMenuItem mi_newcategory; + private System.Windows.Forms.ToolStripMenuItem mi_edit; + private System.Windows.Forms.ToolStripMenuItem mi_delete; } } diff --git a/Reseter2/Form1.cs b/Reseter2/Form1.cs index 350bf9c..135cbba 100644 --- a/Reseter2/Form1.cs +++ b/Reseter2/Form1.cs @@ -47,34 +47,7 @@ namespace Reseter2 wcc.Add(wic10); WordsItemControl wic11 = new WordsItemControl(); wcc.Add(wic11); - WordsItemControl wic12 = new WordsItemControl(); - wcc.Add(wic12); - WordsItemControl wic13 = new WordsItemControl(); - wcc.Add(wic13); - WordsItemControl wic14 = new WordsItemControl(); - wcc.Add(wic14); - WordsItemControl wic21 = new WordsItemControl(); - wcc.Add(wic21); - WordsItemControl wic22 = new WordsItemControl(); - wcc.Add(wic22); - WordsItemControl wic23 = new WordsItemControl(); - wcc.Add(wic23); - WordsItemControl wic24 = new WordsItemControl(); - wcc.Add(wic24); - WordsItemControl wic25 = new WordsItemControl(); - wcc.Add(wic25); - WordsItemControl wic26 = new WordsItemControl(); - wcc.Add(wic26); - WordsItemControl wic30 = new WordsItemControl(); - wcc.Add(wic30); - WordsItemControl wic31 = new WordsItemControl(); - wcc.Add(wic31); - WordsItemControl wic32 = new WordsItemControl(); - wcc.Add(wic32); - WordsItemControl wic33 = new WordsItemControl(); - wcc.Add(wic33); - WordsItemControl wic34 = new WordsItemControl(); - wcc.Add(wic34); + WordsCategoryControl wcc1 = new WordsCategoryControl(); flow_words.Controls.Add(wcc1); WordsItemControl wic7 = new WordsItemControl(); @@ -160,5 +133,11 @@ namespace Reseter2 // selectItem = null; FocusContext = false; } + + private void mi_newitem_Click(object sender, EventArgs e) + { + BilderWords bilderWords = new BilderWords(); + bilderWords.ShowDialog(); + } } } diff --git a/Reseter2/Form1.resx b/Reseter2/Form1.resx index 227681a..175f01f 100644 --- a/Reseter2/Form1.resx +++ b/Reseter2/Form1.resx @@ -120,6 +120,9 @@ 122, 17 + + 319, 17 + 209, 17 diff --git a/Reseter2/Reseter2.csproj b/Reseter2/Reseter2.csproj index 98bb066..40591e6 100644 --- a/Reseter2/Reseter2.csproj +++ b/Reseter2/Reseter2.csproj @@ -35,6 +35,7 @@ + @@ -78,6 +79,12 @@ TaskControl.cs + + Form + + + BilderWords.cs + @@ -86,6 +93,19 @@ WordsCategoryControl.cs + + + UserControl + + + WordsEditCompControl.cs + + + UserControl + + + WordsEditCategoryControl.cs + UserControl @@ -108,9 +128,18 @@ TaskControl.cs + + BilderWords.cs + WordsCategoryControl.cs + + WordsEditCompControl.cs + + + WordsEditCategoryControl.cs + WordsItemControl.cs diff --git a/Reseter2/StatusRebootError.cs b/Reseter2/StatusRebootError.cs index 245e2be..3a6ec24 100644 --- a/Reseter2/StatusRebootError.cs +++ b/Reseter2/StatusRebootError.cs @@ -25,6 +25,7 @@ namespace Reseter2 } public override string GetName() { + return "Ошибка"; } } diff --git a/Reseter2/Words/BilderWords.Designer.cs b/Reseter2/Words/BilderWords.Designer.cs new file mode 100644 index 0000000..559c6a9 --- /dev/null +++ b/Reseter2/Words/BilderWords.Designer.cs @@ -0,0 +1,77 @@ +namespace Reseter2.Words +{ + partial class BilderWords + { + /// + /// 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() + { + this.rb_category = new System.Windows.Forms.RadioButton(); + this.rb_comp = new System.Windows.Forms.RadioButton(); + this.SuspendLayout(); + // + // rb_category + // + this.rb_category.AutoSize = true; + this.rb_category.Checked = true; + this.rb_category.Location = new System.Drawing.Point(13, 13); + this.rb_category.Name = "rb_category"; + this.rb_category.Size = new System.Drawing.Size(78, 17); + this.rb_category.TabIndex = 0; + this.rb_category.TabStop = true; + this.rb_category.Text = "Категория"; + this.rb_category.UseVisualStyleBackColor = true; + this.rb_category.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); + // + // rb_comp + // + this.rb_comp.AutoSize = true; + this.rb_comp.Location = new System.Drawing.Point(97, 13); + this.rb_comp.Name = "rb_comp"; + this.rb_comp.Size = new System.Drawing.Size(83, 17); + this.rb_comp.TabIndex = 1; + this.rb_comp.Text = "Компьютер"; + this.rb_comp.UseVisualStyleBackColor = true; + // + // BilderWords + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(327, 264); + this.Controls.Add(this.rb_comp); + this.Controls.Add(this.rb_category); + this.Name = "BilderWords"; + this.Text = "BilderWords"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rb_category; + private System.Windows.Forms.RadioButton rb_comp; + } +} \ No newline at end of file diff --git a/Reseter2/Words/BilderWords.cs b/Reseter2/Words/BilderWords.cs new file mode 100644 index 0000000..75a4e7f --- /dev/null +++ b/Reseter2/Words/BilderWords.cs @@ -0,0 +1,42 @@ +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 Reseter2.Words +{ + internal partial class BilderWords : Form + { + public BilderWords() + { + InitializeComponent(); + + } + + public BilderWords(WordsCategory category):base() + { + + } + public BilderWords(WordsComp item) : base() + { + + } + + private void radioButton1_CheckedChanged(object sender, EventArgs e) + { + if(rb_category.Checked) + { + + } + else + { + + } + } + } +} diff --git a/Reseter2/Words/BilderWords.resx b/Reseter2/Words/BilderWords.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Reseter2/Words/BilderWords.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Reseter2/Words/IWordsItem.cs b/Reseter2/Words/IWordsItem.cs index 138abdd..7bc4415 100644 --- a/Reseter2/Words/IWordsItem.cs +++ b/Reseter2/Words/IWordsItem.cs @@ -8,12 +8,12 @@ namespace Reseter2.Words { internal abstract class IWordsItem { - public abstract bool Cheked(); - public abstract string GetName(); - public IWordsItem() - { + + public abstract List ChekList(); + public abstract List CategoryList(); - } + public abstract void ChekChange(bool chek); + diff --git a/Reseter2/Words/WordsCategory.cs b/Reseter2/Words/WordsCategory.cs index 9cf9c29..007cb6b 100644 --- a/Reseter2/Words/WordsCategory.cs +++ b/Reseter2/Words/WordsCategory.cs @@ -10,14 +10,49 @@ namespace Reseter2.Words { private string Name; private bool cheked; + private List items; - public override string GetName() + public WordsCategory(string name) + { + Name = name; + + } + + public void Add(IWordsItem newitem) + { + items.Add(newitem); + } + + public string GetName() { return Name; } - public override bool Cheked() + public override void ChekChange(bool chek) { - return cheked; + cheked = chek; + foreach(var item in items) + { + item.ChekChange(chek); + } + } + public override List ChekList() + { + List itemsChek = new List(); + foreach (var item in items) + { + itemsChek.AddRange(item.ChekList()); + } + return itemsChek; + } + public override List CategoryList() + { + List itemsCatrgory = new List(); + itemsCatrgory.Add(this); + foreach (var item in items) + { + itemsCatrgory.AddRange(item.CategoryList()); + } + return itemsCatrgory; } } } diff --git a/Reseter2/Words/WordsCategoryControl.Designer.cs b/Reseter2/Words/WordsCategoryControl.Designer.cs index 32b9e6e..a28dd97 100644 --- a/Reseter2/Words/WordsCategoryControl.Designer.cs +++ b/Reseter2/Words/WordsCategoryControl.Designer.cs @@ -91,6 +91,7 @@ // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; this.AutoSize = true; + this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.Controls.Add(this.flow_wordsItem); this.Controls.Add(this.Select); this.Controls.Add(this.label1); diff --git a/Reseter2/Words/WordsComp.cs b/Reseter2/Words/WordsComp.cs new file mode 100644 index 0000000..758fc97 --- /dev/null +++ b/Reseter2/Words/WordsComp.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Reseter2.Words +{ + internal class WordsComp : IWordsItem + { + private IComp Comp; + private bool cheked; + + public WordsComp(IComp comp) + { + Comp = comp; + + } + + public string GetName() + { + return Comp.GetName(); + } + public override void ChekChange(bool chek) + { + cheked = chek; + } + public override List ChekList() + { + + List itemsChek = new List(); + if (cheked) {itemsChek.Add(this); } + return itemsChek; + } + public override List CategoryList() + { + return new List(); + } + } +} diff --git a/Reseter2/Words/WordsEditCategoryControl.Designer.cs b/Reseter2/Words/WordsEditCategoryControl.Designer.cs new file mode 100644 index 0000000..6e5a340 --- /dev/null +++ b/Reseter2/Words/WordsEditCategoryControl.Designer.cs @@ -0,0 +1,116 @@ +namespace Reseter2.Words +{ + partial class WordsEditCategoryControl + { + /// + /// Обязательная переменная конструктора. + /// + 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() + { + this.label1 = new System.Windows.Forms.Label(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.label3 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 35); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(112, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Название категории"; + this.label1.Click += new System.EventHandler(this.label1_Click); + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(134, 4); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(179, 21); + this.comboBox1.TabIndex = 1; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 7); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(125, 13); + this.label2.TabIndex = 2; + this.label2.Text = "Родтиельский элемент"; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(134, 32); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(179, 20); + this.textBox1.TabIndex = 3; + // + // listBox1 + // + this.listBox1.FormattingEnabled = true; + this.listBox1.Location = new System.Drawing.Point(6, 82); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(307, 147); + this.listBox1.TabIndex = 4; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(6, 63); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(173, 13); + this.label3.TabIndex = 5; + this.label3.Text = "Порядок элементов в категории"; + // + // WordsEditCategoryControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label3); + this.Controls.Add(this.listBox1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.label1); + this.Name = "WordsEditCategoryControl"; + this.Size = new System.Drawing.Size(316, 233); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.ListBox listBox1; + private System.Windows.Forms.Label label3; + } +} diff --git a/Reseter2/Words/WordsEditCategoryControl.cs b/Reseter2/Words/WordsEditCategoryControl.cs new file mode 100644 index 0000000..0da7c73 --- /dev/null +++ b/Reseter2/Words/WordsEditCategoryControl.cs @@ -0,0 +1,26 @@ +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 Reseter2.Words +{ + [DefaultEvent(nameof(WordsEditCategoryControl))] + public partial class WordsEditCategoryControl : UserControl + { + public WordsEditCategoryControl() + { + InitializeComponent(); + } + + private void label1_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/Reseter2/Words/WordsEditCategoryControl.resx b/Reseter2/Words/WordsEditCategoryControl.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Reseter2/Words/WordsEditCategoryControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Reseter2/Words/WordsEditCompControl.Designer.cs b/Reseter2/Words/WordsEditCompControl.Designer.cs new file mode 100644 index 0000000..a23e34a --- /dev/null +++ b/Reseter2/Words/WordsEditCompControl.Designer.cs @@ -0,0 +1,139 @@ +namespace Reseter2.Words +{ + partial class WordsEditCompControl + { + /// + /// Обязательная переменная конструктора. + /// + 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() + { + this.label1 = new System.Windows.Forms.Label(); + this.serviceController1 = new System.ServiceProcess.ServiceController(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 8); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(125, 13); + this.label1.TabIndex = 0; + this.label1.Text = "Родительский элемент"; + // + // comboBox1 + // + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(136, 5); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(177, 21); + this.comboBox1.TabIndex = 1; + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(66, 33); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(247, 20); + this.textBox1.TabIndex = 2; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 36); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(47, 13); + this.label2.TabIndex = 3; + this.label2.Text = "Имя ПК"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(3, 62); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(50, 13); + this.label3.TabIndex = 5; + this.label3.Text = "IP адрес"; + // + // textBox2 + // + this.textBox2.Location = new System.Drawing.Point(66, 59); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(247, 20); + this.textBox2.TabIndex = 4; + // + // textBox3 + // + this.textBox3.Location = new System.Drawing.Point(66, 85); + this.textBox3.Multiline = true; + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(247, 63); + this.textBox3.TabIndex = 6; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(3, 87); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(57, 13); + this.label4.TabIndex = 7; + this.label4.Text = "Описание"; + // + // WordsCompCategoryControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label4); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.label3); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.label2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.comboBox1); + this.Controls.Add(this.label1); + this.Name = "WordsCompCategoryControl"; + this.Size = new System.Drawing.Size(316, 150); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.ServiceProcess.ServiceController serviceController1; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Label label4; + } +} diff --git a/Reseter2/Words/WordsEditCompControl.cs b/Reseter2/Words/WordsEditCompControl.cs new file mode 100644 index 0000000..eeeb594 --- /dev/null +++ b/Reseter2/Words/WordsEditCompControl.cs @@ -0,0 +1,23 @@ +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 Reseter2.Words +{ + + [DefaultEvent(nameof(WordsEditCompControl))] + public partial class WordsEditCompControl : UserControl + { + + public WordsEditCompControl() + { + InitializeComponent(); + } + } +} diff --git a/Reseter2/Words/WordsEditCompControl.resx b/Reseter2/Words/WordsEditCompControl.resx new file mode 100644 index 0000000..b978c38 --- /dev/null +++ b/Reseter2/Words/WordsEditCompControl.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/Reseter2/Words/WordsList.cs b/Reseter2/Words/WordsList.cs index 55c0b38..88b5c65 100644 --- a/Reseter2/Words/WordsList.cs +++ b/Reseter2/Words/WordsList.cs @@ -9,10 +9,10 @@ namespace Reseter2.Words { static class WordsList { - private static List wordsItems = new List(); - private static void Add() + private static WordsCategory MainCategory = new WordsCategory("Main"); + private static void AddItem(IWordsItem item) { - + } } }