diff --git a/SushiBar/SushiBarView/FormMain.Designer.cs b/SushiBar/SushiBarView/FormMain.Designer.cs index 023ca27..1999a78 100644 --- a/SushiBar/SushiBarView/FormMain.Designer.cs +++ b/SushiBar/SushiBarView/FormMain.Designer.cs @@ -37,9 +37,9 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.componentsToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.sushiToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dataGridView = new System.Windows.Forms.DataGridView(); this.shopsToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.transactionToolStripMenuItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.пополнениеМагазинаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dataGridView = new System.Windows.Forms.DataGridView(); this.menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -97,7 +97,8 @@ // menuStrip // this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripMenuItem1}); + this.toolStripMenuItem1, + this.пополнениеМагазинаToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Size = new System.Drawing.Size(922, 24); @@ -109,8 +110,7 @@ this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.componentsToolStripMenuItemToolStripMenuItem, this.sushiToolStripMenuItemToolStripMenuItem, - this.shopsToolStripMenuItemToolStripMenuItem, - this.transactionToolStripMenuItemToolStripMenuItem}); + this.shopsToolStripMenuItemToolStripMenuItem}); this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Size = new System.Drawing.Size(94, 20); this.toolStripMenuItem1.Text = "Справочники"; @@ -129,6 +129,20 @@ this.sushiToolStripMenuItemToolStripMenuItem.Text = "Суши"; this.sushiToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.sushiToolStripMenuItem_Click); // + // shopsToolStripMenuItemToolStripMenuItem + // + this.shopsToolStripMenuItemToolStripMenuItem.Name = "shopsToolStripMenuItemToolStripMenuItem"; + this.shopsToolStripMenuItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.shopsToolStripMenuItemToolStripMenuItem.Text = "Магазины"; + this.shopsToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.shopsToolStripMenuItem_Click); + // + // пополнениеМагазинаToolStripMenuItem + // + this.пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; + this.пополнениеМагазинаToolStripMenuItem.Size = new System.Drawing.Size(143, 20); + this.пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; + this.пополнениеМагазинаToolStripMenuItem.Click += new System.EventHandler(this.transactionToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.BackgroundColor = System.Drawing.Color.White; @@ -139,20 +153,6 @@ this.dataGridView.Size = new System.Drawing.Size(647, 344); this.dataGridView.TabIndex = 6; // - // shopsToolStripMenuItemToolStripMenuItem - // - this.shopsToolStripMenuItemToolStripMenuItem.Name = "shopsToolStripMenuItemToolStripMenuItem"; - this.shopsToolStripMenuItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.shopsToolStripMenuItemToolStripMenuItem.Text = "Магазины"; - this.shopsToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.shopsToolStripMenuItem_Click); - // - // transactionToolStripMenuItemToolStripMenuItem - // - this.transactionToolStripMenuItemToolStripMenuItem.Name = "transactionToolStripMenuItemToolStripMenuItem"; - this.transactionToolStripMenuItemToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.transactionToolStripMenuItemToolStripMenuItem.Text = "Транзакции"; - this.transactionToolStripMenuItemToolStripMenuItem.Click += new System.EventHandler(this.transactionToolStripMenuItem_Click); - // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -190,6 +190,6 @@ private ToolStripMenuItem sushiToolStripMenuItemToolStripMenuItem; private DataGridView dataGridView; private ToolStripMenuItem shopsToolStripMenuItemToolStripMenuItem; - private ToolStripMenuItem transactionToolStripMenuItemToolStripMenuItem; + private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; } } \ No newline at end of file diff --git a/SushiBar/SushiBarView/FormShop.Designer.cs b/SushiBar/SushiBarView/FormShop.Designer.cs index c12987b..5cf4b69 100644 --- a/SushiBar/SushiBarView/FormShop.Designer.cs +++ b/SushiBar/SushiBarView/FormShop.Designer.cs @@ -46,40 +46,43 @@ // labelName // this.labelName.AutoSize = true; - this.labelName.Location = new System.Drawing.Point(11, 15); + this.labelName.Location = new System.Drawing.Point(10, 11); this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(84, 20); + this.labelName.Size = new System.Drawing.Size(65, 15); this.labelName.TabIndex = 0; this.labelName.Text = "Название: "; // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(102, 12); + this.textBoxName.Location = new System.Drawing.Point(89, 9); + this.textBoxName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(276, 27); + this.textBoxName.Size = new System.Drawing.Size(242, 23); this.textBoxName.TabIndex = 1; // // textBoxAdress // - this.textBoxAdress.Location = new System.Drawing.Point(102, 59); + this.textBoxAdress.Location = new System.Drawing.Point(89, 44); + this.textBoxAdress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxAdress.Name = "textBoxAdress"; - this.textBoxAdress.Size = new System.Drawing.Size(427, 27); + this.textBoxAdress.Size = new System.Drawing.Size(374, 23); this.textBoxAdress.TabIndex = 3; // // labelAdress // this.labelAdress.AutoSize = true; - this.labelAdress.Location = new System.Drawing.Point(11, 61); + this.labelAdress.Location = new System.Drawing.Point(10, 46); this.labelAdress.Name = "labelAdress"; - this.labelAdress.Size = new System.Drawing.Size(58, 20); + this.labelAdress.Size = new System.Drawing.Size(46, 15); this.labelAdress.TabIndex = 2; this.labelAdress.Text = "Адрес: "; // // buttonCancel // - this.buttonCancel.Location = new System.Drawing.Point(451, 457); + this.buttonCancel.Location = new System.Drawing.Point(395, 343); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(130, 44); + this.buttonCancel.Size = new System.Drawing.Size(114, 33); this.buttonCancel.TabIndex = 5; this.buttonCancel.Text = "Отмена"; this.buttonCancel.UseVisualStyleBackColor = true; @@ -87,9 +90,10 @@ // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(315, 457); + this.buttonSave.Location = new System.Drawing.Point(276, 343); + this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(130, 44); + this.buttonSave.Size = new System.Drawing.Size(114, 33); this.buttonSave.TabIndex = 6; this.buttonSave.Text = "Сохранить"; this.buttonSave.UseVisualStyleBackColor = true; @@ -100,18 +104,20 @@ this.dataGridView.AllowUserToAddRows = false; this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.BackgroundColor = System.Drawing.Color.White; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.id, this.SushiName, this.Count}); - this.dataGridView.Location = new System.Drawing.Point(12, 144); + this.dataGridView.Location = new System.Drawing.Point(10, 108); + this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dataGridView.Name = "dataGridView"; this.dataGridView.ReadOnly = true; this.dataGridView.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None; this.dataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(569, 307); + this.dataGridView.Size = new System.Drawing.Size(498, 230); this.dataGridView.TabIndex = 7; // // id @@ -139,24 +145,25 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 103); + this.label1.Location = new System.Drawing.Point(10, 77); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(110, 20); + this.label1.Size = new System.Drawing.Size(87, 15); this.label1.TabIndex = 8; this.label1.Text = "Дата открытия"; // // dateTimeOpen // - this.dateTimeOpen.Location = new System.Drawing.Point(128, 103); + this.dateTimeOpen.Location = new System.Drawing.Point(112, 77); + this.dateTimeOpen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dateTimeOpen.Name = "dateTimeOpen"; - this.dateTimeOpen.Size = new System.Drawing.Size(401, 27); + this.dateTimeOpen.Size = new System.Drawing.Size(351, 23); this.dateTimeOpen.TabIndex = 9; // // FormShop // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(593, 513); + this.ClientSize = new System.Drawing.Size(519, 385); this.Controls.Add(this.dateTimeOpen); this.Controls.Add(this.label1); this.Controls.Add(this.dataGridView); @@ -166,6 +173,7 @@ this.Controls.Add(this.labelAdress); this.Controls.Add(this.textBoxName); this.Controls.Add(this.labelName); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormShop"; this.Text = "Магазин"; this.Load += new System.EventHandler(this.FormShop_Load); diff --git a/SushiBar/SushiBarView/FormShop.resx b/SushiBar/SushiBarView/FormShop.resx index 1af7de1..f298a7b 100644 --- a/SushiBar/SushiBarView/FormShop.resx +++ b/SushiBar/SushiBarView/FormShop.resx @@ -1,64 +1,4 @@ - - - + diff --git a/SushiBar/SushiBarView/FormShops.Designer.cs b/SushiBar/SushiBarView/FormShops.Designer.cs index b54a130..f668a5f 100644 --- a/SushiBar/SushiBarView/FormShops.Designer.cs +++ b/SushiBar/SushiBarView/FormShops.Designer.cs @@ -44,16 +44,18 @@ this.ToolsPanel.Controls.Add(this.buttonDel); this.ToolsPanel.Controls.Add(this.buttonUpd); this.ToolsPanel.Controls.Add(this.buttonAdd); - this.ToolsPanel.Location = new System.Drawing.Point(608, 12); + this.ToolsPanel.Location = new System.Drawing.Point(532, 9); + this.ToolsPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.ToolsPanel.Name = "ToolsPanel"; - this.ToolsPanel.Size = new System.Drawing.Size(180, 426); + this.ToolsPanel.Size = new System.Drawing.Size(158, 320); this.ToolsPanel.TabIndex = 3; // // buttonRef // - this.buttonRef.Location = new System.Drawing.Point(31, 206); + this.buttonRef.Location = new System.Drawing.Point(27, 154); + this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(126, 36); + this.buttonRef.Size = new System.Drawing.Size(110, 27); this.buttonRef.TabIndex = 3; this.buttonRef.Text = "Обновить"; this.buttonRef.UseVisualStyleBackColor = true; @@ -61,9 +63,10 @@ // // buttonDel // - this.buttonDel.Location = new System.Drawing.Point(31, 142); + this.buttonDel.Location = new System.Drawing.Point(27, 106); + this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonDel.Name = "buttonDel"; - this.buttonDel.Size = new System.Drawing.Size(126, 36); + this.buttonDel.Size = new System.Drawing.Size(110, 27); this.buttonDel.TabIndex = 2; this.buttonDel.Text = "Удалить"; this.buttonDel.UseVisualStyleBackColor = true; @@ -71,9 +74,10 @@ // // buttonUpd // - this.buttonUpd.Location = new System.Drawing.Point(31, 76); + this.buttonUpd.Location = new System.Drawing.Point(27, 57); + this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonUpd.Name = "buttonUpd"; - this.buttonUpd.Size = new System.Drawing.Size(126, 36); + this.buttonUpd.Size = new System.Drawing.Size(110, 27); this.buttonUpd.TabIndex = 1; this.buttonUpd.Text = "Изменить"; this.buttonUpd.UseVisualStyleBackColor = true; @@ -81,9 +85,10 @@ // // buttonAdd // - this.buttonAdd.Location = new System.Drawing.Point(31, 16); + this.buttonAdd.Location = new System.Drawing.Point(27, 12); + this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(126, 36); + this.buttonAdd.Size = new System.Drawing.Size(110, 27); this.buttonAdd.TabIndex = 0; this.buttonAdd.Text = "Добавить"; this.buttonAdd.UseVisualStyleBackColor = true; @@ -93,22 +98,25 @@ // this.dataGridView.AllowUserToAddRows = false; this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.Color.White; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(12, 12); + this.dataGridView.Location = new System.Drawing.Point(10, 9); + this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.dataGridView.Name = "dataGridView"; this.dataGridView.ReadOnly = true; this.dataGridView.RowHeadersWidth = 51; this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(590, 426); + this.dataGridView.Size = new System.Drawing.Size(516, 320); this.dataGridView.TabIndex = 2; // // FormShops // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(700, 338); this.Controls.Add(this.ToolsPanel); this.Controls.Add(this.dataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "FormShops"; this.Text = "Магазины"; this.Load += new System.EventHandler(this.FormShops_Load); diff --git a/SushiBar/SushiBarView/FormShops.resx b/SushiBar/SushiBarView/FormShops.resx index 1af7de1..f298a7b 100644 --- a/SushiBar/SushiBarView/FormShops.resx +++ b/SushiBar/SushiBarView/FormShops.resx @@ -1,64 +1,4 @@ - - - +