Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
add 2 themes - Cobalt & Dark amethyst
Greedeks0ed80d3c8114
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.csindex 64c5cdd9..6fd80bcb 100644--- a/.Source/GTweak/App.xaml.cs+++ b/.Source/GTweak/App.xaml.cs@@ -104,7 +104,9 @@ namespace GTweak{"Dark" => new Uri($"Styles/Themes/Dark/Colors.xaml", UriKind.Relative),"Light" => new Uri($"Styles/Themes/Light/Colors.xaml", UriKind.Relative),- "Cold Blue" => new Uri($"Styles/Themes/Cold Blue/Colors.xaml", UriKind.Relative),+ "Cobalt" => new Uri($"Styles/Themes/Cobalt/Colors.xaml", UriKind.Relative),+ "Dark amethyst" => new Uri($"Styles/Themes/Dark amethyst/Colors.xaml", UriKind.Relative),+ "Cold Blue" => new Uri($"Styles/Themes/Cold blue/Colors.xaml", UriKind.Relative),_ => RegistryHelp.GetValue(@"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize", "AppsUseLightTheme", string.Empty) == "0" ? new Uri("Styles/Themes/Dark/Colors.xaml", UriKind.Relative) : new Uri($"Styles/Themes/Light/Colors.xaml", UriKind.Relative),}};diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 87ecc7cf..7e740ae5 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -419,7 +419,15 @@<SubType>Designer</SubType><Generator>MSBuild:Compile</Generator></Page>- <Page Include="Styles\Themes\Cold Blue\Colors.xaml">+ <Page Include="Styles\Themes\Cobalt\Colors.xaml">+ <Generator>MSBuild:Compile</Generator>+ <SubType>Designer</SubType>+ </Page>+ <Page Include="Styles\Themes\Cold blue\Colors.xaml">+ <Generator>MSBuild:Compile</Generator>+ <SubType>Designer</SubType>+ </Page>+ <Page Include="Styles\Themes\Dark amethyst\Colors.xaml"><Generator>MSBuild:Compile</Generator><SubType>Designer</SubType></Page>diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xamlindex cbb7819a..95244274 100644--- a/.Source/GTweak/Languages/en/Localize.xaml+++ b/.Source/GTweak/Languages/en/Localize.xaml@@ -91,6 +91,8 @@<v:String x:Key="cmbox_theme_main">Interface theme:</v:String><v:String x:Key="cmbox_dark_main">Dark</v:String><v:String x:Key="cmbox_light_main">Light</v:String>+ <v:String x:Key="cmbox_cobalt_main">Cobalt</v:String>+ <v:String x:Key="cmbox_amethyst_main">Dark amethyst</v:String><v:String x:Key="cmbox_cblue_main">Cold blue</v:String><v:String x:Key="cmbox_system_main">System</v:String><v:String x:Key="btn_import">Import</v:String>diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xamlindex 43c05721..20bde175 100644--- a/.Source/GTweak/Languages/ko/Localize.xaml+++ b/.Source/GTweak/Languages/ko/Localize.xaml@@ -91,6 +91,8 @@<v:String x:Key="cmbox_theme_main">인터페이스 테마:</v:String><v:String x:Key="cmbox_dark_main">어두운</v:String><v:String x:Key="cmbox_light_main">밝은</v:String>+ <v:String x:Key="cmbox_cobalt_main">코발트</v:String>+ <v:String x:Key="cmbox_amethyst_main">어두운 자수정</v:String><v:String x:Key="cmbox_cblue_main">차가운 파란색</v:String><v:String x:Key="cmbox_system_main">시스템</v:String><v:String x:Key="btn_import">가져오기</v:String>diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xamlindex 39312b0a..113cf35a 100644--- a/.Source/GTweak/Languages/ru/Localize.xaml+++ b/.Source/GTweak/Languages/ru/Localize.xaml@@ -91,7 +91,9 @@<v:String x:Key="cmbox_theme_main">Тема интерфейса:</v:String><v:String x:Key="cmbox_dark_main">Тёмная</v:String><v:String x:Key="cmbox_light_main">Светлая</v:String>- <v:String x:Key="cmbox_cblue_main">Холодный синиий</v:String>+ <v:String x:Key="cmbox_cobalt_main">Кобальт</v:String>+ <v:String x:Key="cmbox_amethyst_main">Тёмный аметист</v:String>+ <v:String x:Key="cmbox_cblue_main">Холодный синий</v:String><v:String x:Key="cmbox_system_main">Системная</v:String><v:String x:Key="btn_import">Импорт</v:String><v:String x:Key="btn_export">Экспорт</v:String>diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xamlindex 261202c9..f19ebc9e 100644--- a/.Source/GTweak/Languages/uk/Localize.xaml+++ b/.Source/GTweak/Languages/uk/Localize.xaml@@ -91,6 +91,8 @@<v:String x:Key="cmbox_theme_main">Тема інтерфейсу:</v:String><v:String x:Key="cmbox_dark_main">Темна</v:String><v:String x:Key="cmbox_light_main">Світла</v:String>+ <v:String x:Key="cmbox_cobalt_main">Кобальт</v:String>+ <v:String x:Key="cmbox_amethyst_main">Темний аметист</v:String><v:String x:Key="cmbox_cblue_main">Холодний синій</v:String><v:String x:Key="cmbox_system_main">Системна</v:String><v:String x:Key="btn_import">Імпорт</v:String>diff --git a/.Source/GTweak/Styles/Themes/Cobalt/Colors.xaml b/.Source/GTweak/Styles/Themes/Cobalt/Colors.xamlnew file mode 100644index 00000000..919efa5e--- /dev/null+++ b/.Source/GTweak/Styles/Themes/Cobalt/Colors.xaml@@ -0,0 +1,33 @@+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">++ <SolidColorBrush x:Key="Color_Background" Color="#1E1E1E"/>+ <SolidColorBrush x:Key="Color_Background_Dark" Color="#1A1A1A"/>++ <SolidColorBrush x:Key="Color_Accent" Color="#54A9FF"/>+ <SolidColorBrush x:Key="Color_Inactive" Color="#808080"/>+ <SolidColorBrush x:Key="Color_Highlighted" Color="#FFFFFF"/>++ <SolidColorBrush x:Key="Color_Over" Color="#6AB2EC"/>+ <SolidColorBrush x:Key="Color_MButton" Color="#FF292929"/>+ <SolidColorBrush x:Key="Color_ButtonOver" Color="#60B0F0"/>+ <SolidColorBrush x:Key="Color_MButtonOver" Color="#FF404040"/>+ <SolidColorBrush x:Key="Color_ButtonOver_Navigation" Color="#212121"/>+ <SolidColorBrush x:Key="Color_Border" Color="#007ED6"/>++ <SolidColorBrush x:Key="Color_ComboBoxOver" Color="#303030"/>+ <SolidColorBrush x:Key="Color_Background_Slider" Color="#262626"/>+ <SolidColorBrush x:Key="Color_TetBlock_Inactivity" Color="#BFBFBF"/>+ <SolidColorBrush x:Key="Color_TetBox_Border" Color="#D1DBE4"/>+ <SolidColorBrush x:Key="Color_Background_RadialProgressBar" Color="#4D4D4D"/>+ <SolidColorBrush x:Key="Color_DeletedTime" Color="#1AFF7E"/>++ <Color x:Key="Color_Shadow">#1A7EFF</Color>+ <Color x:Key="Color_Border_Gradient_1">#54A9FF</Color>+ <Color x:Key="Color_Border_Gradient_2">#1A7EFF</Color>+ <Color x:Key="Color_ToggleButton_OFF_1">#464646</Color>+ <Color x:Key="Color_ToggleButton_OFF_2">#5C5C5C</Color>+ <Color x:Key="Color_ToggleButton_ON_1">#54A9FF</Color>+ <Color x:Key="Color_ToggleButton_ON_2">#2496FF</Color>++</ResourceDictionary>\ No newline at end of filediff --git a/.Source/GTweak/Styles/Themes/Dark amethyst/Colors.xaml b/.Source/GTweak/Styles/Themes/Dark amethyst/Colors.xamlnew file mode 100644index 00000000..664a802f--- /dev/null+++ b/.Source/GTweak/Styles/Themes/Dark amethyst/Colors.xaml@@ -0,0 +1,33 @@+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">++ <SolidColorBrush x:Key="Color_Background" Color="#211D2C"/>+ <SolidColorBrush x:Key="Color_Background_Dark" Color="#1B1725"/>++ <SolidColorBrush x:Key="Color_Accent" Color="#8B469F"/>+ <SolidColorBrush x:Key="Color_Inactive" Color="#9A98A6"/>+ <SolidColorBrush x:Key="Color_Highlighted" Color="#FFFFFF"/>++ <SolidColorBrush x:Key="Color_Over" Color="#A863C3"/>+ <SolidColorBrush x:Key="Color_MButton" Color="#3A3547"/>+ <SolidColorBrush x:Key="Color_ButtonOver" Color="#95489F"/>+ <SolidColorBrush x:Key="Color_MButtonOver" Color="#463E57"/>+ <SolidColorBrush x:Key="Color_ButtonOver_Navigation" Color="#271E34"/>+ <SolidColorBrush x:Key="Color_Border" Color="#772B8B"/>++ <SolidColorBrush x:Key="Color_ComboBoxOver" Color="#352E40"/>+ <SolidColorBrush x:Key="Color_Background_Slider" Color="#42394E"/>+ <SolidColorBrush x:Key="Color_TetBlock_Inactivity" Color="#A6A4B4"/>+ <SolidColorBrush x:Key="Color_TetBox_Border" Color="#CCC8DA"/>+ <SolidColorBrush x:Key="Color_Background_RadialProgressBar" Color="#5F5570"/>+ <SolidColorBrush x:Key="Color_DeletedTime" Color="#FF80AB"/>++ <Color x:Key="Color_Shadow">#6B3680</Color>+ <Color x:Key="Color_Border_Gradient_1">#8B469F</Color>+ <Color x:Key="Color_Border_Gradient_2">#772B8B</Color>+ <Color x:Key="Color_ToggleButton_OFF_1">#352E40</Color>+ <Color x:Key="Color_ToggleButton_OFF_2">#42394E</Color>+ <Color x:Key="Color_ToggleButton_ON_1">#8B469F</Color>+ <Color x:Key="Color_ToggleButton_ON_2">#95489F</Color>++</ResourceDictionary>\ No newline at end of filediff --git a/.Source/GTweak/Utilities/Controls/SettingsRepository.cs b/.Source/GTweak/Utilities/Controls/SettingsRepository.csindex 8858bf9f..323d2b5e 100644--- a/.Source/GTweak/Utilities/Controls/SettingsRepository.cs+++ b/.Source/GTweak/Utilities/Controls/SettingsRepository.cs@@ -30,7 +30,7 @@ namespace GTweak.Utilities.Controlsinternal static extern int waveOutSetVolume(IntPtr hwo, uint dwVolume);internal static string[] AvailableLangs = { "en", "ko", "ru", "uk" };- internal static string[] AvailableThemes = { "Dark", "Light", "Cold Blue", "System" };+ internal static string[] AvailableThemes = { "Dark", "Light", "Cobalt", "Dark amethyst", "Cold Blue", "System" };internal static int PID = 0;internal static string currentRelease = (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion.Split(' ').Last().Trim();diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xamlindex db439d32..e9f96d9c 100644--- a/.Source/GTweak/Windows/MainWindow.xaml+++ b/.Source/GTweak/Windows/MainWindow.xaml@@ -252,6 +252,8 @@<ComboBox x:Name="ThemeSelectionMenu" Height="25" Width="155" Margin="10,-5,0,0" SelectionChanged="ThemeSelectionMenu_SelectionChanged"><TextBlock Text="{DynamicResource cmbox_dark_main}"/><TextBlock Text="{DynamicResource cmbox_light_main}"/>+ <TextBlock Text="{DynamicResource cmbox_cobalt_main}"/>+ <TextBlock Text="{DynamicResource cmbox_amethyst_main}"/><TextBlock Text="{DynamicResource cmbox_cblue_main}"/><TextBlock Text="{DynamicResource cmbox_system_main}"/></ComboBox>