великий дизайнер

WinFormsApp/FormMain.Designer.cs

@@ -34,35 +34,46 @@
             menuStrip1 = new MenuStrip();
             товарыToolStripMenuItem = new ToolStripMenuItem();
             поставщикиToolStripMenuItem = new ToolStripMenuItem();
+            статистикаToolStripMenuItem = new ToolStripMenuItem();
             buttonSupplyStatusArriving = new Button();
             buttonSupplyStatusCompleted = new Button();
-            buttonCreateReport = new Button();
-            buttonPrintReport = new Button();
             printPreviewDialog = new PrintPreviewDialog();
             printDialog = new PrintDialog();
             buttonRefresh = new Button();
-            статистикаToolStripMenuItem = new ToolStripMenuItem();
+            pictureBox1 = new PictureBox();
+            groupBox1 = new GroupBox();
+            pictureBox2 = new PictureBox();
+            buttonPrintReport = new Button();
+            buttonCreateReport = new Button();
+            groupBox2 = new GroupBox();
+            label1 = new Label();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             menuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
+            groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox2).BeginInit();
+            groupBox2.SuspendLayout();
             SuspendLayout();
             // 
             // dataGridView
             // 
+            dataGridView.BackgroundColor = Color.SteelBlue;
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Dock = DockStyle.Left;
+            dataGridView.Dock = DockStyle.Top;
             dataGridView.Location = new Point(0, 24);
             dataGridView.Name = "dataGridView";
-            dataGridView.Size = new Size(663, 360);
+            dataGridView.Size = new Size(901, 231);
             dataGridView.TabIndex = 0;
             // 
             // buttonCreateSupply
             // 
-            buttonCreateSupply.Location = new Point(707, 27);
+            buttonCreateSupply.BackColor = Color.MediumSpringGreen;
+            buttonCreateSupply.Location = new Point(6, 24);
             buttonCreateSupply.Name = "buttonCreateSupply";
             buttonCreateSupply.Size = new Size(154, 23);
             buttonCreateSupply.TabIndex = 1;
             buttonCreateSupply.Text = "Оформить поставку";
-            buttonCreateSupply.UseVisualStyleBackColor = true;
+            buttonCreateSupply.UseVisualStyleBackColor = false;
             buttonCreateSupply.Click += buttonCreateSupply_Click;
             // 
             // menuStrip1
@@ -88,9 +99,16 @@
             поставщикиToolStripMenuItem.Text = "Поставщики";
             поставщикиToolStripMenuItem.Click += поставщикиToolStripMenuItem_Click_1;
             // 
+            // статистикаToolStripMenuItem
+            // 
+            статистикаToolStripMenuItem.Name = "статистикаToolStripMenuItem";
+            статистикаToolStripMenuItem.Size = new Size(80, 20);
+            статистикаToolStripMenuItem.Text = "Статистика";
+            статистикаToolStripMenuItem.Click += статистикаToolStripMenuItem_Click;
+            // 
             // buttonSupplyStatusArriving
             // 
-            buttonSupplyStatusArriving.Location = new Point(707, 76);
+            buttonSupplyStatusArriving.Location = new Point(190, 53);
             buttonSupplyStatusArriving.Name = "buttonSupplyStatusArriving";
             buttonSupplyStatusArriving.Size = new Size(154, 23);
             buttonSupplyStatusArriving.TabIndex = 3;
@@ -100,7 +118,7 @@
             // 
             // buttonSupplyStatusCompleted
             // 
-            buttonSupplyStatusCompleted.Location = new Point(707, 125);
+            buttonSupplyStatusCompleted.Location = new Point(190, 23);
             buttonSupplyStatusCompleted.Name = "buttonSupplyStatusCompleted";
             buttonSupplyStatusCompleted.Size = new Size(154, 23);
             buttonSupplyStatusCompleted.TabIndex = 4;
@@ -108,26 +126,6 @@
             buttonSupplyStatusCompleted.UseVisualStyleBackColor = true;
             buttonSupplyStatusCompleted.Click += buttonSupplyStatusCompleted_Click;
             // 
