Merge branch 'LabWork01' into LabWork02
This commit is contained in:
commit
84e044afdd
@ -120,4 +120,7 @@
|
|||||||
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||||
<value>17, 17</value>
|
<value>17, 17</value>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
|
<value>25</value>
|
||||||
|
</metadata>
|
||||||
</root>
|
</root>
|
2
SushiBar/FormSushi.Designer.cs
generated
2
SushiBar/FormSushi.Designer.cs
generated
@ -218,7 +218,7 @@
|
|||||||
Font = new Font("Candara", 10.2F, FontStyle.Regular, GraphicsUnit.Point, 204);
|
Font = new Font("Candara", 10.2F, FontStyle.Regular, GraphicsUnit.Point, 204);
|
||||||
Margin = new Padding(3, 4, 3, 4);
|
Margin = new Padding(3, 4, 3, 4);
|
||||||
Name = "FormSushi";
|
Name = "FormSushi";
|
||||||
Text = "FormSushi";
|
Text = "Суши";
|
||||||
Load += FormSushi_Load;
|
Load += FormSushi_Load;
|
||||||
groupBoxComponents.ResumeLayout(false);
|
groupBoxComponents.ResumeLayout(false);
|
||||||
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
|
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
|
||||||
|
2
SushiBar/FormSushis.Designer.cs
generated
2
SushiBar/FormSushis.Designer.cs
generated
@ -106,7 +106,7 @@
|
|||||||
Controls.Add(buttonAddSushi);
|
Controls.Add(buttonAddSushi);
|
||||||
Controls.Add(dataGridView);
|
Controls.Add(dataGridView);
|
||||||
Name = "FormSushis";
|
Name = "FormSushis";
|
||||||
Text = "FormSushis";
|
Text = "Суши";
|
||||||
Load += FormSushis_Load;
|
Load += FormSushis_Load;
|
||||||
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
|
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
|
||||||
ResumeLayout(false);
|
ResumeLayout(false);
|
||||||
|
Loading…
Reference in New Issue
Block a user