diff --git a/Confectionery/ConfectioneryView/FormComponent.Designer.cs b/Confectionery/ConfectioneryView/FormComponent.Designer.cs index 360eb91..7aa1bd1 100644 --- a/Confectionery/ConfectioneryView/FormComponent.Designer.cs +++ b/Confectionery/ConfectioneryView/FormComponent.Designer.cs @@ -101,6 +101,7 @@ Controls.Add(labelName); Name = "FormComponent"; Text = "Компонент"; + Load += FormComponent_Load; ResumeLayout(false); PerformLayout(); } diff --git a/Confectionery/ConfectioneryView/FormComponents.Designer.cs b/Confectionery/ConfectioneryView/FormComponents.Designer.cs index aacb97d..d821b55 100644 --- a/Confectionery/ConfectioneryView/FormComponents.Designer.cs +++ b/Confectionery/ConfectioneryView/FormComponents.Designer.cs @@ -112,6 +112,7 @@ namespace ConfectioneryView Controls.Add(buttonAdd); Name = "FormComponents"; Text = "Компоненты"; + Load += FormComponents_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); } diff --git a/Confectionery/ConfectioneryView/FormComponents.cs b/Confectionery/ConfectioneryView/FormComponents.cs index 7850141..a09ab48 100644 --- a/Confectionery/ConfectioneryView/FormComponents.cs +++ b/Confectionery/ConfectioneryView/FormComponents.cs @@ -79,6 +79,7 @@ namespace ConfectioneryView } } } + } private void buttonDelete_Click(object sender, EventArgs e) diff --git a/Confectionery/ConfectioneryView/FormCreateOrder.Designer.cs b/Confectionery/ConfectioneryView/FormCreateOrder.Designer.cs index c0bb1b5..196dc7e 100644 --- a/Confectionery/ConfectioneryView/FormCreateOrder.Designer.cs +++ b/Confectionery/ConfectioneryView/FormCreateOrder.Designer.cs @@ -128,6 +128,7 @@ Controls.Add(labelPastry); Name = "FormCreateOrder"; Text = "Создание заказа"; + Load += FormCreateOrder_Load; ResumeLayout(false); PerformLayout(); } diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs index 2e0c0e7..f2c81c5 100644 --- a/Confectionery/ConfectioneryView/FormMain.Designer.cs +++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs @@ -62,14 +62,14 @@ // ComponentToolStripMenuItem // ComponentToolStripMenuItem.Name = "ComponentToolStripMenuItem"; - ComponentToolStripMenuItem.Size = new Size(224, 26); + ComponentToolStripMenuItem.Size = new Size(182, 26); ComponentToolStripMenuItem.Text = "Компоненты"; ComponentToolStripMenuItem.Click += ComponentToolStripMenuItem_Click; // // PastryToolStripMenuItem // PastryToolStripMenuItem.Name = "PastryToolStripMenuItem"; - PastryToolStripMenuItem.Size = new Size(224, 26); + PastryToolStripMenuItem.Size = new Size(182, 26); PastryToolStripMenuItem.Text = "Изделия"; PastryToolStripMenuItem.Click += PastryToolStripMenuItem_Click; // @@ -82,6 +82,7 @@ dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; dataGridView.Size = new Size(920, 422); dataGridView.TabIndex = 1; // @@ -150,6 +151,7 @@ MainMenuStrip = menuStrip1; Name = "FormMain"; Text = "Кондитерский магазин"; + Load += FormMain_Load; menuStrip1.ResumeLayout(false); menuStrip1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); diff --git a/Confectionery/ConfectioneryView/FormPastries.Designer.cs b/Confectionery/ConfectioneryView/FormPastries.Designer.cs index 139208b..86463a6 100644 --- a/Confectionery/ConfectioneryView/FormPastries.Designer.cs +++ b/Confectionery/ConfectioneryView/FormPastries.Designer.cs @@ -38,13 +38,20 @@ // // dataGridView // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; dataGridView.BackgroundColor = SystemColors.ControlLightLight; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(-1, 0); + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 0); + dataGridView.MultiSelect = false; dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(440, 399); + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(440, 397); dataGridView.TabIndex = 0; // // buttonAdd @@ -99,6 +106,7 @@ Controls.Add(dataGridView); Name = "FormPastries"; Text = "Кондитерские изделия"; + Load += FormPastries_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); } diff --git a/Confectionery/ConfectioneryView/FormPastry.Designer.cs b/Confectionery/ConfectioneryView/FormPastry.Designer.cs index d392dcf..b414502 100644 --- a/Confectionery/ConfectioneryView/FormPastry.Designer.cs +++ b/Confectionery/ConfectioneryView/FormPastry.Designer.cs @@ -219,6 +219,7 @@ Controls.Add(labelName); Name = "FormPastry"; Text = "Кондитерское изделие"; + Load += FormPastry_Load; groupBoxComponents.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); diff --git a/Confectionery/ConfectioneryView/FormPastry.cs b/Confectionery/ConfectioneryView/FormPastry.cs index 6b457b3..2c30757 100644 --- a/Confectionery/ConfectioneryView/FormPastry.cs +++ b/Confectionery/ConfectioneryView/FormPastry.cs @@ -35,7 +35,7 @@ namespace ConfectioneryView _productComponents = new Dictionary(); } - private void FormProduct_Load(object sender, EventArgs e) + private void FormPastry_Load(object sender, EventArgs e) { if (_id.HasValue) { diff --git a/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs index a9c2a83..57fbe7e 100644 --- a/Confectionery/ConfectioneryView/Program.cs +++ b/Confectionery/ConfectioneryView/Program.cs @@ -48,6 +48,7 @@ namespace ConfectioneryView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); } }