diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.Designer.cs index 50c50a4..88ae3f3 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.Designer.cs @@ -38,7 +38,7 @@ // // buttonAdd // - buttonAdd.Location = new Point(487, 16); + buttonAdd.Location = new Point(474, 12); buttonAdd.Name = "buttonAdd"; buttonAdd.Size = new Size(118, 29); buttonAdd.TabIndex = 1; @@ -48,7 +48,7 @@ // // buttonChange // - buttonChange.Location = new Point(487, 51); + buttonChange.Location = new Point(474, 47); buttonChange.Name = "buttonChange"; buttonChange.Size = new Size(118, 29); buttonChange.TabIndex = 2; @@ -58,7 +58,7 @@ // // buttonDelete // - buttonDelete.Location = new Point(487, 86); + buttonDelete.Location = new Point(474, 82); buttonDelete.Name = "buttonDelete"; buttonDelete.Size = new Size(118, 29); buttonDelete.TabIndex = 3; @@ -68,7 +68,7 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(487, 121); + buttonRefresh.Location = new Point(474, 117); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(118, 29); buttonRefresh.TabIndex = 4; @@ -89,7 +89,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(619, 450); + ClientSize = new Size(600, 450); Controls.Add(dataGridView); Controls.Add(buttonRefresh); Controls.Add(buttonDelete); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs index c5d615d..cbe89a7 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.Designer.cs @@ -75,6 +75,7 @@ // // ComboBoxManufacture // + ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList; ComboBoxManufacture.FormattingEnabled = true; ComboBoxManufacture.Location = new Point(125, 14); ComboBoxManufacture.Name = "ComboBoxManufacture"; diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs index 4dabbf6..eb45662 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs @@ -31,7 +31,7 @@ menuStrip = new MenuStrip(); GuidesToolStripMenuItem = new ToolStripMenuItem(); ComponentsToolStripMenuItem = new ToolStripMenuItem(); - ManufactureToolStripMenuItem = new ToolStripMenuItem(); + ManufacturesToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonRefresh = new Button(); @@ -53,7 +53,7 @@ // // GuidesToolStripMenuItem // - GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufactureToolStripMenuItem }); + GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem }); GuidesToolStripMenuItem.Name = "GuidesToolStripMenuItem"; GuidesToolStripMenuItem.Size = new Size(94, 20); GuidesToolStripMenuItem.Text = "Справочники"; @@ -65,12 +65,12 @@ ComponentsToolStripMenuItem.Text = "Компоненты"; ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click; // - // ManufactureToolStripMenuItem + // ManufacturesToolStripMenuItem // - ManufactureToolStripMenuItem.Name = "ManufactureToolStripMenuItem"; - ManufactureToolStripMenuItem.Size = new Size(181, 22); - ManufactureToolStripMenuItem.Text = "Кузнечные изделия"; - ManufactureToolStripMenuItem.Click += ManufacturesStripMenuItem_Click; + ManufacturesToolStripMenuItem.Name = "ManufacturesToolStripMenuItem"; + ManufacturesToolStripMenuItem.Size = new Size(181, 22); + ManufacturesToolStripMenuItem.Text = "Кузнечные изделия"; + ManufacturesToolStripMenuItem.Click += ManufacturesStripMenuItem_Click; // // dataGridView // @@ -159,7 +159,7 @@ private MenuStrip menuStrip; private ToolStripMenuItem GuidesToolStripMenuItem; private ToolStripMenuItem ComponentsToolStripMenuItem; - private ToolStripMenuItem ManufactureToolStripMenuItem; + private ToolStripMenuItem ManufacturesToolStripMenuItem; private DataGridView dataGridView; private Button buttonCreateOrder; private Button buttonRefresh; diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs index ab60114..6867046 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.Designer.cs @@ -34,15 +34,15 @@ textBoxPrice = new TextBox(); groupBoxComponents = new GroupBox(); dataGridView = new DataGridView(); - ColumnId = new DataGridViewTextBoxColumn(); - ColumnName = new DataGridViewTextBoxColumn(); - ColumnPrice = new DataGridViewTextBoxColumn(); buttonRefresh = new Button(); buttonDelete = new Button(); buttonChange = new Button(); buttonAdd = new Button(); buttonSave = new Button(); buttonCancel = new Button(); + ColumnId = new DataGridViewTextBoxColumn(); + ColumnName = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); groupBoxComponents.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -76,6 +76,7 @@ // textBoxPrice.Location = new Point(106, 38); textBoxPrice.Name = "textBoxPrice"; + textBoxPrice.ReadOnly = true; textBoxPrice.Size = new Size(289, 23); textBoxPrice.TabIndex = 3; // @@ -97,30 +98,13 @@ // dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice }); + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnCount }); dataGridView.Location = new Point(11, 23); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; dataGridView.Size = new Size(439, 256); dataGridView.TabIndex = 5; // - // ColumnId - // - ColumnId.HeaderText = "Идентификатор"; - ColumnId.Name = "ColumnId"; - ColumnId.Visible = false; - // - // ColumnName - // - ColumnName.FillWeight = 200F; - ColumnName.HeaderText = "Компонент"; - ColumnName.Name = "ColumnName"; - // - // ColumnPrice - // - ColumnPrice.HeaderText = "Стоимость"; - ColumnPrice.Name = "ColumnPrice"; - // // buttonRefresh // buttonRefresh.Location = new Point(470, 137); @@ -181,6 +165,23 @@ buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; // + // ColumnId + // + ColumnId.HeaderText = "Идентификатор"; + ColumnId.Name = "ColumnId"; + ColumnId.Visible = false; + // + // ColumnName + // + ColumnName.FillWeight = 200F; + ColumnName.HeaderText = "Компонент"; + ColumnName.Name = "ColumnName"; + // + // ColumnCount + // + ColumnCount.HeaderText = "Количество"; + ColumnCount.Name = "ColumnCount"; + // // FormManufacture // AutoScaleDimensions = new SizeF(7F, 15F); @@ -218,6 +219,6 @@ private DataGridView dataGridView; private DataGridViewTextBoxColumn ColumnId; private DataGridViewTextBoxColumn ColumnName; - private DataGridViewTextBoxColumn ColumnPrice; + private DataGridViewTextBoxColumn ColumnCount; } } \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx index 4178078..fcacbcb 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.resx @@ -123,7 +123,7 @@ True - + True \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureComponent.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureComponent.Designer.cs index 6c76c54..250fe8b 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureComponent.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactureComponent.Designer.cs @@ -47,6 +47,7 @@ // // comboBoxComponent // + comboBoxComponent.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxComponent.FormattingEnabled = true; comboBoxComponent.Location = new Point(93, 6); comboBoxComponent.Name = "comboBoxComponent"; diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.Designer.cs index c211b94..5b26d58 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.Designer.cs @@ -39,7 +39,7 @@ // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(1, 0); + dataGridView.Location = new Point(0, 0); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; dataGridView.Size = new Size(468, 450); @@ -47,7 +47,7 @@ // // buttonAdd // - buttonAdd.Location = new Point(489, 21); + buttonAdd.Location = new Point(474, 12); buttonAdd.Name = "buttonAdd"; buttonAdd.Size = new Size(118, 29); buttonAdd.TabIndex = 7; @@ -57,7 +57,7 @@ // // buttonChange // - buttonChange.Location = new Point(489, 56); + buttonChange.Location = new Point(474, 47); buttonChange.Name = "buttonChange"; buttonChange.Size = new Size(118, 29); buttonChange.TabIndex = 8; @@ -67,7 +67,7 @@ // // buttonDelete // - buttonDelete.Location = new Point(489, 91); + buttonDelete.Location = new Point(474, 82); buttonDelete.Name = "buttonDelete"; buttonDelete.Size = new Size(118, 29); buttonDelete.TabIndex = 9; @@ -77,7 +77,7 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(489, 126); + buttonRefresh.Location = new Point(474, 117); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(118, 29); buttonRefresh.TabIndex = 10; @@ -89,7 +89,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(619, 450); + ClientSize = new Size(600, 450); Controls.Add(buttonRefresh); Controls.Add(buttonDelete); Controls.Add(buttonChange);