From 24ac6da8cc56cde7b049c0012ecc10193ea17d0a Mon Sep 17 00:00:00 2001 From: the Date: Tue, 25 Jun 2024 22:34:53 +0400 Subject: [PATCH] ffffffffffff --- WinFormsApp/FormMain.Designer.cs | 40 ++++++++++------- WinFormsApp/FormMain.resx | 2 +- WinFormsApp/FormProducts.Designer.cs | 4 +- WinFormsApp/FormSupply.Designer.cs | 2 +- WinFormsApp/FormSupply.resx | 9 ++++ WinFormsApp/FormSupplyProduct.Designer.cs | 54 ++++++++++++++++++----- 6 files changed, 82 insertions(+), 29 deletions(-) diff --git a/WinFormsApp/FormMain.Designer.cs b/WinFormsApp/FormMain.Designer.cs index b8b1869..53622f7 100644 --- a/WinFormsApp/FormMain.Designer.cs +++ b/WinFormsApp/FormMain.Designer.cs @@ -57,7 +57,7 @@ // // dataGridView // - dataGridView.BackgroundColor = Color.FromArgb(160, 160, 220); + dataGridView.BackgroundColor = Color.AliceBlue; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Dock = DockStyle.Top; dataGridView.Location = new Point(0, 24); @@ -68,9 +68,10 @@ // buttonCreateSupply // buttonCreateSupply.BackColor = Color.FromArgb(192, 255, 192); - buttonCreateSupply.Location = new Point(6, 24); + buttonCreateSupply.ForeColor = SystemColors.ActiveCaptionText; + buttonCreateSupply.Location = new Point(6, 32); buttonCreateSupply.Name = "buttonCreateSupply"; - buttonCreateSupply.Size = new Size(154, 23); + buttonCreateSupply.Size = new Size(108, 52); buttonCreateSupply.TabIndex = 1; buttonCreateSupply.Text = "Оформить поставку"; buttonCreateSupply.UseVisualStyleBackColor = false; @@ -108,9 +109,10 @@ // // buttonSupplyStatusArriving // - buttonSupplyStatusArriving.Location = new Point(190, 53); + buttonSupplyStatusArriving.ForeColor = SystemColors.ActiveCaptionText; + buttonSupplyStatusArriving.Location = new Point(131, 33); buttonSupplyStatusArriving.Name = "buttonSupplyStatusArriving"; - buttonSupplyStatusArriving.Size = new Size(154, 23); + buttonSupplyStatusArriving.Size = new Size(105, 54); buttonSupplyStatusArriving.TabIndex = 3; buttonSupplyStatusArriving.Text = "Поставка в пути"; buttonSupplyStatusArriving.UseVisualStyleBackColor = true; @@ -118,9 +120,10 @@ // // buttonSupplyStatusCompleted // - buttonSupplyStatusCompleted.Location = new Point(190, 23); + buttonSupplyStatusCompleted.ForeColor = SystemColors.ActiveCaptionText; + buttonSupplyStatusCompleted.Location = new Point(259, 33); buttonSupplyStatusCompleted.Name = "buttonSupplyStatusCompleted"; - buttonSupplyStatusCompleted.Size = new Size(154, 23); + buttonSupplyStatusCompleted.Size = new Size(97, 53); buttonSupplyStatusCompleted.TabIndex = 4; buttonSupplyStatusCompleted.Text = "Поставка завершена"; buttonSupplyStatusCompleted.UseVisualStyleBackColor = true; @@ -142,7 +145,8 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(735, 272); + buttonRefresh.Font = new Font("Segoe UI", 10F, FontStyle.Bold); + buttonRefresh.Location = new Point(735, 293); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(154, 47); buttonRefresh.TabIndex = 7; @@ -166,10 +170,12 @@ // // groupBox1 // - groupBox1.BackColor = SystemColors.ActiveCaption; + groupBox1.BackColor = Color.Transparent; groupBox1.Controls.Add(buttonSupplyStatusCompleted); groupBox1.Controls.Add(buttonSupplyStatusArriving); groupBox1.Controls.Add(buttonCreateSupply); + groupBox1.Font = new Font("Segoe UI", 10F, FontStyle.Bold); + groupBox1.ForeColor = SystemColors.Control; groupBox1.Location = new Point(12, 260); groupBox1.Name = "groupBox1"; groupBox1.Size = new Size(362, 112); @@ -181,16 +187,17 @@ // pictureBox2.BackgroundImage = Properties.Resources.pdf_icon_on_transparent_background_free_png_2869912988; pictureBox2.BackgroundImageLayout = ImageLayout.Zoom; - pictureBox2.Location = new Point(323, 0); + pictureBox2.Location = new Point(302, 64); pictureBox2.Name = "pictureBox2"; - pictureBox2.Size = new Size(26, 33); + pictureBox2.Size = new Size(47, 58); pictureBox2.TabIndex = 9; pictureBox2.TabStop = false; pictureBox2.Click += pictureBox2_Click; // // buttonPrintReport // - buttonPrintReport.Location = new Point(154, 31); + buttonPrintReport.ForeColor = SystemColors.ActiveCaptionText; + buttonPrintReport.Location = new Point(154, 37); buttonPrintReport.Name = "buttonPrintReport"; buttonPrintReport.Size = new Size(154, 44); buttonPrintReport.TabIndex = 6; @@ -201,9 +208,10 @@ // buttonCreateReport // buttonCreateReport.BackgroundImageLayout = ImageLayout.Zoom; - buttonCreateReport.Location = new Point(20, 31); + buttonCreateReport.ForeColor = SystemColors.ActiveCaptionText; + buttonCreateReport.Location = new Point(6, 31); buttonCreateReport.Name = "buttonCreateReport"; - buttonCreateReport.Size = new Size(113, 44); + buttonCreateReport.Size = new Size(142, 57); buttonCreateReport.TabIndex = 5; buttonCreateReport.Text = "Сформировать отчет о поставке"; buttonCreateReport.UseVisualStyleBackColor = true; @@ -211,10 +219,12 @@ // // groupBox2 // - groupBox2.BackColor = SystemColors.ActiveCaption; + groupBox2.BackColor = Color.Transparent; groupBox2.Controls.Add(buttonPrintReport); groupBox2.Controls.Add(buttonCreateReport); groupBox2.Controls.Add(pictureBox2); + groupBox2.Font = new Font("Segoe UI", 10F, FontStyle.Bold); + groupBox2.ForeColor = SystemColors.Control; groupBox2.Location = new Point(380, 261); groupBox2.Name = "groupBox2"; groupBox2.Size = new Size(349, 111); diff --git a/WinFormsApp/FormMain.resx b/WinFormsApp/FormMain.resx index 8f58aea..d939944 100644 --- a/WinFormsApp/FormMain.resx +++ b/WinFormsApp/FormMain.resx @@ -153,7 +153,7 @@ iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAHPdJREFUeF7tXQmQI1d5bh0Ltste74JNKgQMBOdw4jXeOTQaSSNp7mt37vuSRpqd + vQAADr0BR/uQrQAAHPdJREFUeF7tXQmQI1d5bh0Ltste74JNKgQMBOdw4jXeOTQaSSNp7mt37vuSRpqd e/bwrnfXhmCTchIqsZ2quEhiSCUhRRGSUBUIlElSieNQdiVQwcQ4iSEH2ITE2NjgJTb2ro7O9z2919Oj 6ZnVzI5mV+L9VV+97laru/X+733//16/bhnatGnTpk2bNm3atGnTpk2bNm3atGnTpk2bNm3atGnTpk2b Nm3atGnTpk2bth8fW1lZMZaWltaB29Vn2srY6OSjR48KwNluCQ/gleAyt7kAI5lMGg899JCxuLgoj6Ct diff --git a/WinFormsApp/FormProducts.Designer.cs b/WinFormsApp/FormProducts.Designer.cs index d385862..811d7af 100644 --- a/WinFormsApp/FormProducts.Designer.cs +++ b/WinFormsApp/FormProducts.Designer.cs @@ -62,7 +62,7 @@ // // dataGridView // - dataGridView.BackgroundColor = Color.Lavender; + dataGridView.BackgroundColor = Color.AliceBlue; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Location = new Point(290, 27); dataGridView.Name = "dataGridView"; @@ -312,7 +312,7 @@ Controls.Add(menuStrip1); MainMenuStrip = menuStrip1; Name = "FormProducts"; - Text = "FormProducts"; + Text = "Товары"; Load += FormProducts_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); groupBoxControls.ResumeLayout(false); diff --git a/WinFormsApp/FormSupply.Designer.cs b/WinFormsApp/FormSupply.Designer.cs index 35182c3..fe80ee0 100644 --- a/WinFormsApp/FormSupply.Designer.cs +++ b/WinFormsApp/FormSupply.Designer.cs @@ -218,7 +218,7 @@ Controls.Add(buttonSave); Controls.Add(groupBoxProducts); Name = "FormSupply"; - Text = "FormSupply"; + Text = "Оформление поставки"; Load += FormSupply_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); groupBoxProducts.ResumeLayout(false); diff --git a/WinFormsApp/FormSupply.resx b/WinFormsApp/FormSupply.resx index 3f4c598..04861d1 100644 --- a/WinFormsApp/FormSupply.resx +++ b/WinFormsApp/FormSupply.resx @@ -126,4 +126,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/WinFormsApp/FormSupplyProduct.Designer.cs b/WinFormsApp/FormSupplyProduct.Designer.cs index a8ac46f..a0ce1d0 100644 --- a/WinFormsApp/FormSupplyProduct.Designer.cs +++ b/WinFormsApp/FormSupplyProduct.Designer.cs @@ -32,57 +32,89 @@ comboBoxProduct = new ComboBox(); buttonSave = new Button(); buttonCancel = new Button(); + label1 = new Label(); + label2 = new Label(); ((System.ComponentModel.ISupportInitialize)numericUpDownCount).BeginInit(); SuspendLayout(); // // numericUpDownCount // - numericUpDownCount.Location = new Point(26, 76); + numericUpDownCount.Location = new Point(109, 69); + numericUpDownCount.Maximum = new decimal(new int[] { 100000, 0, 0, 0 }); numericUpDownCount.Name = "numericUpDownCount"; - numericUpDownCount.Size = new Size(120, 23); + numericUpDownCount.Size = new Size(157, 23); numericUpDownCount.TabIndex = 1; // // comboBoxProduct // comboBoxProduct.FormattingEnabled = true; - comboBoxProduct.Location = new Point(25, 33); + comboBoxProduct.Location = new Point(109, 20); comboBoxProduct.Name = "comboBoxProduct"; - comboBoxProduct.Size = new Size(121, 23); + comboBoxProduct.Size = new Size(158, 23); comboBoxProduct.TabIndex = 2; // // buttonSave // - buttonSave.Location = new Point(192, 74); + buttonSave.BackColor = Color.FromArgb(192, 255, 192); + buttonSave.Font = new Font("Segoe UI", 9F); + buttonSave.Location = new Point(109, 98); buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(75, 23); + buttonSave.RightToLeft = RightToLeft.No; + buttonSave.Size = new Size(77, 28); buttonSave.TabIndex = 3; buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; + buttonSave.UseVisualStyleBackColor = false; buttonSave.Click += ButtonSave_Click; // // buttonCancel // + buttonCancel.BackColor = Color.FromArgb(255, 192, 192); + buttonCancel.Font = new Font("Segoe UI", 9F); buttonCancel.Location = new Point(192, 98); buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(75, 23); + buttonCancel.Size = new Size(75, 28); buttonCancel.TabIndex = 4; buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.UseVisualStyleBackColor = false; buttonCancel.Click += ButtonCancel_Click; // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("Segoe UI", 12F, FontStyle.Bold); + label1.Location = new Point(12, 22); + label1.Name = "label1"; + label1.Size = new Size(60, 21); + label1.TabIndex = 5; + label1.Text = "Товар:"; + // + // label2 + // + label2.AutoSize = true; + label2.Font = new Font("Segoe UI", 12F, FontStyle.Bold); + label2.Location = new Point(12, 66); + label2.Name = "label2"; + label2.Size = new Size(69, 21); + label2.TabIndex = 6; + label2.Text = "Кол-во:"; + // // FormSupplyProduct // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.AliceBlue; ClientSize = new Size(287, 138); + Controls.Add(label2); + Controls.Add(label1); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(comboBoxProduct); Controls.Add(numericUpDownCount); Name = "FormSupplyProduct"; - Text = "FormSupplyProduct"; + Text = "+ Товар к поставке"; ((System.ComponentModel.ISupportInitialize)numericUpDownCount).EndInit(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -90,5 +122,7 @@ private ComboBox comboBoxProduct; private Button buttonSave; private Button buttonCancel; + private Label label1; + private Label label2; } } \ No newline at end of file