From 880272b84d99b6a146ef4019115df9c0acf3fe4d Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev <s.kozyrev-s@yandex.ru> Date: Tue, 5 Mar 2024 14:34:27 +0400 Subject: [PATCH] RemoveConflict --- SewingDresses/SewingDressesView/MainForm.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/SewingDresses/SewingDressesView/MainForm.cs b/SewingDresses/SewingDressesView/MainForm.cs index a5d837f..a4ee92c 100644 --- a/SewingDresses/SewingDressesView/MainForm.cs +++ b/SewingDresses/SewingDressesView/MainForm.cs @@ -24,6 +24,7 @@ namespace SewingDressesView { dataGridView.DataSource = list; dataGridView.Columns["DressId"].Visible = false; + dataGridView.Columns["DressName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Load orders"); } @@ -142,9 +143,22 @@ namespace SewingDressesView LoadData(); } - private void MainForm_Load(object sender, EventArgs e) + private void ShopsToolStripMenuItem_Click(object sender, EventArgs e) { - LoadData(); + var service = Program.ServiceProvider?.GetService(typeof(ShopsForm)); + if (service is ShopsForm form) + { + form.ShowDialog(); + } + } + + private void SupplyToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(SupplyForm)); + if (service is SupplyForm form) + { + form.ShowDialog(); + } } } }