diff --git a/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 b/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 index d12cce3..7e22aba 100644 Binary files a/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 and b/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/1a17ea9a-e1f8-4645-8890-b1046fde2265.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/1a17ea9a-e1f8-4645-8890-b1046fde2265.vsidx deleted file mode 100644 index 2c76153..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/1a17ea9a-e1f8-4645-8890-b1046fde2265.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/cc8a1e58-6176-4c91-a0e5-42dc076c5afa.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/22131ef2-8365-4817-a217-ffcad2908f9d.vsidx similarity index 100% rename from .vs/GtaVUsersInfo/FileContentIndex/cc8a1e58-6176-4c91-a0e5-42dc076c5afa.vsidx rename to .vs/GtaVUsersInfo/FileContentIndex/22131ef2-8365-4817-a217-ffcad2908f9d.vsidx diff --git a/.vs/GtaVUsersInfo/FileContentIndex/339b9713-5955-41cb-b8ea-95605e84cd9b.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/339b9713-5955-41cb-b8ea-95605e84cd9b.vsidx new file mode 100644 index 0000000..b413867 Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/339b9713-5955-41cb-b8ea-95605e84cd9b.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/8a36960c-088e-46cf-b1f6-1d8cc7f96584.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/8a36960c-088e-46cf-b1f6-1d8cc7f96584.vsidx deleted file mode 100644 index 94c7dd7..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/8a36960c-088e-46cf-b1f6-1d8cc7f96584.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/b7a74056-d124-437e-816c-ae76d413980b.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/b7a74056-d124-437e-816c-ae76d413980b.vsidx new file mode 100644 index 0000000..d508fbe Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/b7a74056-d124-437e-816c-ae76d413980b.vsidx differ diff --git a/.vs/GtaVUsersInfo/v17/.futdcache.v2 b/.vs/GtaVUsersInfo/v17/.futdcache.v2 index d7797cc..f29af9a 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 7577a0f..16bbb64 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 da49cb6..e0513fa 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 62242c6..6205f26 100644 Binary files a/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin and b/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin differ diff --git a/Controls/ParameterControl.Designer.cs b/Controls/ParameterControl.Designer.cs index 3cd7f2a..3955048 100644 --- a/Controls/ParameterControl.Designer.cs +++ b/Controls/ParameterControl.Designer.cs @@ -50,6 +50,7 @@ // // Textbox // + Textbox.BackColor = SystemColors.Control; Textbox.Dock = DockStyle.Top; Textbox.ImeMode = ImeMode.NoControl; Textbox.Location = new Point(2, 17); diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index e87e292..467db61 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -284,7 +284,7 @@ // textToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { colorTextToolStripMenuItem, styleTextToolStripMenuItem, toolStripSeparator3, defaultToolStripMenuItem }); textToolStripMenuItem.Name = "textToolStripMenuItem"; - textToolStripMenuItem.Size = new Size(106, 22); + textToolStripMenuItem.Size = new Size(180, 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(106, 22); + colorToolStripMenuItem.Size = new Size(180, 22); colorToolStripMenuItem.Text = "Цвета"; // // buttonPanelToolStripMenuItem diff --git a/MainForm.cs b/MainForm.cs index fe3eda1..0365aae 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -1,26 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Security.AccessControl; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using System.Xml.Linq; -using GtaVUsersInfo.Helpers; -using GtaVUsersInfo.Controls; -using Newtonsoft.Json; -using System.IO; -using System.Data.Common; +using GtaVUsersInfo.Controls; using GtaVUsersInfo.Forms; -using System.Collections; -using System.Security.Cryptography; +using GtaVUsersInfo.Helpers; using GtaVUsersInfo.Sources; -using OpenQA.Selenium.DevTools.V127.Page; -using Microsoft.VisualBasic.ApplicationServices; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using Newtonsoft.Json; +using System.Data; namespace GtaVUsersInfo { @@ -135,8 +118,6 @@ namespace GtaVUsersInfo } } - - private void MainForm_Load(object sender, EventArgs e) { AllPanelCreate(); @@ -602,12 +583,27 @@ namespace GtaVUsersInfo private void ChangePanelColor() { this.buttonsPanel.BackColor = panelColorSettings.leftPanel; + + PanelColorSettings.ChangeFontInControls(this.buttonsPanel, panelColorSettings.leftPanel); + this.parametersPanel.BackColor = panelColorSettings.rightPanel; + + PanelColorSettings.ChangeFontInControls(this.parametersPanel, panelColorSettings.rightPanel); + this.carsPanel.BackColor = panelColorSettings.centerPanel; this.carsItems.BackColor = panelColorSettings.centerPanel; this.upPanel.BackColor = panelColorSettings.upDownPanel; + + PanelColorSettings.ChangeFontInControls(this.upPanel, panelColorSettings.upDownPanel); + this.downPanel.BackColor = panelColorSettings.upDownPanel; + + PanelColorSettings.ChangeFontInControls(this.downPanel, panelColorSettings.upDownPanel); + this.menuStrip.BackColor = panelColorSettings.upDownPanel; + + this.splitterLeft.BackColor = panelColorSettings.upDownPanel; + this.splitterRigth.BackColor = panelColorSettings.upDownPanel; } private void buttonPanelToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user index 9eb70ab..c29c2fe 100644 --- a/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2024-10-10T10:54:38.0393379Z;True|2024-10-10T13:48:01.9862052+03:00;True|2024-10-10T12:30:25.7657642+03:00;True|2024-10-10T10:55:42.4660156+03:00;True|2024-10-10T10:36:20.4890831+03:00; + True|2024-10-10T11:39:55.0855728Z;True|2024-10-10T13:54:38.0393379+03:00;True|2024-10-10T13:48:01.9862052+03:00;True|2024-10-10T12:30:25.7657642+03:00;True|2024-10-10T10:55:42.4660156+03:00;True|2024-10-10T10:36:20.4890831+03:00; \ No newline at end of file diff --git a/Sources/PanelColorSettings.cs b/Sources/PanelColorSettings.cs index 9c7cfff..915efb7 100644 --- a/Sources/PanelColorSettings.cs +++ b/Sources/PanelColorSettings.cs @@ -60,5 +60,25 @@ namespace GtaVUsersInfo.Sources return null; } } + + public static void ChangeFontInControls(Control parent, Color color) + { + foreach (Control control in parent.Controls) + { + if (control is TextBox || + control is Button || + control is ComboBox || + control is Label || + control is MenuStrip) + { + control.BackColor = color; + } + + if (control.HasChildren) + { + ChangeFontInControls(control, color); + } + } + } } } diff --git a/bin/Debug/net7.0-windows/GtaVUsersInfo.dll b/bin/Debug/net7.0-windows/GtaVUsersInfo.dll index 0cff562..a87165c 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 ba7eef7..55c429d 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/Release/net7.0-windows/GtaVUsersInfo.dll b/bin/Release/net7.0-windows/GtaVUsersInfo.dll index 7bb3cd2..7bc5878 100644 Binary files a/bin/Release/net7.0-windows/GtaVUsersInfo.dll and b/bin/Release/net7.0-windows/GtaVUsersInfo.dll differ diff --git a/bin/Release/net7.0-windows/GtaVUsersInfo.pdb b/bin/Release/net7.0-windows/GtaVUsersInfo.pdb index 22528c3..afe6009 100644 Binary files a/bin/Release/net7.0-windows/GtaVUsersInfo.pdb and b/bin/Release/net7.0-windows/GtaVUsersInfo.pdb differ diff --git a/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll b/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll index b3fa5ab..03254f5 100644 Binary files a/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll and b/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll differ diff --git a/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb b/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb index 8807aa6..6f36817 100644 Binary files a/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb and b/bin/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb differ diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache index 2d9dbc1..cbc4f14 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 0cff562..a87165c 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 ba7eef7..55c429d 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb and b/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb differ diff --git a/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll b/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll index 8f2a02f..965f35b 100644 Binary files a/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll and b/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll differ diff --git a/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll b/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll index 8f2a02f..965f35b 100644 Binary files a/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll and b/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll differ diff --git a/obj/Release/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache b/obj/Release/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache index a7bb83e..ecea49c 100644 Binary files a/obj/Release/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache and b/obj/Release/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache differ diff --git a/obj/Release/net7.0-windows/GtaVUsersInfo.dll b/obj/Release/net7.0-windows/GtaVUsersInfo.dll index 7bb3cd2..7bc5878 100644 Binary files a/obj/Release/net7.0-windows/GtaVUsersInfo.dll and b/obj/Release/net7.0-windows/GtaVUsersInfo.dll differ diff --git a/obj/Release/net7.0-windows/GtaVUsersInfo.pdb b/obj/Release/net7.0-windows/GtaVUsersInfo.pdb index 22528c3..afe6009 100644 Binary files a/obj/Release/net7.0-windows/GtaVUsersInfo.pdb and b/obj/Release/net7.0-windows/GtaVUsersInfo.pdb differ diff --git a/obj/Release/net7.0-windows/ref/GtaVUsersInfo.dll b/obj/Release/net7.0-windows/ref/GtaVUsersInfo.dll index 84c8fcd..fe1cdd2 100644 Binary files a/obj/Release/net7.0-windows/ref/GtaVUsersInfo.dll and b/obj/Release/net7.0-windows/ref/GtaVUsersInfo.dll differ diff --git a/obj/Release/net7.0-windows/refint/GtaVUsersInfo.dll b/obj/Release/net7.0-windows/refint/GtaVUsersInfo.dll index 84c8fcd..fe1cdd2 100644 Binary files a/obj/Release/net7.0-windows/refint/GtaVUsersInfo.dll and b/obj/Release/net7.0-windows/refint/GtaVUsersInfo.dll differ diff --git a/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.csproj.GenerateResource.cache b/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.csproj.GenerateResource.cache index a7bb83e..ecea49c 100644 Binary files a/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.csproj.GenerateResource.cache and b/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.csproj.GenerateResource.cache differ diff --git a/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll b/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll index b3fa5ab..03254f5 100644 Binary files a/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll and b/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.dll differ diff --git a/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb b/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb index 8807aa6..6f36817 100644 Binary files a/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb and b/obj/Release/net7.0-windows/win-x86/GtaVUsersInfo.pdb differ diff --git a/obj/Release/net7.0-windows/win-x86/ref/GtaVUsersInfo.dll b/obj/Release/net7.0-windows/win-x86/ref/GtaVUsersInfo.dll index b636434..2704996 100644 Binary files a/obj/Release/net7.0-windows/win-x86/ref/GtaVUsersInfo.dll and b/obj/Release/net7.0-windows/win-x86/ref/GtaVUsersInfo.dll differ diff --git a/obj/Release/net7.0-windows/win-x86/refint/GtaVUsersInfo.dll b/obj/Release/net7.0-windows/win-x86/refint/GtaVUsersInfo.dll index b636434..2704996 100644 Binary files a/obj/Release/net7.0-windows/win-x86/refint/GtaVUsersInfo.dll and b/obj/Release/net7.0-windows/win-x86/refint/GtaVUsersInfo.dll differ