diff --git a/IceCreamShop/IceCreamShop/MainForm.Designer.cs b/IceCreamShop/IceCreamShop/MainForm.Designer.cs index 3227836..ec22665 100644 --- a/IceCreamShop/IceCreamShop/MainForm.Designer.cs +++ b/IceCreamShop/IceCreamShop/MainForm.Designer.cs @@ -34,6 +34,7 @@ МороженноеStripMenuItem = new ToolStripMenuItem(); магазиныToolStripMenuItem = new ToolStripMenuItem(); поставкиToolStripMenuItem = new ToolStripMenuItem(); + продажиToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); списокМороженногоToolStripMenuItem = new ToolStripMenuItem(); компонентыПоМороженнымToolStripMenuItem = new ToolStripMenuItem(); @@ -44,7 +45,6 @@ ReadyButton = new Button(); IssuedButton = new Button(); RefreshButton = new Button(); - продажиToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); SuspendLayout(); @@ -55,8 +55,8 @@ menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenu, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Padding = new Padding(6, 3, 0, 3); - menuStrip1.Size = new Size(1296, 30); + menuStrip1.Padding = new Padding(7, 4, 0, 4); + menuStrip1.Size = new Size(1290, 32); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -64,23 +64,44 @@ // ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыStripMenuItem, МороженноеStripMenuItem, магазиныToolStripMenuItem, поставкиToolStripMenuItem, продажиToolStripMenuItem }); ToolStripMenu.Name = "ToolStripMenu"; - ToolStripMenu.Size = new Size(94, 20); + ToolStripMenu.Size = new Size(117, 24); ToolStripMenu.Text = "Справочники"; // // КомпонентыStripMenuItem // КомпонентыStripMenuItem.Name = "КомпонентыStripMenuItem"; - КомпонентыStripMenuItem.Size = new Size(180, 22); + КомпонентыStripMenuItem.Size = new Size(186, 26); КомпонентыStripMenuItem.Text = "Компоненты"; КомпонентыStripMenuItem.Click += КомпонентыStripMenuItem_Click; // // МороженноеStripMenuItem // МороженноеStripMenuItem.Name = "МороженноеStripMenuItem"; - МороженноеStripMenuItem.Size = new Size(180, 22); + МороженноеStripMenuItem.Size = new Size(186, 26); МороженноеStripMenuItem.Text = "Мороженное"; МороженноеStripMenuItem.Click += МороженноеStripMenuItem_Click; // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(186, 26); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click; + // + // поставкиToolStripMenuItem + // + поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; + поставкиToolStripMenuItem.Size = new Size(186, 26); + поставкиToolStripMenuItem.Text = "Поставки"; + поставкиToolStripMenuItem.Click += поставкиToolStripMenuItem_Click; + // + // продажиToolStripMenuItem + // + продажиToolStripMenuItem.Name = "продажиToolStripMenuItem"; + продажиToolStripMenuItem.Size = new Size(186, 26); + продажиToolStripMenuItem.Text = "Продажи"; + продажиToolStripMenuItem.Click += продажиToolStripMenuItem_Click; + // // отчетыToolStripMenuItem // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокМороженногоToolStripMenuItem, компонентыПоМороженнымToolStripMenuItem, списокЗаказовToolStripMenuItem }); @@ -109,35 +130,21 @@ списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; // - // магазиныToolStripMenuItem - // - магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(180, 22); - магазиныToolStripMenuItem.Text = "Магазины"; - магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click; - // - // поставкиToolStripMenuItem - // - поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; - поставкиToolStripMenuItem.Size = new Size(180, 22); - поставкиToolStripMenuItem.Text = "Поставки"; - поставкиToolStripMenuItem.Click += поставкиToolStripMenuItem_Click; - // // DataGridView // DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - DataGridView.Location = new Point(11, 31); + DataGridView.Location = new Point(13, 41); + DataGridView.Margin = new Padding(3, 4, 3, 4); DataGridView.Name = "DataGridView"; DataGridView.RowHeadersWidth = 51; - DataGridView.Size = new Size(881, 305); + DataGridView.Size = new Size(1007, 407); DataGridView.TabIndex = 1; // // CreateOrderButton // - CreateOrderButton.Location = new Point(897, 23); - CreateOrderButton.Margin = new Padding(3, 2, 3, 2); + CreateOrderButton.Location = new Point(1025, 31); CreateOrderButton.Name = "CreateOrderButton"; - CreateOrderButton.Size = new Size(227, 22); + CreateOrderButton.Size = new Size(259, 29); CreateOrderButton.TabIndex = 2; CreateOrderButton.Text = "Создать заказ"; CreateOrderButton.UseVisualStyleBackColor = true; @@ -145,9 +152,10 @@ // // TakeInWorkButton // - TakeInWorkButton.Location = new Point(1025, 67); + TakeInWorkButton.Location = new Point(1026, 65); + TakeInWorkButton.Margin = new Padding(3, 4, 3, 4); TakeInWorkButton.Name = "TakeInWorkButton"; - TakeInWorkButton.Size = new Size(227, 22); + TakeInWorkButton.Size = new Size(259, 29); TakeInWorkButton.TabIndex = 3; TakeInWorkButton.Text = "Отдать заказ в работу"; TakeInWorkButton.UseVisualStyleBackColor = true; @@ -155,10 +163,9 @@ // // ReadyButton // - ReadyButton.Location = new Point(897, 76); - ReadyButton.Margin = new Padding(3, 2, 3, 2); + ReadyButton.Location = new Point(1025, 101); ReadyButton.Name = "ReadyButton"; - ReadyButton.Size = new Size(227, 22); + ReadyButton.Size = new Size(259, 29); ReadyButton.TabIndex = 4; ReadyButton.Text = "Заказ готов"; ReadyButton.UseVisualStyleBackColor = true; @@ -166,10 +173,9 @@ // // IssuedButton // - IssuedButton.Location = new Point(897, 102); - IssuedButton.Margin = new Padding(3, 2, 3, 2); + IssuedButton.Location = new Point(1025, 136); IssuedButton.Name = "IssuedButton"; - IssuedButton.Size = new Size(227, 22); + IssuedButton.Size = new Size(259, 29); IssuedButton.TabIndex = 5; IssuedButton.Text = "Заказ выдан"; IssuedButton.UseVisualStyleBackColor = true; @@ -177,27 +183,19 @@ // // RefreshButton // - RefreshButton.Location = new Point(897, 128); - RefreshButton.Margin = new Padding(3, 2, 3, 2); + RefreshButton.Location = new Point(1025, 171); RefreshButton.Name = "RefreshButton"; - RefreshButton.Size = new Size(227, 22); + RefreshButton.Size = new Size(259, 29); RefreshButton.TabIndex = 6; RefreshButton.Text = "Обновить"; RefreshButton.UseVisualStyleBackColor = true; RefreshButton.Click += RefreshButton_Click; // - // продажиToolStripMenuItem - // - продажиToolStripMenuItem.Name = "продажиToolStripMenuItem"; - продажиToolStripMenuItem.Size = new Size(180, 22); - продажиToolStripMenuItem.Text = "Продажи"; - продажиToolStripMenuItem.Click += продажиToolStripMenuItem_Click; - // // MainForm // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1296, 451); + ClientSize = new Size(1290, 476); Controls.Add(RefreshButton); Controls.Add(IssuedButton); Controls.Add(ReadyButton); @@ -206,7 +204,6 @@ Controls.Add(DataGridView); Controls.Add(menuStrip1); MainMenuStrip = menuStrip1; - Margin = new Padding(3, 2, 3, 2); Name = "MainForm"; Text = "Форма главная"; Load += MainForm_Load; diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20240324074257_InitialCreate.Designer.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20240324074257_InitialCreate.Designer.cs index 777e3bf..a298d4a 100644 --- a/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20240324074257_InitialCreate.Designer.cs +++ b/IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20240324074257_InitialCreate.Designer.cs @@ -12,11 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace IceCreamShopDatabaseImplement.Migrations { [DbContext(typeof(IceCreamShopDataBase))] -<<<<<<<< HEAD:IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20240324075315_InitialCreate.Designer.cs - [Migration("20240324075315_InitialCreate")] -======== [Migration("20240324074257_InitialCreate")] ->>>>>>>> Lab3_Hard:IceCreamShop/IceCreamShopDatabaseImplement/Migrations/20240324074257_InitialCreate.Designer.cs + partial class InitialCreate { ///