Skip to content

Portable Tool for an Ideal Windows Setup

-added choose system theme -correction

Greedeksaa245309d726
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 22d2489e..21e504d1 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -19,6 +19,12 @@ 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 string Language
{
set
@@ -35,7 +41,8 @@ namespace GTweak
};
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);
@@ -48,12 +55,6 @@ namespace GTweak
}
}
- 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 string Theme
{
set
@@ -65,7 +66,8 @@ namespace GTweak
Source = value switch
{
"Light" => new Uri($"Styles/Theme/Colors.Light.xaml", UriKind.Relative),
- _ => new Uri("Styles/Theme/Colors.xaml", UriKind.Relative),
+ "Dark" => new Uri($"Styles/Theme/Colors.xaml", UriKind.Relative),
+ _ => Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize")?.GetValue("AppsUseLightTheme")?.ToString()! == "0" ? new Uri("Styles/Theme/Colors.xaml", UriKind.Relative) : new Uri($"Styles/Theme/Colors.Light.xaml", UriKind.Relative),
}
};
diff --git a/.Source/GTweak/Assets/UserControl/ToggleButton.xaml b/.Source/GTweak/Assets/UserControl/ToggleButton.xaml
index 80220112..8c598b55 100644
--- a/.Source/GTweak/Assets/UserControl/ToggleButton.xaml
+++ b/.Source/GTweak/Assets/UserControl/ToggleButton.xaml
@@ -13,8 +13,8 @@
<Rectangle x:Name="Back" Cursor="Hand" HorizontalAlignment="Left" Height="56.5" VerticalAlignment="Top" Width="96.5" Margin="2,2,0,0" RadiusY="29" RadiusX="29" KeyboardNavigation.IsTabStop="False" >
<Rectangle.Fill>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
- <GradientStop Color="{DynamicResource Color_ToggleButton_OFF_1}" Offset="1"/>
- <GradientStop Color="{DynamicResource Color_ToggleButton_OFF_2}" Offset="1"/>
+ <GradientStop Color="{StaticResource Color_ToggleButton_OFF_1}" Offset="1"/>
+ <GradientStop Color="{StaticResource Color_ToggleButton_OFF_2}" Offset="1"/>
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
diff --git a/.Source/GTweak/Core/ViewModel/MainViewModel.cs b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
index 84038916..99df2a6a 100644
--- a/.Source/GTweak/Core/ViewModel/MainViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
@@ -73,7 +73,6 @@ namespace GTweak.Core.ViewModel
CurrentView = new MoreVM();
App.ImportTweaksUpdate += delegate { CurrentView = new MoreVM(); };
- App.ThemeChanged += delegate { CurrentView = new MoreVM(); };
}
}
}
diff --git a/.Source/GTweak/Language/lang.ru.xaml b/.Source/GTweak/Language/lang.ru.xaml
index dd96d676..9065ff6e 100644
--- a/.Source/GTweak/Language/lang.ru.xaml
+++ b/.Source/GTweak/Language/lang.ru.xaml
@@ -79,6 +79,7 @@
<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_system_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 f3844a29..b6967e7a 100644
--- a/.Source/GTweak/Language/lang.xaml
+++ b/.Source/GTweak/Language/lang.xaml
@@ -79,6 +79,7 @@
<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_system_main">System</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/Buttons.xaml b/.Source/GTweak/Styles/Buttons.xaml
index 7ea18192..3c781aa3 100644
--- a/.Source/GTweak/Styles/Buttons.xaml
+++ b/.Source/GTweak/Styles/Buttons.xaml
@@ -22,8 +22,8 @@
</Style>
<Style TargetType="RadioButton" x:Key="BtnNavigation">
- <Setter Property="Background" Value="{DynamicResource Color_Background_Dark}"/>
- <Setter Property="Foreground" Value="{DynamicResource Color_Inactive}"/>
+ <Setter Property="Background" Value="{StaticResource Color_Background_Dark}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Inactive}"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
<Setter Property="FontSize" Value="13"/>
<Setter Property="IsTabStop" Value="False"/>
@@ -32,7 +32,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RadioButton">
- <Border x:Name="Indicator" Background="{TemplateBinding Background}" BorderBrush="{DynamicResource Color_Accent}" BorderThickness="0">
+ <Border x:Name="Indicator" Background="{TemplateBinding Background}" BorderBrush="{StaticResource Color_Accent}" BorderThickness="0">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<ControlTemplate.Triggers>
@@ -45,19 +45,19 @@
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
- <Setter Property="Background" Value="{DynamicResource Color_ButtonOver_Navigation}"/>
- <Setter Property="Foreground" Value="{DynamicResource Color_Accent}"/>
+ <Setter Property="Background" Value="{StaticResource Color_ButtonOver_Navigation}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Accent}"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
- <Setter Property="Background" Value="{DynamicResource Color_Background_Dark}"/>
- <Setter Property="Foreground" Value="{DynamicResource Color_Accent}"/>
+ <Setter Property="Background" Value="{StaticResource Color_Background_Dark}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Accent}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type Button}" x:Key="BtnDefault">
- <Setter Property="Foreground" Value="{DynamicResource Color_Background_Dark}"/>
- <Setter Property="Background" Value="{DynamicResource Color_Accent}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Background_Dark}"/>
+ <Setter Property="Background" Value="{StaticResource Color_Accent}"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="13.5px"/>
@@ -112,7 +112,7 @@
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
- <Setter Property="Background" Value="{DynamicResource Color_ButtonOver}"/>
+ <Setter Property="Background" Value="{StaticResource Color_ButtonOver}"/>
</Trigger>
<EventTrigger RoutedEvent="Button.MouseEnter">
<EventTrigger.Actions>
diff --git a/.Source/GTweak/Styles/ComboBox.xaml b/.Source/GTweak/Styles/ComboBox.xaml
index 05f6ac57..295c6c8a 100644
--- a/.Source/GTweak/Styles/ComboBox.xaml
+++ b/.Source/GTweak/Styles/ComboBox.xaml
@@ -12,14 +12,14 @@
Grid.Column="0"
Grid.ColumnSpan="2"
CornerRadius="2"
- Background="{DynamicResource Color_Background_Dark}"
- BorderBrush="{DynamicResource Color_Accent}"
+ Background="{StaticResource Color_Background_Dark}"
+ BorderBrush="{StaticResource Color_Accent}"
BorderThickness="1" />
<Path
x:Name="Arrow"
Margin="0 0 4 0"
Grid.Column="1"
- Fill="{DynamicResource Color_Highlighted}"
+ Fill="{StaticResource Color_Highlighted}"
Width="10" Height="6"
Stretch="Fill"
HorizontalAlignment="Center"
@@ -42,7 +42,7 @@
<Setter Property="MinWidth" Value="120"/>
<Setter Property="MinHeight" Value="20"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
- <Setter Property="Foreground" Value="{DynamicResource Color_Highlighted}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
<Setter Property="FontSize" Value="14px"/>
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template">
@@ -85,10 +85,10 @@
MaxHeight="{TemplateBinding MaxDropDownHeight}">
<Border
x:Name="DropDownBorder"
- Background="{DynamicResource Color_Background_Dark}"
+ Background="{StaticResource Color_Background_Dark}"
CornerRadius="2"
BorderThickness="1"
- BorderBrush="{DynamicResource Color_Accent}"/>
+ BorderBrush="{StaticResource Color_Accent}"/>
<ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
</ScrollViewer>
@@ -100,7 +100,7 @@
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
- <Setter Property="Foreground" Value="{DynamicResource Color_Background_Dark}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Background_Dark}"/>
</Trigger>
<Trigger Property="IsGrouping" Value="true">
<Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
@@ -124,7 +124,7 @@
<Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}">
<Setter Property="SnapsToDevicePixels" Value="true"/>
- <Setter Property="Foreground" Value="{DynamicResource Color_Highlighted}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
<Setter Property="FontSize" Value="14px"/>
<Setter Property="OverridesDefaultStyle" Value="true"/>
<Setter Property="Cursor" Value="Hand"/>
@@ -136,7 +136,7 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsHighlighted" Value="true">
- <Setter TargetName="Border" Property="Background" Value="{DynamicResource Color_ComboBoxOver}"/>
+ <Setter TargetName="Border" Property="Background" Value="{StaticResource Color_ComboBoxOver}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
diff --git a/.Source/GTweak/Styles/ProgressBar.xaml b/.Source/GTweak/Styles/ProgressBar.xaml
index e5f559b7..bb42097f 100644
--- a/.Source/GTweak/Styles/ProgressBar.xaml
+++ b/.Source/GTweak/Styles/ProgressBar.xaml
@@ -31,10 +31,10 @@
</Border>
<Border x:Name="PART_Indicator" CornerRadius="1" BorderThickness="1" HorizontalAlignment="Left" Background="{TemplateBinding Foreground}">
<Border.BorderBrush>
- <SolidColorBrush Color="{DynamicResource Color_Border_Gradient_1}"/>
+ <SolidColorBrush Color="{StaticResource Color_Border_Gradient_1}"/>
</Border.BorderBrush>
<Grid ClipToBounds="True" x:Name="Animation">
- <Rectangle x:Name="PART_GlowRect" Width="30" HorizontalAlignment="Left" Fill="{DynamicResource Color_Accent}" Margin="-100,0,0,0" />
+ <Rectangle x:Name="PART_GlowRect" Width="30" HorizontalAlignment="Left" Fill="{StaticResource Color_Accent}" Margin="-100,0,0,0" />
</Grid>
</Border>
</Grid>
@@ -48,7 +48,7 @@
</Setter>
<Setter Property="Foreground">
<Setter.Value>
- <SolidColorBrush Color="{DynamicResource Color_Border_Gradient_1}"/>
+ <SolidColorBrush Color="{StaticResource Color_Border_Gradient_1}"/>
</Setter.Value>
</Setter>
</Style>
diff --git a/.Source/GTweak/Styles/ScrollBar.xaml b/.Source/GTweak/Styles/ScrollBar.xaml
index 15784687..84dade95 100644
--- a/.Source/GTweak/Styles/ScrollBar.xaml
+++ b/.Source/GTweak/Styles/ScrollBar.xaml
@@ -26,18 +26,18 @@
<Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
<Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
- <Setter Property="Foreground" Value="{DynamicResource Color_Border}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Border}"/>
<Setter Property="IsTabStop" Value="False"/>
<Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel"/>
<Setter Property="Width" Value="0"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ScrollBar}">
- <Border x:Name="GridRoot" Width="5" Background="{DynamicResource Color_Background_ScrollBar}" CornerRadius="2" Margin="0,5,-6,0">
+ <Border x:Name="GridRoot" Width="5" Background="{StaticResource Color_Background_ScrollBar}" CornerRadius="2" Margin="0,5,-6,0">
<Track x:Name="PART_Track" Grid.Row="0" IsDirectionReversed="true" Focusable="False">
<Track.Thumb>
<Thumb x:Name="Thumb" Background="{TemplateBinding Foreground}"
- Style="{DynamicResource ScrollThumbs}" Width="5"/>
+ Style="{StaticResource ScrollThumbs}" Width="5"/>
</Track.Thumb>
<Track.IncreaseRepeatButton>
<RepeatButton x:Name="PageUp" Command="ScrollBar.PageDownCommand" Opacity="0" Focusable="False"/>
@@ -50,10 +50,10 @@
<ControlTemplate.Triggers>
<Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
- <Setter Value="{DynamicResource Color_Accent}" TargetName="Thumb" Property="Background"/>
+ <Setter Value="{StaticResource Color_Accent}" TargetName="Thumb" Property="Background"/>
</Trigger>
<Trigger SourceName="Thumb" Property="IsDragging" Value="true">
- <Setter Value="{DynamicResource Color_Accent}" TargetName="Thumb" Property="Background"/>
+ <Setter Value="{StaticResource Color_Accent}" TargetName="Thumb" Property="Background"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
diff --git a/.Source/GTweak/Styles/Slider.xaml b/.Source/GTweak/Styles/Slider.xaml
index 89ca6f19..9f42ac85 100644
--- a/.Source/GTweak/Styles/Slider.xaml
+++ b/.Source/GTweak/Styles/Slider.xaml
@@ -9,7 +9,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RepeatButton">
- <Border BorderThickness="1" BorderBrush="{DynamicResource Color_Background_Slider}" Background="{DynamicResource Color_Background_Slider}" Height="5" CornerRadius="0,1,1,0"/>
+ <Border BorderThickness="1" BorderBrush="{StaticResource Color_Background_Slider}" Background="{StaticResource Color_Background_Slider}" Height="5" CornerRadius="0,1,1,0"/>
</ControlTemplate>
</Setter.Value>
</Setter>
@@ -23,7 +23,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="RepeatButton">
- <Border SnapsToDevicePixels="True" Background="{DynamicResource Color_Accent}" BorderThickness="1" BorderBrush="{DynamicResource Color_Border}" Height="5" CornerRadius="1,0,0,1"/>
+ <Border SnapsToDevicePixels="True" Background="{StaticResource Color_Accent}" BorderThickness="1" BorderBrush="{StaticResource Color_Border}" Height="5" CornerRadius="1,0,0,1"/>
</ControlTemplate>
</Setter.Value>
</Setter>
@@ -38,10 +38,10 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Thumb">
- <Border x:Name="Switch" Height="12" Width="12" Background="{DynamicResource Color_Border}" CornerRadius="2" BorderBrush="{DynamicResource Color_Accent}" BorderThickness="1"></Border>
+ <Border x:Name="Switch" Height="12" Width="12" Background="{StaticResource Color_Border}" CornerRadius="2" BorderBrush="{StaticResource Color_Accent}" BorderThickness="1"></Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="true">
- <Setter TargetName="Switch" Property="Background" Value="{DynamicResource Color_Accent}"></Setter>
+ <Setter TargetName="Switch" Property="Background" Value="{StaticResource Color_Accent}"></Setter>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@@ -68,7 +68,7 @@
</Track.IncreaseRepeatButton>
</Track>
<TextBlock FocusVisualStyle="{x:Null}" Text="{Binding Value, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Slider}}}"
- FontFamily="{StaticResource Jura}" FontSize="14px" FontWeight="Medium" Grid.Row="2" Margin="0,-5,0,0" HorizontalAlignment="Center" Foreground="{DynamicResource Color_Highlighted}">
+ FontFamily="{StaticResource Jura}" FontSize="14px" FontWeight="Medium" Grid.Row="2" Margin="0,-5,0,0" HorizontalAlignment="Center" Foreground="{StaticResource Color_Highlighted}">
</TextBlock>
</Grid>
</ControlTemplate>
diff --git a/.Source/GTweak/Styles/TextBlock.xaml b/.Source/GTweak/Styles/TextBlock.xaml
index 6b4166af..ff41ae5f 100644
--- a/.Source/GTweak/Styles/TextBlock.xaml
+++ b/.Source/GTweak/Styles/TextBlock.xaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="{x:Type TextBlock}" x:Key="Text_In">
- <Setter Property="Foreground" Value="{DynamicResource Color_TetBlock_Inactivity}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_TetBlock_Inactivity}"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="16px"/>
@@ -16,13 +16,13 @@
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
- <Setter Property="Foreground" Value="{DynamicResource Color_Highlighted}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type TextBlock}" x:Key="Text">
- <Setter Property="Foreground" Value="{DynamicResource Color_Accent}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Accent}"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="16px"/>
@@ -36,13 +36,13 @@
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
- <Setter Property="Foreground" Value="{DynamicResource Color_Over}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Over}"/>
</Trigger>
</Style.Triggers>
</Style>
<Style TargetType="{x:Type TextBlock}" x:Key="Description">
- <Setter Property="Foreground" Value="{DynamicResource Color_Highlighted}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="16"/>
diff --git a/.Source/GTweak/Styles/TextBox.xaml b/.Source/GTweak/Styles/TextBox.xaml
index db7649dd..6afadb4f 100644
--- a/.Source/GTweak/Styles/TextBox.xaml
+++ b/.Source/GTweak/Styles/TextBox.xaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style TargetType="{x:Type TextBox}">
- <Setter Property="Foreground" Value="{DynamicResource Color_Highlighted}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
<Setter Property="FontFamily" Value="{StaticResource Jura}"/>
<Setter Property="FontWeight" Value="Normal"/>
<Setter Property="FontSize" Value="14" />
@@ -15,15 +15,15 @@
<Setter Property="Height" Value="27" />
<Setter Property="Cursor" Value="IBeam" />
<Setter Property="VerticalContentAlignment" Value="Center" />
- <Setter Property="CaretBrush" Value="{DynamicResource Color_Highlighted}"/>
+ <Setter Property="CaretBrush" Value="{StaticResource Color_Highlighted}"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Grid>
- <Border x:Name="border" Background="{DynamicResource Color_Background_Dark}" BorderBrush="{DynamicResource Color_Accent}" BorderThickness="0,0,0,1" CornerRadius="5"/>
+ <Border x:Name="border" Background="{StaticResource Color_Background_Dark}" BorderBrush="{StaticResource Color_Accent}" BorderThickness="0,0,0,1" CornerRadius="5"/>
<ScrollViewer x:Name="PART_ContentHost" Margin="5,0,0,0" VerticalAlignment="Center" />
<Label Margin="5,0,0,0" x:Name="WaterMarkLabel" Content="{TemplateBinding Tag}" VerticalAlignment="Center"
- Visibility="Collapsed" Foreground="{DynamicResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}"/>
+ Visibility="Collapsed" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}"/>
</Grid>
<ControlTemplate.Triggers>
<MultiTrigger>
@@ -33,16 +33,16 @@
<Setter Property="Visibility" TargetName="WaterMarkLabel" Value="Visible"/>
</MultiTrigger>
<Trigger Property="IsEnabled" Value="False">
- <Setter Property="Foreground" Value="{DynamicResource Color_Highlighted}"/>
- <Setter Property="BorderBrush" Value="{DynamicResource Color_TetBox_Border}" TargetName="border"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
+ <Setter Property="BorderBrush" Value="{StaticResource Color_TetBox_Border}" TargetName="border"/>
</Trigger>
<Trigger Property="IsFocused" Value="False">
<Setter Property="Text" Value=""/>
- <Setter Property="BorderBrush" Value="{DynamicResource Color_TetBox_Border}" TargetName="border"/>
+ <Setter Property="BorderBrush" Value="{StaticResource Color_TetBox_Border}" TargetName="border"/>
</Trigger>
<Trigger Property="IsKeyboardFocused" Value="False">
<Setter Property="Text" Value=""/>
- <Setter Property="BorderBrush" Value="{DynamicResource Color_TetBox_Border}" TargetName="border"/>
+ <Setter Property="BorderBrush" Value="{StaticResource Color_TetBox_Border}" TargetName="border"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
diff --git a/.Source/GTweak/Styles/Theme/Colors.Light.xaml b/.Source/GTweak/Styles/Theme/Colors.Light.xaml
index 100575a7..aad30f7c 100644
--- a/.Source/GTweak/Styles/Theme/Colors.Light.xaml
+++ b/.Source/GTweak/Styles/Theme/Colors.Light.xaml
@@ -1,31 +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" Color="#E2E2E2"/>
<SolidColorBrush x:Key="Color_Background_Dark" Color="#F5F5F5"/>
- <SolidColorBrush x:Key="Color_Accent" Color="#3cb671"/>
+ <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_Highlighted" Color="#111111"/>
- <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_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_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"/>
+ <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>
+ <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/Utilities/Settings.cs b/.Source/GTweak/Utilities/Settings.cs
index 0cd7aacd..5651492d 100644
--- a/.Source/GTweak/Utilities/Settings.cs
+++ b/.Source/GTweak/Utilities/Settings.cs
@@ -188,7 +188,7 @@ namespace GTweak.Utilities
Application.Current.Shutdown();
Process.Start(new ProcessStartInfo()
{
- Arguments = "/C choice /C Y /N /D Y /T 3 & Del \"" + (new FileInfo(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath)).Name + "\" & " +
+ Arguments = "/c choice /c y /n /d y /t 3 & del \"" + (new FileInfo(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath)).Name + "\" & " +
"rd /s /q " + PathTempFiles + @"& rd /s /q "+Environment.SystemDirectory+ @"\config\systemprofile\AppData\Local\GTweak",
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true,
@@ -197,5 +197,17 @@ namespace GTweak.Utilities
}
catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
}
+
+ internal static void SelfRestart()
+ {
+ Process.Start(new ProcessStartInfo()
+ {
+ Arguments = "/c choice /c y /n /d y /t 1 & start \"\" \"" + Assembly.GetEntryAssembly().Location + "\"",
+ WindowStyle = ProcessWindowStyle.Hidden,
+ CreateNoWindow = true,
+ FileName = "cmd.exe"
+ });
+ Process.GetCurrentProcess().Kill();
+ }
}
}
diff --git a/.Source/GTweak/Utilities/Tweaks/Firewall.cs b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
index 6516c72a..8c22cbf7 100644
--- a/.Source/GTweak/Utilities/Tweaks/Firewall.cs
+++ b/.Source/GTweak/Utilities/Tweaks/Firewall.cs
@@ -75,11 +75,7 @@ namespace GTweak.Utilities.Tweaks
});
}
}
- catch
- {
- App.ViewingSettings();
- new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]);
- }
+ catch { new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]); }
}
private static void AddRulesIn(in bool isChoose, in string pathProgram, in string nameRule, in string description = "Windows update blocking")
@@ -129,7 +125,6 @@ namespace GTweak.Utilities.Tweaks
protected static void BlockSpyDomain(in bool isChoose)
{
- App.ViewingSettings();
try
{
if (CheckRulesWindows(NameRules["Domain"]) && isChoose)
@@ -139,11 +134,7 @@ namespace GTweak.Utilities.Tweaks
try { RulesHosts(isChoose); } catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
}
}
- catch
- {
- App.ViewingSettings();
- new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]);
- }
+ catch { new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]); }
}
private static void RulesHosts(in bool isChoose)
@@ -186,7 +177,6 @@ namespace GTweak.Utilities.Tweaks
protected static void BlockWDefender(bool isChoose)
{
- App.ViewingSettings();
try
{
if (CheckRulesWindows(NameRules["WDefender"]) && isChoose)
@@ -202,11 +192,7 @@ namespace GTweak.Utilities.Tweaks
});
}
}
- catch
- {
- App.ViewingSettings();
- new ViewNotification().Show("", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["firewalloff_notification"]);
- }
+ catch { 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 c3e06d1f..59bc521c 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemData.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemData.cs
@@ -260,7 +260,6 @@ namespace GTweak.Utilities.Tweaks
}
catch
{
- App.ViewingSettings();
СonfigurationData["IpAddress"] = (string)Application.Current.Resources["limited_systemInformation"];
isInternetLimited = true;
}
@@ -278,7 +277,6 @@ namespace GTweak.Utilities.Tweaks
}
else
{
- App.ViewingSettings();
isConnectionBlock = true;
СonfigurationData["IpAddress"] = (string)Application.Current.Resources["connection_block_systemInformation"];
}
@@ -286,7 +284,6 @@ namespace GTweak.Utilities.Tweaks
}
else
{
- 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 b4177d8d..7dd0239f 100644
--- a/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
+++ b/.Source/GTweak/Utilities/Tweaks/WindowsLicense.cs
@@ -92,8 +92,6 @@ namespace GTweak.Utilities.Tweaks
waitingWindow.Close();
- App.ViewingSettings();
-
if (statusLicense == 1)
new ViewNotification().Show("restart", (string)Application.Current.Resources["title0_notification"], (string)Application.Current.Resources["successactivate_notification"]);
else if (statusLicense != 1)
diff --git a/.Source/GTweak/View/ApplicationsView.xaml b/.Source/GTweak/View/ApplicationsView.xaml
index e1e53b2b..854086fb 100644
--- a/.Source/GTweak/View/ApplicationsView.xaml
+++ b/.Source/GTweak/View/ApplicationsView.xaml
@@ -16,18 +16,18 @@
<Grid Grid.Row="0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Top">
- <TextBlock Width="Auto" Height="auto" FontFamily="{StaticResource Jura}" FontSize="13pt" Foreground="{DynamicResource Color_TetBlock_Inactivity}" HorizontalAlignment="Center" VerticalAlignment="Top" KeyboardNavigation.IsTabStop="False" Margin="0,10,0,0">
+ <TextBlock Width="Auto" Height="auto" FontFamily="{StaticResource Jura}" FontSize="13pt" Foreground="{StaticResource Color_TetBlock_Inactivity}" HorizontalAlignment="Center" VerticalAlignment="Top" KeyboardNavigation.IsTabStop="False" Margin="0,10,0,0">
<Run Text="{DynamicResource text0_applications}"/>
- <Run Text="{DynamicResource text1_applications}" Foreground="{DynamicResource Color_Accent}"/>
+ <Run Text="{DynamicResource text1_applications}" Foreground="{StaticResource Color_Accent}"/>
<Run Text="{DynamicResource text2_applications}"/>
- <Run Text="{DynamicResource text3_applications}" Foreground="{DynamicResource Color_Inactive}"/>
+ <Run Text="{DynamicResource text3_applications}" Foreground="{StaticResource Color_Inactive}"/>
<Run Text="{DynamicResource text4_applications}"/>
</TextBlock>
</StackPanel>
<Grid HorizontalAlignment="Center" VerticalAlignment="Center" Width="Auto" Height="Auto" Margin="0,-20,0,0">
<StackPanel Orientation="Vertical" Margin="92,50,884,0" VerticalAlignment="Top">
- <Image x:Name="MicrosoftStore" Style="{StaticResource Apps}" Source="{StaticResource A_DI_MicrosoftStore}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="MicrosoftStore" Style="{DynamicResource Apps}" Source="{DynamicResource A_DI_MicrosoftStore}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
<Image x:Name="Xbox" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Xbox}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
<Image x:Name="OneNote" Style="{StaticResource Apps}" Source="{StaticResource A_DI_OneNote}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
<Image x:Name="Outlook" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Outlook}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
@@ -122,7 +122,7 @@
</Grid>
<Grid Grid.Row="1">
- <Rectangle Fill="{DynamicResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+ <Rectangle Fill="{StaticResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
<TextBlock x:Name="TextDescription" Style="{StaticResource Description}" Text="{DynamicResource defaultDescriptionApp}" Cursor="Arrow"/>
</Grid>
diff --git a/.Source/GTweak/View/ConfidentialityView.xaml b/.Source/GTweak/View/ConfidentialityView.xaml
index 101e8bd5..3d055a37 100644
--- a/.Source/GTweak/View/ConfidentialityView.xaml
+++ b/.Source/GTweak/View/ConfidentialityView.xaml
@@ -62,7 +62,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="1">
- <Rectangle Fill="{DynamicResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+ <Rectangle Fill="{StaticResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
<TextBlock x:Name="TextDescription" Style="{StaticResource Description}" Text="{DynamicResource defaultDescription}"/>
</Grid>
diff --git a/.Source/GTweak/View/InformationSystemView.xaml b/.Source/GTweak/View/InformationSystemView.xaml
index 2c8a44a5..060e467c 100644
--- a/.Source/GTweak/View/InformationSystemView.xaml
+++ b/.Source/GTweak/View/InformationSystemView.xaml
@@ -22,9 +22,9 @@
</Grid.RowDefinitions>
<Popup x:Name="PopupCopy" AllowsTransparency="True">
- <Border x:Name="CopyTextToastBody" Opacity="0" Background="{DynamicResource Color_Background_Dark}" BorderThickness="1" CornerRadius="2" BorderBrush="{DynamicResource Color_Accent}" Width="Auto" Height="35" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="1">
+ <Border x:Name="CopyTextToastBody" Opacity="0" Background="{StaticResource Color_Background_Dark}" BorderThickness="1" CornerRadius="2" BorderBrush="{StaticResource Color_Accent}" Width="Auto" Height="35" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="1">
<StackPanel Orientation="Horizontal">
- <Label Content="{DynamicResource text_copy_systemInformatin}" Foreground="{DynamicResource Color_Accent}" FontFamily="{StaticResource Jura}" FontSize="13" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+ <Label Content="{DynamicResource text_copy_systemInformatin}" Foreground="{StaticResource Color_Accent}" FontFamily="{StaticResource Jura}" FontSize="13" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
</StackPanel>
</Border>
</Popup>
@@ -32,60 +32,60 @@
<Grid Grid.Row="0">
<Grid HorizontalAlignment="Left" Margin="50,20,0,0">
- <Ellipse Height="90" Width="90" Stroke="{DynamicResource Color_Background_RadialProgressBar}" StrokeThickness="5.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.4"/>
+ <Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="5.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.4"/>
<xrpb:RadialProgressBar x:Name="CPULoad" Value="0" Maximum="100" Width="100" Height="100" ArcWidth="5" VerticalAlignment="Center" HorizontalAlignment="Center">
<xrpb:RadialProgressBar.Foreground>
<LinearGradientBrush EndPoint="0,0.3" StartPoint="0.9,0" ColorInterpolationMode="ScRgbLinearInterpolation" MappingMode="RelativeToBoundingBox" SpreadMethod="Pad">
- <GradientStop Color="{DynamicResource Color_Border_Gradient_2}" Offset="0.7"/>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_1}" Offset="0.4"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="0.7"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0.4"/>
</LinearGradientBrush>
</xrpb:RadialProgressBar.Foreground>
<xrpb:RadialProgressBar.Effect>
- <DropShadowEffect BlurRadius="30" ShadowDepth="1" Direction="-90" Opacity="0.5" Color="{DynamicResource Color_Shadow}"/>
+ <DropShadowEffect BlurRadius="30" ShadowDepth="1" Direction="-90" Opacity="0.5" Color="{StaticResource Color_Shadow}"/>
</xrpb:RadialProgressBar.Effect>
</xrpb:RadialProgressBar>
- <TextBlock Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,30,0,0">
+ <TextBlock Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,30,0,0">
<Run Text="{Binding ElementName=CPULoad, Path=Value, Mode=OneWay,StringFormat=N0}"/><Run Text="%"/>
</TextBlock>
- <TextBlock Text="CPU" Foreground="{DynamicResource Color_Inactive}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,50,0,0"/>
+ <TextBlock Text="CPU" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,50,0,0"/>
</Grid>
<Grid HorizontalAlignment="Center" Margin="0,20,0,0">
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Text}" FontSize="15pt" Width="Auto" Height="65">
- <Run Foreground="{DynamicResource Color_Accent}" Text="{DynamicResource title_win_systemInformation}"/>
- <Run Foreground="{DynamicResource Color_Highlighted}" Text="{Binding DisplayWindowsName}" PreviewMouseDown="Run_PreviewMouseDown" Cursor="Hand"/>
+ <Run Foreground="{StaticResource Color_Accent}" Text="{DynamicResource title_win_systemInformation}"/>
+ <Run Foreground="{StaticResource Color_Highlighted}" Text="{Binding DisplayWindowsName}" PreviewMouseDown="Run_PreviewMouseDown" Cursor="Hand"/>
</TextBlock>
<Image x:Name="ImageWindows" Source="{StaticResource DI_LogoWin}" Height="80" Width="80" HorizontalAlignment="Right" Margin="30,0,0,0"/>
</StackPanel>
- <TextBlock x:Name="ViewCountProcess" HorizontalAlignment="Left" FontFamily="{StaticResource Jura}" FontSize="14" MaxWidth="300" Foreground="{DynamicResource Color_Inactive}">
+ <TextBlock x:Name="ViewCountProcess" HorizontalAlignment="Left" FontFamily="{StaticResource Jura}" FontSize="14" MaxWidth="300" Foreground="{StaticResource Color_Inactive}">
<Run Text="{DynamicResource runprocces_systemInformation}"/>
<Run Text="{Binding DisplayCountProcess}"/>
</TextBlock>
</StackPanel>
</Grid>
<Grid HorizontalAlignment="Right" Margin="0,20,50,0">
- <Ellipse Height="90" Width="90" Stroke="{DynamicResource Color_Background_RadialProgressBar}" StrokeThickness="5.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.4"/>
+ <Ellipse Height="90" Width="90" Stroke="{StaticResource Color_Background_RadialProgressBar}" StrokeThickness="5.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="0.4"/>
<xrpb:RadialProgressBar x:Name="RAMLoad" Value="0" Maximum="100" Width="100" Height="100" ArcWidth="5" VerticalAlignment="Center" HorizontalAlignment="Center" Cursor="Arrow">
<xrpb:RadialProgressBar.Foreground>
<LinearGradientBrush EndPoint="0,0.3" StartPoint="0.9,0" ColorInterpolationMode="ScRgbLinearInterpolation" MappingMode="RelativeToBoundingBox" SpreadMethod="Pad">
- <GradientStop Color="{DynamicResource Color_Border_Gradient_2}" Offset="0.7"/>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_1}" Offset="0.4"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="0.7"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0.4"/>
</LinearGradientBrush>
</xrpb:RadialProgressBar.Foreground>
<xrpb:RadialProgressBar.Effect>
- <DropShadowEffect BlurRadius="30" ShadowDepth="1" Direction="-90" Opacity="0.5" Color="{DynamicResource Color_Shadow}"/>
+ <DropShadowEffect BlurRadius="30" ShadowDepth="1" Direction="-90" Opacity="0.5" Color="{StaticResource Color_Shadow}"/>
</xrpb:RadialProgressBar.Effect>
</xrpb:RadialProgressBar>
- <TextBlock Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,30,0,0">
+ <TextBlock Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,30,0,0">
<Run Text="{Binding ElementName=RAMLoad, Path=Value, Mode=OneWay,StringFormat=N0}"/><Run Text="%"/>
</TextBlock>
- <TextBlock Text="RAM" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,50,0,0"/>
+ <TextBlock Text="RAM" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource Text}" Margin="0,50,0,0"/>
</Grid>
</Grid>
@@ -107,37 +107,37 @@
<Grid Grid.Row="0">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_bios_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayBiosName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_bios_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayBiosName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_motherbr_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayMotherBrName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_motherbr_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayMotherBrName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="2">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_cpu_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayCpuName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_cpu_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayCpuName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="3">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_gpu_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayGpuName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_gpu_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayGpuName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="4">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_ram_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayRamName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_ram_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayRamName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
</Grid>
@@ -152,30 +152,30 @@
<Grid Grid.Row="0">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_disk_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayDiskName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_disk_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayDiskName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_sound_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplaySoundName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_sound_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplaySoundName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="2">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_netadapter_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
- <TextBlock Text="{Binding DisplayNetAdapterName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
+ <TextBlock Text="{DynamicResource title_netadapter_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{Binding DisplayNetAdapterName}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand"/>
</StackPanel>
</Grid>
<Grid Grid.Row="3">
<StackPanel Orientation="Vertical" Margin="50,20,0,0">
- <TextBlock Text="{DynamicResource title_ip_systemInformation}" Style="{StaticResource Text}" Foreground="{DynamicResource Color_Accent}" Height="Auto" Width="Auto"/>
+ <TextBlock Text="{DynamicResource title_ip_systemInformation}" Style="{StaticResource Text}" Foreground="{StaticResource Color_Accent}" Height="Auto" Width="Auto"/>
<StackPanel Orientation="Horizontal">
- <TextBlock x:Name="IpAddress" Text="{Binding DisplayIpAddress}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand">
+ <TextBlock x:Name="IpAddress" Text="{Binding DisplayIpAddress}" Style="{StaticResource Text}" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{StaticResource Color_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="TextBlock_PreviewMouseDown" Cursor="Hand">
<TextBlock.Effect>
<BlurEffect Radius="{Binding SetBlurValue}"/>
</TextBlock.Effect>
diff --git a/.Source/GTweak/View/InterfaceView.xaml b/.Source/GTweak/View/InterfaceView.xaml
index 9a7fda1b..d3657072 100644
--- a/.Source/GTweak/View/InterfaceView.xaml
+++ b/.Source/GTweak/View/InterfaceView.xaml
@@ -76,7 +76,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="1">
- <Rectangle Fill="{DynamicResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+ <Rectangle Fill="{StaticResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
<TextBlock x:Name="TextDescription" Style="{StaticResource Description}" Text="{DynamicResource defaultDescription}"/>
<TextBlock x:Name="TextViewColor" Style="{StaticResource Description}" Text="{DynamicResource textcolor_interface}" VerticalAlignment="Top" Foreground="#505050" Visibility="Hidden" Margin="0,28,0,0"/>
</Grid>
diff --git a/.Source/GTweak/View/InterfaceView.xaml.cs b/.Source/GTweak/View/InterfaceView.xaml.cs
index c360a329..97fbd248 100644
--- a/.Source/GTweak/View/InterfaceView.xaml.cs
+++ b/.Source/GTweak/View/InterfaceView.xaml.cs
@@ -20,10 +20,7 @@ namespace GTweak.View
App.LanguageChanged += delegate { WorkWithText.TypeWriteAnimation((string)FindResource("defaultDescription"), TextDescription, TimeSpan.FromMilliseconds(0)); };
if (WindowsLicense.statusLicense != 1)
- {
- App.ViewingSettings();
new ViewNotification().Show("", (string)Application.Current.Resources["title1_notification"], (string)Application.Current.Resources["viewlicense_notification"]);
- }
}
private void Tweak_MouseEnter(object sender, MouseEventArgs e)
diff --git a/.Source/GTweak/View/MoreView.xaml b/.Source/GTweak/View/MoreView.xaml
index fd7152e9..4dde9702 100644
--- a/.Source/GTweak/View/MoreView.xaml
+++ b/.Source/GTweak/View/MoreView.xaml
@@ -14,9 +14,9 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0">
- <TextBlock Width="Auto" Height="auto" FontFamily="{StaticResource Jura}" FontSize="13pt" Foreground="{DynamicResource Color_TetBlock_Inactivity}" HorizontalAlignment="Center" VerticalAlignment="Top" KeyboardNavigation.IsTabStop="False" Margin="0,10,0,0">
+ <TextBlock Width="Auto" Height="auto" FontFamily="{StaticResource Jura}" FontSize="13pt" Foreground="{StaticResource Color_TetBlock_Inactivity}" HorizontalAlignment="Center" VerticalAlignment="Top" KeyboardNavigation.IsTabStop="False" Margin="0,10,0,0">
<Run Text="{DynamicResource text0_more}"/>
- <Run Text="{DynamicResource text1_more}" Foreground="{DynamicResource Color_Accent}"/>
+ <Run Text="{DynamicResource text1_more}" Foreground="{StaticResource Color_Accent}"/>
<Run Text="{DynamicResource text2_more}"/>
</TextBlock>
</Grid>
@@ -36,7 +36,7 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource 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>
@@ -46,14 +46,14 @@
</Image.Style>
</Image>
<TextBlock Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_licens_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_licens_more}"/>
+ <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_licens_more}"/>
<Button x:Name="BtnWinLicense" Content="{DynamicResource btntext_licens_more}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnWinLicense_PreviewMouseDown"/>
</StackPanel>
</Border>
</Grid>
<Grid Grid.Column="1">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource 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>
@@ -63,14 +63,14 @@
</Image.Style>
</Image>
<TextBlock Style="{StaticResource Text}" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_createpoint_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_createpoint_more}"/>
+ <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_createpoint_more}"/>
<Button x:Name="BtnRestorePoint" Content="{DynamicResource btntext_createpoint_more}" FontSize="10pt" VerticalAlignment="Bottom" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnRestorePoint_PreviewMouseDown"/>
</StackPanel>
</Border>
</Grid>
<Grid Grid.Column="2">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource 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>
@@ -80,7 +80,7 @@
</Image.Style>
</Image>
<TextBlock Style="{StaticResource Text}" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_recovery_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_recovery_more}"/>
+ <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_recovery_more}"/>
<Button x:Name="BtnRecoveyLaunch" Content="{DynamicResource btntext_recovery_more}" FontSize="10pt" VerticalAlignment="Bottom" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnRecoveyLaunch_PreviewMouseDown"/>
</StackPanel>
</Border>
@@ -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="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource 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>
@@ -104,14 +104,14 @@
</Image.Style>
</Image>
<TextBlock Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_clear_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_clear_more}"/>
+ <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_clear_more}"/>
<Button x:Name="BtnClear" Content="{DynamicResource btntext_clear_more}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnClear_PreviewMouseDown"/>
</StackPanel>
</Border>
</Grid>
<Grid Grid.Column="1" Margin="0,0,180,0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource 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>
@@ -121,7 +121,7 @@
</Image.Style>
</Image>
<TextBlock Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_disablepoint_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_disablepoint_more}"/>
+ <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_disablepoint_more}"/>
<Button x:Name="BtnDisableRecovery" Content="{DynamicResource btntext_disablepoint_more}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnDisableRecovery_PreviewMouseDown"/>
</StackPanel>
</Border>
diff --git a/.Source/GTweak/View/ServicesView.xaml b/.Source/GTweak/View/ServicesView.xaml
index 83a0581d..3fd57f25 100644
--- a/.Source/GTweak/View/ServicesView.xaml
+++ b/.Source/GTweak/View/ServicesView.xaml
@@ -69,7 +69,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="1">
- <Rectangle Fill="{DynamicResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+ <Rectangle Fill="{StaticResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
<TextBlock x:Name="TextDescription" Style="{StaticResource Description}" Text="{DynamicResource defaultDescription}"/>
</Grid>
diff --git a/.Source/GTweak/View/SystemView.xaml b/.Source/GTweak/View/SystemView.xaml
index d767a3cb..9b02a5f2 100644
--- a/.Source/GTweak/View/SystemView.xaml
+++ b/.Source/GTweak/View/SystemView.xaml
@@ -79,7 +79,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="1">
- <Rectangle Fill="{DynamicResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
+ <Rectangle Fill="{StaticResource Color_Accent}" Width="900" Height="1" RadiusX="15" RadiusY="15" Margin="2" VerticalAlignment="Top" HorizontalAlignment="Center"/>
<TextBlock x:Name="TextDescription" Style="{StaticResource Description}" Text="{DynamicResource defaultDescription}"/>
</Grid>
</Grid>
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml b/.Source/GTweak/Windows/ImportWindow.xaml
index dda51032..bf565492 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml
+++ b/.Source/GTweak/Windows/ImportWindow.xaml
@@ -15,11 +15,11 @@
</Window.DataContext>
<Grid>
- <Border Background="{DynamicResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
+ <Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
<LinearGradientBrush>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_1}" Offset="0"/>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_2}" Offset="1"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>
</LinearGradientBrush>
</Border.BorderBrush>
@@ -30,10 +30,10 @@
</Grid.RowDefinitions>
<Grid x:Name="TitleBar" Grid.Row="0" SnapsToDevicePixels="True" UseLayoutRounding="True" MouseDown="TitleBar_MouseDown">
- <Border Background="{DynamicResource Color_Background_Dark}" CornerRadius="9,9,0,0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{DynamicResource Color_Accent}" FontSize="17px" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
+ <Border Background="{StaticResource Color_Background_Dark}" CornerRadius="9,9,0,0">
+ <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="17px" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
</TextBlock>
</Border>
@@ -46,10 +46,10 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
- <Border BorderBrush="{DynamicResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="90" Height="90" HorizontalAlignment="Center" VerticalAlignment="Center">
+ <Border BorderBrush="{StaticResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="90" Height="90" HorizontalAlignment="Center" VerticalAlignment="Center">
<Border CornerRadius="50">
<Border.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
</Border.Effect>
<Border.Background>
<ImageBrush x:Name="ProfileAvatar" ImageSource="{Binding DisplayProfileAvatar}" Stretch="Uniform"/>
@@ -61,12 +61,12 @@
<Grid Grid.Column="1">
<StackPanel Orientation="Vertical">
<StackPanel Margin="0,10,0,0">
- <TextBlock Text="{DynamicResource title_win_import}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="15px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>
- <TextBlock Text="{DynamicResource wait_win_import}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="14px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>
+ <TextBlock Text="{DynamicResource title_win_import}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="15px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>
+ <TextBlock Text="{DynamicResource wait_win_import}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="14px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium"/>
</StackPanel>
<StackPanel Orientation="Vertical">
<ProgressBar IsIndeterminate="True" Width="250" Height="10" Margin="0,25,0,0" Style="{StaticResource ProgressBarStyle}"/>
- <TextBlock Text="{DynamicResource warning_win_import}" Foreground="{DynamicResource Color_Accent}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
+ <TextBlock Text="{DynamicResource warning_win_import}" Foreground="{StaticResource Color_Accent}" Height="auto" Width="auto" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
</StackPanel>
</StackPanel>
</Grid>
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml b/.Source/GTweak/Windows/LoadingWindow.xaml
index 491055c3..1f2cf5ab 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml
@@ -23,7 +23,7 @@
<StackPanel Orientation="Vertical" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,30,0,0">
- <TextBlock x:Name="TextTittle" Text="{DynamicResource title0_load}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium">
+ <TextBlock x:Name="TextTittle" Text="{DynamicResource title0_load}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium">
<TextBlock.Triggers>
<EventTrigger RoutedEvent="TextBlock.Loaded">
<BeginStoryboard>
@@ -39,10 +39,10 @@
</TextBlock.Triggers>
</TextBlock>
- <Border BorderBrush="{DynamicResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,26,0,0">
+ <Border BorderBrush="{StaticResource Color_Accent}" BorderThickness="1.2" CornerRadius="50" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,26,0,0">
<Border CornerRadius="50">
<Border.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
</Border.Effect>
<Border.Background>
<ImageBrush x:Name="ProfileAvatar" ImageSource="{Binding DisplayProfileAvatar}" Stretch="Uniform"/>
@@ -54,7 +54,7 @@
<ProgressBar Width="100" Height="5" Margin="0,20,0,0" IsIndeterminate="True" Style="{StaticResource ProgressBarStyle}"/>
- <TextBlock x:Name="TextLoad" Text="{DynamicResource text0_load}" Foreground="{DynamicResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
+ <TextBlock x:Name="TextLoad" Text="{DynamicResource text0_load}" Foreground="{StaticResource Color_TetBlock_Inactivity}" FontFamily="{StaticResource Jura}" FontSize="12px" HorizontalAlignment="Center" TextAlignment="Center" FontStretch="Medium" Margin="0,20,0,0"/>
</StackPanel>
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index 6eb856a2..2ad254d5 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -21,11 +21,11 @@
<vm:MainViewModel/>
</Window.DataContext>
- <Border Background="{DynamicResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
+ <Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
<LinearGradientBrush>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_1}" Offset="0"/>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_2}" Offset="1"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>
</LinearGradientBrush>
</Border.BorderBrush>
@@ -37,19 +37,19 @@
</Grid.RowDefinitions>
<Grid x:Name="TitleBar" Grid.Row="0" SnapsToDevicePixels="True" UseLayoutRounding="True" MouseDown="TitleBar_MouseDown">
- <Border Background="{DynamicResource Color_Background_Dark}" CornerRadius="7,7,0,0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{DynamicResource Color_Accent}" FontSize="18" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
+ <Border Background="{StaticResource Color_Background_Dark}" CornerRadius="7,7,0,0">
+ <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="18" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center">
<TextBlock.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
</TextBlock>
</Border>
<StackPanel Orientation="Horizontal" Width="Auto" VerticalAlignment="Center" HorizontalAlignment="Center">
- <Border BorderBrush="{DynamicResource Color_Accent}" BorderThickness="1" CornerRadius="50.5" Width="29" Height="29" HorizontalAlignment="Left" VerticalAlignment="Center">
+ <Border BorderBrush="{StaticResource Color_Accent}" BorderThickness="1" CornerRadius="50.5" Width="29" Height="29" HorizontalAlignment="Left" VerticalAlignment="Center">
<Border CornerRadius="50">
<Border.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
</Border.Effect>
<Border.Background>
<ImageBrush x:Name="ProfileAvatar" ImageSource="{Binding DisplayProfileAvatar}" Stretch="Uniform"/>
@@ -57,9 +57,9 @@
</Border>
</Border>
- <TextBlock x:Name="ProfileName" Width="Auto" Text="{Binding DisplayProfileName}" FontSize="17" FontFamily="{StaticResource Jura}" Foreground="{DynamicResource Color_Accent}" HorizontalAlignment="Right" VerticalAlignment="Center" KeyboardNavigation.IsTabStop="False" Margin="10,0,0,0">
+ <TextBlock x:Name="ProfileName" Width="Auto" Text="{Binding DisplayProfileName}" FontSize="17" FontFamily="{StaticResource Jura}" Foreground="{StaticResource Color_Accent}" HorizontalAlignment="Right" VerticalAlignment="Center" KeyboardNavigation.IsTabStop="False" Margin="10,0,0,0">
<TextBlock.Effect>
- <DropShadowEffect BlurRadius="15" ShadowDepth="0" Opacity="0.7" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="15" ShadowDepth="0" Opacity="0.7" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
</TextBlock>
</StackPanel>
@@ -132,13 +132,13 @@
<Grid x:Name="SettingsMenu" Width="0" HorizontalAlignment="Right" Opacity="0.97" Panel.ZIndex="1">
- <Border HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="1" Height="550" Background="{DynamicResource Color_Background_Dark}" CornerRadius="10 0 0 10">
+ <Border HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="1" Height="550" Background="{StaticResource Color_Background_Dark}" CornerRadius="10 0 0 10">
<Border.Effect>
- <DropShadowEffect BlurRadius="10" ShadowDepth="1" Direction="-90" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="10" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</Border.Effect>
</Border>
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Background="{DynamicResource Color_Background_Dark}" VirtualizingStackPanel.IsVirtualizing="True">
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Background="{StaticResource Color_Background_Dark}" VirtualizingStackPanel.IsVirtualizing="True">
<Grid Width="399">
<Grid.RowDefinitions>
<RowDefinition Height="52*"/>
@@ -147,9 +147,9 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="{DynamicResource title_settings_main}" Foreground="{DynamicResource Color_Accent}" FontSize="20" Margin="0,10,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">
+ <TextBlock FontFamily="{StaticResource Jura}" Text="{DynamicResource title_settings_main}" Foreground="{StaticResource Color_Accent}" FontSize="20" Margin="0,10,0,0" HorizontalAlignment="Center" VerticalAlignment="Top">
<TextBlock.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
</TextBlock>
@@ -164,14 +164,14 @@
<uс:ToggleButton x:Name="BtnSoundNtn" DynamicText="{DynamicResource btgl_sound_main}" VerticalAlignment="Top" Height="25" Margin="40,20,0,0" ChangedState="BtnSoundNtn_ChangedState"/>
<StackPanel Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="40,20,0,0">
- <TextBlock Style="{StaticResource Text_In}" Foreground="{DynamicResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource slider_volume_main}"/>
+ <TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource slider_volume_main}"/>
<Slider x:Name="SliderVolume" Style="{StaticResource Horizontal_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="100" Margin="7,13,0,0" Width="140" ValueChanged="SliderVolume_ValueChanged"/>
</StackPanel>
<uс:ToggleButton x:Name="BtnTopMost" VerticalAlignment="Top" Height="25" DynamicText="{DynamicResource btgl_toast_main}" Margin="40,20,0,0" ChangedState="BtnTopMost_ChangedState"/>
<StackPanel Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="40,20,0,0">
- <TextBlock Style="{StaticResource Text_In}" Foreground="{DynamicResource Color_Highlighted}" Text="{DynamicResource cmbox_lang_main}"/>
+ <TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Text="{DynamicResource cmbox_lang_main}"/>
<ComboBox x:Name="LanguageSelectionMenu" Height="25" Width="155" Margin="10,-5,0,0" SelectionChanged="LanguageSelectionMenu_SelectionChanged" >
<TextBlock Text="{DynamicResource cmbox_eng_main}"/>
<TextBlock Text="{DynamicResource cmbox_ru_main}"/>
@@ -179,17 +179,18 @@
</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}"/>
+ <TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource 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}"/>
+ <TextBlock Text="{DynamicResource cmbox_system_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">
- <TextBlock Style="{StaticResource Text_In}" Foreground="{DynamicResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource text_saveconfig}"/>
+ <TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource text_saveconfig}"/>
<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"/>
@@ -205,7 +206,7 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="40,20,0,0">
- <TextBlock Style="{StaticResource Text_In}" Foreground="{DynamicResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource text_selfremove}"/>
+ <TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource text_selfremove}"/>
<Button x:Name="BtnDelete" Content="{DynamicResource btn_selfremove}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="107" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnDelete_PreviewMouseDown"/>
</StackPanel>
</StackPanel>
@@ -225,7 +226,7 @@
</StackPanel>
</Grid>
<Grid Grid.Column="1">
- <TextBlock x:Name="TweakVersion" Style="{StaticResource Text_In}" FontSize="12px" Foreground="{DynamicResource Color_Inactive}" Text="{Binding DisplayTweakVersion}"/>
+ <TextBlock x:Name="TweakVersion" Style="{StaticResource Text_In}" FontSize="12px" Foreground="{StaticResource Color_Inactive}" Text="{Binding DisplayTweakVersion}"/>
</Grid>
</Grid>
</Grid>
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 507c0388..6744a9ee 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -22,10 +22,14 @@ 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; };
+ ThemeSelectionMenu.SelectedIndex = Settings.Theme switch
+ {
+ "Dark" => 0,
+ "Light" => 1,
+ _ => 2,
+ };
+ App.ImportTweaksUpdate += delegate { BtnMore.IsChecked = true; };
+ App.ThemeChanged += delegate { Settings.SelfRestart(); };
}
#region Button Title/Animation Window
@@ -165,10 +169,14 @@ namespace GTweak
Settings.ChangingParameters("Dark", "Theme");
App.Theme = "Dark";
break;
- default:
+ case 1:
Settings.ChangingParameters("Light", "Theme");
App.Theme = "Light";
break;
+ default:
+ Settings.ChangingParameters("System", "Theme");
+ App.Theme = "System";
+ break;
}
}
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml b/.Source/GTweak/Windows/MessageWindow.xaml
index 3d3eef06..5f0ffcc5 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml
+++ b/.Source/GTweak/Windows/MessageWindow.xaml
@@ -10,11 +10,11 @@
Background="Transparent" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Topmost="True" ResizeMode="CanMinimize"
ShowInTaskbar="False" IsTabStop="False">
<Grid>
- <Border Background="{DynamicResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
+ <Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
<LinearGradientBrush>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_1}" Offset="0"/>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_2}" Offset="1"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>
</LinearGradientBrush>
</Border.BorderBrush>
@@ -26,20 +26,20 @@
</Grid.RowDefinitions>
<Grid x:Name="TitleBar" Grid.Row="0" SnapsToDevicePixels="True" UseLayoutRounding="True" MouseDown="TitleBar_MouseDown">
- <Border Background="{DynamicResource Color_Background_Dark}" CornerRadius="9,9,0,0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{DynamicResource Color_Accent}" FontSize="17px" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,5,0,0">
+ <Border Background="{StaticResource Color_Background_Dark}" CornerRadius="9,9,0,0">
+ <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="17px" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,5,0,0">
<TextBlock.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
</TextBlock>
</Border>
</Grid>
<Grid Grid.Row="1">
- <TextBlock Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" Width="330" FontFamily="{StaticResource Jura}" FontSize="15px" TextWrapping="Wrap"
+ <TextBlock Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" Width="330" FontFamily="{StaticResource Jura}" FontSize="15px" TextWrapping="Wrap"
HorizontalAlignment="Center" TextAlignment="Left" FontStretch="Medium" Margin="5,16,0,0">
<Run x:Name="TextRun0" Text="{DynamicResource text0_message}"/>
- <Run x:Name="TextRun1" Text="{DynamicResource text1_message}" Foreground="{DynamicResource Color_Accent}"/>
+ <Run x:Name="TextRun1" Text="{DynamicResource text1_message}" Foreground="{StaticResource Color_Accent}"/>
<Run x:Name="TextRun2" Text="{DynamicResource text2_message}"/>
</TextBlock>
</Grid>
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml.cs b/.Source/GTweak/Windows/MessageWindow.xaml.cs
index e62aee62..b4dfa252 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MessageWindow.xaml.cs
@@ -18,8 +18,6 @@ namespace GTweak.Windows
{
InitializeComponent();
- App.ViewingSettings();
-
try
{
timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, delegate
@@ -34,9 +32,9 @@ namespace GTweak.Windows
if (isViolationSystem)
{
- TextRun0.Text = (string)Application.Current.Resources["text0_nosupport_message"];
- TextRun1.Text = (string)Application.Current.Resources["text1_nosupport_message"];
- TextRun2.Text = (string)Application.Current.Resources["text2_nosupport_message"];
+ TextRun0.Text = (string)FindResource("text0_nosupport_message");
+ TextRun1.Text = (string)FindResource("text1_nosupport_message");
+ TextRun2.Text = (string)FindResource("text2_nosupport_message");
}
}
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml b/.Source/GTweak/Windows/NotificationWindow.xaml
index 5214f2de..4684e9f5 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml
@@ -13,11 +13,11 @@
AllowsTransparency="True" WindowStartupLocation="Manual" ResizeMode="CanMinimize"
Topmost="True" Closing="Window_Closing" Loaded="Window_Loaded">
- <Border Background="{DynamicResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
+ <Border Background="{StaticResource Color_Background}" BorderThickness="1" CornerRadius="7" Opacity="0.98">
<Border.BorderBrush>
<LinearGradientBrush>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_1}" Offset="0"/>
- <GradientStop Color="{DynamicResource Color_Border_Gradient_2}" Offset="1"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_1}" Offset="0"/>
+ <GradientStop Color="{StaticResource Color_Border_Gradient_2}" Offset="1"/>
</LinearGradientBrush>
</Border.BorderBrush>
@@ -34,9 +34,9 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
- <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{DynamicResource Color_Accent}" FontSize="15" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="19,0,0,0">
+ <TextBlock FontFamily="{StaticResource Jura}" Text="GTweak" Foreground="{StaticResource Color_Accent}" FontSize="15" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="19,0,0,0">
<TextBlock.Effect>
- <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{DynamicResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="20" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
</TextBlock.Effect>
</TextBlock>
</Grid>
@@ -75,7 +75,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0">
- <TextBlock x:Name="TitleSet" Text="Title" Foreground="{DynamicResource Color_Highlighted}" Height="auto" FontFamily="{StaticResource Jura}" FontSize="15" TextWrapping="Wrap"
+ <TextBlock x:Name="TitleSet" Text="Title" Foreground="{StaticResource Color_Highlighted}" Height="auto" FontFamily="{StaticResource Jura}" FontSize="15" TextWrapping="Wrap"
HorizontalAlignment="Left" TextAlignment="Left" FontStretch="Medium" Margin="0,5,0,0">
<TextBlock.Effect>
<DropShadowEffect Opacity="0.2"/>
@@ -84,7 +84,7 @@
</Grid>
<Grid Grid.Row="1">
- <TextBlock x:Name="TextSet" Text="Text" Foreground="{DynamicResource Color_TetBlock_Inactivity}" Height="auto" FontFamily="{StaticResource Jura}" FontSize="14" TextWrapping="Wrap"
+ <TextBlock x:Name="TextSet" Text="Text" Foreground="{StaticResource Color_TetBlock_Inactivity}" Height="auto" FontFamily="{StaticResource Jura}" FontSize="14" TextWrapping="Wrap"
HorizontalAlignment="Left" TextAlignment="Left" FontStretch="Medium" MaxWidth="265" Margin="0,0,0,3">
<TextBlock.Effect>
<DropShadowEffect Opacity="0.2"/>
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml.cs b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
index ca532272..c7c44ab8 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml.cs
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
@@ -29,8 +29,6 @@ namespace GTweak.Windows
ImageBody.Source ??= new BitmapImage(new Uri(Settings.PathIcon));
- App.ViewingSettings();
-
timer = new DispatcherTimer(new TimeSpan(0, 0, 1), DispatcherPriority.Normal, delegate
{
if (time == TimeSpan.Zero) { timer.Stop(); this.Close(); }