-            // buttonCreateReport
-            // 
-            buttonCreateReport.Location = new Point(707, 190);
-            buttonCreateReport.Name = "buttonCreateReport";
-            buttonCreateReport.Size = new Size(154, 44);
-            buttonCreateReport.TabIndex = 5;
-            buttonCreateReport.Text = "Сформировать отчет о поставке";
-            buttonCreateReport.UseVisualStyleBackColor = true;
-            buttonCreateReport.Click += buttonCreateReport_Click;
-            // 
-            // buttonPrintReport
-            // 
-            buttonPrintReport.Location = new Point(707, 261);
-            buttonPrintReport.Name = "buttonPrintReport";
-            buttonPrintReport.Size = new Size(154, 44);
-            buttonPrintReport.TabIndex = 6;
-            buttonPrintReport.Text = "Распечатать отчет";
-            buttonPrintReport.UseVisualStyleBackColor = true;
-            buttonPrintReport.Click += buttonPrintReport_Click;
-            // 
             // printPreviewDialog
             // 
             printPreviewDialog.AutoScrollMargin = new Size(0, 0);
@@ -144,41 +142,121 @@
             // 
             // buttonRefresh
             // 
-            buttonRefresh.Location = new Point(707, 325);
+            buttonRefresh.Location = new Point(735, 272);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(154, 47);
             buttonRefresh.TabIndex = 7;
-            buttonRefresh.Text = "Обновить";
+            buttonRefresh.Text = "Обновить список поставок";
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += buttonRefresh_Click;
             // 
-            // статистикаToolStripMenuItem
+            // pictureBox1
             // 
-            статистикаToolStripMenuItem.Name = "статистикаToolStripMenuItem";
-            статистикаToolStripMenuItem.Size = new Size(80, 20);
-            статистикаToolStripMenuItem.Text = "Статистика";
-            статистикаToolStripMenuItem.Click += статистикаToolStripMenuItem_Click;
+            pictureBox1.BackColor = Color.Transparent;
+            pictureBox1.BackgroundImage = (Image)resources.GetObject("pictureBox1.BackgroundImage");
+            pictureBox1.BackgroundImageLayout = ImageLayout.Zoom;
+            pictureBox1.BorderStyle = BorderStyle.FixedSingle;
+            pictureBox1.InitialImage = (Image)resources.GetObject("pictureBox1.InitialImage");
+            pictureBox1.Location = new Point(873, 360);
+            pictureBox1.Name = "pictureBox1";
+            pictureBox1.Size = new Size(28, 24);
+            pictureBox1.TabIndex = 8;
+            pictureBox1.TabStop = false;
+            pictureBox1.Click += pictureBox1_Click;
+            // 
+            // groupBox1
+            // 
+            groupBox1.BackColor = SystemColors.ActiveCaption;
+            groupBox1.Controls.Add(buttonSupplyStatusCompleted);
+            groupBox1.Controls.Add(buttonSupplyStatusArriving);
+            groupBox1.Controls.Add(buttonCreateSupply);
+            groupBox1.Location = new Point(12, 260);
+            groupBox1.Name = "groupBox1";
+            groupBox1.Size = new Size(362, 112);
+            groupBox1.TabIndex = 10;
+            groupBox1.TabStop = false;
+            groupBox1.Text = "Управление поставками";
+            // 
+            // pictureBox2
+            // 
+            pictureBox2.BackgroundImage = (Image)resources.GetObject("pictureBox2.BackgroundImage");
+            pictureBox2.BackgroundImageLayout = ImageLayout.Zoom;
+            pictureBox2.Location = new Point(323, 0);
+            pictureBox2.Name = "pictureBox2";
+            pictureBox2.Size = new Size(26, 33);
+            pictureBox2.TabIndex = 9;
+            pictureBox2.TabStop = false;
+            pictureBox2.Click += pictureBox2_Click;
+            // 
+            // buttonPrintReport
+            // 
+            buttonPrintReport.Location = new Point(154, 31);
+            buttonPrintReport.Name = "buttonPrintReport";
+            buttonPrintReport.Size = new Size(154, 44);
+            buttonPrintReport.TabIndex = 6;
+            buttonPrintReport.Text = "Распечатать отчет";
+            buttonPrintReport.UseVisualStyleBackColor = true;
+            buttonPrintReport.Click += buttonPrintReport_Click;
+            // 
+            // buttonCreateReport
+            // 
+            buttonCreateReport.BackgroundImageLayout = ImageLayout.Zoom;
+            buttonCreateReport.Location = new Point(20, 31);
+            buttonCreateReport.Name = "buttonCreateReport";
+            buttonCreateReport.Size = new Size(113, 44);
+            buttonCreateReport.TabIndex = 5;
+            buttonCreateReport.Text = "Сформировать отчет о поставке";
+            buttonCreateReport.UseVisualStyleBackColor = true;
+            buttonCreateReport.Click += buttonCreateReport_Click;
+            // 
+            // groupBox2
+            // 
+            groupBox2.BackColor = SystemColors.ActiveCaption;
+            groupBox2.Controls.Add(buttonPrintReport);
+            groupBox2.Controls.Add(buttonCreateReport);
+            groupBox2.Controls.Add(pictureBox2);
+            groupBox2.Location = new Point(380, 261);
+            groupBox2.Name = "groupBox2";
+            groupBox2.Size = new Size(349, 111);
+            groupBox2.TabIndex = 11;
+            groupBox2.TabStop = false;
+            groupBox2.Text = "Управление отчетами";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.BackColor = Color.Transparent;
+            label1.ForeColor = SystemColors.Control;
+            label1.Location = new Point(772, 369);
+            label1.Name = "label1";
+            label1.Size = new Size(95, 15);
+            label1.TabIndex = 12;
+            label1.Text = "Система 21guns";
             // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
