Skip to content

Portable Tool for an Ideal Windows Setup

-added light theme

Greedeks37df08dfe0e6
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xaml
index e4a284f6..47b547b3 100644
--- a/.Source/GTweak/App.xaml
+++ b/.Source/GTweak/App.xaml
@@ -7,13 +7,13 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="Language/lang.xaml" />
+ <ResourceDictionary Source="Language/Lang.xaml" />
<ResourceDictionary Source="Core/DataTemplate.xaml" />
<ResourceDictionary Source="Assets/Font/Font.xaml" />
<ResourceDictionary Source="Assets/DrawingImage/Other.xaml" />
<ResourceDictionary Source="Assets/DrawingImage/AppsInstalled.xaml" />
<ResourceDictionary Source="Assets/DrawingImage/AppsDeleted.xaml" />
- <ResourceDictionary Source="Styles/Colors.xaml" />
+ <ResourceDictionary Source="Styles/Theme/Colors.xaml" />
<ResourceDictionary Source="Styles/Buttons.xaml" />
<ResourceDictionary Source="Styles/ScrollBar.xaml" />
<ResourceDictionary Source="Styles/Slider.xaml" />
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 77722c3c..22d2489e 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -10,12 +10,15 @@ namespace GTweak
public partial class App : Application
{
internal static event EventHandler LanguageChanged;
+ internal static event EventHandler ThemeChanged;
internal static event EventHandler ImportTweaksUpdate;
public App()
{
InitializeComponent();
}
+ internal static void UpdateImport() => ImportTweaksUpdate?.Invoke(null, EventArgs.Empty);
+
internal static string Language
{
set
@@ -26,13 +29,13 @@ namespace GTweak
{
Source = value switch
{
- "ru" => new Uri($"Language/lang.ru.xaml", UriKind.Relative),
- _ => new Uri("Language/lang.xaml", UriKind.Relative),
+ "ru" => new Uri($"Language/Lang.RU.xaml", UriKind.Relative),
+ _ => new Uri("Language/Lang.xaml", UriKind.Relative),
}
};
ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
- where dict.Source != null && dict.Source.OriginalString.StartsWith("Language/lang.") select dict).First();
+ where dict.Source != null && dict.Source.OriginalString.StartsWith("Language/Lang.") select dict).First();
if (oldDictionary != null)
{
int ind = Current.Resources.MergedDictionaries.IndexOf(oldDictionary);
@@ -45,11 +48,40 @@ namespace GTweak
}
}
- internal static void UpdateImport()=> ImportTweaksUpdate?.Invoke(null, EventArgs.Empty);
+ internal static void ViewingSettings()
+ {
+ Language = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Language")?.ToString() ?? Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline);
+ Theme = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Theme")?.ToString() ?? "Dark";
+ }
- internal static void ViewLang() => Language = Registry.CurrentUser.OpenSubKey(@"Software\GTweak")?.GetValue("Language")?.ToString() ?? Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "", RegexOptions.Multiline);
-
-
+ internal static string Theme
+ {
+ set
+ {
+ value ??= "Dark";
+ ResourceDictionary dictionary = new ResourceDictionary
+ {
+ Source = value switch
+ {
+ "Light" => new Uri($"Styles/Theme/Colors.Light.xaml", UriKind.Relative),
+ _ => new Uri("Styles/Theme/Colors.xaml", UriKind.Relative),
+ }
+ };
+
+ ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
+ where dict.Source != null && dict.Source.OriginalString.StartsWith("Styles/Theme/Colors.")
+ select dict).First();
+ if (oldDictionary != null)
+ {
+ int ind = Current.Resources.MergedDictionaries.IndexOf(oldDictionary);
+ Current.Resources.MergedDictionaries.Remove(oldDictionary);
+ Current.Resources.MergedDictionaries.Insert(ind, dictionary);
+ }
+ else { Current.Resources.MergedDictionaries.Add(dictionary); }
+
+ ThemeChanged?.Invoke(null, EventArgs.Empty);
+ }
+ }
}
}
diff --git a/.Source/GTweak/Core/ViewModel/MainViewModel.cs b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
index 2c33acca..84038916 100644
--- a/.Source/GTweak/Core/ViewModel/MainViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
@@ -72,7 +72,8 @@ namespace GTweak.Core.ViewModel
CurrentView = new MoreVM();
- App.ImportTweaksUpdate += (s, e) => { CurrentView = new MoreVM(); };
+ App.ImportTweaksUpdate += delegate { CurrentView = new MoreVM(); };
+ App.ThemeChanged += delegate { CurrentView = new MoreVM(); };
}
}
}
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 9430689e..ca1cc875 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -298,11 +298,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Language\lang.ru.xaml">
+ <Page Include="Language\Lang.RU.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Language\lang.xaml">
+ <Page Include="Language\Lang.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -342,7 +342,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Styles\Colors.xaml">
+ <Page Include="Styles\Theme\Colors.Light.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="Styles\Theme\Colors.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
diff --git a/.Source/GTweak/Language/lang.ru.xaml b/.Source/GTweak/Language/lang.ru.xaml
index 01239cb7..dd96d676 100644
--- a/.Source/GTweak/Language/lang.ru.xaml
+++ b/.Source/GTweak/Language/lang.ru.xaml
@@ -76,6 +76,9 @@
<v:String x:Key="cmbox_lang_main">Язык интерфейса:</v:String>
<v:String x:Key="cmbox_eng_main">Английский</v:String>
<v:String x:Key="cmbox_ru_main">Русский</v:String>
+ <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="text_saveconfig">Мои твики:</v:String>
<v:String x:Key="btn_import">Импорт</v:String>
<v:String x:Key="btn_export">Экспорт</v:String>
diff --git a/.Source/GTweak/Language/lang.xaml b/.Source/GTweak/Language/lang.xaml
index 7069b3d0..f3844a29 100644
--- a/.Source/GTweak/Language/lang.xaml
+++ b/.Source/GTweak/Language/lang.xaml
@@ -76,6 +76,9 @@
<v:String x:Key="cmbox_lang_main">Interface language:</v:String>
<v:String x:Key="cmbox_eng_main">English</v:String>
<v:String x:Key="cmbox_ru_main">Russian</v:String>
+ <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="text_saveconfig">My tweaks:</v:String>
<v:String x:Key="btn_import">Import</v:String>
<v:String x:Key="btn_export">Export</v:String>
diff --git a/.Source/GTweak/Styles/Theme/Colors.Light.xaml b/.Source/GTweak/Styles/Theme/Colors.Light.xaml
new file mode 100644
index 00000000..100575a7
--- /dev/null
+++ b/.Source/GTweak/Styles/Theme/Colors.Light.xaml
@@ -0,0 +1,31 @@
+<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="#D9D9D9"/>
+ <SolidColorBrush x:Key="Color_Background_Dark" Color="#F5F5F5"/>
+
+ <SolidColorBrush x:Key="Color_Accent" Color="#3cb671"/>
+ <SolidColorBrush x:Key="Color_Inactive" Color="#707070"/>
+ <SolidColorBrush x:Key="Color_Highlighted" Color="#131313"/>
+
+ <SolidColorBrush x:Key="Color_Over" Color="#4ca874"/>
+ <SolidColorBrush x:Key="Color_ButtonOver" Color="#45ab77"/>
+ <SolidColorBrush x:Key="Color_ButtonOver_Navigation" Color="#e1e1e1"/>
+ <SolidColorBrush x:Key="Color_Border" Color="#009843"/>
+
+ <SolidColorBrush x:Key="Color_ComboBoxOver" Color="#e1e1e1"/>
+ <SolidColorBrush x:Key="Color_Background_ScrollBar" Color="#b8b8b8"/>
+ <SolidColorBrush x:Key="Color_Background_Slider" Color="#828282"/>
+ <SolidColorBrush x:Key="Color_TetBlock_Inactivity" Color="#202020"/>
+ <SolidColorBrush x:Key="Color_TetBox_Border" Color="#242527"/>
+ <SolidColorBrush x:Key="Color_Background_RadialProgressBar" Color="#b8b8b8"/>
+
+ <Color x:Key="Color_Shadow">#13b65a</Color>
+ <Color x:Key="Color_Border_Gradient_1">#3cb671</Color>
+ <Color x:Key="Color_Border_Gradient_2">#13b65a</Color>
+ <Color x:Key="Color_ToggleButton_OFF_1">#b0b0b0</Color>
+ <Color x:Key="Color_ToggleButton_OFF_2">#bcbcbc</Color>
+ <Color x:Key="Color_ToggleButton_ON_1">#3cb671</Color>
+ <Color x:Key="Color_ToggleButton_ON_2">#1ab65e</Color>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Colors.xaml b/.Source/GTweak/Styles/Theme/Colors.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Colors.xaml
rename to .Source/GTweak/Styles/Theme/Colors.xaml
diff --git a/.Source/GTweak/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.cs
index 71f1db7f..0cd7aacd 100644
--- a/.Source/GTweak/Utilities/Settings.cs
+++ b/.Source/GTweak/Utilities/Settings.cs
@@ -23,7 +23,8 @@ namespace GTweak.Utilities
private static bool _isViewNotification = true;
private static bool _isSoundNotification = true;
private static byte _volumeNotification = 100;
- private static string _language_ = string.Empty;
+ private static string _language = string.Empty;
+ private static string _theme = "Dark";
private static bool _isTopMost = false;
internal static int PID = 0;
internal static bool _isHiddenIpAddress = false;
@@ -32,7 +33,8 @@ namespace GTweak.Utilities
internal static bool IsSoundNotification { get => _isSoundNotification; set => _isSoundNotification = value; }
internal static byte VolumeNotification { get => _volumeNotification; set => _volumeNotification = value; }
internal static bool IsTopMost { get => _isTopMost; set => _isTopMost = value; }
- internal static string Language { get => _language_; set => _language_ = value; }
+ internal static string Language { get => _language; set => _language = value; }
+ internal static string Theme { get => _theme; set => _theme = value; }
internal static bool IsHiddenIpAddress { get => _isHiddenIpAddress; set => _isHiddenIpAddress = value; }
internal readonly void RunAnalysis()
@@ -45,7 +47,7 @@ namespace GTweak.Utilities
{
RegistryKey registryKey = Registry.CurrentUser.OpenSubKey(@"Software\GTweak");
if (registryKey == null || registryKey.GetValue("Notification", null) == null || registryKey.GetValue("Sound", null) == null || registryKey.GetValue("Volume", null) == null ||
- registryKey.GetValue("TopMost", null) == null || registryKey.GetValue("Language", null) == null || registryKey.GetValue("HiddenIP", null) == null)
+ registryKey.GetValue("TopMost", null) == null || registryKey.GetValue("Language", null) == null || registryKey.GetValue("HiddenIP", null) == null || registryKey.GetValue("Theme", null) == null)
{
registryKey = Registry.CurrentUser.CreateSubKey(@"Software\GTweak");
registryKey?.SetValue("Notification", IsViewNotification, RegistryValueKind.String);
@@ -53,6 +55,7 @@ namespace GTweak.Utilities
registryKey?.SetValue("Volume", VolumeNotification, RegistryValueKind.String);
registryKey?.SetValue("TopMost", IsTopMost, RegistryValueKind.String);
registryKey?.SetValue("HiddenIP", IsHiddenIpAddress, RegistryValueKind.String);
+ registryKey?.SetValue("Theme", Theme, RegistryValueKind.String);
if (string.IsNullOrEmpty(Language))
{
registryKey?.SetValue("Language", System.Text.RegularExpressions.Regex.Replace(CultureInfo.CurrentCulture.ToString(), @"-.+$", "",
@@ -72,6 +75,7 @@ namespace GTweak.Utilities
IsTopMost = bool.Parse(registryKey?.GetValue("TopMost").ToString() ?? "False");
IsHiddenIpAddress = bool.Parse(registryKey?.GetValue("HiddenIP").ToString() ?? "False");
Language = registryKey?.GetValue("Language").ToString();
+ Theme = registryKey?.GetValue("Theme").ToString() ?? "Dark";
}
registryKey?.Close();
}
@@ -99,7 +103,10 @@ namespace GTweak.Utilities
case "Language":
Language = registryKey?.GetValue("Language").ToString();
break;
- case "HiddenIP":
+ case "Theme":
+ Theme = registryKey?.GetValue("Theme").ToString() ?? "Dark";
+ break;
+ case "HiddenIP":
IsHiddenIpAddress = bool.Parse(registryKey?.GetValue("HiddenIP").ToString() ?? "False");
break;
}
diff --git a/.Source/GTweak/Utilities/Tweaks/Firewall.cs b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
index 0fbec584..6516c72a 100644
--- a/.Source/GTweak/Utilities/Tweaks/Firewall.cs
+++ b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
@@ -77,7 +77,7 @@ namespace GTweak.Utilities.Tweaks
}
catch
{
- App.ViewLang();
+ App.ViewingSettings();
new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]);
}
}
@@ -129,7 +129,7 @@ namespace GTweak.Utilities.Tweaks
protected static void BlockSpyDomain(in bool isChoose)
{
- App.ViewLang();
+ App.ViewingSettings();
try
{
if (CheckRulesWindows(NameRules["Domain"]) && isChoose)
@@ -141,7 +141,7 @@ namespace GTweak.Utilities.Tweaks
}
catch
{
- App.ViewLang();
+ App.ViewingSettings();
new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]);
}
}
@@ -186,7 +186,7 @@ namespace GTweak.Utilities.Tweaks
protected static void BlockWDefender(bool isChoose)
{
- App.ViewLang();
+ App.ViewingSettings();
try
{
if (CheckRulesWindows(NameRules["WDefender"]) && isChoose)
@@ -204,7 +204,7 @@ namespace GTweak.Utilities.Tweaks
}
catch
{
- App.ViewLang();
+ App.ViewingSettings();
new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]);
}
}
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemData.cs b/.Source/GTweak/Utilities/Tweaks/SystemData.cs
index 737ebce0..c3e06d1f 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemData.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemData.cs
@@ -260,7 +260,7 @@ namespace GTweak.Utilities.Tweaks
}
catch
{
- App.ViewLang();
+ App.ViewingSettings();
СonfigurationData["IpAddress"] = (string)Application.Current.Resources["limited_systemInformation"];
isInternetLimited = true;
}
@@ -278,7 +278,7 @@ namespace GTweak.Utilities.Tweaks
}
else
{
- App.ViewLang();
+ App.ViewingSettings();
isConnectionBlock = true;
СonfigurationData["IpAddress"] = (string)Application.Current.Resources["connection_block_systemInformation"];
}
@@ -286,7 +286,7 @@ namespace GTweak.Utilities.Tweaks
}
else
{
- App.ViewLang();
+ App.ViewingSettings();
isConnectionLose = true;
СonfigurationData["IpAddress"] = (string)Application.Current.Resources["connection_lose_systemInformation"];
}
diff --git a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
index 1fb7f808..b4177d8d 100644
--- a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
+++ b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
@@ -92,7 +92,7 @@ namespace GTweak.Utilities.Tweaks
waitingWindow.Close();
- App.ViewLang();
+ App.ViewingSettings();
if (statusLicense == 1)
new ViewNotification().Show("restart", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["successactivate_notification"]);
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index 818ac976..c360a329 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -21,7 +21,7 @@ namespace GTweak.View
if (WindowsLicense.statusLicense != 1)
{
- App.ViewLang();
+ App.ViewingSettings();
new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["viewlicense_notification"]);
}
}
diff --git a/.Source/GTweak/View/MoreView.xaml b/.Source/GTweak/View/MoreView.xaml
index fa5ebdd1..fd7152e9 100644
--- a/.Source/GTweak/View/MoreView.xaml
+++ b/.Source/GTweak/View/MoreView.xaml
@@ -53,7 +53,7 @@
</Grid>
<Grid Grid.Column="1">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
<StackPanel Orientation="Vertical" >
<Image Height="60" Width="60" Margin="0,15,0,0" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image.Style>
@@ -70,7 +70,7 @@
</Grid>
<Grid Grid.Column="2">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
<StackPanel Orientation="Vertical" >
<Image Height="60" Width="60" Margin="0,15,0,0" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image.Style>
@@ -94,7 +94,7 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Margin="180,0,0,0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
<StackPanel Orientation="Vertical" >
<Image Height="60" Width="60" Stretch="Uniform" Margin="0,15,0,0" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image.Style>
@@ -111,7 +111,7 @@
</Grid>
<Grid Grid.Column="1" Margin="0,0,180,0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
<StackPanel Orientation="Vertical" >
<Image Height="60" Width="60" Stretch="Uniform" Margin="0,15,0,0" HorizontalAlignment="Center" VerticalAlignment="Center">
<Image.Style>
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index 19f222cf..527dfe7d 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -14,9 +14,10 @@ namespace GTweak.Windows
{
public LoadingWindow()
{
+ App.ViewingSettings();
+
InitializeComponent();
- App.ViewLang();
BlockRunTweaker.CheckingApplicationCopies();
BlockRunTweaker.CheckingSystemRequirements();
}
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index b3a29847..6eb856a2 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -141,9 +141,9 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Background="{DynamicResource Color_Background_Dark}" VirtualizingStackPanel.IsVirtualizing="True">
<Grid Width="399">
<Grid.RowDefinitions>
- <RowDefinition Height="70*"/>
- <RowDefinition Height="481*"/>
- <RowDefinition Height="45*"/>
+ <RowDefinition Height="52*"/>
+ <RowDefinition Height="458*"/>
+ <RowDefinition Height="41*"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0">
@@ -178,6 +178,14 @@
</ComboBox>
</StackPanel>
+ <StackPanel Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="40,5,0,0">
+ <TextBlock Style="{StaticResource Text_In}" Foreground="{DynamicResource Color_Highlighted}" Text="{DynamicResource cmbox_theme_main}"/>
+ <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}"/>
+ </ComboBox>
+ </StackPanel>
+
<Border Background="{DynamicResource Color_Accent}" Height="1.2" Width="330" VerticalAlignment="Bottom" Margin="0,20,0,0" CornerRadius="10 10 0 0"/>
<StackPanel Orientation="Horizontal" Margin="40,20,0,0">
@@ -185,13 +193,13 @@
<Button x:Name="BtnExport" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="96" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnExport_PreviewMouseDown">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{DynamicResource btn_export}" Margin="0,2,0,0"/>
- <Image Source="{StaticResource DI_Export}" Margin="5,0,0,0" Width="20" Height="20"/>
+ <Image Source="{DynamicResource DI_Export}" Margin="5,0,0,0" Width="20" Height="20"/>
</StackPanel>
</Button>
<Button x:Name="BtnImport" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="96" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnImport_PreviewMouseDown">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{DynamicResource btn_import}" Margin="0,2,0,0"/>
- <Image Source="{StaticResource DI_Import}" Margin="5,0,0,0" Width="20" Height="20"/>
+ <Image Source="{DynamicResource DI_Import}" Margin="5,0,0,0" Width="20" Height="20"/>
</StackPanel>
</Button>
</StackPanel>
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 307778a2..507c0388 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -22,8 +22,10 @@ namespace GTweak
BtnTopMost.State = Topmost = Settings.IsTopMost;
SliderVolume.Value = Settings.VolumeNotification;
LanguageSelectionMenu.SelectedIndex = Settings.Language == "en" ? 0 : 1;
+ ThemeSelectionMenu.SelectedIndex = Settings.Theme == "Dark" ? 0 : 1;
App.ImportTweaksUpdate += (s, e) => { BtnMore.IsChecked = true; };
+ App.ThemeChanged += (s, e) => { BtnMore.IsChecked = true; };
}
#region Button Title/Animation Window
@@ -155,6 +157,21 @@ namespace GTweak
}
}
+ private void ThemeSelectionMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ switch (ThemeSelectionMenu.SelectedIndex)
+ {
+ case 0:
+ Settings.ChangingParameters("Dark", "Theme");
+ App.Theme = "Dark";
+ break;
+ default:
+ Settings.ChangingParameters("Light", "Theme");
+ App.Theme = "Light";
+ break;
+ }
+ }
+
private void BtnExport_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
if (e.LeftButton == MouseButtonState.Pressed)
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml.cs b/.Source/GTweak/Windows/MessageWindow.xaml.cs
index a5334748..e62aee62 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MessageWindow.xaml.cs
@@ -18,7 +18,7 @@ namespace GTweak.Windows
{
InitializeComponent();
- App.ViewLang();
+ App.ViewingSettings();
try
{
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml.cs b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
index c086929d..ca532272 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml.cs
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
@@ -29,7 +29,7 @@ namespace GTweak.Windows
ImageBody.Source ??= new BitmapImage(new Uri(Settings.PathIcon));
- App.ViewLang();
+ App.ViewingSettings();
timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, delegate
{