diff --git a/PlumbingRepair/FormMain.Designer.cs b/PlumbingRepair/FormMain.Designer.cs index bb042d0..aa2c69b 100644 --- a/PlumbingRepair/FormMain.Designer.cs +++ b/PlumbingRepair/FormMain.Designer.cs @@ -43,6 +43,7 @@ IssuedOrderButton = new Button(); UpdateListButton = new Button(); DataGridView = new DataGridView(); + почтаToolStripMenuItem = new ToolStripMenuItem(); MenuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); SuspendLayout(); @@ -50,11 +51,10 @@ // MenuStrip // MenuStrip.ImageScalingSize = new Size(20, 20); - MenuStrip.Items.AddRange(new ToolStripItem[] { СправочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem }); + MenuStrip.Items.AddRange(new ToolStripItem[] { СправочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem }); MenuStrip.Location = new Point(0, 0); MenuStrip.Name = "MenuStrip"; - MenuStrip.Padding = new Padding(7, 3, 0, 3); - MenuStrip.Size = new Size(989, 30); + MenuStrip.Size = new Size(865, 24); MenuStrip.TabIndex = 0; MenuStrip.Text = "menuStrip1"; // @@ -62,34 +62,34 @@ // СправочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { РаботыToolStripMenuItem, КомпонентыToolStripMenuItem, КлиентыToolStripMenuItem, исполнителиToolStripMenuItem }); СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; - СправочникиToolStripMenuItem.Size = new Size(117, 24); + СправочникиToolStripMenuItem.Size = new Size(94, 20); СправочникиToolStripMenuItem.Text = "Cправочники"; // // РаботыToolStripMenuItem // РаботыToolStripMenuItem.Name = "РаботыToolStripMenuItem"; - РаботыToolStripMenuItem.Size = new Size(185, 26); + РаботыToolStripMenuItem.Size = new Size(149, 22); РаботыToolStripMenuItem.Text = "Работы"; РаботыToolStripMenuItem.Click += РаботыToolStripMenuItem_Click; // // КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(185, 26); + КомпонентыToolStripMenuItem.Size = new Size(149, 22); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // КлиентыToolStripMenuItem // КлиентыToolStripMenuItem.Name = "КлиентыToolStripMenuItem"; - КлиентыToolStripMenuItem.Size = new Size(185, 26); + КлиентыToolStripMenuItem.Size = new Size(149, 22); КлиентыToolStripMenuItem.Text = "Клиенты"; КлиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(185, 26); + исполнителиToolStripMenuItem.Size = new Size(149, 22); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // @@ -97,43 +97,42 @@ // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { WorksToolStripMenuItem, WorkComponentToolStripMenuItem, OrdersToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(73, 24); + отчетыToolStripMenuItem.Size = new Size(60, 20); отчетыToolStripMenuItem.Text = "Отчеты"; // // WorksToolStripMenuItem // WorksToolStripMenuItem.Name = "WorksToolStripMenuItem"; - WorksToolStripMenuItem.Size = new Size(273, 26); + WorksToolStripMenuItem.Size = new Size(211, 22); WorksToolStripMenuItem.Text = "Список Работ"; WorksToolStripMenuItem.Click += WorksToolStripMenuItem_Click; // // WorkComponentToolStripMenuItem // WorkComponentToolStripMenuItem.Name = "WorkComponentToolStripMenuItem"; - WorkComponentToolStripMenuItem.Size = new Size(273, 26); + WorkComponentToolStripMenuItem.Size = new Size(211, 22); WorkComponentToolStripMenuItem.Text = "Работы по компонентам"; WorkComponentToolStripMenuItem.Click += WorkComponentToolStripMenuItem_Click; // // OrdersToolStripMenuItem // OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; - OrdersToolStripMenuItem.Size = new Size(273, 26); + OrdersToolStripMenuItem.Size = new Size(211, 22); OrdersToolStripMenuItem.Text = "Список заказов"; OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // // запускРаботToolStripMenuItem // запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; - запускРаботToolStripMenuItem.Size = new Size(114, 24); + запускРаботToolStripMenuItem.Size = new Size(92, 20); запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // // CreateOrderButton // - CreateOrderButton.Location = new Point(832, 37); - CreateOrderButton.Margin = new Padding(3, 4, 3, 4); + CreateOrderButton.Location = new Point(728, 28); CreateOrderButton.Name = "CreateOrderButton"; - CreateOrderButton.Size = new Size(143, 44); + CreateOrderButton.Size = new Size(125, 33); CreateOrderButton.TabIndex = 2; CreateOrderButton.Text = "Создать заказ"; CreateOrderButton.UseVisualStyleBackColor = true; @@ -141,10 +140,9 @@ // // IssuedOrderButton // - IssuedOrderButton.Location = new Point(831, 149); - IssuedOrderButton.Margin = new Padding(3, 4, 3, 4); + IssuedOrderButton.Location = new Point(727, 112); IssuedOrderButton.Name = "IssuedOrderButton"; - IssuedOrderButton.Size = new Size(143, 44); + IssuedOrderButton.Size = new Size(125, 33); IssuedOrderButton.TabIndex = 5; IssuedOrderButton.Text = "Заказ выдан"; IssuedOrderButton.UseVisualStyleBackColor = true; @@ -152,10 +150,9 @@ // // UpdateListButton // - UpdateListButton.Location = new Point(831, 269); - UpdateListButton.Margin = new Padding(3, 4, 3, 4); + UpdateListButton.Location = new Point(727, 202); UpdateListButton.Name = "UpdateListButton"; - UpdateListButton.Size = new Size(143, 44); + UpdateListButton.Size = new Size(125, 33); UpdateListButton.TabIndex = 6; UpdateListButton.Text = "Обновить список"; UpdateListButton.UseVisualStyleBackColor = true; @@ -164,26 +161,31 @@ // DataGridView // DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - DataGridView.Location = new Point(0, 36); - DataGridView.Margin = new Padding(3, 4, 3, 4); + DataGridView.Location = new Point(0, 27); DataGridView.Name = "DataGridView"; DataGridView.RowHeadersWidth = 51; DataGridView.RowTemplate.Height = 25; - DataGridView.Size = new Size(825, 561); + DataGridView.Size = new Size(722, 421); DataGridView.TabIndex = 1; // + // почтаToolStripMenuItem + // + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(53, 20); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; + // // FormMain // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(989, 600); + ClientSize = new Size(865, 450); Controls.Add(UpdateListButton); Controls.Add(IssuedOrderButton); Controls.Add(CreateOrderButton); Controls.Add(DataGridView); Controls.Add(MenuStrip); MainMenuStrip = MenuStrip; - Margin = new Padding(3, 4, 3, 4); Name = "FormMain"; Text = "Ремонт сантехники"; Load += FormMain_Load; @@ -211,5 +213,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private DataGridView DataGridView; + private ToolStripMenuItem почтаToolStripMenuItem; } } \ No newline at end of file diff --git a/PlumbingRepair/FormMain.cs b/PlumbingRepair/FormMain.cs index 3aac899..2c5ab1b 100644 --- a/PlumbingRepair/FormMain.cs +++ b/PlumbingRepair/FormMain.cs @@ -173,5 +173,14 @@ namespace PlumbingRepair form.ShowDialog(); } } + + private void почтаToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + if (service is FormMails form) + { + form.ShowDialog(); + } + } } } diff --git a/PlumbingRepair/FormMain.resx b/PlumbingRepair/FormMain.resx index a694815..cae68fc 100644 --- a/PlumbingRepair/FormMain.resx +++ b/PlumbingRepair/FormMain.resx @@ -1,4 +1,64 @@ - + + +