diff --git a/LawFirm/LawFirm/FormMain.Designer.cs b/LawFirm/LawFirm/FormMain.Designer.cs index 6da42d1..1ae57eb 100644 --- a/LawFirm/LawFirm/FormMain.Designer.cs +++ b/LawFirm/LawFirm/FormMain.Designer.cs @@ -32,16 +32,16 @@ toolStripMenuItem = new ToolStripMenuItem(); BlanksToolStripMenuItem = new ToolStripMenuItem(); DocumentsToolStripMenuItem = new ToolStripMenuItem(); + ReportsToolStripMenuItem = new ToolStripMenuItem(); + ListOfDocumentsToolStripMenuItem = new ToolStripMenuItem(); + FormsForDocumentsToolStripMenuItem = new ToolStripMenuItem(); + OrderListToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonUpdate = new Button(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - списокДокументовToolStripMenuItem = new ToolStripMenuItem(); - бланкиПоДокументамToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -49,7 +49,7 @@ // menuStrip // menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, ReportsToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(929, 28); @@ -66,17 +66,45 @@ // BlanksToolStripMenuItem // BlanksToolStripMenuItem.Name = "BlanksToolStripMenuItem"; - BlanksToolStripMenuItem.Size = new Size(224, 26); + BlanksToolStripMenuItem.Size = new Size(170, 26); BlanksToolStripMenuItem.Text = "Бланки"; BlanksToolStripMenuItem.Click += BlanksToolStripMenuItem_Click; // // DocumentsToolStripMenuItem // DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; - DocumentsToolStripMenuItem.Size = new Size(224, 26); + DocumentsToolStripMenuItem.Size = new Size(170, 26); DocumentsToolStripMenuItem.Text = "Документы"; DocumentsToolStripMenuItem.Click += DocumentsToolStripMenuItem_Click; // + // ReportsToolStripMenuItem + // + ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ListOfDocumentsToolStripMenuItem, FormsForDocumentsToolStripMenuItem, OrderListToolStripMenuItem }); + ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; + ReportsToolStripMenuItem.Size = new Size(73, 24); + ReportsToolStripMenuItem.Text = "Отчеты"; + // + // ListOfDocumentsToolStripMenuItem + // + ListOfDocumentsToolStripMenuItem.Name = "ListOfDocumentsToolStripMenuItem"; + ListOfDocumentsToolStripMenuItem.Size = new Size(252, 26); + ListOfDocumentsToolStripMenuItem.Text = "Список документов"; + ListOfDocumentsToolStripMenuItem.Click += ListOfDocumentsToolStripMenuItem_Click; + // + // FormsForDocumentsToolStripMenuItem + // + FormsForDocumentsToolStripMenuItem.Name = "FormsForDocumentsToolStripMenuItem"; + FormsForDocumentsToolStripMenuItem.Size = new Size(252, 26); + FormsForDocumentsToolStripMenuItem.Text = "Бланки по документам"; + FormsForDocumentsToolStripMenuItem.Click += FormsForDocumentsToolStripMenuItem_Click; + // + // OrderListToolStripMenuItem + // + OrderListToolStripMenuItem.Name = "OrderListToolStripMenuItem"; + OrderListToolStripMenuItem.Size = new Size(252, 26); + OrderListToolStripMenuItem.Text = "Список заказов"; + OrderListToolStripMenuItem.Click += OrderListToolStripMenuItem_Click; + // // dataGridView // dataGridView.AllowUserToAddRows = false; @@ -142,34 +170,6 @@ buttonUpdate.UseVisualStyleBackColor = true; buttonUpdate.Click += buttonUpdate_Click; // - // отчетыToolStripMenuItem - // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокДокументовToolStripMenuItem, бланкиПоДокументамToolStripMenuItem, списокЗаказовToolStripMenuItem }); - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); - отчетыToolStripMenuItem.Text = "Отчеты"; - // - // списокДокументовToolStripMenuItem - // - списокДокументовToolStripMenuItem.Name = "списокДокументовToolStripMenuItem"; - списокДокументовToolStripMenuItem.Size = new Size(252, 26); - списокДокументовToolStripMenuItem.Text = "Список документов"; - списокДокументовToolStripMenuItem.Click += списокДокументовToolStripMenuItem_Click; - // - // бланкиПоДокументамToolStripMenuItem - // - бланкиПоДокументамToolStripMenuItem.Name = "бланкиПоДокументамToolStripMenuItem"; - бланкиПоДокументамToolStripMenuItem.Size = new Size(252, 26); - бланкиПоДокументамToolStripMenuItem.Text = "Бланки по документам"; - бланкиПоДокументамToolStripMenuItem.Click += бланкиПоДокументамToolStripMenuItem_Click; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(252, 26); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; - // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -205,9 +205,9 @@ private Button buttonOrderReady; private Button buttonIssuedOrder; private Button buttonUpdate; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem списокДокументовToolStripMenuItem; - private ToolStripMenuItem бланкиПоДокументамToolStripMenuItem; - private ToolStripMenuItem списокЗаказовToolStripMenuItem; + private ToolStripMenuItem ReportsToolStripMenuItem; + private ToolStripMenuItem ListOfDocumentsToolStripMenuItem; + private ToolStripMenuItem FormsForDocumentsToolStripMenuItem; + private ToolStripMenuItem OrderListToolStripMenuItem; } } \ No newline at end of file diff --git a/LawFirm/LawFirm/FormMain.cs b/LawFirm/LawFirm/FormMain.cs index 6d7504a..96ab000 100644 --- a/LawFirm/LawFirm/FormMain.cs +++ b/LawFirm/LawFirm/FormMain.cs @@ -167,7 +167,7 @@ namespace LawFirmView form.ShowDialog(); } } - private void списокДокументовToolStripMenuItem_Click(object sender, EventArgs e) + private void ListOfDocumentsToolStripMenuItem_Click(object sender, EventArgs e) { using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; if (dialog.ShowDialog() == DialogResult.OK) @@ -179,7 +179,7 @@ namespace LawFirmView MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); } } - private void бланкиПоДокументамToolStripMenuItem_Click(object sender, EventArgs e) + private void FormsForDocumentsToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportDocumentBlanks)); if (service is FormReportDocumentBlanks form) @@ -187,7 +187,7 @@ namespace LawFirmView form.ShowDialog(); } } - private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) + private void OrderListToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormReportOrder)); if (service is FormReportOrder form)