diff --git a/TravelCompany/TravelCompany/FormMain.Designer.cs b/TravelCompany/TravelCompany/FormMain.Designer.cs index eb7f73d..f2e6e64 100644 --- a/TravelCompany/TravelCompany/FormMain.Designer.cs +++ b/TravelCompany/TravelCompany/FormMain.Designer.cs @@ -40,7 +40,7 @@ toolStripMenuItem1 = new ToolStripMenuItem(); toolStripMenuItem2 = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); - toolStripLabel1 = new ToolStripLabel(); + DoWorkToolStripLabel = new ToolStripLabel(); buttonCreateeOrder = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); @@ -52,23 +52,22 @@ // dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(1, 31); - dataGridView.Margin = new Padding(3, 2, 3, 2); + dataGridView.Location = new Point(1, 41); dataGridView.Name = "dataGridView"; dataGridView.ReadOnly = true; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(1129, 427); + dataGridView.Size = new Size(1290, 569); dataGridView.TabIndex = 0; // // toolStrip1 // toolStrip1.ImageScalingSize = new Size(20, 20); - toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2, toolStripLabel1 }); + toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2, DoWorkToolStripLabel }); toolStrip1.Location = new Point(0, 0); toolStrip1.Name = "toolStrip1"; - toolStrip1.Size = new Size(1297, 25); + toolStrip1.Size = new Size(1482, 27); toolStrip1.TabIndex = 1; toolStrip1.Text = "toolStrip1"; // @@ -79,34 +78,34 @@ toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - toolStripDropDownButton1.Size = new Size(88, 22); + toolStripDropDownButton1.Size = new Size(107, 24); toolStripDropDownButton1.Text = "Справочник"; // // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(202, 22); + компонентыToolStripMenuItem.Size = new Size(238, 24); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; // // туристическиеПутевкиToolStripMenuItem // туристическиеПутевкиToolStripMenuItem.Name = "туристическиеПутевкиToolStripMenuItem"; - туристическиеПутевкиToolStripMenuItem.Size = new Size(202, 22); + туристическиеПутевкиToolStripMenuItem.Size = new Size(238, 24); туристическиеПутевкиToolStripMenuItem.Text = "Туристические путевки"; туристическиеПутевкиToolStripMenuItem.Click += путевкиToolStripMenuItem_Click; // // клиентыToolStripMenuItem // клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(202, 22); + клиентыToolStripMenuItem.Size = new Size(238, 24); клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(202, 22); + исполнителиToolStripMenuItem.Size = new Size(238, 24); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // @@ -117,43 +116,42 @@ toolStripDropDownButton2.Image = (Image)resources.GetObject("toolStripDropDownButton2.Image"); toolStripDropDownButton2.ImageTransparentColor = Color.Magenta; toolStripDropDownButton2.Name = "toolStripDropDownButton2"; - toolStripDropDownButton2.Size = new Size(61, 22); + toolStripDropDownButton2.Size = new Size(72, 24); toolStripDropDownButton2.Text = "Отчеты"; // // toolStripMenuItem1 // toolStripMenuItem1.Name = "toolStripMenuItem1"; - toolStripMenuItem1.Size = new Size(216, 22); + toolStripMenuItem1.Size = new Size(258, 24); toolStripMenuItem1.Text = "Список компонентов"; toolStripMenuItem1.Click += списокКомпонентовToolStripMenuItem_Click; // // toolStripMenuItem2 // toolStripMenuItem2.Name = "toolStripMenuItem2"; - toolStripMenuItem2.Size = new Size(216, 22); + toolStripMenuItem2.Size = new Size(258, 24); toolStripMenuItem2.Text = "Компоненты по путевкам"; toolStripMenuItem2.Click += компонентыПоПутeвкамToolStripMenuItem_Click; // // списокЗаказовToolStripMenuItem // списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(216, 22); + списокЗаказовToolStripMenuItem.Size = new Size(258, 24); списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; // - // toolStripLabel1 + // DoWorkToolStripLabel // - toolStripLabel1.Name = "toolStripLabel1"; - toolStripLabel1.Size = new Size(80, 22); - toolStripLabel1.Text = "Запуск работ"; - toolStripLabel1.Click += toolStripLabel1_Click; + DoWorkToolStripLabel.Name = "DoWorkToolStripLabel"; + DoWorkToolStripLabel.Size = new Size(100, 24); + DoWorkToolStripLabel.Text = "Запуск работ"; + DoWorkToolStripLabel.Click += DoWorkToolStripLabel_Click; // // buttonCreateeOrder // - buttonCreateeOrder.Location = new Point(1149, 44); - buttonCreateeOrder.Margin = new Padding(3, 2, 3, 2); + buttonCreateeOrder.Location = new Point(1313, 59); buttonCreateeOrder.Name = "buttonCreateeOrder"; - buttonCreateeOrder.Size = new Size(136, 29); + buttonCreateeOrder.Size = new Size(155, 39); buttonCreateeOrder.TabIndex = 2; buttonCreateeOrder.Text = "Создать заказ"; buttonCreateeOrder.UseVisualStyleBackColor = true; @@ -161,10 +159,9 @@ // // buttonIssuedOrder // - buttonIssuedOrder.Location = new Point(1149, 93); - buttonIssuedOrder.Margin = new Padding(3, 2, 3, 2); + buttonIssuedOrder.Location = new Point(1313, 124); buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(136, 29); + buttonIssuedOrder.Size = new Size(155, 39); buttonIssuedOrder.TabIndex = 5; buttonIssuedOrder.Text = "Заказ выдан"; buttonIssuedOrder.UseVisualStyleBackColor = true; @@ -172,10 +169,9 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(1149, 141); - buttonRefresh.Margin = new Padding(3, 2, 3, 2); + buttonRefresh.Location = new Point(1313, 188); buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(136, 29); + buttonRefresh.Size = new Size(155, 39); buttonRefresh.TabIndex = 6; buttonRefresh.Text = "Обновить список"; buttonRefresh.UseVisualStyleBackColor = true; @@ -183,15 +179,14 @@ // // FormMain // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1297, 458); + ClientSize = new Size(1482, 611); Controls.Add(buttonRefresh); Controls.Add(buttonIssuedOrder); Controls.Add(buttonCreateeOrder); Controls.Add(toolStrip1); Controls.Add(dataGridView); - Margin = new Padding(3, 2, 3, 2); Name = "FormMain"; Text = "Туристическая фирма"; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); @@ -217,6 +212,6 @@ private ToolStripMenuItem списокЗаказовToolStripMenuItem; private ToolStripMenuItem клиентыToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; - private ToolStripLabel toolStripLabel1; + private ToolStripLabel DoWorkToolStripLabel; } } \ No newline at end of file diff --git a/TravelCompany/TravelCompany/FormMain.cs b/TravelCompany/TravelCompany/FormMain.cs index b4b6ba8..822013e 100644 --- a/TravelCompany/TravelCompany/FormMain.cs +++ b/TravelCompany/TravelCompany/FormMain.cs @@ -156,7 +156,7 @@ namespace TravelCompanyView } } - private void toolStripLabel1_Click(object sender, EventArgs e) + private void DoWorkToolStripLabel_Click(object sender, EventArgs e) { _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);