ekallin/PIbd-21_Bakalskaya_E.D._SushiBar_mistakes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

исправлено вроде все с конфликтами - форма загружается, названия на одном языке

Browse Source
This commit is contained in:
ekallin 2024-02-25 10:37:43 +04:00
commit c479da2cdc
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SushiBar/FormMain.Designer.cs generated
View File

@ -150,6 +150,7 @@
MainMenuStrip = menuStrip1; MainMenuStrip = menuStrip1;
Name = "FormMain"; Name = "FormMain";
Text = "Суши Бар"; Text = "Суши Бар";
Load += FormMain_Load;
menuStrip1.ResumeLayout(false); menuStrip1.ResumeLayout(false);
menuStrip1.PerformLayout(); menuStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();

2
SushiBar/FormSushi.Designer.cs generated
View File

@ -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
View File

@ -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);

2
SushiBar/Program.cs
View File

@ -12,6 +12,8 @@ namespace SushiBar
{ {
internal static class Program internal static class Program
{ {
//<<<<<<< HEAD=======
// ïîïûòêà èñïðàâèòü ãê >>>>>>> 194224615c9ce8063382a619ef3c0a5ba4dafd57
private static ServiceProvider? _serviceProvider; private static ServiceProvider? _serviceProvider;
public static ServiceProvider? ServiceProvider => _serviceProvider; public static ServiceProvider? ServiceProvider => _serviceProvider;