Skip to content

Portable Tool for an Ideal Windows Setup

-fixed blink of system data for disk, adapter, audio device

Greedeksfd092edeadbc
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xaml
index 16a47d95..fd69a6d4 100644
--- a/.Source/GTweak/App.xaml
+++ b/.Source/GTweak/App.xaml
@@ -15,6 +15,8 @@
<ResourceDictionary Source="Assets/DrawingImages/Other.xaml" />
<ResourceDictionary Source="Styles/Themes/Dark/Colors.xaml" />
<ResourceDictionary Source="Styles/Buttons.xaml" />
+ <ResourceDictionary Source="Styles/RadioButtons.xaml" />
+ <ResourceDictionary Source="Styles/ToggleButtons.xaml" />
<ResourceDictionary Source="Styles/ScrollBar.xaml" />
<ResourceDictionary Source="Styles/Slider.xaml" />
<ResourceDictionary Source="Styles/TextBlock.xaml" />
diff --git a/.Source/GTweak/Core/Model/MainModel.cs b/.Source/GTweak/Core/Model/MainModel.cs
index 4c25fd7f..de1b665d 100644
--- a/.Source/GTweak/Core/Model/MainModel.cs
+++ b/.Source/GTweak/Core/Model/MainModel.cs
@@ -1,15 +1,9 @@
-using System.Windows.Media;
+using System.Windows;
namespace GTweak.Core.Model
{
internal class MainModel
{
- internal sealed class InterfaceModel
- {
- internal bool IsBlockWin10 { get; set; }
- internal bool IsBlockLicense { get; set; }
- }
-
internal sealed class InformationSystemModel
{
internal string WindowsName { get; set; }
@@ -24,14 +18,7 @@ namespace GTweak.Core.Model
internal string IpAddress { get; set; }
internal string CountProcess { get; set; }
internal int BlurValue { get; set; }
- internal DrawingImage ImageHidden { get; set; }
- }
-
- internal sealed class MainWindowModel
- {
- internal ImageSource ProfileAvatar { get; set; }
- internal string ProfileName { get; set; }
- internal string TweakVersion { get; set; }
+ internal Visibility IpVisibility { get; set; }
}
}
}
diff --git a/.Source/GTweak/Core/ViewModel/MainViewModel.cs b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
index d3e85bc5..aa99381d 100644
--- a/.Source/GTweak/Core/ViewModel/MainViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/MainViewModel.cs
@@ -9,7 +9,6 @@ namespace GTweak.Core.ViewModel
{
internal class MainViewModel : ViewModelBase
{
- private readonly MainWindowModel model;
private object _currentView;
public object CurrentView
@@ -18,23 +17,11 @@ namespace GTweak.Core.ViewModel
set { _currentView = value; OnPropertyChanged(); }
}
- public ImageSource DisplayProfileAvatar
- {
- get => model.ProfileAvatar;
- set { model.ProfileAvatar = value; OnPropertyChanged(); }
- }
+ public ImageSource DisplayProfileAvatar => SystemData.ProfileData.GetProfileImage() ?? Application.Current.Resources["DI_AvatarProfile"] as DrawingImage;
- public string DisplayProfileName
- {
- get => model.ProfileName;
- set { model.ProfileName = value; OnPropertyChanged(); }
- }
+ public string DisplayProfileName => SystemData.ProfileData.GetProfileName();
- public string DisplayTweakVersion
- {
- get => model.TweakVersion;
- set { model.TweakVersion = value; OnPropertyChanged(); }
- }
+ public string DisplayTweakVersion => (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
public ICommand ConfidentialityCommand { get; set; }
public ICommand InterfaceCommand { get; set; }
@@ -55,12 +42,6 @@ namespace GTweak.Core.ViewModel
public MainViewModel()
{
- model = new MainWindowModel();
-
- DisplayProfileAvatar = SystemData.ProfileData.GetProfileImage() ?? Application.Current.Resources["DI_AvatarProfile"] as DrawingImage;
- DisplayProfileName = SystemData.ProfileData.GetProfileName();
- DisplayTweakVersion = (Assembly.GetEntryAssembly() ?? throw new InvalidOperationException()).GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
-
ConfidentialityCommand = new RelayCommand(Confidentiality);
InterfaceCommand = new RelayCommand(Interface);
ApplicationsCommand = new RelayCommand(Apps);
diff --git a/.Source/GTweak/Core/ViewModel/PagesViewModel.cs b/.Source/GTweak/Core/ViewModel/PagesViewModel.cs
index 625de98f..d72b7398 100644
--- a/.Source/GTweak/Core/ViewModel/PagesViewModel.cs
+++ b/.Source/GTweak/Core/ViewModel/PagesViewModel.cs
@@ -1,7 +1,6 @@
using GTweak.Utilities;
using GTweak.Utilities.Tweaks;
using System.Windows;
-using System.Windows.Media;
namespace GTweak.Core.ViewModel
{
@@ -14,30 +13,14 @@ namespace GTweak.Core.ViewModel
internal class InterfaceVM : ViewModelBase
{
- private readonly InterfaceModel model;
- public bool IsBlockForWin10
- {
- get => model.IsBlockWin10;
- set { model.IsBlockWin10 = value; OnPropertyChanged(); }
- }
-
- public bool IsBlockWithoutLicense
- {
- get => model.IsBlockLicense;
- set { model.IsBlockLicense = value; OnPropertyChanged(); }
- }
-
- public InterfaceVM()
- {
- model = new InterfaceModel();
- IsBlockForWin10 = SystemData.СomputerСonfiguration.WindowsClientVersion.Contains("11");
- IsBlockWithoutLicense = WindowsLicense.statusLicense == 1;
- }
+ public bool IsBlockForWin10 => SystemData.СomputerСonfiguration.WindowsClientVersion.Contains("11");
+ public bool IsBlockWithoutLicense => WindowsLicense.statusLicense == 1;
}
internal class InformationSystemVM : ViewModelBase
{
private readonly InformationSystemModel model;
+
public string DisplayWindowsName
{
get => model.WindowsName;
@@ -110,16 +93,22 @@ namespace GTweak.Core.ViewModel
set { model.BlurValue = value; OnPropertyChanged("SetBlurValue"); }
}
- public DrawingImage DisplayImageHidden
+ public Visibility SetVisibility
{
- get => model.ImageHidden;
- set { model.ImageHidden = value; OnPropertyChanged(); }
+ get => model.IpVisibility;
+ set { model.IpVisibility = value; OnPropertyChanged(); }
}
+ public bool StateButton
+ {
+ get => Settings.IsHiddenIpAddress;
+ set { Settings.IsHiddenIpAddress = value; OnPropertyChanged(); }
+ }
+
+
public InformationSystemVM()
{
model = new InformationSystemModel();
-
DisplayWindowsName = SystemData.СomputerСonfiguration.СonfigurationData["Windows"];
DisplayBiosName = SystemData.СomputerСonfiguration.СonfigurationData["BIOS"];
DisplayMotherBrName = SystemData.СomputerСonfiguration.СonfigurationData["MotherBr"];
@@ -149,12 +138,12 @@ namespace GTweak.Core.ViewModel
if (Settings.IsHiddenIpAddress & SystemData.СomputerСonfiguration.ConnectionStatus == 0)
{
SetBlurValue = 20;
- DisplayImageHidden = (DrawingImage)Application.Current.Resources["DI_Show"];
+ SetVisibility = Visibility.Visible;
}
else
{
SetBlurValue = 0;
- DisplayImageHidden = SystemData.СomputerСonfiguration.ConnectionStatus == 0 ? (DrawingImage)Application.Current.Resources["DI_Hide"] : default;
+ SetVisibility = SystemData.СomputerСonfiguration.ConnectionStatus == 0 ? Visibility.Visible : Visibility.Hidden;
}
}
}
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 19f2938c..bcd33956 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -346,6 +346,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Styles\RadioButtons.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Styles\ScrollBar.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -374,6 +378,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Styles\ToggleButtons.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="View\ApplicationsView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
diff --git a/.Source/GTweak/Styles/Buttons.xaml b/.Source/GTweak/Styles/Buttons.xaml
index 11524755..f9e3c0fa 100644
--- a/.Source/GTweak/Styles/Buttons.xaml
+++ b/.Source/GTweak/Styles/Buttons.xaml
@@ -41,40 +41,6 @@
</Style.Triggers>
</Style>
- <Style TargetType="RadioButton" x:Key="BtnNavigation">
- <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"/>
- <Setter Property="Cursor" Value="Hand"/>
- <Setter Property="FocusVisualStyle" Value="{x:Null}" />
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="RadioButton">
- <Border x:Name="Indicator" Background="{TemplateBinding Background}" BorderBrush="{StaticResource Color_Accent}" BorderThickness="0">
- <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
- </Border>
- <ControlTemplate.Triggers>
- <Trigger Property="IsChecked" Value="True">
- <Setter Property="BorderThickness" TargetName="Indicator" Value="0 1.2 0 0" />
- </Trigger>
- </ControlTemplate.Triggers>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- <Style.Triggers>
- <Trigger Property="IsMouseOver" Value="True">
- <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="{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="{StaticResource Color_Background_Dark}"/>
<Setter Property="Background" Value="{StaticResource Color_Accent}"/>
@@ -239,64 +205,4 @@
</Style.Triggers>
</Style>
- <ControlTemplate x:Key="Sound_Enable" TargetType="ToggleButton">
- <Image>
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_BtnSoundOn}"/>
- </Style>
- </Image.Style>
- </Image>
- </ControlTemplate>
-
- <ControlTemplate x:Key="Sound_Disabled" TargetType="ToggleButton">
- <Image>
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_BtnSoundOff}"/>
- </Style>
- </Image.Style>
- </Image>
- </ControlTemplate>
-
- <Style TargetType="ToggleButton" x:Key="ToggleSound">
- <Setter Property="IsTabStop" Value="False"/>
- <Setter Property="Cursor" Value="Hand"/>
- <Setter Property="FocusVisualStyle" Value="{x:Null}" />
- <Setter Property="RenderTransformOrigin" Value=".5,.5"/>
- <Setter Property="RenderTransform">
- <Setter.Value>
- <ScaleTransform x:Name="ImageScale" ScaleX="1" ScaleY="1" />
- </Setter.Value>
- </Setter>
- <Style.Triggers>
- <Trigger Property="IsChecked" Value="True">
- <Setter Property="Template" Value="{StaticResource Sound_Enable}" />
- </Trigger>
- <Trigger Property="IsChecked" Value="False">
- <Setter Property="Template" Value="{StaticResource Sound_Disabled}" />
- </Trigger>
- <EventTrigger RoutedEvent="Button.MouseEnter">
- <EventTrigger.Actions>
- <BeginStoryboard>
- <Storyboard Timeline.DesiredFrameRate="400">
- <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1" To="1.07" Duration="0:0:1.0" SpeedRatio="10"/>
- <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1" To="1.07" Duration="0:0:1.0" SpeedRatio="10"/>
- </Storyboard>
- </BeginStoryboard>
- </EventTrigger.Actions>
- </EventTrigger>
- <EventTrigger RoutedEvent="Button.MouseLeave">
- <EventTrigger.Actions>
- <BeginStoryboard>
- <Storyboard Timeline.DesiredFrameRate="400">
- <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1.07" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
- <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1.07" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
- </Storyboard>
- </BeginStoryboard>
- </EventTrigger.Actions>
- </EventTrigger>
- </Style.Triggers>
- </Style>
-
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Page.xaml b/.Source/GTweak/Styles/Page.xaml
index a49dc0d7..b6f7d94c 100644
--- a/.Source/GTweak/Styles/Page.xaml
+++ b/.Source/GTweak/Styles/Page.xaml
@@ -1,8 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <Style x:Key="LaunchPage"
- TargetType="{x:Type UserControl}">
+ <Style x:Key="LaunchPage" TargetType="{x:Type UserControl}">
<Setter Property="SnapsToDevicePixels" Value="True"/>
<Setter Property="UseLayoutRounding" Value="True"/>
<Setter Property="IsTabStop" Value="False"/>
@@ -22,8 +21,7 @@
</Style.Triggers>
</Style>
- <Style x:Key="ScrollPage"
- TargetType="{x:Type ScrollViewer}">
+ <Style x:Key="ScrollPage" TargetType="{x:Type ScrollViewer}">
<Setter Property="SnapsToDevicePixels" Value="True"/>
<Setter Property="UseLayoutRounding" Value="True"/>
<Setter Property="IsTabStop" Value="False"/>
diff --git a/.Source/GTweak/Styles/RadioButtons.xaml b/.Source/GTweak/Styles/RadioButtons.xaml
new file mode 100644
index 00000000..2483e64c
--- /dev/null
+++ b/.Source/GTweak/Styles/RadioButtons.xaml
@@ -0,0 +1,38 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+ <Style TargetType="{x:Type RadioButton}" x:Key="BtnNavigation">
+ <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"/>
+ <Setter Property="Cursor" Value="Hand"/>
+ <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="RadioButton">
+ <Border x:Name="Indicator" Background="{TemplateBinding Background}" BorderBrush="{StaticResource Color_Accent}" BorderThickness="0">
+ <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter Property="BorderThickness" TargetName="Indicator" Value="0 1.2 0 0" />
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ <Style.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <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="{StaticResource Color_Background_Dark}"/>
+ <Setter Property="Foreground" Value="{StaticResource Color_Accent}"/>
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Slider.xaml b/.Source/GTweak/Styles/Slider.xaml
index 39f1df53..c4345d68 100644
--- a/.Source/GTweak/Styles/Slider.xaml
+++ b/.Source/GTweak/Styles/Slider.xaml
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
- <Style x:Key="SliderRepeatButton_In" TargetType="RepeatButton">
+ <Style x:Key="SliderRepeatButton_In" TargetType="{x:Type RepeatButton}">
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="False"/>
@@ -15,7 +15,7 @@
</Setter>
</Style>
- <Style x:Key="SliderRepeatButton" TargetType="RepeatButton">
+ <Style x:Key="SliderRepeatButton" TargetType="{x:Type RepeatButton}">
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="False"/>
@@ -29,7 +29,7 @@
</Setter>
</Style>
- <Style x:Key="SliderThumb" TargetType="Thumb">
+ <Style x:Key="SliderThumb" TargetType="{x:Type Thumb}">
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="IsTabStop" Value="False"/>
@@ -49,7 +49,7 @@
</Setter>
</Style>
- <ControlTemplate x:Key="Slider" TargetType="Slider">
+ <ControlTemplate x:Key="Slider" TargetType="{x:Type Slider}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -73,7 +73,7 @@
</Grid>
</ControlTemplate>
- <ControlTemplate x:Key="SliderPercent" TargetType="Slider">
+ <ControlTemplate x:Key="SliderPercent" TargetType="{x:Type Slider}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -103,7 +103,7 @@
</Grid>
</ControlTemplate>
- <Style x:Key="VerticalText_Slider" TargetType="Slider">
+ <Style x:Key="VerticalText_Slider" TargetType="{x:Type Slider}">
<Setter Property="Focusable" Value="False"/>
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="OverridesDefaultStyle" Value="true" />
@@ -118,7 +118,7 @@
</Style.Triggers>
</Style>
- <Style x:Key="HorizontalText_Slider" TargetType="Slider">
+ <Style x:Key="HorizontalText_Slider" TargetType="{x:Type Slider}">
<Setter Property="Focusable" Value="False"/>
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="OverridesDefaultStyle" Value="true" />
diff --git a/.Source/GTweak/Styles/ToggleButtons.xaml b/.Source/GTweak/Styles/ToggleButtons.xaml
new file mode 100644
index 00000000..7e1a1c08
--- /dev/null
+++ b/.Source/GTweak/Styles/ToggleButtons.xaml
@@ -0,0 +1,124 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+ <ControlTemplate x:Key="Sound_Enable" TargetType="{x:Type ToggleButton}">
+ <Image>
+ <Image.Style>
+ <Style TargetType="{x:Type Image}">
+ <Setter Property="Source" Value="{StaticResource DI_BtnSoundOn}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ </ControlTemplate>
+
+ <ControlTemplate x:Key="Sound_Disabled" TargetType="{x:Type ToggleButton}">
+ <Image>
+ <Image.Style>
+ <Style TargetType="{x:Type Image}">
+ <Setter Property="Source" Value="{StaticResource DI_BtnSoundOff}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ </ControlTemplate>
+
+ <Style TargetType="{x:Type ToggleButton}" x:Key="TglButtonSound">
+ <Setter Property="IsTabStop" Value="False"/>
+ <Setter Property="Cursor" Value="Hand"/>
+ <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+ <Setter Property="RenderTransformOrigin" Value=".5,.5"/>
+ <Setter Property="RenderTransform">
+ <Setter.Value>
+ <ScaleTransform x:Name="ImageScale" ScaleX="1" ScaleY="1" />
+ </Setter.Value>
+ </Setter>
+ <Style.Triggers>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter Property="Template" Value="{StaticResource Sound_Enable}" />
+ </Trigger>
+ <Trigger Property="IsChecked" Value="False">
+ <Setter Property="Template" Value="{StaticResource Sound_Disabled}" />
+ </Trigger>
+ <EventTrigger RoutedEvent="Button.MouseEnter">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1" To="1.07" Duration="0:0:1.0" SpeedRatio="10"/>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1" To="1.07" Duration="0:0:1.0" SpeedRatio="10"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ <EventTrigger RoutedEvent="Button.MouseLeave">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1.07" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1.07" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+
+ <ControlTemplate x:Key="IP_Show" TargetType="{x:Type ToggleButton}">
+ <Image>
+ <Image.Style>
+ <Style TargetType="{x:Type Image}">
+ <Setter Property="Source" Value="{StaticResource DI_Show}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ </ControlTemplate>
+
+ <ControlTemplate x:Key="IP_Hide" TargetType="{x:Type ToggleButton}">
+ <Image>
+ <Image.Style>
+ <Style TargetType="{x:Type Image}">
+ <Setter Property="Source" Value="{StaticResource DI_Hide}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ </ControlTemplate>
+
+ <Style TargetType="{x:Type ToggleButton}" x:Key="TglButtonIP">
+ <Setter Property="IsTabStop" Value="False"/>
+ <Setter Property="Cursor" Value="Hand"/>
+ <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+ <Setter Property="RenderTransformOrigin" Value=".5,.5"/>
+ <Setter Property="RenderTransform">
+ <Setter.Value>
+ <ScaleTransform x:Name="ImageScale" ScaleX="1" ScaleY="1" />
+ </Setter.Value>
+ </Setter>
+ <Style.Triggers>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter Property="Template" Value="{StaticResource IP_Show}" />
+ </Trigger>
+ <Trigger Property="IsChecked" Value="False">
+ <Setter Property="Template" Value="{StaticResource IP_Hide}" />
+ </Trigger>
+ <EventTrigger RoutedEvent="Button.MouseEnter">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1" To="1.07" Duration="0:0:1.0" SpeedRatio="10"/>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1" To="1.07" Duration="0:0:1.0" SpeedRatio="10"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ <EventTrigger RoutedEvent="Button.MouseLeave">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1.07" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1.07" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Utilities/Tweaks/SystemData.cs b/.Source/GTweak/Utilities/Tweaks/SystemData.cs
index 99f76496..863d46f6 100644
--- a/.Source/GTweak/Utilities/Tweaks/SystemData.cs
+++ b/.Source/GTweak/Utilities/Tweaks/SystemData.cs
@@ -2,7 +2,6 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.Data;
using System.Diagnostics;
using System.Globalization;
using System.IO;
diff --git a/.Source/GTweak/View/InformationSystemView.xaml b/.Source/GTweak/View/InformationSystemView.xaml
index 1f4a3578..07fab0b3 100644
--- a/.Source/GTweak/View/InformationSystemView.xaml
+++ b/.Source/GTweak/View/InformationSystemView.xaml
@@ -180,7 +180,7 @@
<BlurEffect Radius="{Binding SetBlurValue}"/>
</TextBlock.Effect>
</TextBlock>
- <Image x:Name="ImageHidden" Source="{Binding DisplayImageHidden}" Style="{StaticResource Apps}" Height="20" Width="20" Margin="10,0,0,0" PreviewMouseDown="ImageHidden_PreviewMouseDown"/>
+ <ToggleButton x:Name="BtnHiddenIP" Width="20" Height="20" Margin="10,0,0,0" Style="{StaticResource TglButtonIP}" IsChecked="{Binding StateButton}" Visibility="{Binding SetVisibility}" PreviewMouseDown="BtnHiddenIP_PreviewMouseDown"/>
</StackPanel>
</StackPanel>
</Grid>
diff --git a/.Source/GTweak/View/InformationSystemView.xaml.cs b/.Source/GTweak/View/InformationSystemView.xaml.cs
index d0c1794d..c5fc076e 100644
--- a/.Source/GTweak/View/InformationSystemView.xaml.cs
+++ b/.Source/GTweak/View/InformationSystemView.xaml.cs
@@ -51,8 +51,7 @@ namespace GTweak.View
backgroundWorker.DoWork += delegate
{
Parallel.Invoke(SystemData.СomputerСonfiguration.UpdatingDeviceData);
- Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().GetCpuUsage(); })
- { IsBackground = true };
+ Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().GetCpuUsage(); }) { IsBackground = true };
_thread.Start();
};
backgroundWorker.RunWorkerCompleted += delegate
@@ -60,12 +59,11 @@ namespace GTweak.View
Thread _thread = new Thread(() => { new SystemData.MonitoringSystem().CountProcess.ToString(); })
{ IsBackground = true };
Application.Current.Dispatcher.Invoke(ProgressBarAnim);
- DataContext = new InformationSystemVM();
- if (Settings.IsHiddenIpAddress & ImageHidden.Source == default)
+ if (BtnHiddenIP.IsChecked.Value & BtnHiddenIP.Visibility == Visibility.Hidden)
{
DoubleAnimation doubleAnim = new DoubleAnimation(0, (Duration)TimeSpan.FromSeconds(0.18));
- doubleAnim.Completed += (s, _) => { Parallel.Invoke(() => { Settings.ChangingParameters(false, "HiddenIP"); }); };
+ doubleAnim.Completed += delegate { Parallel.Invoke(() => { Settings.ChangingParameters(false, "HiddenIP"); }); };
Timeline.SetDesiredFrameRate(doubleAnim, 400);
IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);
}
@@ -112,22 +110,21 @@ namespace GTweak.View
PopupCopy.BeginAnimation(Popup.VerticalOffsetProperty, doubleAnim);
}
- private void ImageHidden_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ private void BtnHiddenIP_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
if (e.LeftButton == MouseButtonState.Pressed)
{
+ Parallel.Invoke(() => { Settings.ChangingParameters(!BtnHiddenIP.IsChecked.Value, "HiddenIP"); });
+
DoubleAnimation doubleAnim = new DoubleAnimation()
{
- From = Settings.IsHiddenIpAddress ? 20 : 0,
- To = Settings.IsHiddenIpAddress ? 0 : 20,
+ From = BtnHiddenIP.IsChecked.Value ? 20 : 0,
+ To = BtnHiddenIP.IsChecked.Value ? 0 : 20,
EasingFunction = new QuadraticEase(),
Duration = TimeSpan.FromSeconds(0.2)
};
Timeline.SetDesiredFrameRate(doubleAnim, 400);
IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);
-
- Parallel.Invoke(() => { Settings.ChangingParameters(!Settings.IsHiddenIpAddress, "HiddenIP"); });
- DataContext = new InformationSystemVM();
}
}
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index 01b1fd41..b23f2d72 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -198,7 +198,7 @@
<StackPanel Orientation="Horizontal" Height="45" VerticalAlignment="Top" Margin="40,10,0,0">
<TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource slider_volume_main}"/>
- <ToggleButton x:Name="BtnSoundNtn" Width="20" Height="20" Margin="10,1,0,0" Style="{StaticResource ToggleSound}" PreviewMouseDown="BtnSoundNtn_PreviewMouseDown"/>
+ <ToggleButton x:Name="BtnSoundNtn" Width="20" Height="20" Margin="10,1,0,0" Style="{StaticResource TglButtonSound}" PreviewMouseDown="BtnSoundNtn_PreviewMouseDown"/>
<Slider x:Name="SliderVolume" Style="{StaticResource HorizontalText_Slider}" IsSnapToTickEnabled="True" Minimum="0" Maximum="100" Margin="10,4,0,0" Width="187" ValueChanged="SliderVolume_ValueChanged" Height="10"/>
</StackPanel>