+            BackgroundImage = (Image)resources.GetObject("$this.BackgroundImage");
             ClientSize = new Size(901, 384);
+            Controls.Add(label1);
+            Controls.Add(groupBox2);
+            Controls.Add(groupBox1);
+            Controls.Add(pictureBox1);
             Controls.Add(buttonRefresh);
-            Controls.Add(buttonPrintReport);
-            Controls.Add(buttonCreateReport);
-            Controls.Add(buttonSupplyStatusCompleted);
-            Controls.Add(buttonSupplyStatusArriving);
-            Controls.Add(buttonCreateSupply);
             Controls.Add(dataGridView);
             Controls.Add(menuStrip1);
             MainMenuStrip = menuStrip1;
             Name = "FormMain";
-            Text = "FormMain";
+            Text = "Поставки";
             Load += FormMain_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
             menuStrip1.ResumeLayout(false);
             menuStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
+            groupBox1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pictureBox2).EndInit();
+            groupBox2.ResumeLayout(false);
             ResumeLayout(false);
             PerformLayout();
         }
@@ -192,11 +270,16 @@
         private ToolStripMenuItem поставщикиToolStripMenuItem;
         private Button buttonSupplyStatusArriving;
         private Button buttonSupplyStatusCompleted;
-        private Button buttonCreateReport;
-        private Button buttonPrintReport;
         private PrintPreviewDialog printPreviewDialog;
         private PrintDialog printDialog;
         private Button buttonRefresh;
         private ToolStripMenuItem статистикаToolStripMenuItem;
+        private PictureBox pictureBox1;
+        private GroupBox groupBox1;
+        private PictureBox pictureBox2;
+        private Button buttonPrintReport;
+        private Button buttonCreateReport;
+        private GroupBox groupBox2;
+        private Label label1;
     }
 }

WinFormsApp/FormMain.cs

@@ -39,6 +39,9 @@ namespace WinFormsApp
         private void FormMain_Load(object sender, EventArgs e)
         {
             LoadData();
+            this.FormBorderStyle = FormBorderStyle.FixedSingle;
+            this.MinimumSize = new Size(Width, Height);
+            this.MaximumSize = this.MinimumSize;
         }
 
         private void LoadData()
@@ -223,5 +226,15 @@ namespace WinFormsApp
                 form.ShowDialog();
             }
         }
+
+        private void pictureBox2_Click(object sender, EventArgs e)
+        {
+
+        }
+
+        private void pictureBox1_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

WinFormsApp/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WinFormsApp.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // с помощью такого средства, как ResGen или Visual Studio.
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // с параметром /str или перестройте свой проект VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WinFormsApp.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

WinFormsApp/Properties/Resources.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

WinFormsApp/WinFormsApp.csproj

@@ -45,4 +45,19 @@
     <ProjectReference Include="..\DatabaseImplement\DatabaseImplement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>