diff --git a/.vs/GtaVUsersInfo/FileContentIndex/17692a60-d14b-48f8-9914-6d513d708611.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/17692a60-d14b-48f8-9914-6d513d708611.vsidx new file mode 100644 index 0000000..47c3cbc Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/17692a60-d14b-48f8-9914-6d513d708611.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/33a01b59-a5d0-4619-bab5-f0d624ee018c.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/33a01b59-a5d0-4619-bab5-f0d624ee018c.vsidx new file mode 100644 index 0000000..5c074df Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/33a01b59-a5d0-4619-bab5-f0d624ee018c.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/9a7b5a13-304b-4ee3-ab33-bd580047a412.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/9a7b5a13-304b-4ee3-ab33-bd580047a412.vsidx deleted file mode 100644 index 1c74a8a..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/9a7b5a13-304b-4ee3-ab33-bd580047a412.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/922209e1-c1de-40bc-9451-c8aa827b35bd.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/d2f74daa-2c16-401c-939a-46fed931540c.vsidx similarity index 82% rename from .vs/GtaVUsersInfo/FileContentIndex/922209e1-c1de-40bc-9451-c8aa827b35bd.vsidx rename to .vs/GtaVUsersInfo/FileContentIndex/d2f74daa-2c16-401c-939a-46fed931540c.vsidx index 70820c9..38f4166 100644 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/922209e1-c1de-40bc-9451-c8aa827b35bd.vsidx and b/.vs/GtaVUsersInfo/FileContentIndex/d2f74daa-2c16-401c-939a-46fed931540c.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/e602db10-2f3a-4b42-b65e-599cead7225f.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/e602db10-2f3a-4b42-b65e-599cead7225f.vsidx new file mode 100644 index 0000000..cfc0a88 Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/e602db10-2f3a-4b42-b65e-599cead7225f.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/ee41b38c-92a7-4412-9dca-909ef079c894.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/ee41b38c-92a7-4412-9dca-909ef079c894.vsidx deleted file mode 100644 index a06dd3d..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/ee41b38c-92a7-4412-9dca-909ef079c894.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/fda6ea35-274a-4356-9929-9961f4e15c7c.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/fda6ea35-274a-4356-9929-9961f4e15c7c.vsidx deleted file mode 100644 index 303bc66..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/fda6ea35-274a-4356-9929-9961f4e15c7c.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/v17/.futdcache.v2 b/.vs/GtaVUsersInfo/v17/.futdcache.v2 index c2b52b9..b3cd5e8 100644 Binary files a/.vs/GtaVUsersInfo/v17/.futdcache.v2 and b/.vs/GtaVUsersInfo/v17/.futdcache.v2 differ diff --git a/.vs/GtaVUsersInfo/v17/.suo b/.vs/GtaVUsersInfo/v17/.suo index 0b75e29..4765f78 100644 Binary files a/.vs/GtaVUsersInfo/v17/.suo and b/.vs/GtaVUsersInfo/v17/.suo differ diff --git a/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin b/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin index ee49305..6189adc 100644 Binary files a/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin and b/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin b/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin index 2da9838..c424430 100644 Binary files a/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin and b/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin differ diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 467db61..adfae8c 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -231,45 +231,45 @@ // openFileToolStripMenuItem // openFileToolStripMenuItem.Name = "openFileToolStripMenuItem"; - openFileToolStripMenuItem.Size = new Size(170, 22); + openFileToolStripMenuItem.Size = new Size(180, 22); openFileToolStripMenuItem.Text = "Открыть"; openFileToolStripMenuItem.Click += openFileToolStripMenuItem_Click; // // saveToolStripMenuItem // saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - saveToolStripMenuItem.Size = new Size(170, 22); + saveToolStripMenuItem.Size = new Size(180, 22); saveToolStripMenuItem.Text = "Сохранить"; saveToolStripMenuItem.Click += saveToolStripMenuItem_Click; // // saveAsКакToolStripMenuItem // saveAsКакToolStripMenuItem.Name = "saveAsКакToolStripMenuItem"; - saveAsКакToolStripMenuItem.Size = new Size(170, 22); + saveAsКакToolStripMenuItem.Size = new Size(180, 22); saveAsКакToolStripMenuItem.Text = "Сохранить как"; saveAsКакToolStripMenuItem.Click += saveAsКакToolStripMenuItem_Click; // // toolStripSeparator2 // toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new Size(167, 6); + toolStripSeparator2.Size = new Size(177, 6); // // newToolStripMenuItem // newToolStripMenuItem.Name = "newToolStripMenuItem"; - newToolStripMenuItem.Size = new Size(170, 22); + newToolStripMenuItem.Size = new Size(180, 22); newToolStripMenuItem.Text = "Новый персонаж"; newToolStripMenuItem.Click += newToolStripMenuItem_Click; // // toolStripSeparator1 // toolStripSeparator1.Name = "toolStripSeparator1"; - toolStripSeparator1.Size = new Size(167, 6); + toolStripSeparator1.Size = new Size(177, 6); // // exitToolStripMenuItem // exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - exitToolStripMenuItem.Size = new Size(170, 22); + exitToolStripMenuItem.Size = new Size(180, 22); exitToolStripMenuItem.Text = "Выйти"; exitToolStripMenuItem.Click += exitToolStripMenuItem_Click; // @@ -284,7 +284,7 @@ // textToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { colorTextToolStripMenuItem, styleTextToolStripMenuItem, toolStripSeparator3, defaultToolStripMenuItem }); textToolStripMenuItem.Name = "textToolStripMenuItem"; - textToolStripMenuItem.Size = new Size(180, 22); + textToolStripMenuItem.Size = new Size(106, 22); textToolStripMenuItem.Text = "Текст"; // // colorTextToolStripMenuItem @@ -317,7 +317,7 @@ // colorToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { buttonPanelToolStripMenuItem, parameterPanelToolStripMenuItem, carPanelToolStripMenuItem, top_downPanelToolStripMenuItem }); colorToolStripMenuItem.Name = "colorToolStripMenuItem"; - colorToolStripMenuItem.Size = new Size(180, 22); + colorToolStripMenuItem.Size = new Size(106, 22); colorToolStripMenuItem.Text = "Цвета"; // // buttonPanelToolStripMenuItem diff --git a/MainForm.cs b/MainForm.cs index b01e5f4..a1649a6 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -129,6 +129,7 @@ namespace GtaVUsersInfo CarPanelCreate(); FontSettings.ChangeFontInControls(this, fontSettings); + ChangePanelColor(); } private void WindowResize() @@ -144,10 +145,10 @@ namespace GtaVUsersInfo { parametersPanel.Controls.Clear(); - foreach (Control param in parameters) + foreach (ParameterControl param in parameters) { param.Dock = DockStyle.Top; - (param as ParameterControl).MenuStrip = new ParameterItemMenuStrip(addNewParameter, deleteParameter, param as ParameterControl).Menu; + param.MenuStrip = new ParameterItemMenuStrip(addNewParameter, deleteParameter, param).Menu; parametersPanel.Controls.Add(param); parametersPanel.Controls.SetChildIndex(param, 0); } diff --git a/bin/Debug/net7.0-windows/GtaVUsersInfo.dll b/bin/Debug/net7.0-windows/GtaVUsersInfo.dll index a87165c..3fccfb0 100644 Binary files a/bin/Debug/net7.0-windows/GtaVUsersInfo.dll and b/bin/Debug/net7.0-windows/GtaVUsersInfo.dll differ diff --git a/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb b/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb index 55c429d..32f528b 100644 Binary files a/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb and b/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb differ diff --git a/bin/Debug/net7.0-windows/data/window.json b/bin/Debug/net7.0-windows/data/window.json index fdb4d7d..e724932 100644 --- a/bin/Debug/net7.0-windows/data/window.json +++ b/bin/Debug/net7.0-windows/data/window.json @@ -4,5 +4,5 @@ "leftPos": 150, "rightPos": 181, "isFullScreen": true, - "prevFile": "C:\\Users\\eugen\\YandexDisk\\БТШ\\Карл.json" + "prevFile": "C:\\Users\\eugen\\YandexDisk\\Важное\\GTAV\\123.json" } \ No newline at end of file diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache index cbc4f14..6016ff9 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache and b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache differ diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.dll b/obj/Debug/net7.0-windows/GtaVUsersInfo.dll index a87165c..3fccfb0 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.dll and b/obj/Debug/net7.0-windows/GtaVUsersInfo.dll differ diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb b/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb index 55c429d..32f528b 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb and b/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb differ