From c44986349c5480c36e788ee87f1fc24074bf458f Mon Sep 17 00:00:00 2001 From: bocchanskyy Date: Wed, 4 Sep 2024 17:42:18 +0400 Subject: [PATCH] still gotta work --- .../CustomInputRangeDate.Designer.cs | 4 +- .../WinFormsLibraryVolkov/CustomTreeCell.cs | 52 +-- .../SelectionListBox.Designer.cs | 2 + .../WinFormsLibraryVolkov/SelectionListBox.cs | 4 + .../WinFormsTestApp/FormMain.Designer.cs | 433 +++++++++--------- VolkovLabs/WinFormsTestApp/FormMain.cs | 2 +- VolkovLabs/WinFormsTestApp/FormMain.resx | 71 ++- 7 files changed, 277 insertions(+), 291 deletions(-) diff --git a/VolkovLabs/WinFormsLibraryVolkov/CustomInputRangeDate.Designer.cs b/VolkovLabs/WinFormsLibraryVolkov/CustomInputRangeDate.Designer.cs index ddacd33..bf00c1b 100644 --- a/VolkovLabs/WinFormsLibraryVolkov/CustomInputRangeDate.Designer.cs +++ b/VolkovLabs/WinFormsLibraryVolkov/CustomInputRangeDate.Designer.cs @@ -35,7 +35,7 @@ // dateTimePicker.Location = new Point(3, 3); dateTimePicker.Name = "dateTimePicker"; - dateTimePicker.Size = new Size(200, 23); + dateTimePicker.Size = new Size(142, 23); dateTimePicker.TabIndex = 0; dateTimePicker.ValueChanged += dateTimePicker_ValueChanged; // @@ -45,7 +45,7 @@ AutoScaleMode = AutoScaleMode.Font; Controls.Add(dateTimePicker); Name = "CustomInputRangeDate"; - Size = new Size(206, 183); + Size = new Size(148, 231); ResumeLayout(false); } diff --git a/VolkovLabs/WinFormsLibraryVolkov/CustomTreeCell.cs b/VolkovLabs/WinFormsLibraryVolkov/CustomTreeCell.cs index af749bd..fc1b082 100644 --- a/VolkovLabs/WinFormsLibraryVolkov/CustomTreeCell.cs +++ b/VolkovLabs/WinFormsLibraryVolkov/CustomTreeCell.cs @@ -62,56 +62,6 @@ namespace WinFormsLibraryVolkov return val; } - - public void AddCells(int columnIndex, List elements) - { - if (elements == null || elements.Count == 0) - { - return; - } - - foreach (T element in elements) - { - AddCell(columnIndex, element); - } - } - - // Обновленный метод для добавления одного элемента в дерево - public void AddCell(int columnIndex, T element) - { - if (Levels == null || element == null || columnIndex < 0 || columnIndex >= Levels.NodeNames.Count) - { - return; - } - - TreeNodeCollection treeNodeCollection = treeView.Nodes; - int num = 0; - foreach (string nodeName in Levels.NodeNames) - { - // Получение значения свойства или поля - PropertyInfo property = element.GetType().GetProperty(nodeName); - string text = property?.GetValue(element, null)?.ToString() ?? nodeName; - - TreeNode treeNode = null; - foreach (TreeNode item in treeNodeCollection) - { - if (item.Text == text) - { - treeNode = item; - break; - } - } - - // Если узел не найден, добавляем новый - treeNodeCollection = (treeNode == null) ? treeNodeCollection.Add(text).Nodes : treeNode.Nodes; - - if (num >= columnIndex) - { - break; - } - - num++; - } - } + } } diff --git a/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.Designer.cs b/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.Designer.cs index 02f10f4..1f6f6d0 100644 --- a/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.Designer.cs +++ b/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.Designer.cs @@ -39,6 +39,8 @@ checkedListBox.Size = new Size(144, 148); checkedListBox.TabIndex = 0; checkedListBox.Dock = DockStyle.Fill; + checkedListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.CheckedListBox_ItemCheck); + checkedListBox.SelectedIndexChanged += new System.EventHandler(this.checkedListBox_SelectedIndexChanged); // // SelectionListBox // diff --git a/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.cs b/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.cs index a202908..b9ddbe9 100644 --- a/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.cs +++ b/VolkovLabs/WinFormsLibraryVolkov/SelectionListBox.cs @@ -93,5 +93,9 @@ namespace WinFormsLibraryVolkov _changeEvent?.Invoke(this, EventArgs.Empty); }); } + private void checkedListBox_SelectedIndexChanged(object sender, EventArgs e) + { + _changeEvent?.Invoke(sender, e); + } } } diff --git a/VolkovLabs/WinFormsTestApp/FormMain.Designer.cs b/VolkovLabs/WinFormsTestApp/FormMain.Designer.cs index 2eb3295..d906e30 100644 --- a/VolkovLabs/WinFormsTestApp/FormMain.Designer.cs +++ b/VolkovLabs/WinFormsTestApp/FormMain.Designer.cs @@ -28,305 +28,284 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.customInputRangeDate = new WinFormsLibraryVolkov.CustomInputRangeDate(); - this.buttonCheck = new System.Windows.Forms.Button(); - this.labelCheckValue = new System.Windows.Forms.Label(); - this.groupBoxInput = new System.Windows.Forms.GroupBox(); - this.groupBoxSelected = new System.Windows.Forms.GroupBox(); - this.buttonGetSelected = new System.Windows.Forms.Button(); - this.labelSelectedValue = new System.Windows.Forms.Label(); - this.buttonClear = new System.Windows.Forms.Button(); - this.buttonAdd = new System.Windows.Forms.Button(); - this.textBoxAdd = new System.Windows.Forms.TextBox(); - this.SelectionListBox = new WinFormsLibraryVolkov.SelectionListBox(); - this.groupBoxData = new System.Windows.Forms.GroupBox(); - this.labelTransportType = new System.Windows.Forms.Label(); - this.labelModel = new System.Windows.Forms.Label(); - this.labelRegNum = new System.Windows.Forms.Label(); - this.buttonGetFromTree = new System.Windows.Forms.Button(); - this.buttonAddToTree = new System.Windows.Forms.Button(); - this.comboBoxTransportType = new System.Windows.Forms.ComboBox(); - this.textBoxModel = new System.Windows.Forms.TextBox(); - this.textBoxRegNumber = new System.Windows.Forms.TextBox(); - this.customTreeCell = new WinFormsLibraryVolkov.CustomTreeCell(); - this.tabControl = new System.Windows.Forms.TabControl(); - this.Visual = new System.Windows.Forms.TabPage(); - this.groupBoxInput.SuspendLayout(); - this.groupBoxSelected.SuspendLayout(); - this.groupBoxData.SuspendLayout(); - this.tabControl.SuspendLayout(); - this.Visual.SuspendLayout(); - this.SuspendLayout(); + customInputRangeDate = new WinFormsLibraryVolkov.CustomInputRangeDate(); + buttonCheck = new Button(); + labelCheckValue = new Label(); + groupBoxInput = new GroupBox(); + groupBoxSelected = new GroupBox(); + buttonGetSelected = new Button(); + labelSelectedValue = new Label(); + buttonClear = new Button(); + buttonAdd = new Button(); + textBoxAdd = new TextBox(); + SelectionListBox = new WinFormsLibraryVolkov.SelectionListBox(); + groupBoxData = new GroupBox(); + labelTransportType = new Label(); + labelModel = new Label(); + labelRegNum = new Label(); + buttonGetFromTree = new Button(); + buttonAddToTree = new Button(); + comboBoxTransportType = new ComboBox(); + textBoxModel = new TextBox(); + textBoxRegNumber = new TextBox(); + customTreeCell = new WinFormsLibraryVolkov.CustomTreeCell(); + tabControl = new TabControl(); + Visual = new TabPage(); + groupBoxInput.SuspendLayout(); + groupBoxSelected.SuspendLayout(); + groupBoxData.SuspendLayout(); + tabControl.SuspendLayout(); + Visual.SuspendLayout(); + SuspendLayout(); // // customInputRangeDate // - this.customInputRangeDate.AutoValidate = System.Windows.Forms.AutoValidate.Disable; - this.customInputRangeDate.CausesValidation = false; - this.customInputRangeDate.Location = new System.Drawing.Point(34, 25); - this.customInputRangeDate.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); - this.customInputRangeDate.MaxDate = new DateTime(2024, 12, 31); - this.customInputRangeDate.MinDate = new DateTime(2004, 01, 11); - this.customInputRangeDate.Name = "customInputRangeDate"; - this.customInputRangeDate.Size = new System.Drawing.Size(144, 40); - this.customInputRangeDate.TabIndex = 0; - this.customInputRangeDate.Date = new DateTime(2024, 9, 1); + customInputRangeDate.AutoValidate = AutoValidate.Disable; + customInputRangeDate.CausesValidation = false; + customInputRangeDate.Date = new DateTime(2024, 9, 1, 0, 0, 0, 0); + customInputRangeDate.Location = new Point(15, 19); + customInputRangeDate.Margin = new Padding(3, 4, 3, 4); + customInputRangeDate.MaxDate = new DateTime(2024, 12, 31, 0, 0, 0, 0); + customInputRangeDate.MinDate = new DateTime(2004, 1, 11, 0, 0, 0, 0); + customInputRangeDate.Name = "customInputRangeDate"; + customInputRangeDate.Size = new Size(148, 30); + customInputRangeDate.TabIndex = 0; // // buttonCheck // - this.buttonCheck.Location = new System.Drawing.Point(193, 29); - this.buttonCheck.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonCheck.Name = "buttonCheck"; - this.buttonCheck.Size = new System.Drawing.Size(144, 31); - this.buttonCheck.TabIndex = 1; - this.buttonCheck.Text = "Check"; - this.buttonCheck.UseVisualStyleBackColor = true; - this.buttonCheck.Click += new System.EventHandler(this.buttonCheck_Click); + buttonCheck.Location = new Point(169, 22); + buttonCheck.Name = "buttonCheck"; + buttonCheck.Size = new Size(126, 23); + buttonCheck.TabIndex = 1; + buttonCheck.Text = "Check"; + buttonCheck.UseVisualStyleBackColor = true; + buttonCheck.Click += buttonCheck_Click; // // labelCheckValue // - this.labelCheckValue.AutoSize = true; - this.labelCheckValue.Location = new System.Drawing.Point(34, 148); - this.labelCheckValue.Name = "labelCheckValue"; - this.labelCheckValue.Size = new System.Drawing.Size(82, 20); - this.labelCheckValue.TabIndex = 2; - this.labelCheckValue.Text = "Enter value"; + labelCheckValue.AutoSize = true; + labelCheckValue.Location = new Point(30, 111); + labelCheckValue.Name = "labelCheckValue"; + labelCheckValue.Size = new Size(65, 15); + labelCheckValue.TabIndex = 2; + labelCheckValue.Text = "Enter value"; // // groupBoxInput // - this.groupBoxInput.Controls.Add(this.customInputRangeDate); - this.groupBoxInput.Controls.Add(this.labelCheckValue); - this.groupBoxInput.Controls.Add(this.buttonCheck); - this.groupBoxInput.Location = new System.Drawing.Point(7, 8); - this.groupBoxInput.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxInput.Name = "groupBoxInput"; - this.groupBoxInput.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxInput.Size = new System.Drawing.Size(355, 253); - this.groupBoxInput.TabIndex = 9; - this.groupBoxInput.TabStop = false; - this.groupBoxInput.Text = "Input"; + groupBoxInput.Controls.Add(customInputRangeDate); + groupBoxInput.Controls.Add(labelCheckValue); + groupBoxInput.Controls.Add(buttonCheck); + groupBoxInput.Location = new Point(6, 6); + groupBoxInput.Name = "groupBoxInput"; + groupBoxInput.Size = new Size(311, 190); + groupBoxInput.TabIndex = 9; + groupBoxInput.TabStop = false; + groupBoxInput.Text = "Input"; // // groupBoxSelected // - this.groupBoxSelected.Controls.Add(this.buttonGetSelected); - this.groupBoxSelected.Controls.Add(this.labelSelectedValue); - this.groupBoxSelected.Controls.Add(this.buttonClear); - this.groupBoxSelected.Controls.Add(this.buttonAdd); - this.groupBoxSelected.Controls.Add(this.textBoxAdd); - this.groupBoxSelected.Controls.Add(this.SelectionListBox); - this.groupBoxSelected.Location = new System.Drawing.Point(370, 8); - this.groupBoxSelected.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxSelected.Name = "groupBoxSelected"; - this.groupBoxSelected.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxSelected.Size = new System.Drawing.Size(355, 253); - this.groupBoxSelected.TabIndex = 10; - this.groupBoxSelected.TabStop = false; - this.groupBoxSelected.Text = "Selected"; + groupBoxSelected.Controls.Add(buttonGetSelected); + groupBoxSelected.Controls.Add(labelSelectedValue); + groupBoxSelected.Controls.Add(buttonClear); + groupBoxSelected.Controls.Add(buttonAdd); + groupBoxSelected.Controls.Add(textBoxAdd); + groupBoxSelected.Controls.Add(SelectionListBox); + groupBoxSelected.Location = new Point(324, 6); + groupBoxSelected.Name = "groupBoxSelected"; + groupBoxSelected.Size = new Size(311, 190); + groupBoxSelected.TabIndex = 10; + groupBoxSelected.TabStop = false; + groupBoxSelected.Text = "Selected"; // // buttonGetSelected // - this.buttonGetSelected.Location = new System.Drawing.Point(219, 192); - this.buttonGetSelected.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonGetSelected.Name = "buttonGetSelected"; - this.buttonGetSelected.Size = new System.Drawing.Size(114, 31); - this.buttonGetSelected.TabIndex = 14; - this.buttonGetSelected.Text = "Get Selected"; - this.buttonGetSelected.UseVisualStyleBackColor = true; - this.buttonGetSelected.Click += new System.EventHandler(this.buttonGetSelected_Click); + buttonGetSelected.Location = new Point(192, 144); + buttonGetSelected.Name = "buttonGetSelected"; + buttonGetSelected.Size = new Size(100, 23); + buttonGetSelected.TabIndex = 14; + buttonGetSelected.Text = "Get Selected"; + buttonGetSelected.UseVisualStyleBackColor = true; + buttonGetSelected.Click += buttonGetSelected_Click; // // labelSelectedValue // - this.labelSelectedValue.AutoSize = true; - this.labelSelectedValue.Location = new System.Drawing.Point(219, 148); - this.labelSelectedValue.Name = "labelSelectedValue"; - this.labelSelectedValue.Size = new System.Drawing.Size(105, 20); - this.labelSelectedValue.TabIndex = 11; - this.labelSelectedValue.Text = "Selected value"; + labelSelectedValue.AutoSize = true; + labelSelectedValue.Location = new Point(192, 111); + labelSelectedValue.Name = "labelSelectedValue"; + labelSelectedValue.Size = new Size(82, 15); + labelSelectedValue.TabIndex = 11; + labelSelectedValue.Text = "Selected value"; // // buttonClear // - this.buttonClear.Location = new System.Drawing.Point(219, 108); - this.buttonClear.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonClear.Name = "buttonClear"; - this.buttonClear.Size = new System.Drawing.Size(114, 31); - this.buttonClear.TabIndex = 13; - this.buttonClear.Text = "Clear"; - this.buttonClear.UseVisualStyleBackColor = true; - this.buttonClear.Click += new System.EventHandler(this.buttonClear_Click); + buttonClear.Location = new Point(192, 81); + buttonClear.Name = "buttonClear"; + buttonClear.Size = new Size(100, 23); + buttonClear.TabIndex = 13; + buttonClear.Text = "Clear"; + buttonClear.UseVisualStyleBackColor = true; + buttonClear.Click += buttonClear_Click; // // buttonAdd // - this.buttonAdd.Location = new System.Drawing.Point(219, 69); - this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(114, 31); - this.buttonAdd.TabIndex = 12; - this.buttonAdd.Text = "Add or Select"; - this.buttonAdd.UseVisualStyleBackColor = true; - this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + buttonAdd.Location = new Point(192, 52); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(100, 23); + buttonAdd.TabIndex = 12; + buttonAdd.Text = "Add or Select"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; // // textBoxAdd // - this.textBoxAdd.Location = new System.Drawing.Point(219, 31); - this.textBoxAdd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.textBoxAdd.Name = "textBoxAdd"; - this.textBoxAdd.Size = new System.Drawing.Size(114, 27); - this.textBoxAdd.TabIndex = 11; + textBoxAdd.Location = new Point(192, 23); + textBoxAdd.Name = "textBoxAdd"; + textBoxAdd.Size = new Size(100, 23); + textBoxAdd.TabIndex = 11; // // SelectionListBox // - this.SelectionListBox.Location = new System.Drawing.Point(41, 25); - this.SelectionListBox.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); - this.SelectionListBox.Name = "SelectionListBox"; - this.SelectionListBox.SelectedValue = ""; - this.SelectionListBox.Size = new System.Drawing.Size(171, 209); - this.SelectionListBox.TabIndex = 0; + SelectionListBox.Location = new Point(36, 19); + SelectionListBox.Margin = new Padding(3, 4, 3, 4); + SelectionListBox.Name = "SelectionListBox"; + SelectionListBox.SelectedValue = ""; + SelectionListBox.Size = new Size(150, 157); + SelectionListBox.TabIndex = 0; // // groupBoxData // - this.groupBoxData.Controls.Add(this.labelTransportType); - this.groupBoxData.Controls.Add(this.labelModel); - this.groupBoxData.Controls.Add(this.labelRegNum); - this.groupBoxData.Controls.Add(this.buttonGetFromTree); - this.groupBoxData.Controls.Add(this.buttonAddToTree); - this.groupBoxData.Controls.Add(this.comboBoxTransportType); - this.groupBoxData.Controls.Add(this.textBoxModel); - this.groupBoxData.Controls.Add(this.textBoxRegNumber); - this.groupBoxData.Controls.Add(this.customTreeCell); - this.groupBoxData.Location = new System.Drawing.Point(7, 269); - this.groupBoxData.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxData.Name = "groupBoxData"; - this.groupBoxData.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.groupBoxData.Size = new System.Drawing.Size(719, 307); - this.groupBoxData.TabIndex = 11; - this.groupBoxData.TabStop = false; - this.groupBoxData.Text = "Data"; + groupBoxData.Controls.Add(labelTransportType); + groupBoxData.Controls.Add(labelModel); + groupBoxData.Controls.Add(labelRegNum); + groupBoxData.Controls.Add(buttonGetFromTree); + groupBoxData.Controls.Add(buttonAddToTree); + groupBoxData.Controls.Add(comboBoxTransportType); + groupBoxData.Controls.Add(textBoxModel); + groupBoxData.Controls.Add(textBoxRegNumber); + groupBoxData.Controls.Add(customTreeCell); + groupBoxData.Location = new Point(6, 202); + groupBoxData.Name = "groupBoxData"; + groupBoxData.Size = new Size(629, 230); + groupBoxData.TabIndex = 11; + groupBoxData.TabStop = false; + groupBoxData.Text = "Data"; // // labelTransportType // - this.labelTransportType.AutoSize = true; - this.labelTransportType.Location = new System.Drawing.Point(494, 155); - this.labelTransportType.Name = "labelTransportType"; - this.labelTransportType.Size = new System.Drawing.Size(119, 20); - this.labelTransportType.TabIndex = 8; - this.labelTransportType.Text = "Тип транспорта"; + labelTransportType.AutoSize = true; + labelTransportType.Location = new Point(432, 116); + labelTransportType.Name = "labelTransportType"; + labelTransportType.Size = new Size(93, 15); + labelTransportType.TabIndex = 8; + labelTransportType.Text = "Тип транспорта"; // // labelModel // - this.labelModel.AutoSize = true; - this.labelModel.Location = new System.Drawing.Point(494, 96); - this.labelModel.Name = "labelModel"; - this.labelModel.Size = new System.Drawing.Size(63, 20); - this.labelModel.TabIndex = 7; - this.labelModel.Text = "Модель"; + labelModel.AutoSize = true; + labelModel.Location = new Point(432, 72); + labelModel.Name = "labelModel"; + labelModel.Size = new Size(50, 15); + labelModel.TabIndex = 7; + labelModel.Text = "Модель"; // // labelRegNum // - this.labelRegNum.AutoSize = true; - this.labelRegNum.Location = new System.Drawing.Point(494, 37); - this.labelRegNum.Name = "labelRegNum"; - this.labelRegNum.Size = new System.Drawing.Size(185, 20); - this.labelRegNum.TabIndex = 6; - this.labelRegNum.Text = "Регистрационный номер"; + labelRegNum.AutoSize = true; + labelRegNum.Location = new Point(432, 28); + labelRegNum.Name = "labelRegNum"; + labelRegNum.Size = new Size(146, 15); + labelRegNum.TabIndex = 6; + labelRegNum.Text = "Регистрационный номер"; // // buttonGetFromTree // - this.buttonGetFromTree.Location = new System.Drawing.Point(494, 260); - this.buttonGetFromTree.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonGetFromTree.Name = "buttonGetFromTree"; - this.buttonGetFromTree.Size = new System.Drawing.Size(215, 31); - this.buttonGetFromTree.TabIndex = 5; - this.buttonGetFromTree.Text = "Get Selected"; - this.buttonGetFromTree.UseVisualStyleBackColor = true; - this.buttonGetFromTree.Click += new System.EventHandler(this.buttonGetFromTree_Click); + buttonGetFromTree.Location = new Point(432, 195); + buttonGetFromTree.Name = "buttonGetFromTree"; + buttonGetFromTree.Size = new Size(188, 23); + buttonGetFromTree.TabIndex = 5; + buttonGetFromTree.Text = "Get Selected"; + buttonGetFromTree.UseVisualStyleBackColor = true; + buttonGetFromTree.Click += buttonGetFromTree_Click; // // buttonAddToTree // - this.buttonAddToTree.Location = new System.Drawing.Point(494, 221); - this.buttonAddToTree.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonAddToTree.Name = "buttonAddToTree"; - this.buttonAddToTree.Size = new System.Drawing.Size(215, 31); - this.buttonAddToTree.TabIndex = 4; - this.buttonAddToTree.Text = "Add"; - this.buttonAddToTree.UseVisualStyleBackColor = true; - this.buttonAddToTree.Click += new System.EventHandler(this.buttonAddToTree_Click); + buttonAddToTree.Location = new Point(432, 166); + buttonAddToTree.Name = "buttonAddToTree"; + buttonAddToTree.Size = new Size(188, 23); + buttonAddToTree.TabIndex = 4; + buttonAddToTree.Text = "Add"; + buttonAddToTree.UseVisualStyleBackColor = true; + buttonAddToTree.Click += buttonAddToTree_Click; // // comboBoxTransportType // - this.comboBoxTransportType.FormattingEnabled = true; - this.comboBoxTransportType.Location = new System.Drawing.Point(494, 179); - this.comboBoxTransportType.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.comboBoxTransportType.Name = "comboBoxTransportType"; - this.comboBoxTransportType.Size = new System.Drawing.Size(214, 28); - this.comboBoxTransportType.TabIndex = 3; + comboBoxTransportType.FormattingEnabled = true; + comboBoxTransportType.Location = new Point(432, 134); + comboBoxTransportType.Name = "comboBoxTransportType"; + comboBoxTransportType.Size = new Size(188, 23); + comboBoxTransportType.TabIndex = 3; // // textBoxModel // - this.textBoxModel.Location = new System.Drawing.Point(494, 120); - this.textBoxModel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.textBoxModel.Name = "textBoxModel"; - this.textBoxModel.Size = new System.Drawing.Size(214, 27); - this.textBoxModel.TabIndex = 2; + textBoxModel.Location = new Point(432, 90); + textBoxModel.Name = "textBoxModel"; + textBoxModel.Size = new Size(188, 23); + textBoxModel.TabIndex = 2; // // textBoxRegNumber // - this.textBoxRegNumber.Location = new System.Drawing.Point(494, 61); - this.textBoxRegNumber.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.textBoxRegNumber.Name = "textBoxRegNumber"; - this.textBoxRegNumber.Size = new System.Drawing.Size(214, 27); - this.textBoxRegNumber.TabIndex = 1; + textBoxRegNumber.Location = new Point(432, 46); + textBoxRegNumber.Name = "textBoxRegNumber"; + textBoxRegNumber.Size = new Size(188, 23); + textBoxRegNumber.TabIndex = 1; // // customTreeCell // - this.customTreeCell.Location = new System.Drawing.Point(17, 29); - this.customTreeCell.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); - this.customTreeCell.Name = "customTreeCell"; - this.customTreeCell.Size = new System.Drawing.Size(455, 269); - this.customTreeCell.TabIndex = 0; + customTreeCell.Location = new Point(15, 22); + customTreeCell.Margin = new Padding(3, 4, 3, 4); + customTreeCell.Name = "customTreeCell"; + customTreeCell.Size = new Size(398, 202); + customTreeCell.TabIndex = 0; // // tabControl // - this.tabControl.Controls.Add(this.Visual); - this.tabControl.Location = new System.Drawing.Point(14, 16); - this.tabControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.tabControl.Name = "tabControl"; - this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(746, 621); - this.tabControl.TabIndex = 12; + tabControl.Controls.Add(Visual); + tabControl.Location = new Point(12, 12); + tabControl.Name = "tabControl"; + tabControl.SelectedIndex = 0; + tabControl.Size = new Size(653, 466); + tabControl.TabIndex = 12; // // Visual // - this.Visual.Controls.Add(this.groupBoxData); - this.Visual.Controls.Add(this.groupBoxInput); - this.Visual.Controls.Add(this.groupBoxSelected); - this.Visual.Location = new System.Drawing.Point(4, 29); - this.Visual.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Visual.Name = "Visual"; - this.Visual.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Visual.Size = new System.Drawing.Size(738, 588); - this.Visual.TabIndex = 0; - this.Visual.Text = "Visual"; - this.Visual.UseVisualStyleBackColor = true; + Visual.Controls.Add(groupBoxData); + Visual.Controls.Add(groupBoxInput); + Visual.Controls.Add(groupBoxSelected); + Visual.Location = new Point(4, 24); + Visual.Name = "Visual"; + Visual.Padding = new Padding(3, 3, 3, 3); + Visual.Size = new Size(645, 438); + Visual.TabIndex = 0; + Visual.Text = "Visual"; + Visual.UseVisualStyleBackColor = true; // // FormMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(771, 648); - this.Controls.Add(this.tabControl); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "FormMain"; - this.Text = "FormMain"; - this.groupBoxInput.ResumeLayout(false); - this.groupBoxInput.PerformLayout(); - this.groupBoxSelected.ResumeLayout(false); - this.groupBoxSelected.PerformLayout(); - this.groupBoxData.ResumeLayout(false); - this.groupBoxData.PerformLayout(); - this.tabControl.ResumeLayout(false); - this.Visual.ResumeLayout(false); - this.ResumeLayout(false); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(675, 486); + Controls.Add(tabControl); + Name = "FormMain"; + Text = "FormMain"; + groupBoxInput.ResumeLayout(false); + groupBoxInput.PerformLayout(); + groupBoxSelected.ResumeLayout(false); + groupBoxSelected.PerformLayout(); + groupBoxData.ResumeLayout(false); + groupBoxData.PerformLayout(); + tabControl.ResumeLayout(false); + Visual.ResumeLayout(false); + ResumeLayout(false); } #endregion diff --git a/VolkovLabs/WinFormsTestApp/FormMain.cs b/VolkovLabs/WinFormsTestApp/FormMain.cs index 9517da8..96a0dd8 100644 --- a/VolkovLabs/WinFormsTestApp/FormMain.cs +++ b/VolkovLabs/WinFormsTestApp/FormMain.cs @@ -77,7 +77,7 @@ namespace WinFormsTestApp private void buttonAdd_Click(object sender, EventArgs e) { - // доделать + } private void buttonClear_Click(object sender, EventArgs e) diff --git a/VolkovLabs/WinFormsTestApp/FormMain.resx b/VolkovLabs/WinFormsTestApp/FormMain.resx index 93c550b..af32865 100644 --- a/VolkovLabs/WinFormsTestApp/FormMain.resx +++ b/VolkovLabs/WinFormsTestApp/FormMain.resx @@ -1,4 +1,64 @@ - + + + @@ -57,13 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 161, 17 - - - 295, 17 - \ No newline at end of file