diff --git a/Reseter2/CheckControl.Designer.cs b/Reseter2/CheckControl.Designer.cs
new file mode 100644
index 0000000..993d890
--- /dev/null
+++ b/Reseter2/CheckControl.Designer.cs
@@ -0,0 +1,72 @@
+namespace Reseter2
+{
+ partial class CheckControl
+ {
+ ///
+ /// Обязательная переменная конструктора.
+ ///
+ 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.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CheckControl));
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.imageList2 = new System.Windows.Forms.ImageList(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(18, 18);
+ this.pictureBox1.TabIndex = 0;
+ this.pictureBox1.TabStop = false;
+ this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
+ //
+ // imageList2
+ //
+ this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
+ this.imageList2.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList2.Images.SetKeyName(0, "off.ico");
+ this.imageList2.Images.SetKeyName(1, "on.ico");
+ this.imageList2.Images.SetKeyName(2, "or.ico");
+ //
+ // CheckControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.pictureBox1);
+ this.Name = "CheckControl";
+ this.Size = new System.Drawing.Size(18, 18);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.ImageList imageList2;
+ }
+}
diff --git a/Reseter2/CheckControl.cs b/Reseter2/CheckControl.cs
new file mode 100644
index 0000000..e232bed
--- /dev/null
+++ b/Reseter2/CheckControl.cs
@@ -0,0 +1,61 @@
+using Reseter2.Words;
+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
+{
+ [DefaultEvent(nameof(CheckControl))]
+ public partial class CheckControl : UserControl
+ {
+ public bool Checked = false;
+ // public ImageList imageList;
+ public delegate void UpdateCheck(bool check);
+ public event UpdateCheck updateCheck;
+
+ public CheckControl()
+ {
+ // imageList = imagelist;
+ InitializeComponent();
+ pictureBox1.Image = imageList2.Images[0];
+ }
+
+ public void pictureBox1_Click(object sender, EventArgs e)
+ {
+ Checked = !Checked;
+ if (Checked)
+ {
+ pictureBox1.Image = imageList2.Images[1];
+ }
+ else
+ {
+ pictureBox1.Image = imageList2.Images[0];
+ }
+ updateCheck(Checked);
+ }
+
+ public void set_intedmet()
+ {
+ pictureBox1.Image = imageList2.Images[2];
+ }
+ public void set_state(bool checkeds)
+ {
+ Checked = checkeds;
+ if (Checked)
+ {
+ pictureBox1.Image = imageList2.Images[1];
+ }
+ else
+ {
+ pictureBox1.Image = imageList2.Images[0];
+ }
+ // updateCheck(Checked);
+ }
+ }
+}
diff --git a/Reseter2/CheckControl.resx b/Reseter2/CheckControl.resx
new file mode 100644
index 0000000..5d2edf6
--- /dev/null
+++ b/Reseter2/CheckControl.resx
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADQ
+ CgAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABEgEAARIBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ AwABSAMAARIDAAEBAQABCAUAARABBRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
+ AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
+ AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
+ AwABZgMAAZkDAAHMAgABMwMAAjMCAAEzAWYCAAEzAZkCAAEzAcwCAAEzAf8CAAFmAwABZgEzAgACZgIA
+ AWYBmQIAAWYBzAIAAWYB/wIAAZkDAAGZATMCAAGZAWYCAAKZAgABmQHMAgABmQH/AgABzAMAAcwBMwIA
+ AcwBZgIAAcwBmQIAAswCAAHMAf8CAAH/AWYCAAH/AZkCAAH/AcwBAAEzAf8CAAH/AQABMwEAATMBAAFm
+ AQABMwEAAZkBAAEzAQABzAEAATMBAAH/AQAB/wEzAgADMwEAAjMBZgEAAjMBmQEAAjMBzAEAAjMB/wEA
+ ATMBZgIAATMBZgEzAQABMwJmAQABMwFmAZkBAAEzAWYBzAEAATMBZgH/AQABMwGZAgABMwGZATMBAAEz
+ AZkBZgEAATMCmQEAATMBmQHMAQABMwGZAf8BAAEzAcwCAAEzAcwBMwEAATMBzAFmAQABMwHMAZkBAAEz
+ AswBAAEzAcwB/wEAATMB/wEzAQABMwH/AWYBAAEzAf8BmQEAATMB/wHMAQABMwL/AQABZgMAAWYBAAEz
+ AQABZgEAAWYBAAFmAQABmQEAAWYBAAHMAQABZgEAAf8BAAFmATMCAAFmAjMBAAFmATMBZgEAAWYBMwGZ
+ AQABZgEzAcwBAAFmATMB/wEAAmYCAAJmATMBAANmAQACZgGZAQACZgHMAQABZgGZAgABZgGZATMBAAFm
+ AZkBZgEAAWYCmQEAAWYBmQHMAQABZgGZAf8BAAFmAcwCAAFmAcwBMwEAAWYBzAGZAQABZgLMAQABZgHM
+ Af8BAAFmAf8CAAFmAf8BMwEAAWYB/wGZAQABZgH/AcwBAAHMAQAB/wEAAf8BAAHMAQACmQIAAZkBMwGZ
+ AQABmQEAAZkBAAGZAQABzAEAAZkDAAGZAjMBAAGZAQABZgEAAZkBMwHMAQABmQEAAf8BAAGZAWYCAAGZ
+ AWYBMwEAAZkBMwFmAQABmQFmAZkBAAGZAWYBzAEAAZkBMwH/AQACmQEzAQACmQFmAQADmQEAApkBzAEA
+ ApkB/wEAAZkBzAIAAZkBzAEzAQABZgHMAWYBAAGZAcwBmQEAAZkCzAEAAZkBzAH/AQABmQH/AgABmQH/
+ ATMBAAGZAcwBZgEAAZkB/wGZAQABmQH/AcwBAAGZAv8BAAHMAwABmQEAATMBAAHMAQABZgEAAcwBAAGZ
+ AQABzAEAAcwBAAGZATMCAAHMAjMBAAHMATMBZgEAAcwBMwGZAQABzAEzAcwBAAHMATMB/wEAAcwBZgIA
+ AcwBZgEzAQABmQJmAQABzAFmAZkBAAHMAWYBzAEAAZkBZgH/AQABzAGZAgABzAGZATMBAAHMAZkBZgEA
+ AcwCmQEAAcwBmQHMAQABzAGZAf8BAALMAgACzAEzAQACzAFmAQACzAGZAQADzAEAAswB/wEAAcwB/wIA
+ AcwB/wEzAQABmQH/AWYBAAHMAf8BmQEAAcwB/wHMAQABzAL/AQABzAEAATMBAAH/AQABZgEAAf8BAAGZ
+ AQABzAEzAgAB/wIzAQAB/wEzAWYBAAH/ATMBmQEAAf8BMwHMAQAB/wEzAf8BAAH/AWYCAAH/AWYBMwEA
+ AcwCZgEAAf8BZgGZAQAB/wFmAcwBAAHMAWYB/wEAAf8BmQIAAf8BmQEzAQAB/wGZAWYBAAH/ApkBAAH/
+ AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
+ ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
+ AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
+ AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP/AgAB8wEHDO8BvAH0
+ Af8BAAHzAQcM7wG8AfQB/wEAAfMBBwzvAbwB9AH/EwACvAvxAfABvAEHAfQBAAK8C/EB8AG8AQcB9AEA
+ ArwL8QHwAbwBBwH0EgABBwG8AfQM/wHzAbwB8AEHAbwB9Az/AfMBvAHwAQcBvAH0DP8B8wG8AfASAAHs
+ AfAO/wHxAe8B7AHwA/8BwgKYAfQH/wHxAe8B7AHwDv8B8QHvEgABbQHxDv8B8QHvAW0B8QL/AcIBlwEz
+ AVUBngf/AfEB7wFtAfEE/wHCA5gBngHCBP8B8QHvEgABbQHxDv8B8QHvAW0B8QH/AcIBVQMzAVUBCAH0
+ Bf8B8QHvAW0B8QP/AfEBmASXAZ4BwgP/AfEB7xIAAW0B8Q7/AfEB7wFtAfABwgGXAjMCVQIzAQgF/wHx
+ Ae8BbQHxAv8B8wGYAZcBCALCAQgBlwGeAcIC/wHxAe8SAAFtAfEO/wHxAe8BbQG8AZcCVQGYAfQBwgFV
+ ATMBVQEIAfQD/wHxAe8BbQHxAv8BCAOYAlUBmAEIAZcBngL/AfEB7xIAAW0B8Q7/AfEB7wFtAfEB8AGY
+ AQgD/wHxAzMBCAP/AfEB7wFtAfEC/wGYAZcBCAGXAjMBVQHCAZcBmAL/AfEB7xIAAW0B8Q7/AfEB7wFt
+ AfEB/wHCAfQD/wH0AfEBVQEzAVUBngH0Af8B8QHvAW0B8QL/AZgBlwEIAZgBVQEzAVUBCAGXAZgC/wHx
+ Ae8SAAFtAfEO/wHxAe8BbQHxCP8BwgFVATMBVQGYAf8B8QHvAW0B8QL/AQgBlwGYAfIBmAGXApgBlwEI
+ Av8B8QHvEgABbQHxDv8B8QHvAW0B8Qn/AQgBVQEzAVUBngHxAe8BbQHxAv8B9AGYAZcBmAEIApgBlwGY
+ AfMC/wHxAe8SAAFtAfEO/wHxAe8BbQHxCv8BwgFVATMBlwHxAe8BbQHxA/8BwgGYA5cCmAHCA/8B8QHv
+ EgABbQHxDv8B8QHvAW0B8Qv/AQgBVQGXAfEB7wFtAfEE/wH0AQgCmAEIBf8B8QHvEgAB6wG8Dv8B8AHv
+ AesBvAz/AcIBmAG8Ae8B6wG8Dv8BvAHvEgAB7wEHAfIL/wH0AfICBwHvAQcB8gv/AfQB8gEHAfAB7wEH
+ AfIL/wH0AfIBBwHwEgAB9AG8AQcBvArxAfACBwHzAfQBvAEHAbwK8QHwAgcB8wH0AbwBBwG8CvEB8AIH
+ AfMTAAH0Ae8C7AhtAewB7QEHAwAB9AHvAuwIbQHsAe0BBwMAAfQB7wLsCG0B7AHtAQcUAAFCAU0BPgcA
+ AT4DAAEoAwABSAMAARIDAAEBAQABAQUAAdgXAAP/AQABgAEAASABAAEIBwABgAEAASABAAEIuwABgAEA
+ AeABAAE4AQABDAUACw==
+
+
+
\ No newline at end of file
diff --git a/Reseter2/Form1.Designer.cs b/Reseter2/Form1.Designer.cs
index 64ae275..a4bc674 100644
--- a/Reseter2/Form1.Designer.cs
+++ b/Reseter2/Form1.Designer.cs
@@ -38,9 +38,10 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.tabPage2 = new System.Windows.Forms.TabPage();
- this.bt_resetAll = new System.Windows.Forms.Button();
- this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.imageList2 = new System.Windows.Forms.ImageList(this.components);
+ this.bt_resetAll = new System.Windows.Forms.Button();
+ this.treeView1 = new Reseter2.NewTreeView();
+ this.imageList1 = new System.Windows.Forms.ImageList(this.components);
this.tabPage3 = new System.Windows.Forms.TabPage();
this.button1 = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
@@ -53,7 +54,8 @@
this.sm_SaveItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.bt_wordsBilder = new System.Windows.Forms.Button();
- this.treeView1 = new Reseter2.NewTreeView();
+ this.checkControl1 = new Reseter2.CheckControl();
+ this.label2 = new System.Windows.Forms.Label();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
@@ -136,6 +138,8 @@
//
// tabPage2
//
+ this.tabPage2.Controls.Add(this.label2);
+ this.tabPage2.Controls.Add(this.checkControl1);
this.tabPage2.Controls.Add(this.bt_resetAll);
this.tabPage2.Controls.Add(this.treeView1);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
@@ -146,9 +150,17 @@
this.tabPage2.Text = "Справочник";
this.tabPage2.UseVisualStyleBackColor = true;
//
+ // imageList2
+ //
+ this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
+ this.imageList2.TransparentColor = System.Drawing.Color.Transparent;
+ this.imageList2.Images.SetKeyName(0, "off.ico");
+ this.imageList2.Images.SetKeyName(1, "on.ico");
+ this.imageList2.Images.SetKeyName(2, "or.ico");
+ //
// bt_resetAll
//
- this.bt_resetAll.Location = new System.Drawing.Point(224, 662);
+ this.bt_resetAll.Location = new System.Drawing.Point(224, 6);
this.bt_resetAll.Name = "bt_resetAll";
this.bt_resetAll.Size = new System.Drawing.Size(168, 23);
this.bt_resetAll.TabIndex = 1;
@@ -156,6 +168,29 @@
this.bt_resetAll.UseVisualStyleBackColor = true;
this.bt_resetAll.Click += new System.EventHandler(this.bt_resetAll_Click);
//
+ // treeView1
+ //
+ this.treeView1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+ this.treeView1.HideSelection = false;
+ this.treeView1.ImageIndex = 0;
+ this.treeView1.ImageList = this.imageList1;
+ this.treeView1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.treeView1.Indent = 27;
+ this.treeView1.ItemHeight = 24;
+ this.treeView1.Location = new System.Drawing.Point(3, 32);
+ this.treeView1.Name = "treeView1";
+ this.treeView1.SelectedImageIndex = 0;
+ this.treeView1.ShowLines = false;
+ this.treeView1.ShowNodeToolTips = true;
+ this.treeView1.Size = new System.Drawing.Size(396, 653);
+ this.treeView1.StateImageList = this.imageList2;
+ this.treeView1.TabIndex = 0;
+ this.treeView1.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCheck);
+ this.treeView1.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseClick);
+ this.treeView1.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseDoubleClick);
+ this.treeView1.MouseCaptureChanged += new System.EventHandler(this.treeView1_MouseCaptureChanged);
+ //
// imageList1
//
this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
@@ -170,14 +205,6 @@
this.imageList1.Images.SetKeyName(7, "17icon2-24.png");
this.imageList1.Images.SetKeyName(8, "40icon-24.png");
//
- // imageList2
- //
- this.imageList2.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList2.ImageStream")));
- this.imageList2.TransparentColor = System.Drawing.Color.Transparent;
- this.imageList2.Images.SetKeyName(0, "off.ico");
- this.imageList2.Images.SetKeyName(1, "on.ico");
- this.imageList2.Images.SetKeyName(2, "or.ico");
- //
// tabPage3
//
this.tabPage3.Controls.Add(this.button1);
@@ -307,28 +334,21 @@
this.bt_wordsBilder.UseVisualStyleBackColor = true;
this.bt_wordsBilder.Click += new System.EventHandler(this.bt_wordsBilder_Click);
//
- // treeView1
+ // checkControl1
//
- this.treeView1.Dock = System.Windows.Forms.DockStyle.Top;
- this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- this.treeView1.HideSelection = false;
- this.treeView1.ImageIndex = 0;
- this.treeView1.ImageList = this.imageList1;
- this.treeView1.ImeMode = System.Windows.Forms.ImeMode.Close;
- this.treeView1.Indent = 22;
- this.treeView1.ItemHeight = 24;
- this.treeView1.Location = new System.Drawing.Point(3, 3);
- this.treeView1.Name = "treeView1";
- this.treeView1.SelectedImageIndex = 0;
- this.treeView1.ShowLines = false;
- this.treeView1.ShowNodeToolTips = true;
- this.treeView1.Size = new System.Drawing.Size(396, 653);
- this.treeView1.StateImageList = this.imageList2;
- this.treeView1.TabIndex = 0;
- this.treeView1.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCheck);
- this.treeView1.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseClick);
- this.treeView1.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseDoubleClick);
- this.treeView1.MouseCaptureChanged += new System.EventHandler(this.treeView1_MouseCaptureChanged);
+ this.checkControl1.Location = new System.Drawing.Point(14, 7);
+ this.checkControl1.Name = "checkControl1";
+ this.checkControl1.Size = new System.Drawing.Size(18, 18);
+ this.checkControl1.TabIndex = 2;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(32, 10);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 13);
+ this.label2.TabIndex = 3;
+ this.label2.Text = "Все элементы";
//
// Form1
//
@@ -347,6 +367,7 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
+ this.tabPage2.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.cm_history.ResumeLayout(false);
@@ -382,6 +403,8 @@
public System.Windows.Forms.ImageList imageList1;
private System.Windows.Forms.ImageList imageList2;
private NewTreeView treeView1;
+ private CheckControl checkControl1;
+ private System.Windows.Forms.Label label2;
}
}
diff --git a/Reseter2/Form1.cs b/Reseter2/Form1.cs
index b54e4fa..8a10bb5 100644
--- a/Reseter2/Form1.cs
+++ b/Reseter2/Form1.cs
@@ -50,6 +50,7 @@ namespace Reseter2
InitializeComponent();
+ checkControl1.updateCheck += CheckControl1_updateCheck;
flowLayoutPanel1.AutoScrollMinSize = new Size(0, 683) ;
flowLayoutPanel1.VerticalScroll.Visible = true;
Reseter.SetForm(flowLayoutPanel1);
@@ -65,6 +66,8 @@ namespace Reseter2
}
+
+
private void label1_Click(object sender, EventArgs e)
{
@@ -200,11 +203,16 @@ namespace Reseter2
}
}
- private bool treeView1_treeViewChangeRootCheckBox(TreeNode treeNode)
+ private int treeView1_treeViewChangeRootCheckBox(TreeNode treeNode)
{
if (treeNode.Nodes.Count == 0)
{
- return treeNode.Checked;
+ if (treeNode.Checked)
+ {
+ return 1;
+ }
+ else { return 0; }
+
}
else
{
@@ -217,20 +225,22 @@ namespace Reseter2
if (treeNode.Nodes[i].StateImageIndex == 2) nedoCheked = true;
}
- bool Cheked = false;
+ int Cheked = 0;
if (treeNode.Nodes.Count == nodeCheked)
{
- Cheked = true;
- treeNode.Checked = Cheked;
+ Cheked = 0;
+ treeNode.Checked = true;
treeNode.StateImageIndex = 1;
}
else if (nodeCheked != 0 || nedoCheked)
{
treeNode.StateImageIndex = 2;
- }else if(nodeCheked == 0)
+ Cheked = 2;
+ }
+ else if(nodeCheked == 0)
{
- Cheked = false;
- treeNode.Checked = Cheked;
+ Cheked = 0;
+ treeNode.Checked = false;
treeNode.StateImageIndex = 0;
}
@@ -297,10 +307,11 @@ namespace Reseter2
}
treeView1_treeViewChangeCheckBox(e.Node);
treeView1_ChangePrentRootCheckBox(e.Node);
+ CheckControl1_interdmet();
}
- bool k = false;
+
// for (int i = 0; i < tree.Nodes.Count; i++)
// {
// treeView1_treeViewChangeRootCheckBox(tree.Nodes[i]);
@@ -366,5 +377,35 @@ namespace Reseter2
}
}
}
+ private void CheckControl1_updateCheck(bool Сhecked)
+ {
+ for (int i = 0; i < treeView1.Nodes.Count; i++)
+ {
+ treeView1.Nodes[i].Checked = Сhecked;
+ treeView1_treeViewChangeCheckBox(treeView1.Nodes[i]);
+ }
+ }
+
+ private void CheckControl1_interdmet()
+ {
+ int chek_inter = 0;
+ int interdmet = checkControl1.Checked == false ? 0 : 1 ;
+ int summ = 0;
+ for (int i = 0; i < treeView1.Nodes.Count; i++)
+ {
+
+ if (2 == treeView1_treeViewChangeRootCheckBox(treeView1.Nodes[i])) chek_inter++;
+ if (interdmet == treeView1_treeViewChangeRootCheckBox(treeView1.Nodes[i])) summ++;
+ }
+ if (chek_inter < treeView1.Nodes.Count)
+ {
+ checkControl1.set_intedmet();
+ }
+ else if(treeView1.Nodes.Count == summ )
+ {
+ checkControl1.set_state(interdmet == 0 ? false : true );
+ }
+ }
+
}
}
diff --git a/Reseter2/Form1.resx b/Reseter2/Form1.resx
index 46788bf..db7bb1e 100644
--- a/Reseter2/Form1.resx
+++ b/Reseter2/Form1.resx
@@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
- UQAAAk1TRnQBSQFMAgEBCQEAAWgBAAFoAQABGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
+ UQAAAk1TRnQBSQFMAgEBCQEAAcgBAAHIAQABGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
AwABSAMAAQEBAAEQBgABNhIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/kAAB/wF/
Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/
@@ -486,47 +486,54 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAu
- CQAAAk1TRnQBSQFMAgEBAwEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
- AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
- AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
- AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
- AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
- AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
- AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
- ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
- AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
- AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
- AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
- AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
- AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
- AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
- AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
- AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
- ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
- Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
- AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
- AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
- AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
- ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
- Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
- AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
- AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
- AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
- AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
- AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
- AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wMAAesLbQQAAesLbQQA
- AesLbRMAAewB9Ar/AfQB7QIAAewB9Ar/AfQB7QIAAewB9Ar/AfQB7REAAewB8Qz/AfMC7AHxDP8B8wLs
- AfEM/wHzAewQAAFtDv8CbQT/AjMI/wJtDv8BbRAAAW0O/wJtA/8EMwf/Am0E/wHzAVUCMwFVAcIE/wFt
- EAABbQ7/Am0C/wMzAVUCMwb/Am0D/wH0AVUBCAL/AcIBVQHCA/8BbRAAAW0O/wJtAf8DMwL/AVUCMwX/
- Am0D/wGXAZgBCAIzAf8BCAFVA/8BbRAAAW0O/wJtAf8BCAGXBP8DMwT/Am0D/wFVARsBlwMzAf8BMwP/
- AW0QAAFtDv8CbQj/AzMD/wJtA/8BVQHCAQgDMwH0ATMD/wFtEAABbQ7/Am0J/wMzAv8CbQP/AZgBlwH/
- AQgBlwEIAZgBlwP/AW0QAAFtDv8CbQr/AVUCMwH/Am0E/wFVAZcCCAGXAVUE/wFtEAABbQ7/Am0L/wIz
- Af8CbQX/AZgCVQGYBf8BbRAAAW0B9A3/Am0B9Av/ATMB/wJtAfQN/wFtEAABkgG8DP8B8QHsAZIBvAz/
- AbwCkgG8DP8BvAGSEQAB7AG8AfMI/wHzAbwB7AIAAewBvAHzCP8B8wG8AewCAAHsAbwB8wj/AfMBvAHs
- EwABkgHsCG0B7AHtBAABkgHsCG0B7AHtBAABkgHsCG0B7AHtEgABQgFNAT4HAAE+AwABKAMAAUADAAEQ
- AwABAQEAAQEFAAGAFwAD/wEAAcABAwHAAQMBwAEDAgABgAEBAYABAQGAAQFiAAGAAQEBgAEBAYABAQIA
- AcABAwHAAQMBwAEDAgAL
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADQ
+ CgAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABEgEAARIBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ AwABSAMAARIDAAEBAQABCAUAARABBRgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
+ AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
+ AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
+ AwABZgMAAZkDAAHMAgABMwMAAjMCAAEzAWYCAAEzAZkCAAEzAcwCAAEzAf8CAAFmAwABZgEzAgACZgIA
+ AWYBmQIAAWYBzAIAAWYB/wIAAZkDAAGZATMCAAGZAWYCAAKZAgABmQHMAgABmQH/AgABzAMAAcwBMwIA
+ AcwBZgIAAcwBmQIAAswCAAHMAf8CAAH/AWYCAAH/AZkCAAH/AcwBAAEzAf8CAAH/AQABMwEAATMBAAFm
+ AQABMwEAAZkBAAEzAQABzAEAATMBAAH/AQAB/wEzAgADMwEAAjMBZgEAAjMBmQEAAjMBzAEAAjMB/wEA
+ ATMBZgIAATMBZgEzAQABMwJmAQABMwFmAZkBAAEzAWYBzAEAATMBZgH/AQABMwGZAgABMwGZATMBAAEz
+ AZkBZgEAATMCmQEAATMBmQHMAQABMwGZAf8BAAEzAcwCAAEzAcwBMwEAATMBzAFmAQABMwHMAZkBAAEz
+ AswBAAEzAcwB/wEAATMB/wEzAQABMwH/AWYBAAEzAf8BmQEAATMB/wHMAQABMwL/AQABZgMAAWYBAAEz
+ AQABZgEAAWYBAAFmAQABmQEAAWYBAAHMAQABZgEAAf8BAAFmATMCAAFmAjMBAAFmATMBZgEAAWYBMwGZ
+ AQABZgEzAcwBAAFmATMB/wEAAmYCAAJmATMBAANmAQACZgGZAQACZgHMAQABZgGZAgABZgGZATMBAAFm
+ AZkBZgEAAWYCmQEAAWYBmQHMAQABZgGZAf8BAAFmAcwCAAFmAcwBMwEAAWYBzAGZAQABZgLMAQABZgHM
+ Af8BAAFmAf8CAAFmAf8BMwEAAWYB/wGZAQABZgH/AcwBAAHMAQAB/wEAAf8BAAHMAQACmQIAAZkBMwGZ
+ AQABmQEAAZkBAAGZAQABzAEAAZkDAAGZAjMBAAGZAQABZgEAAZkBMwHMAQABmQEAAf8BAAGZAWYCAAGZ
+ AWYBMwEAAZkBMwFmAQABmQFmAZkBAAGZAWYBzAEAAZkBMwH/AQACmQEzAQACmQFmAQADmQEAApkBzAEA
+ ApkB/wEAAZkBzAIAAZkBzAEzAQABZgHMAWYBAAGZAcwBmQEAAZkCzAEAAZkBzAH/AQABmQH/AgABmQH/
+ ATMBAAGZAcwBZgEAAZkB/wGZAQABmQH/AcwBAAGZAv8BAAHMAwABmQEAATMBAAHMAQABZgEAAcwBAAGZ
+ AQABzAEAAcwBAAGZATMCAAHMAjMBAAHMATMBZgEAAcwBMwGZAQABzAEzAcwBAAHMATMB/wEAAcwBZgIA
+ AcwBZgEzAQABmQJmAQABzAFmAZkBAAHMAWYBzAEAAZkBZgH/AQABzAGZAgABzAGZATMBAAHMAZkBZgEA
+ AcwCmQEAAcwBmQHMAQABzAGZAf8BAALMAgACzAEzAQACzAFmAQACzAGZAQADzAEAAswB/wEAAcwB/wIA
+ AcwB/wEzAQABmQH/AWYBAAHMAf8BmQEAAcwB/wHMAQABzAL/AQABzAEAATMBAAH/AQABZgEAAf8BAAGZ
+ AQABzAEzAgAB/wIzAQAB/wEzAWYBAAH/ATMBmQEAAf8BMwHMAQAB/wEzAf8BAAH/AWYCAAH/AWYBMwEA
+ AcwCZgEAAf8BZgGZAQAB/wFmAcwBAAHMAWYB/wEAAf8BmQIAAf8BmQEzAQAB/wGZAWYBAAH/ApkBAAH/
+ AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
+ ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
+ AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
+ AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP/AgAB8wEHDO8BvAH0
+ Af8BAAHzAQcM7wG8AfQB/wEAAfMBBwzvAbwB9AH/EwACvAvxAfABvAEHAfQBAAK8C/EB8AG8AQcB9AEA
+ ArwL8QHwAbwBBwH0EgABBwG8AfQM/wHzAbwB8AEHAbwB9Az/AfMBvAHwAQcBvAH0DP8B8wG8AfASAAHs
+ AfAO/wHxAe8B7AHwA/8BwgKYAfQH/wHxAe8B7AHwDv8B8QHvEgABbQHxDv8B8QHvAW0B8QL/AcIBlwEz
+ AVUBngf/AfEB7wFtAfEE/wHCA5gBngHCBP8B8QHvEgABbQHxDv8B8QHvAW0B8QH/AcIBVQMzAVUBCAH0
+ Bf8B8QHvAW0B8QP/AfEBmASXAZ4BwgP/AfEB7xIAAW0B8Q7/AfEB7wFtAfABwgGXAjMCVQIzAQgF/wHx
+ Ae8BbQHxAv8B8wGYAZcBCALCAQgBlwGeAcIC/wHxAe8SAAFtAfEO/wHxAe8BbQG8AZcCVQGYAfQBwgFV
+ ATMBVQEIAfQD/wHxAe8BbQHxAv8BCAOYAlUBmAEIAZcBngL/AfEB7xIAAW0B8Q7/AfEB7wFtAfEB8AGY
+ AQgD/wHxAzMBCAP/AfEB7wFtAfEC/wGYAZcBCAGXAjMBVQHCAZcBmAL/AfEB7xIAAW0B8Q7/AfEB7wFt
+ AfEB/wHCAfQD/wH0AfEBVQEzAVUBngH0Af8B8QHvAW0B8QL/AZgBlwEIAZgBVQEzAVUBCAGXAZgC/wHx
+ Ae8SAAFtAfEO/wHxAe8BbQHxCP8BwgFVATMBVQGYAf8B8QHvAW0B8QL/AQgBlwGYAfIBmAGXApgBlwEI
+ Av8B8QHvEgABbQHxDv8B8QHvAW0B8Qn/AQgBVQEzAVUBngHxAe8BbQHxAv8B9AGYAZcBmAEIApgBlwGY
+ AfMC/wHxAe8SAAFtAfEO/wHxAe8BbQHxCv8BwgFVATMBlwHxAe8BbQHxA/8BwgGYA5cCmAHCA/8B8QHv
+ EgABbQHxDv8B8QHvAW0B8Qv/AQgBVQGXAfEB7wFtAfEE/wH0AQgCmAEIBf8B8QHvEgAB6wG8Dv8B8AHv
+ AesBvAz/AcIBmAG8Ae8B6wG8Dv8BvAHvEgAB7wEHAfIL/wH0AfICBwHvAQcB8gv/AfQB8gEHAfAB7wEH
+ AfIL/wH0AfIBBwHwEgAB9AG8AQcBvArxAfACBwHzAfQBvAEHAbwK8QHwAgcB8wH0AbwBBwG8CvEB8AIH
+ AfMTAAH0Ae8C7AhtAewB7QEHAwAB9AHvAuwIbQHsAe0BBwMAAfQB7wLsCG0B7AHtAQcUAAFCAU0BPgcA
+ AT4DAAEoAwABSAMAARIDAAEBAQABAQUAAdgXAAP/AQABgAEAASABAAEIBwABgAEAASABAAEIuwABgAEA
+ AeABAAE4AQABDAUACw==
diff --git a/Reseter2/Reseter2.csproj b/Reseter2/Reseter2.csproj
index c1a0aaf..1ae37f9 100644
--- a/Reseter2/Reseter2.csproj
+++ b/Reseter2/Reseter2.csproj
@@ -51,6 +51,12 @@
+
+ UserControl
+
+
+ CheckControl.cs
+
Form
@@ -126,6 +132,9 @@
WordsItemControl.cs
+
+ CheckControl.cs
+
Form1.cs
diff --git a/Reseter2/Words/WordsEditCompControl.Designer.cs b/Reseter2/Words/WordsEditCompControl.Designer.cs
index cd03ed9..5632d35 100644
--- a/Reseter2/Words/WordsEditCompControl.Designer.cs
+++ b/Reseter2/Words/WordsEditCompControl.Designer.cs
@@ -65,7 +65,7 @@
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(50, 13);
this.label3.TabIndex = 5;
- this.label3.Text = "IP адрес";
+ this.label3.Text = "IP-адрес";
//
// lb_ip
//
diff --git a/Reseter2/Words/WordsItemControl.Designer.cs b/Reseter2/Words/WordsItemControl.Designer.cs
index fa6a2ef..7b00289 100644
--- a/Reseter2/Words/WordsItemControl.Designer.cs
+++ b/Reseter2/Words/WordsItemControl.Designer.cs
@@ -71,7 +71,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(50, 13);
this.label2.TabIndex = 3;
- this.label2.Text = "IP адрес";
+ this.label2.Text = "IP-адрес";
//
// lb_ip
//