Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
upd. SystemInfo page UI to card-based design (#126)
Greedeks20a25ef4a8e0
diff --git a/.Source/GTweak/Assets/DrawingImages/SystemInfo.xaml b/.Source/GTweak/Assets/DrawingImages/SystemInfo.xamlindex db8f3848..89758bba 100644--- a/.Source/GTweak/Assets/DrawingImages/SystemInfo.xaml+++ b/.Source/GTweak/Assets/DrawingImages/SystemInfo.xaml@@ -108,4 +108,27 @@</DrawingImage.Drawing></DrawingImage>+ <DrawingImage x:Key="Icon_Audio">+ <DrawingImage.Drawing>+ <DrawingGroup ClipGeometry="M0,0 V96 H96 V0 H0 Z">+ <DrawingGroup Opacity="1">+ <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M96,96z M0,0z M50.879,11.52C54.484,15.129 55.203,17.563 55.23,22.605 55.246,23.859 55.262,25.109 55.277,26.402L55.266,30.48Q55.27,32.584,55.281,34.688A944,944,0,0,1,55.273,43.488C55.258,47.242 55.281,50.996 55.313,54.75 55.336,57.645 55.332,60.54 55.324,63.434 55.324,64.816 55.332,66.204 55.344,67.586 55.364,69.523 55.344,71.457 55.324,73.395L55.324,76.73C54.535,80.594 52.961,82.05 49.922,84.48 46.703,84.754 44.988,84.145 42.414,82.207 40.488,80.504 38.66,78.734 36.84,76.922 35.59,75.699 34.336,74.484 33.082,73.266 32.535,72.726 31.988,72.184 31.426,71.625 26.352,66.918 22.434,66.793 15.719,66.863 11.566,66.773 8.03499999999999,66.363 4.88299999999999,63.328 2.348,58.738 3.027,53.086 3.12,48L3.05,44.3C3.104,35.883 3.104,35.883 4.897,32.656 7.522,30.125 9.8,29.742 13.358,29.418Q15.41,29.49,17.46,29.578C23.593,29.543,26.976,28.785,31.62,24.422A471,471,0,0,0,36.48,19.199C38.167,17.684 39.886,16.199 41.64,14.762 42.378,14.132 43.12,13.508 43.882,12.863 46.55,11.23 47.812,10.867 50.878,11.52 M42.66,24.059L39.984,26.434C37.488,28.656 37.488,28.656 35.738,30.836 31.84,35.234 28.441,35.91 22.766,36.27 20.286,36.36 17.813,36.398 15.332,36.414 11.742,36.035 11.742,36.035 10.559,37.441A78,78,0,0,0,10.434,42.121C10.43,43.066,10.43,44.011,10.43,44.984L10.44,48 10.429,51.016C10.429,51.961 10.429,52.906 10.433,53.879 10.433,54.754 10.433,55.629 10.437,56.527 10.331,58.547 10.331,58.547 11.519,59.52L15.097,59.352C23.577,59.02 29.53,59.348 36.003,65.258 38.312,67.598 40.553,69.984 42.69,72.484 44.366,74.266 44.366,74.266 47.999,75.84L47.999,20.16C45.987,20.16,44.022,22.816,42.659,24.059 M78.719,15.36C80.992,15.46 80.992,15.46 83.519,16.32 92.633,28.688 93.742,45.176 91.711,59.902 90.203,66.738 87.695,74.016 83.52,79.68 81.05,80.598 81.05,80.598 78.719,80.64 78.086,80.008 77.453,79.371 76.801,78.719 77.156,75.063 78.488,72.149 80.101,68.879 85.875,56.348 85.871,44.016 81.754,30.855 80.789,28.242 79.723,25.855 78.422,23.398 76.801,20.16 76.801,20.16 77.117,18.098 77.762,16.32 77.762,16.32 78.719,15.359 M78.719,15.359" />+ <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M96,96z M0,0z M71.04,23.04C73.348,23.969 74.64,24.598 76.027,26.7 81.562,39.719 81.914,51.746 77.762,65.281 76.676,67.867 75.586,69.707 73.922,72 72.496,72.477 72.496,72.477 71.039,72.96 70.089,72.328 69.141,71.691 68.16,71.04 68.559,67.207 69.094,64.387 70.559,60.781 74.117,51.637 73.199,42.723 70.079,33.601Q69.122,31.679,68.16,29.761C67.86,27.238,67.86,27.238,68.16,24.961z M71.04,23.04" />+ <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M96,96z M0,0z M60.48,33.602C62.7,33.66 62.7,33.66 65.281,34.559 69.332,40.57 68.758,47.723 68.161,54.719 67.559,57.609 66.965,58.941 65.281,61.441 62.699,62.34 62.699,62.34 60.481,62.398 59.398,60.84 59.398,60.84 58.559,58.558 59.199,56.641 59.839,54.718 60.48,52.801 60.89,48.18 60.848,43.851 59.398,39.421L58.558,36.481C59.195,35.531,59.828,34.578,60.48,33.601 M60.48,33.601" />+ </DrawingGroup>+ </DrawingGroup>+ </DrawingImage.Drawing>+ </DrawingImage>++ <DrawingImage x:Key="Icon_Microphone">+ <DrawingImage.Drawing>+ <DrawingGroup ClipGeometry="M0,0 V96 H96 V0 H0 Z">+ <DrawingGroup Opacity="1">+ <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M96,96z M0,0z M56.035,4.656C60.934,7.379 63.957,11.258 66.238,16.32 66.883,19.508 66.914,22.586 66.878,25.828L66.891,28.52A445,445,0,0,1,66.867,34.113C66.84,36.953,66.867,39.789,66.895,42.625Q66.893,45.36,66.879,48.09C66.887,48.93 66.899,49.77 66.906,50.633 66.793,56.641 65.226,60.602 61.441,65.281 56.261,70.09 51.988,70.418 45.137,70.351 39.852,69.855 36.91,67.742 33.301,63.84 30.93,60.328 29.527,57.777 29.465,53.496L29.418,51.066C29.414,50.211,29.41,49.352,29.402,48.465L29.379,45.762Q29.356,42.928,29.352,40.094A704,704,0,0,0,29.246,31.48C29.234,29.64 29.226,27.805 29.223,25.965 29.203,25.113 29.188,24.262 29.168,23.387 29.211,17.352 30.652,13.281 34.558,8.64099999999999 40.66,3.10899999999999 48.215,1.84799999999999 56.035,4.65599999999999 M38.641,14.88C35.723,18.384 36.309,22.782 36.285,27.083 36.281,27.856 36.273,28.63 36.27,29.427 36.258,31.06 36.254,32.697 36.25,34.329 36.238,36.825 36.21,39.317 36.18,41.813Q36.169,44.198,36.164,46.583L36.129,48.837C36.152,54.661 37.523,57.634 41.519,61.739 44.934,63.837 46.934,63.853 50.879,63.36 53.938,61.903 56.387,60.208 58.559,57.603 59.762,53.993 59.695,50.599 59.715,46.837L59.73,44.497C59.742,42.86 59.746,41.227 59.75,39.591 59.762,37.099 59.79,34.603 59.82,32.111Q59.831,29.721,59.836,27.337L59.871,25.087C59.848,19.7 58.582,16.817 55.281,12.712 49.695,8.337 43.395,10.806 38.641,14.88 M38.641,14.88" />+ <GeometryDrawing Brush="{DynamicResource Brush_Inactive}" Geometry="F1 M96,96z M0,0z M19.2,41.281C21.719,41.641,21.719,41.641,24,42.238L24.285,45.539C25.47,58.73 25.47,58.73 32.762,69.422 37.926,73.46 43.98,75.27 50.52,74.82 57.586,73.637 62.434,70.64 66.984,65.164 70.082,60.414 70.598,55.614 71.16,50.102 71.242,49.344 71.324,48.586 71.41,47.809Q71.714,45.026,72,42.239C74.281,41.641 74.281,41.641 76.8,41.281 79.402,43.883 79.008,45.328 79.02,48.961 78.824,59.414 75.906,68.18 68.336,75.637 63.625,79.5 58.684,81.187 52.801,82.559 52.711,83.566 52.711,83.566 52.625,84.594L52.379,87.238C52.301,88.109 52.223,88.977 52.145,89.871 51.84,92.161 51.84,92.161 50.879,94.078L45.12,94.078C43.952,91.742,43.85,89.84,43.62,87.238L43.374,84.594C43.288,83.586 43.288,83.586 43.198,82.559 42.312,82.363 42.312,82.363 41.401,82.168 32.659,79.941 26.538,75.898 21.659,68.218 17.289,60.156 16.397,52.368 17.28,43.199z M19.2,41.281" />+ </DrawingGroup>+ </DrawingGroup>+ </DrawingImage.Drawing>+ </DrawingImage>+</ResourceDictionary>\ No newline at end of filediff --git a/.Source/GTweak/Assets/UserControls/Card.xaml.cs b/.Source/GTweak/Assets/UserControls/Card.xaml.csindex cafe114e..3b2dce57 100644--- a/.Source/GTweak/Assets/UserControls/Card.xaml.cs+++ b/.Source/GTweak/Assets/UserControls/Card.xaml.cs@@ -18,13 +18,44 @@ namespace GTweak.Assets.UserControlsinternal static new readonly DependencyProperty ContentProperty =DependencyProperty.Register(nameof(BtnContent), typeof(string), typeof(Button), new PropertyMetadata(string.Empty, (s, e) => { if (s is Button btn && e.NewValue is string str) { btn.Content = str; } }));- internal Style IconStyle { get => (Style)GetValue(IconStyleProperty); set => SetValue(IconStyleProperty, value); }+ internal Style IconStyle+ {+ get => (Style)GetValue(IconStyleProperty);+ set => SetValue(IconStyleProperty, value);+ }- internal DynamicResourceExtension Title { set { if (value != null) { CardTitle?.SetResourceReference(TextBlock.TextProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey)); } } }+ internal DynamicResourceExtension Title+ {+ set+ {+ if (value != null)+ {+ CardTitle?.SetResourceReference(TextBlock.TextProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey));+ }+ }+ }- internal DynamicResourceExtension Description { set { if (value != null) { CardText?.SetResourceReference(TextBlock.TextProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey)); } } }+ internal DynamicResourceExtension Description+ {+ set+ {+ if (value != null)+ {+ CardText?.SetResourceReference(TextBlock.TextProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey));+ }+ }+ }- internal DynamicResourceExtension BtnContent { set { if (value != null) { CardButton?.SetResourceReference(ContentProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey)); } } }+ internal DynamicResourceExtension BtnContent+ {+ set+ {+ if (value != null)+ {+ CardButton?.SetResourceReference(ContentProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey));+ }+ }+ }internal DynamicResourceExtension BtnContentSecondary{diff --git a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xamlindex 1ce34376..19144585 100644--- a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml+++ b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:local="clr-namespace:GTweak.Assets.UserControls"mc:Ignorable="d" IsTabStop="False" Focusable="False" KeyboardNavigation.TabNavigation="None" SnapsToDevicePixels="True" UseLayoutRounding="True"d:DesignHeight="100" d:DesignWidth="800">diff --git a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.csindex ed5b6274..5aa2d114 100644--- a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs+++ b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs@@ -5,8 +5,8 @@ using System.Threading;using System.Threading.Tasks;using System.Windows;using System.Windows.Media.Animation;+using GTweak.Core.Behaviors;using GTweak.Utilities.Animation;-using GTweak.Utilities.Behaviors;using GTweak.Utilities.Controls;namespace GTweak.Assets.UserControlsdiff --git a/.Source/GTweak/Assets/UserControls/FlowPanel.cs b/.Source/GTweak/Assets/UserControls/FlowPanel.csindex 89066402..9f7e9bec 100644--- a/.Source/GTweak/Assets/UserControls/FlowPanel.cs+++ b/.Source/GTweak/Assets/UserControls/FlowPanel.cs@@ -459,8 +459,6 @@ namespace GTweak.Assets.UserControls};}- double stretchExtraPerColumn = (isStretch && groups.Count > 0) ? extraSpace / groups.Count : 0;-for (int i = 0; i < groups.Count; i++){FlowItemGroup col = groups[i];@@ -469,7 +467,8 @@ namespace GTweak.Assets.UserControlsdouble columnX = xV + shift;double y = 0;- double actualColWidth = isStretch ? col.Width + stretchExtraPerColumn : col.Width;+ double equalWidth = isStretch ? (availableWidth - (groups.Count - 1) * HorizontalSpacing) / groups.Count : 0;+ double actualColWidth = isStretch ? equalWidth : col.Width;foreach (UIElement child in col.Elements){diff --git a/.Source/GTweak/Assets/UserControls/InfoCard.xaml b/.Source/GTweak/Assets/UserControls/InfoCard.xamlnew file mode 100644index 00000000..88fdef79--- /dev/null+++ b/.Source/GTweak/Assets/UserControls/InfoCard.xaml@@ -0,0 +1,31 @@+<UserControl x:Class="GTweak.Assets.UserControls.InfoCard"+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"+ xmlns:local="clr-namespace:GTweak.Assets.UserControls"+ mc:Ignorable="d"+ d:DesignHeight="450" d:DesignWidth="800">+ <Grid Margin="5">+ <Border CornerRadius="8" Opacity="0.5" Background="{StaticResource Brush_ShadowOverlay}"+ IsHitTestVisible="False">+ <Border.RenderTransform>+ <TranslateTransform X="3" Y="6"/>+ </Border.RenderTransform>+ </Border>++ <Border BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" Background="{StaticResource Brush_Background_Card}" CornerRadius="8" Padding="15,12" SnapsToDevicePixels="True">+ <StackPanel Orientation="Vertical">++ <StackPanel Orientation="Horizontal">+ <Image x:Name="CardIcon" Height="16" Width="16" VerticalAlignment="Center"/>+ <TextBlock Margin="5,0,0,0" Text="{Binding Title, RelativeSource={RelativeSource AncestorType=UserControl}}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Accent}"/>+ </StackPanel>++ <Border Background="{StaticResource Brush_Separator}" Height="1" CornerRadius="10" Margin="0,10,0,0"/>++ <ContentPresenter Margin="0,8,0,0" Content="{Binding CardContent, RelativeSource={RelativeSource AncestorType=UserControl}}"/>+ </StackPanel>+ </Border>+ </Grid>+</UserControl>diff --git a/.Source/GTweak/Assets/UserControls/InfoCard.xaml.cs b/.Source/GTweak/Assets/UserControls/InfoCard.xaml.csnew file mode 100644index 00000000..10f2b54f--- /dev/null+++ b/.Source/GTweak/Assets/UserControls/InfoCard.xaml.cs@@ -0,0 +1,52 @@+using System.Windows;+using System.Windows.Controls;++namespace GTweak.Assets.UserControls+{+ public partial class InfoCard : UserControl+ {++ internal static readonly DependencyProperty IconStyleProperty =+ DependencyProperty.Register(nameof(IconStyle), typeof(Style), typeof(InfoCard), new PropertyMetadata(null, OnIconStyleChanged));++ internal static readonly DependencyProperty TitleProperty =+ DependencyProperty.Register(nameof(Title), typeof(string), typeof(InfoCard));++ internal static readonly DependencyProperty CardContentProperty =+ DependencyProperty.Register(nameof(CardContent), typeof(object), typeof(InfoCard));++ internal Style IconStyle+ {+ get => (Style)GetValue(IconStyleProperty);+ set => SetValue(IconStyleProperty, value);+ }++ internal string Title+ {+ get => (string)GetValue(TitleProperty);+ set => SetValue(TitleProperty, value);+ }++ internal object CardContent+ {+ get => GetValue(CardContentProperty);+ set => SetValue(CardContentProperty, value);+ }++ private static void OnIconStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)+ {+ if (d is InfoCard card && card.CardIcon != null)+ {+ if (e.NewValue is Style style)+ {+ card.CardIcon.Style = style;+ }+ }+ }++ public InfoCard()+ {+ InitializeComponent();+ }+ }+}diff --git a/.Source/GTweak/Core/Behaviors/ArcAnimationBehavior.cs b/.Source/GTweak/Core/Behaviors/ArcAnimationBehavior.csnew file mode 100644index 00000000..a13ff803--- /dev/null+++ b/.Source/GTweak/Core/Behaviors/ArcAnimationBehavior.cs@@ -0,0 +1,30 @@+using System;+using System.Windows;+using System.Windows.Media.Animation;+using System.Windows.Threading;+using GTweak.Utilities.Animation;++namespace GTweak.Core.Behaviors+{+ internal class ArcAnimationBehavior+ {+ internal static readonly DependencyProperty AnimatedAngleProperty =+ DependencyProperty.RegisterAttached("AnimatedAngle", typeof(double), typeof(ArcAnimationBehavior), new PropertyMetadata(0.0, OnAngleChanged));++ internal static void SetAnimatedAngle(DependencyObject obj, double value) => obj.SetValue(AnimatedAngleProperty, value);+ internal static double GetAnimatedAngle(DependencyObject obj) => (double)obj.GetValue(AnimatedAngleProperty);++ private static void OnAngleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)+ {+ if (d is Wpf.Ui.Controls.Arc arc)+ {+ arc.Dispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() =>+ {+ DoubleAnimation animation = FactoryAnimation.CreateIn(arc.EndAngle, (double)e.NewValue, 0.2, useCubicEase: true);+ Timeline.SetDesiredFrameRate(animation, 60);+ arc.BeginAnimation(Wpf.Ui.Controls.Arc.EndAngleProperty, animation);+ }));+ }+ }+ }+}diff --git a/.Source/GTweak/Utilities/Behaviors/ScrollFadeBehavior.cs b/.Source/GTweak/Core/Behaviors/ScrollFadeBehavior.cssimilarity index 93%rename from .Source/GTweak/Utilities/Behaviors/ScrollFadeBehavior.csrename to .Source/GTweak/Core/Behaviors/ScrollFadeBehavior.csindex 370fbdab..343d8994 100644--- a/.Source/GTweak/Utilities/Behaviors/ScrollFadeBehavior.cs+++ b/.Source/GTweak/Core/Behaviors/ScrollFadeBehavior.cs@@ -3,15 +3,15 @@ using System.Windows;using System.Windows.Controls;using System.Windows.Media;-namespace GTweak.Utilities.Behaviors+namespace GTweak.Core.Behaviors{internal static class ScrollFadeBehavior{- public static readonly DependencyProperty EnableFadeProperty =+ internal static readonly DependencyProperty EnableFadeProperty =DependencyProperty.RegisterAttached("EnableFade", typeof(bool), typeof(ScrollFadeBehavior), new PropertyMetadata(false, OnEnableFadeChanged));- public static bool GetEnableFade(DependencyObject obj) => (bool)obj.GetValue(EnableFadeProperty);- public static void SetEnableFade(DependencyObject obj, bool value) => obj.SetValue(EnableFadeProperty, value);+ internal static bool GetEnableFade(DependencyObject obj) => (bool)obj.GetValue(EnableFadeProperty);+ internal static void SetEnableFade(DependencyObject obj, bool value) => obj.SetValue(EnableFadeProperty, value);private static void OnEnableFadeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e){diff --git a/.Source/GTweak/Utilities/Behaviors/ScrollViewerBehavior.cs b/.Source/GTweak/Core/Behaviors/ScrollViewerBehavior.cssimilarity index 96%rename from .Source/GTweak/Utilities/Behaviors/ScrollViewerBehavior.csrename to .Source/GTweak/Core/Behaviors/ScrollViewerBehavior.csindex f7f6362c..fd757030 100644--- a/.Source/GTweak/Utilities/Behaviors/ScrollViewerBehavior.cs+++ b/.Source/GTweak/Core/Behaviors/ScrollViewerBehavior.cs@@ -1,7 +1,7 @@using System.Windows;using System.Windows.Controls;-namespace GTweak.Utilities.Behaviors+namespace GTweak.Core.Behaviors{internal static class ScrollViewerBehavior{diff --git a/.Source/GTweak/Utilities/Behaviors/TextBoxClearBehavior.cs b/.Source/GTweak/Core/Behaviors/TextBoxClearBehavior.cssimilarity index 85%rename from .Source/GTweak/Utilities/Behaviors/TextBoxClearBehavior.csrename to .Source/GTweak/Core/Behaviors/TextBoxClearBehavior.csindex d06ac189..2f7a4a46 100644--- a/.Source/GTweak/Utilities/Behaviors/TextBoxClearBehavior.cs+++ b/.Source/GTweak/Core/Behaviors/TextBoxClearBehavior.cs@@ -1,15 +1,15 @@using System.Windows;using System.Windows.Controls;-namespace GTweak.Utilities.Behaviors+namespace GTweak.Core.Behaviors{internal class TextBoxClearBehavior{- public static readonly DependencyProperty ClearButtonProperty =+ internal static readonly DependencyProperty ClearButtonProperty =DependencyProperty.RegisterAttached("ClearButton", typeof(bool), typeof(TextBoxClearBehavior), new PropertyMetadata(false, OnClearButtonChanged));- public static bool GetClearButton(UIElement element) => (bool)element.GetValue(ClearButtonProperty);- public static void SetClearButton(UIElement element, bool value) => element.SetValue(ClearButtonProperty, value);+ internal static bool GetClearButton(UIElement element) => (bool)element.GetValue(ClearButtonProperty);+ internal static void SetClearButton(UIElement element, bool value) => element.SetValue(ClearButtonProperty, value);private static void OnClearButtonChanged(DependencyObject d, DependencyPropertyChangedEventArgs e){diff --git a/.Source/GTweak/Core/Converters/PercentToWidthConverter.cs b/.Source/GTweak/Core/Converters/PercentToWidthConverter.csnew file mode 100644index 00000000..e9be6f78--- /dev/null+++ b/.Source/GTweak/Core/Converters/PercentToWidthConverter.cs@@ -0,0 +1,21 @@+using System;+using System.Globalization;+using System.Windows.Data;++namespace GTweak.Core.Converters+{+ internal class PercentToWidthConverter : IMultiValueConverter+ {+ public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)+ {+ if (values[0] is string str && double.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out double percent) && values[1] is double totalWidth)+ {+ return Math.Max(0, Math.Min(totalWidth, totalWidth * percent / 100));+ }++ return 0.0;+ }++ public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();+ }+}diff --git a/.Source/GTweak/Core/Converters/UsageToAngleConverter.cs b/.Source/GTweak/Core/Converters/UsageToAngleConverter.csnew file mode 100644index 00000000..7ed3200a--- /dev/null+++ b/.Source/GTweak/Core/Converters/UsageToAngleConverter.cs@@ -0,0 +1,22 @@+using System;+using System.Globalization;+using System.Windows;+using System.Windows.Data;++namespace GTweak.Core.Converters+{+ internal class UsageToAngleConverter : IValueConverter+ {+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)+ {+ if (value is string str && double.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out double usage))+ {+ return Math.Min(usage * 3.6, 359.9);+ }++ return 0.0;+ }++ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => DependencyProperty.UnsetValue;+ }+}diff --git a/.Source/GTweak/Core/Model/DataSystemModel.cs b/.Source/GTweak/Core/Model/DataSystemModel.csindex 8e4ef029..104c9d1a 100644--- a/.Source/GTweak/Core/Model/DataSystemModel.cs+++ b/.Source/GTweak/Core/Model/DataSystemModel.cs@@ -1,9 +1,12 @@+using System.Collections.Generic;using System.Windows;using GTweak.Core.Base;internal sealed class DataSystemModel : ViewModelBase{private string _data;+ private string[] _dataItems;+ private List<DataSystemModel> _items;private bool _isEnabled;private int _blurValue;private Visibility _ipVisibility;@@ -16,6 +19,18 @@ internal sealed class DataSystemModel : ViewModelBaseset { _data = value; OnPropertyChanged(); }}+ public string[] DataItems+ {+ get => _dataItems;+ set { _dataItems = value; OnPropertyChanged(); }+ }++ public List<DataSystemModel> Items+ {+ get => _items;+ set { _items = value; OnPropertyChanged(); }+ }+public bool IsEnabled{get => _isEnabled;diff --git a/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs b/.Source/GTweak/Core/ViewModel/DataSystemViewModel.csindex 607dfadd..5ecbed13 100644--- a/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs+++ b/.Source/GTweak/Core/ViewModel/DataSystemViewModel.cs@@ -1,6 +1,7 @@using System;using System.Collections.Generic;using System.Collections.ObjectModel;+using System.Globalization;using System.Linq;using System.Windows;using System.Windows.Media;@@ -23,6 +24,7 @@ namespace GTweak.Core.ViewModelprivate readonly DataSystemModel _model = new DataSystemModel();private ObservableCollection<DataSystemModel> _collection;private readonly List<Action> _modelUpdateActions = new List<Action>();+ private readonly List<Action> _fallbackRefresh = new List<Action>();private readonly DataSystemModel _ipAddressModel;public ObservableCollection<DataSystemModel> DisplayData@@ -83,38 +85,36 @@ namespace GTweak.Core.ViewModelCreateModelCollection("OSVersion", () => HardwareData.OS.Version, FallbackKeys.Unknown),CreateModelCollection("Processes", () => HardwareData.RunningProcessesCount, isUpdatable: true),CreateModelCollection("Services", () => HardwareData.RunningServicesCount, isUpdatable: true),+ CreateModelCollection("CPUAngle", () => HardwareData.Processor.Usage.ToString(), isUpdatable: true),+ CreateModelCollection("RAMAngle", () => HardwareData.Memory.Usage.ToString(), isUpdatable: true),CreateModelCollection("Bios", () => HardwareData.Bios.Data, FallbackKeys.NoDevice),+ CreateModelCollection("BiosSerial", () => HardwareData.Bios.SerialNumber, FallbackKeys.Unknown),CreateModelCollection("Mode", () => HardwareData.Bios.Mode, FallbackKeys.Unknown),CreateModelCollection("Motherboard", () => HardwareData.Motherboard.Data, FallbackKeys.NoDevice),+ CreateModelCollection("MotherboardVersion", () => HardwareData.Motherboard.Version, FallbackKeys.Unknown),+ CreateModelCollection("MotherboardSerial", () => HardwareData.Motherboard.SerialNumber, FallbackKeys.Unknown),CreateModelCollection("Chipset", () => HardwareData.Motherboard.Chipset, FallbackKeys.Unknown),CreateModelCollection("Processor", () => HardwareData.Processor.Data, FallbackKeys.NoDevice),CreateModelCollection("Cores", () => HardwareData.Processor.Cores, FallbackKeys.Unknown),CreateModelCollection("Threads", () => HardwareData.Processor.Threads, FallbackKeys.Unknown),CreateModelCollection("Frequency", () => HardwareData.Processor.Frequency, FallbackKeys.Unknown),- CreateModelCollection("Graphics", () => HardwareData.Graphics, FallbackKeys.NoDevice),+ CreateListCollection("Graphics", () => HardwareData.Graphics.Select(g => new[] { g.Data, g.Memory }).ToList(), isUpdatable:false, FallbackKeys.NoDevice, FallbackKeys.Unknown),CreateModelCollection("RefreshRate", () => HardwareData.MonitorRefreshRate, FallbackKeys.Unknown, true),- CreateModelCollection("Memory", () => HardwareData.Memory.Data, FallbackKeys.NoDevice),+ CreateListCollection("Memory", () => HardwareData.Memory.Modules.Select(m => new[] { m.Data, m.Frequency, m.Capacity }).ToList(), isUpdatable:false, FallbackKeys.NoDevice, FallbackKeys.Unknown, FallbackKeys.Unknown),CreateModelCollection("Type", () => HardwareData.Memory.Type, FallbackKeys.Unknown),- CreateModelCollection("Storage", () => HardwareData.Storage.Data, FallbackKeys.NoDevice, true),- CreateModelCollection("UsedSpace", () => HardwareData.Storage.UsedSpace, FallbackKeys.Unknown, true),- CreateModelCollection("FreeSpace", () => HardwareData.Storage.FreeSpace, FallbackKeys.Unknown, true),- CreateModelCollection("Audio", () => HardwareData.AudioDevice, FallbackKeys.NoDriver, true),- CreateModelCollection("Network", () => HardwareData.NetworkAdapter, FallbackKeys.NoDriver, true),+ CreateListCollection("Storage", () => HardwareData.Storage.Select(s => new[] { s.Data, s.Capacity, s.StorageType, s.UsedPercent.ToString(CultureInfo.InvariantCulture), s.FreeSpace, s.UsedSpace }).ToList(),true,FallbackKeys.NoDevice,string.Empty,FallbackKeys.Unknown, string.Empty,string.Empty, string.Empty),+ CreateListCollection("Audio", () => HardwareData.AudioDevices.Select(a => new[] { a.Data, a.IsCapture ? "1" : "0" }).ToList(),true, FallbackKeys.NoDriver),+ CreateListCollection("Network", () => HardwareData.NetworkAdapters.Select(n => new[] { n.Data, n.IsConnected ? "1" : "0" }).ToList(),true, FallbackKeys.NoDriver),+ CreateModelCollection("CountryCode", () => HardwareData.UserCountryCode, isUpdatable: true),(_ipAddressModel = CreateModelCollection("IpAddress", () => HardwareData.UserIPAddress, FallbackKeys.ConnectionLost, true))};- RefreshStates();- }-- internal void Update()- {- foreach (Action updateItemAction in _modelUpdateActions)- {- updateItemAction();- }RefreshStates();}+ internal void RefreshFallback() => _fallbackRefresh.ForEach(action => action());+ internal void UpdateModel() => _modelUpdateActions.ForEach(action => action());+private void RefreshStates(){if (NetworkProvider.isIPAddressFormatValid || _ipAddressModel.Data.Any(char.IsDigit))@@ -138,7 +138,6 @@ namespace GTweak.Core.ViewModelvoid UpdateModelData(){string data = dataProvider();-if (!string.IsNullOrEmpty(data)){model.Data = data;@@ -146,7 +145,7 @@ namespace GTweak.Core.ViewModel}else{- model.Data = fallbackKey == null ? string.Empty : (Application.Current.Resources[fallbackKey] as string ?? string.Empty);+ model.Data = ResolveFallback(fallbackKey);model.IsEnabled = false;}}@@ -158,7 +157,51 @@ namespace GTweak.Core.ViewModel_modelUpdateActions.Add(UpdateModelData);}+ _fallbackRefresh.Add(UpdateModelData);+return model;}++ private DataSystemModel CreateListCollection(string name, Func<List<string[]>> listProvider, bool isUpdatable = false, params string[] fallbacks)+ {+ DataSystemModel model = new DataSystemModel { Name = name };++ void UpdateModelData()+ {+ List<string[]> list = listProvider();+ if (list != null && list.Count > 0)+ {+ model.Items = list.Select(item => new DataSystemModel+ {+ DataItems = item,+ IsEnabled = true+ }).ToList();+ }+ else+ {+ model.Items = new List<DataSystemModel>+ {+ new DataSystemModel+ {+ DataItems = fallbacks.Select(ResolveFallback).ToArray(),+ IsEnabled = false+ }+ };+ }+ }++ UpdateModelData();++ if (isUpdatable)+ {+ _modelUpdateActions.Add(UpdateModelData);+ }++ _fallbackRefresh.Add(UpdateModelData);++ return model;+ }++ private string ResolveFallback(string fallbackKeyOrValue) => string.IsNullOrEmpty(fallbackKeyOrValue) ? string.Empty : (Application.Current.Resources[fallbackKeyOrValue] as string ?? fallbackKeyOrValue);}}diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 7e904ab4..08f98fd1 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -152,6 +152,10 @@<Resource Include="Assets\ShaderEffects\ColorWheelEffect.ps" /></ItemGroup><ItemGroup>+ <Page Include="Assets\UserControls\InfoCard.xaml">+ <SubType>Designer</SubType>+ <Generator>MSBuild:Compile</Generator>+ </Page><Page Include="Languages\**\*.xaml"><Generator>MSBuild:Compile</Generator><SubType>Designer</SubType>@@ -178,6 +182,9 @@<Compile Include="Assets\UserControls\FileCard.xaml.cs"><DependentUpon>FileCard.xaml</DependentUpon></Compile>+ <Compile Include="Assets\UserControls\InfoCard.xaml.cs">+ <DependentUpon>InfoCard.xaml</DependentUpon>+ </Compile><Compile Include="Assets\UserControls\ToolsetCard.xaml.cs"><DependentUpon>ToolsetCard.xaml</DependentUpon></Compile>@@ -185,6 +192,8 @@<Compile Include="Core\Base\IViewPageBase.cs" /><Compile Include="Core\Base\ViewModelPageBase.cs" /><Compile Include="Core\Converters\AngleToPercentConverter.cs" />+ <Compile Include="Core\Converters\PercentToWidthConverter.cs" />+ <Compile Include="Core\Converters\UsageToAngleConverter.cs" /><Compile Include="Core\Services\FuzzySearchService.cs" /><Compile Include="Core\ViewModel\Components\DownloadSession.cs" /><Compile Include="Core\ViewModel\Components\ToolsetItem.cs" />@@ -207,9 +216,10 @@<Compile Include="Core\ViewModel\SystemViewModel.cs" /><Compile Include="Core\ViewModel\ToolsetViewModel.cs" /><Compile Include="Utilities\Animation\BlurAnimation.cs" />- <Compile Include="Utilities\Behaviors\ScrollFadeBehavior.cs" />- <Compile Include="Utilities\Behaviors\ScrollViewerBehavior.cs" />- <Compile Include="Utilities\Behaviors\TextBoxClearBehavior.cs" />+ <Compile Include="Core\Behaviors\ArcAnimationBehavior.cs" />+ <Compile Include="Core\Behaviors\ScrollFadeBehavior.cs" />+ <Compile Include="Core\Behaviors\ScrollViewerBehavior.cs" />+ <Compile Include="Core\Behaviors\TextBoxClearBehavior.cs" /><Compile Include="Utilities\Configuration\IconExtractProvider.cs" /><Compile Include="Utilities\Configuration\NetworkProvider.cs" /><Compile Include="Utilities\Configuration\StorageTypeIdentifier.cs" />diff --git a/.Source/GTweak/Languages/en/Localize.xaml b/.Source/GTweak/Languages/en/Localize.xamlindex eefbbf70..cdeae1c6 100644--- a/.Source/GTweak/Languages/en/Localize.xaml+++ b/.Source/GTweak/Languages/en/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Operating system:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Version:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Operating system:</v:String><v:String x:Key="label_proc_sysinfo">Running processes:</v:String><v:String x:Key="label_svc_sysinfo">services:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Mode:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Motherboard:</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">Processor:</v:String>- <v:String x:Key="title_cores_sysinfo">Cores:</v:String>- <v:String x:Key="title_threads_sysinfo">Threads:</v:String>- <v:String x:Key="title_freq_sysinfo">Frequency:</v:String>- <v:String x:Key="title_gpu_sysinfo">Graphics:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Refresh Rate:</v:String>- <v:String x:Key="title_ram_sysinfo">Memory:</v:String>- <v:String x:Key="title_mtype_sysinfo">Memory Type:</v:String>- <v:String x:Key="title_storage_sysinfo">Storage devices:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Used:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Free:</v:String>- <v:String x:Key="title_sound_sysinfo">Playback devices:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Network adapters:</v:String>- <v:String x:Key="title_ip_sysinfo">Your IP address:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Version</v:String>+ <v:String x:Key="label_serial_sysinfo">Serial number</v:String>+ <v:String x:Key="label_mode_sysinfo">Mode</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Motherboard</v:String>+ <v:String x:Key="label_name_sysinfo">Name</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">Processor</v:String>+ <v:String x:Key="label_cores_sysinfo">Cores</v:String>+ <v:String x:Key="label_threads_sysinfo">Threads</v:String>+ <v:String x:Key="label_freq_sysinfo">Frequency</v:String>+ <v:String x:Key="label_gpu_sysinfo">Graphics</v:String>+ <v:String x:Key="label_capacity_sysinfo">Capacity</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Refresh Rate</v:String>+ <v:String x:Key="label_ram_sysinfo">Memory</v:String>+ <v:String x:Key="label_mtype_sysinfo">Memory Type</v:String>+ <v:String x:Key="label_storage_sysinfo">Storage devices</v:String>+ <v:String x:Key="label_itype_sysinfo">Interface Type</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Used:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Free:</v:String>+ <v:String x:Key="label_sound_sysinfo">Playback devices</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Network adapters</v:String>+ <v:String x:Key="label_ip_sysinfo">Your IP address</v:String><v:String x:Key="connection_limited_sysinfo">Network connectivity is limited</v:String><v:String x:Key="connection_block_sysinfo">Restricted network access</v:String><v:String x:Key="connection_lose_sysinfo">Internet connectivity lost</v:String>diff --git a/.Source/GTweak/Languages/fr/Localize.xaml b/.Source/GTweak/Languages/fr/Localize.xamlindex 2da601ed..3f8adb05 100644--- a/.Source/GTweak/Languages/fr/Localize.xaml+++ b/.Source/GTweak/Languages/fr/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Système d’exploitation :</v:String>- <v:String x:Key="title_win_ver_sysinfo">Version :</v:String>+ <v:String x:Key="label_win_name_sysinfo">Système d’exploitation :</v:String><v:String x:Key="label_proc_sysinfo">Processus en cours d’exécution :</v:String><v:String x:Key="label_svc_sysinfo">services :</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS :</v:String>- <v:String x:Key="title_mode_sysinfo">Mode :</v:String>- <v:String x:Key="title_motherbr_sysinfo">Carte mère :</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">Processeur :</v:String>- <v:String x:Key="title_cores_sysinfo">Cœurs :</v:String>- <v:String x:Key="title_threads_sysinfo">Threads :</v:String>- <v:String x:Key="title_freq_sysinfo">Fréquence :</v:String>- <v:String x:Key="title_gpu_sysinfo">Carte graphique :</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Taux de rafraîchissement :</v:String>- <v:String x:Key="title_ram_sysinfo">Mémoire :</v:String>- <v:String x:Key="title_mtype_sysinfo">Type de mémoire :</v:String>- <v:String x:Key="title_storage_sysinfo">Périphériques de stockage :</v:String>- <v:String x:Key="title_storage_used_sysinfo">Utilisé :</v:String>- <v:String x:Key="title_storage_free_sysinfo">Libre :</v:String>- <v:String x:Key="title_sound_sysinfo">Périphériques audio :</v:String>- <v:String x:Key="title_netadapter_sysinfo">Adaptateurs réseau :</v:String>- <v:String x:Key="title_ip_sysinfo">Votre adresse IP :</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Version</v:String>+ <v:String x:Key="label_serial_sysinfo">Numéro de série</v:String>+ <v:String x:Key="label_mode_sysinfo">Mode</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Carte mère</v:String>+ <v:String x:Key="label_name_sysinfo">Nom</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">Processeur</v:String>+ <v:String x:Key="label_cores_sysinfo">Cœurs</v:String>+ <v:String x:Key="label_threads_sysinfo">Threads</v:String>+ <v:String x:Key="label_freq_sysinfo">Fréquence</v:String>+ <v:String x:Key="label_gpu_sysinfo">Carte graphique</v:String>+ <v:String x:Key="label_capacity_sysinfo">Capacité</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Taux de rafraîchissement</v:String>+ <v:String x:Key="label_ram_sysinfo">Mémoire</v:String>+ <v:String x:Key="label_mtype_sysinfo">Type de mémoire</v:String>+ <v:String x:Key="label_storage_sysinfo">Périphériques de stockage</v:String>+ <v:String x:Key="label_itype_sysinfo">Type d'interface</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Utilisé:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Libre:</v:String>+ <v:String x:Key="label_sound_sysinfo">Périphériques audio</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Adaptateurs réseau</v:String>+ <v:String x:Key="label_ip_sysinfo">Votre adresse IP</v:String><v:String x:Key="connection_limited_sysinfo">Accès réseau limité</v:String><v:String x:Key="connection_block_sysinfo">Connecté sans accès réseau</v:String><v:String x:Key="connection_lose_sysinfo">Pas de connexion Internet</v:String>diff --git a/.Source/GTweak/Languages/he/Localize.xaml b/.Source/GTweak/Languages/he/Localize.xamlindex 28a8c304..4cdf34f0 100644--- a/.Source/GTweak/Languages/he/Localize.xaml+++ b/.Source/GTweak/Languages/he/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">מערכת ההפעלה:</v:String>- <v:String x:Key="title_win_ver_sysinfo">גרסה:</v:String>+ <v:String x:Key="label_win_name_sysinfo">מערכת ההפעלה:</v:String><v:String x:Key="label_proc_sysinfo">תהליכים פעילים:</v:String><v:String x:Key="label_svc_sysinfo">שירותים:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">מצב:</v:String>- <v:String x:Key="title_motherbr_sysinfo">לוח אם:</v:String>- <v:String x:Key="title_chipset_sysinfo">שבבים:</v:String>- <v:String x:Key="title_cpu_sysinfo">מעבד:</v:String>- <v:String x:Key="title_cores_sysinfo">ליבות:</v:String>- <v:String x:Key="title_threads_sysinfo">תהליכונים:</v:String>- <v:String x:Key="title_freq_sysinfo">תדר:</v:String>- <v:String x:Key="title_gpu_sysinfo">כרטיס מסך:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">קצב רענון:</v:String>- <v:String x:Key="title_ram_sysinfo">זיכרון:</v:String>- <v:String x:Key="title_mtype_sysinfo">סוג זיכרון:</v:String>- <v:String x:Key="title_storage_sysinfo">התקני אחסון:</v:String>- <v:String x:Key="title_storage_used_sysinfo">בשימוש:</v:String>- <v:String x:Key="title_storage_free_sysinfo">פנוי:</v:String>- <v:String x:Key="title_sound_sysinfo">התקני השמעה:</v:String>- <v:String x:Key="title_netadapter_sysinfo">מתאמי רשת:</v:String>- <v:String x:Key="title_ip_sysinfo">כתובת ה-IP שלך:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">גרסה</v:String>+ <v:String x:Key="label_serial_sysinfo">מספר סידורי</v:String>+ <v:String x:Key="label_mode_sysinfo">מצב</v:String>+ <v:String x:Key="label_motherbr_sysinfo">לוח אם</v:String>+ <v:String x:Key="label_name_sysinfo">שם</v:String>+ <v:String x:Key="label_chipset_sysinfo">שבבים</v:String>+ <v:String x:Key="label_cpu_sysinfo">מעבד</v:String>+ <v:String x:Key="label_cores_sysinfo">ליבות</v:String>+ <v:String x:Key="label_threads_sysinfo">תהליכונים</v:String>+ <v:String x:Key="label_freq_sysinfo">תדר</v:String>+ <v:String x:Key="label_gpu_sysinfo">כרטיס מסך</v:String>+ <v:String x:Key="label_capacity_sysinfo">קיבולת</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">קצב רענון</v:String>+ <v:String x:Key="label_ram_sysinfo">זיכרון</v:String>+ <v:String x:Key="label_mtype_sysinfo">סוג זיכרון</v:String>+ <v:String x:Key="label_storage_sysinfo">התקני אחסון</v:String>+ <v:String x:Key="label_itype_sysinfo">סוג ממשк</v:String>+ <v:String x:Key="label_storage_used_sysinfo">בשימוש:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">פנוי:</v:String>+ <v:String x:Key="label_sound_sysinfo">התקני השמעה</v:String>+ <v:String x:Key="label_netadapter_sysinfo">מתאמי רשת</v:String>+ <v:String x:Key="label_ip_sysinfo">כתובת ה-IP שלך</v:String><v:String x:Key="connection_limited_sysinfo">קישוריות הרשת מוגבלת</v:String><v:String x:Key="connection_block_sysinfo">גישה לרשת מוגבלת</v:String><v:String x:Key="connection_lose_sysinfo">קישוריות האינטרנט אבדה</v:String>diff --git a/.Source/GTweak/Languages/hu/Localize.xaml b/.Source/GTweak/Languages/hu/Localize.xamlindex d6021109..3a1b2dac 100644--- a/.Source/GTweak/Languages/hu/Localize.xaml+++ b/.Source/GTweak/Languages/hu/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Operációs rendszer:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Verzió:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Operációs rendszer:</v:String><v:String x:Key="label_proc_sysinfo">Futó folyamatok:</v:String><v:String x:Key="label_svc_sysinfo">szolgáltatás:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Üzemmód:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Alaplap:</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">Processzor:</v:String>- <v:String x:Key="title_cores_sysinfo">Magok:</v:String>- <v:String x:Key="title_threads_sysinfo">Szálak:</v:String>- <v:String x:Key="title_freq_sysinfo">Frekvencia:</v:String>- <v:String x:Key="title_gpu_sysinfo">Grafika:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Refresh Rate:</v:String>- <v:String x:Key="title_ram_sysinfo">Memória:</v:String>- <v:String x:Key="title_mtype_sysinfo">Memória típusa:</v:String>- <v:String x:Key="title_storage_sysinfo">Tárolóeszközök:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Used:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Free:</v:String>- <v:String x:Key="title_sound_sysinfo">Lejátszó eszközök:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Hálózati adapterek:</v:String>- <v:String x:Key="title_ip_sysinfo">Az Ön IP-címe:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Verzió</v:String>+ <v:String x:Key="label_serial_sysinfo">Sorozatszám</v:String>+ <v:String x:Key="label_mode_sysinfo">Üzemmód</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Alaplap</v:String>+ <v:String x:Key="label_name_sysinfo">Név</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">Processzor</v:String>+ <v:String x:Key="label_cores_sysinfo">Magok</v:String>+ <v:String x:Key="label_threads_sysinfo">Szálak</v:String>+ <v:String x:Key="label_freq_sysinfo">Frekvencia</v:String>+ <v:String x:Key="label_gpu_sysinfo">Grafika</v:String>+ <v:String x:Key="label_capacity_sysinfo">Kapacitás</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Frissítési gyakoriság</v:String>+ <v:String x:Key="label_ram_sysinfo">Memória</v:String>+ <v:String x:Key="label_mtype_sysinfo">Memória típusa</v:String>+ <v:String x:Key="label_storage_sysinfo">Tárolóeszközök</v:String>+ <v:String x:Key="label_itype_sysinfo">Interfész típusa</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Használt:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Szabad:</v:String>+ <v:String x:Key="label_sound_sysinfo">Lejátszó eszközök</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Hálózati adapterek</v:String>+ <v:String x:Key="label_ip_sysinfo">Az Ön IP-címe</v:String><v:String x:Key="connection_limited_sysinfo">A hálózati kapcsolat korlátozott</v:String><v:String x:Key="connection_block_sysinfo">Korlátozott hálózati hozzáférés</v:String><v:String x:Key="connection_lose_sysinfo">Megszakadt az internetkapcsolat</v:String>diff --git a/.Source/GTweak/Languages/it/Localize.xaml b/.Source/GTweak/Languages/it/Localize.xamlindex 5a11f231..416af2a7 100644--- a/.Source/GTweak/Languages/it/Localize.xaml+++ b/.Source/GTweak/Languages/it/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Sistema operativo:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Versione:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Sistema operativo:</v:String><v:String x:Key="label_proc_sysinfo">Processi in esecuzione:</v:String><v:String x:Key="label_svc_sysinfo">servizi:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Modalità:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Scheda madre:</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">Processore:</v:String>- <v:String x:Key="title_cores_sysinfo">Core:</v:String>- <v:String x:Key="title_threads_sysinfo">Thread:</v:String>- <v:String x:Key="title_freq_sysinfo">Frequenza:</v:String>- <v:String x:Key="title_gpu_sysinfo">Grafica:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Frequenza di aggiornamento:</v:String>- <v:String x:Key="title_ram_sysinfo">Memoria:</v:String>- <v:String x:Key="title_mtype_sysinfo">Tipo di memoria:</v:String>- <v:String x:Key="title_storage_sysinfo">Dispositivi di archiviazione:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Usato:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Libero:</v:String>- <v:String x:Key="title_sound_sysinfo">Dispositivi di riproduzione:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Schede di rete:</v:String>- <v:String x:Key="title_ip_sysinfo">Il tuo indirizzo IP:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Versione</v:String>+ <v:String x:Key="label_serial_sysinfo">Numero di serie</v:String>+ <v:String x:Key="label_mode_sysinfo">Modalità</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Scheda madre</v:String>+ <v:String x:Key="label_name_sysinfo">Nome</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">Processore</v:String>+ <v:String x:Key="label_cores_sysinfo">Core</v:String>+ <v:String x:Key="label_threads_sysinfo">Thread</v:String>+ <v:String x:Key="label_freq_sysinfo">Frequenza</v:String>+ <v:String x:Key="label_gpu_sysinfo">Grafica</v:String>+ <v:String x:Key="label_capacity_sysinfo">Capacità</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Frequenza di aggiornamento</v:String>+ <v:String x:Key="label_ram_sysinfo">Memoria</v:String>+ <v:String x:Key="label_mtype_sysinfo">Tipo di memoria</v:String>+ <v:String x:Key="label_storage_sysinfo">Dispositivi di archiviazione</v:String>+ <v:String x:Key="label_itype_sysinfo">Tipo di interfaccia</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Usato:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Libero:</v:String>+ <v:String x:Key="label_sound_sysinfo">Dispositivi di riproduzione</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Schede di rete</v:String>+ <v:String x:Key="label_ip_sysinfo">Il tuo indirizzo IP</v:String><v:String x:Key="connection_limited_sysinfo">Accesso alla rete limitato</v:String><v:String x:Key="connection_block_sysinfo">Connessione senza accesso alla rete</v:String><v:String x:Key="connection_lose_sysinfo">Nessuna connessione a Internet</v:String>diff --git a/.Source/GTweak/Languages/ko/Localize.xaml b/.Source/GTweak/Languages/ko/Localize.xamlindex 79ab34a0..fc0d3666 100644--- a/.Source/GTweak/Languages/ko/Localize.xaml+++ b/.Source/GTweak/Languages/ko/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">운영 체제:</v:String>- <v:String x:Key="title_win_ver_sysinfo">버전:</v:String>+ <v:String x:Key="label_win_name_sysinfo">운영 체제:</v:String><v:String x:Key="label_proc_sysinfo">실행 중인 프로세스:</v:String><v:String x:Key="label_svc_sysinfo">서비스:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">모드:</v:String>- <v:String x:Key="title_motherbr_sysinfo">머더보드:</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">프로세스:</v:String>- <v:String x:Key="title_cores_sysinfo">코어:</v:String>- <v:String x:Key="title_threads_sysinfo">스레드:</v:String>- <v:String x:Key="title_freq_sysinfo">주파수:</v:String>- <v:String x:Key="title_gpu_sysinfo">그래픽:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">새로 고침 속도:</v:String>- <v:String x:Key="title_ram_sysinfo">메모리:</v:String>- <v:String x:Key="title_mtype_sysinfo">메모리 유형:</v:String>- <v:String x:Key="title_storage_sysinfo">저장소 장치:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Used:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Free:</v:String>- <v:String x:Key="title_sound_sysinfo">재생 장치:</v:String>- <v:String x:Key="title_netadapter_sysinfo">네트워크 어댑터:</v:String>- <v:String x:Key="title_ip_sysinfo">IP 주소:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">버전</v:String>+ <v:String x:Key="label_serial_sysinfo">일련번호</v:String>+ <v:String x:Key="label_mode_sysinfo">모드</v:String>+ <v:String x:Key="label_motherbr_sysinfo">머더보드</v:String>+ <v:String x:Key="label_name_sysinfo">이름</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">프로세스</v:String>+ <v:String x:Key="label_cores_sysinfo">코어</v:String>+ <v:String x:Key="label_threads_sysinfo">스레드</v:String>+ <v:String x:Key="label_freq_sysinfo">주파수</v:String>+ <v:String x:Key="label_gpu_sysinfo">그래픽</v:String>+ <v:String x:Key="label_capacity_sysinfo">용량</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">새로 고침 속도</v:String>+ <v:String x:Key="label_ram_sysinfo">메모리</v:String>+ <v:String x:Key="label_mtype_sysinfo">메모리 유형</v:String>+ <v:String x:Key="label_storage_sysinfo">저장소 장치</v:String>+ <v:String x:Key="label_itype_sysinfo">인터페이스 유형</v:String>+ <v:String x:Key="label_storage_used_sysinfo">사용 중:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">여유 공간:</v:String>+ <v:String x:Key="label_sound_sysinfo">재생 장치</v:String>+ <v:String x:Key="label_netadapter_sysinfo">네트워크 어댑터</v:String>+ <v:String x:Key="label_ip_sysinfo">IP 주소</v:String><v:String x:Key="connection_limited_sysinfo">네트워크 액세스가 제한됩니다</v:String><v:String x:Key="connection_block_sysinfo">네트워크 액세스 없이 연결</v:String><v:String x:Key="connection_lose_sysinfo">인터넷에 연결되어 있지 않습니다</v:String>diff --git a/.Source/GTweak/Languages/pl/Localize.xaml b/.Source/GTweak/Languages/pl/Localize.xamlindex f99bf8e2..ba1c5371 100644--- a/.Source/GTweak/Languages/pl/Localize.xaml+++ b/.Source/GTweak/Languages/pl/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">System operacyjny:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Wersja:</v:String>+ <v:String x:Key="label_win_name_sysinfo">System operacyjny:</v:String><v:String x:Key="label_proc_sysinfo">Uruchomione procesy:</v:String><v:String x:Key="label_svc_sysinfo">usługi:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Tryb:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Płyta główna:</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">Procesor:</v:String>- <v:String x:Key="title_cores_sysinfo">Rdzenie:</v:String>- <v:String x:Key="title_threads_sysinfo">Wątki:</v:String>- <v:String x:Key="title_freq_sysinfo">Częstotliwość:</v:String>- <v:String x:Key="title_gpu_sysinfo">Grafika:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Częstotliwość odświeżania:</v:String>- <v:String x:Key="title_ram_sysinfo">Pamięć:</v:String>- <v:String x:Key="title_mtype_sysinfo">Typ pamięci:</v:String>- <v:String x:Key="title_storage_sysinfo">Urządzenia pamięci masowej:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Używane:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Wolne:</v:String>- <v:String x:Key="title_sound_sysinfo">Urządzenia odtwarzające:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Karty sieciowe:</v:String>- <v:String x:Key="title_ip_sysinfo">Twój adres IP:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Wersja</v:String>+ <v:String x:Key="label_serial_sysinfo">Numer seryjny</v:String>+ <v:String x:Key="label_mode_sysinfo">Tryb</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Płyta główna</v:String>+ <v:String x:Key="label_name_sysinfo">Nazwa</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">Procesor</v:String>+ <v:String x:Key="label_cores_sysinfo">Rdzenie</v:String>+ <v:String x:Key="label_threads_sysinfo">Wątki</v:String>+ <v:String x:Key="label_freq_sysinfo">Częstotliwość</v:String>+ <v:String x:Key="label_gpu_sysinfo">Grafika</v:String>+ <v:String x:Key="label_capacity_sysinfo">Pojemność</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Częstotliwość odświeżania</v:String>+ <v:String x:Key="label_ram_sysinfo">Pamięć</v:String>+ <v:String x:Key="label_mtype_sysinfo">Typ pamięci</v:String>+ <v:String x:Key="label_storage_sysinfo">Urządzenia pamięci masowej</v:String>+ <v:String x:Key="label_itype_sysinfo">Typ interfejsu</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Używane:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Wolne:</v:String>+ <v:String x:Key="label_sound_sysinfo">Urządzenia odtwarzające</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Karty sieciowe</v:String>+ <v:String x:Key="label_ip_sysinfo">Twój adres IP</v:String><v:String x:Key="connection_limited_sysinfo">Łączność sieciowa jest ograniczona</v:String><v:String x:Key="connection_block_sysinfo">Dostęp do sieci jest zablokowany</v:String><v:String x:Key="connection_lose_sysinfo">Utracono połączenie z internetem</v:String>diff --git a/.Source/GTweak/Languages/pt-BR/Localize.xaml b/.Source/GTweak/Languages/pt-BR/Localize.xamlindex 56e0a78b..fb0a2569 100644--- a/.Source/GTweak/Languages/pt-BR/Localize.xaml+++ b/.Source/GTweak/Languages/pt-BR/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Sistema operacional:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Versão:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Sistema operacional:</v:String><v:String x:Key="label_proc_sysinfo">Processos em execução:</v:String><v:String x:Key="label_svc_sysinfo">serviços:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Modo:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Placa-mãe:</v:String>- <v:String x:Key="title_chipset_sysinfo">Chipset:</v:String>- <v:String x:Key="title_cpu_sysinfo">Processador:</v:String>- <v:String x:Key="title_cores_sysinfo">Núcleos:</v:String>- <v:String x:Key="title_threads_sysinfo">Threads:</v:String>- <v:String x:Key="title_freq_sysinfo">Frequência:</v:String>- <v:String x:Key="title_gpu_sysinfo">Gráficos:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Taxa de atualização:</v:String>- <v:String x:Key="title_ram_sysinfo">Memória:</v:String>- <v:String x:Key="title_mtype_sysinfo">Tipo de Memória:</v:String>- <v:String x:Key="title_storage_sysinfo">Dispositivos de armazenamento:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Usado:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Livre:</v:String>- <v:String x:Key="title_sound_sysinfo">Dispositivos de reprodução:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Adaptadores de rede:</v:String>- <v:String x:Key="title_ip_sysinfo">Seu endereço IP:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Versão</v:String>+ <v:String x:Key="label_serial_sysinfo">Número de série</v:String>+ <v:String x:Key="label_mode_sysinfo">Modo</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Placa-mãe</v:String>+ <v:String x:Key="label_name_sysinfo">Nome</v:String>+ <v:String x:Key="label_chipset_sysinfo">Chipset</v:String>+ <v:String x:Key="label_cpu_sysinfo">Processador</v:String>+ <v:String x:Key="label_cores_sysinfo">Núcleos</v:String>+ <v:String x:Key="label_threads_sysinfo">Threads</v:String>+ <v:String x:Key="label_freq_sysinfo">Frequência</v:String>+ <v:String x:Key="label_gpu_sysinfo">Gráficos</v:String>+ <v:String x:Key="label_capacity_sysinfo">Capacidade</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Taxa de atualização:</v:String>+ <v:String x:Key="label_ram_sysinfo">Memória</v:String>+ <v:String x:Key="label_mtype_sysinfo">Tipo de Memória</v:String>+ <v:String x:Key="label_storage_sysinfo">Dispositivos de armazenamento:</v:String>+ <v:String x:Key="label_itype_sysinfo">Tipo de interface</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Usado:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Livre:</v:String>+ <v:String x:Key="label_sound_sysinfo">Dispositivos de reprodução</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Adaptadores de rede</v:String>+ <v:String x:Key="label_ip_sysinfo">Seu endereço IP</v:String><v:String x:Key="connection_limited_sysinfo">O acesso à rede é limitado</v:String><v:String x:Key="connection_block_sysinfo">Conexão sem acesso à rede</v:String><v:String x:Key="connection_lose_sysinfo">Não há conexão com a internet</v:String>diff --git a/.Source/GTweak/Languages/ru/Localize.xaml b/.Source/GTweak/Languages/ru/Localize.xamlindex 343fcd4d..a798a196 100644--- a/.Source/GTweak/Languages/ru/Localize.xaml+++ b/.Source/GTweak/Languages/ru/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Операционная система:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Версия:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Операционная система:</v:String><v:String x:Key="label_proc_sysinfo">Работающих процессов:</v:String><v:String x:Key="label_svc_sysinfo">служб:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Режим:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Материнская плата:</v:String>- <v:String x:Key="title_chipset_sysinfo">Чипсет:</v:String>- <v:String x:Key="title_cpu_sysinfo">Процессор:</v:String>- <v:String x:Key="title_cores_sysinfo">Ядра:</v:String>- <v:String x:Key="title_threads_sysinfo">Потоки:</v:String>- <v:String x:Key="title_freq_sysinfo">Частота:</v:String>- <v:String x:Key="title_gpu_sysinfo">Графика:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Частота обновления:</v:String>- <v:String x:Key="title_ram_sysinfo">Оперативная память:</v:String>- <v:String x:Key="title_mtype_sysinfo">Тип памяти:</v:String>- <v:String x:Key="title_storage_sysinfo">Устройства хранения данных:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Занято:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Свободно:</v:String>- <v:String x:Key="title_sound_sysinfo">Устройства воспроизведения:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Сетевые адаптеры:</v:String>- <v:String x:Key="title_ip_sysinfo">Ваш IP адрес:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Версия</v:String>+ <v:String x:Key="label_serial_sysinfo">Серийный №</v:String>+ <v:String x:Key="label_mode_sysinfo">Режим</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Материнская плата</v:String>+ <v:String x:Key="label_name_sysinfo">Наименование</v:String>+ <v:String x:Key="label_chipset_sysinfo">Чипсет</v:String>+ <v:String x:Key="label_cpu_sysinfo">Процессор</v:String>+ <v:String x:Key="label_cores_sysinfo">Ядра</v:String>+ <v:String x:Key="label_threads_sysinfo">Потоки</v:String>+ <v:String x:Key="label_freq_sysinfo">Частота</v:String>+ <v:String x:Key="label_gpu_sysinfo">Графика</v:String>+ <v:String x:Key="label_capacity_sysinfo">Объём</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Частота обновления</v:String>+ <v:String x:Key="label_ram_sysinfo">Оперативная память</v:String>+ <v:String x:Key="label_mtype_sysinfo">Тип памяти</v:String>+ <v:String x:Key="label_storage_sysinfo">Устройства хранения данных</v:String>+ <v:String x:Key="label_itype_sysinfo">Тип интерфейса</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Занято:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Свободно:</v:String>+ <v:String x:Key="label_sound_sysinfo">Устройства воспроизведения</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Сетевые адаптеры</v:String>+ <v:String x:Key="label_ip_sysinfo">Ваш IP адрес</v:String><v:String x:Key="connection_limited_sysinfo">Доступ к сети ограничен</v:String><v:String x:Key="connection_block_sysinfo">Подключение без доступа к сети</v:String><v:String x:Key="connection_lose_sysinfo">Отсутствует подключения к интернету</v:String>diff --git a/.Source/GTweak/Languages/sl-SI/Localize.xaml b/.Source/GTweak/Languages/sl-SI/Localize.xamlindex ac7284d5..a77de688 100644--- a/.Source/GTweak/Languages/sl-SI/Localize.xaml+++ b/.Source/GTweak/Languages/sl-SI/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Operacijski sistem:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Različica:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Operacijski sistem:</v:String><v:String x:Key="label_proc_sysinfo">Procesov v izvajanju:</v:String><v:String x:Key="label_svc_sysinfo">storitev:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Način:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Matična plošča:</v:String>- <v:String x:Key="title_chipset_sysinfo">Čipovje:</v:String>- <v:String x:Key="title_cpu_sysinfo">Procesor:</v:String>- <v:String x:Key="title_cores_sysinfo">Jedra:</v:String>- <v:String x:Key="title_threads_sysinfo">Niti:</v:String>- <v:String x:Key="title_freq_sysinfo">Frekvenca:</v:String>- <v:String x:Key="title_gpu_sysinfo">Grafika:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Osveževalna frekvenca:</v:String>- <v:String x:Key="title_ram_sysinfo">Pomnilnik:</v:String>- <v:String x:Key="title_mtype_sysinfo">Vrsta pomnilnika:</v:String>- <v:String x:Key="title_storage_sysinfo">Pomnilniške naprave:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Uporabljeno:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Prosto:</v:String>- <v:String x:Key="title_sound_sysinfo">Naprave za predvajanje:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Omrežni vmesniki:</v:String>- <v:String x:Key="title_ip_sysinfo">Vaš IP naslov:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Različica</v:String>+ <v:String x:Key="label_serial_sysinfo">Serijska številka</v:String>+ <v:String x:Key="label_mode_sysinfo">Način</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Matična plošča</v:String>+ <v:String x:Key="label_name_sysinfo">Ime</v:String>+ <v:String x:Key="label_chipset_sysinfo">Čipovje</v:String>+ <v:String x:Key="label_cpu_sysinfo">Procesor</v:String>+ <v:String x:Key="label_cores_sysinfo">Jedra</v:String>+ <v:String x:Key="label_threads_sysinfo">Niti</v:String>+ <v:String x:Key="label_freq_sysinfo">Frekvenca</v:String>+ <v:String x:Key="label_gpu_sysinfo">Grafika</v:String>+ <v:String x:Key="label_capacity_sysinfo">Zmogljivost</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Osveževalna frekvenca</v:String>+ <v:String x:Key="label_ram_sysinfo">Pomnilnik</v:String>+ <v:String x:Key="label_mtype_sysinfo">Vrsta pomnilnika</v:String>+ <v:String x:Key="label_storage_sysinfo">Pomnilniške naprave</v:String>+ <v:String x:Key="label_itype_sysinfo">Vrsta vmesnika</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Uporabljeno:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Prosto:</v:String>+ <v:String x:Key="label_sound_sysinfo">Naprave za predvajanje</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Omrežni vmesniki</v:String>+ <v:String x:Key="label_ip_sysinfo">Vaš IP naslov</v:String><v:String x:Key="connection_limited_sysinfo">Omrežna povezava je omejena</v:String><v:String x:Key="connection_block_sysinfo">Omejen dostop do omrežja</v:String><v:String x:Key="connection_lose_sysinfo">Internetna povezava izgubljena</v:String>diff --git a/.Source/GTweak/Languages/th/Localize.xaml b/.Source/GTweak/Languages/th/Localize.xamlindex 93c35136..78cf7363 100644--- a/.Source/GTweak/Languages/th/Localize.xaml+++ b/.Source/GTweak/Languages/th/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">ระบบปฏิบัติการ:</v:String>- <v:String x:Key="title_win_ver_sysinfo">เวอร์ชัน:</v:String>+ <v:String x:Key="label_win_name_sysinfo">ระบบปฏิบัติการ:</v:String><v:String x:Key="label_proc_sysinfo">กระบวนการที่ทำงานอยู่:</v:String><v:String x:Key="label_svc_sysinfo">บริการ:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">โหมด:</v:String>- <v:String x:Key="title_motherbr_sysinfo">เมนบอร์ด:</v:String>- <v:String x:Key="title_chipset_sysinfo">ชิปเซ็ต:</v:String>- <v:String x:Key="title_cpu_sysinfo">โปรเซสเซอร์:</v:String>- <v:String x:Key="title_cores_sysinfo">คอร์:</v:String>- <v:String x:Key="title_threads_sysinfo">เธรด:</v:String>- <v:String x:Key="title_freq_sysinfo">ความถี่:</v:String>- <v:String x:Key="title_gpu_sysinfo">กราฟิก:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">อัตรารีเฟรช:</v:String>- <v:String x:Key="title_ram_sysinfo">หน่วยความจำ:</v:String>- <v:String x:Key="title_mtype_sysinfo">ประเภทหน่วยความจำ:</v:String>- <v:String x:Key="title_storage_sysinfo">อุปกรณ์จัดเก็บข้อมูล:</v:String>- <v:String x:Key="title_storage_used_sysinfo">ใช้ไป:</v:String>- <v:String x:Key="title_storage_free_sysinfo">ว่าง:</v:String>- <v:String x:Key="title_sound_sysinfo">อุปกรณ์เล่นเสียง:</v:String>- <v:String x:Key="title_netadapter_sysinfo">อะแดปเตอร์เครือข่าย:</v:String>- <v:String x:Key="title_ip_sysinfo">ที่อยู่ IP ของคุณ:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">เวอร์ชัน</v:String>+ <v:String x:Key="label_serial_sysinfo">หมายเลขซีเรียล</v:String>+ <v:String x:Key="label_mode_sysinfo">โหมด</v:String>+ <v:String x:Key="label_motherbr_sysinfo">เมนบอร์ด</v:String>+ <v:String x:Key="label_name_sysinfo">ชื่อ</v:String>+ <v:String x:Key="label_chipset_sysinfo">ชิปเซ็ต</v:String>+ <v:String x:Key="label_cpu_sysinfo">โปรเซสเซอร์</v:String>+ <v:String x:Key="label_cores_sysinfo">คอร์</v:String>+ <v:String x:Key="label_threads_sysinfo">เธรด</v:String>+ <v:String x:Key="label_freq_sysinfo">ความถี่</v:String>+ <v:String x:Key="label_gpu_sysinfo">กราฟิก</v:String>+ <v:String x:Key="label_capacity_sysinfo">ความจุ</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">อัตรารีเฟรช</v:String>+ <v:String x:Key="label_ram_sysinfo">หน่วยความจำ</v:String>+ <v:String x:Key="label_mtype_sysinfo">ประเภทหน่วยความจำ</v:String>+ <v:String x:Key="label_storage_sysinfo">อุปกรณ์จัดเก็บข้อมูล</v:String>+ <v:String x:Key="label_itype_sysinfo">ประเภทอินเทอร์เฟซ</v:String>+ <v:String x:Key="label_storage_used_sysinfo">ใช้ไป:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">ว่าง:</v:String>+ <v:String x:Key="label_sound_sysinfo">อุปกรณ์เล่นเสียง</v:String>+ <v:String x:Key="label_netadapter_sysinfo">อะแดปเตอร์เครือข่าย</v:String>+ <v:String x:Key="label_ip_sysinfo">ที่อยู่ IP ของคุณ</v:String><v:String x:Key="connection_limited_sysinfo">การเชื่อมต่อเครือข่ายมีข้อจำกัด</v:String><v:String x:Key="connection_block_sysinfo">การเข้าถึงเครือข่ายถูกจำกัด</v:String><v:String x:Key="connection_lose_sysinfo">สูญเสียการเชื่อมต่ออินเทอร์เน็ต</v:String>diff --git a/.Source/GTweak/Languages/tr/Localize.xaml b/.Source/GTweak/Languages/tr/Localize.xamlindex fd3d2805..216d3e01 100644--- a/.Source/GTweak/Languages/tr/Localize.xaml+++ b/.Source/GTweak/Languages/tr/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">İşletim sistemi:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Sürüm:</v:String>+ <v:String x:Key="label_win_name_sysinfo">İşletim sistemi:</v:String><v:String x:Key="label_proc_sysinfo">Çalışan işlemler:</v:String><v:String x:Key="label_svc_sysinfo">hizmetler:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Mod:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Anakart:</v:String>- <v:String x:Key="title_chipset_sysinfo">Yonga Seti:</v:String>- <v:String x:Key="title_cpu_sysinfo">İşlemci:</v:String>- <v:String x:Key="title_cores_sysinfo">Çekirdekler:</v:String>- <v:String x:Key="title_threads_sysinfo">İş parçacıkları:</v:String>- <v:String x:Key="title_freq_sysinfo">Frekans:</v:String>- <v:String x:Key="title_gpu_sysinfo">Ekran Kartı:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Yenileme Hızı:</v:String>- <v:String x:Key="title_ram_sysinfo">Bellek:</v:String>- <v:String x:Key="title_mtype_sysinfo">Bellek Türü:</v:String>- <v:String x:Key="title_storage_sysinfo">Depolama birimleri:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Kullanılan:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Boş:</v:String>- <v:String x:Key="title_sound_sysinfo">Ses çıkış cihazları:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Ağ bağdaştırıcıları:</v:String>- <v:String x:Key="title_ip_sysinfo">IP adresiniz:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Sürüm</v:String>+ <v:String x:Key="label_serial_sysinfo">Seri numarası</v:String>+ <v:String x:Key="label_mode_sysinfo">Mod</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Anakart</v:String>+ <v:String x:Key="label_name_sysinfo">Ad</v:String>+ <v:String x:Key="label_chipset_sysinfo">Yonga Seti</v:String>+ <v:String x:Key="label_cpu_sysinfo">İşlemci</v:String>+ <v:String x:Key="label_cores_sysinfo">Çekirdekler</v:String>+ <v:String x:Key="label_threads_sysinfo">İş parçacıkları</v:String>+ <v:String x:Key="label_freq_sysinfo">Frekans</v:String>+ <v:String x:Key="label_gpu_sysinfo">Ekran Kartı</v:String>+ <v:String x:Key="label_capacity_sysinfo">Kapasite</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Yenileme Hızı</v:String>+ <v:String x:Key="label_ram_sysinfo">Bellek</v:String>+ <v:String x:Key="label_mtype_sysinfo">Bellek Türü</v:String>+ <v:String x:Key="label_storage_sysinfo">Depolama birimleri</v:String>+ <v:String x:Key="label_itype_sysinfo">Arayüz tipi</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Kullanılan:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Boş:</v:String>+ <v:String x:Key="label_sound_sysinfo">Ses çıkış cihazları</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Ağ bağdaştırıcıları</v:String>+ <v:String x:Key="label_ip_sysinfo">IP adresiniz</v:String><v:String x:Key="connection_limited_sysinfo">Ağ bağlantısı sınırlı</v:String><v:String x:Key="connection_block_sysinfo">Kısıtlı ağ erişimi</v:String><v:String x:Key="connection_lose_sysinfo">İnternet bağlantısı koptu</v:String>diff --git a/.Source/GTweak/Languages/uk/Localize.xaml b/.Source/GTweak/Languages/uk/Localize.xamlindex 08ef5eef..1d151cf1 100644--- a/.Source/GTweak/Languages/uk/Localize.xaml+++ b/.Source/GTweak/Languages/uk/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">Операційна система:</v:String>- <v:String x:Key="title_win_ver_sysinfo">Версія:</v:String>+ <v:String x:Key="label_win_name_sysinfo">Операційна система:</v:String><v:String x:Key="label_proc_sysinfo">Запущені процеси:</v:String><v:String x:Key="label_svc_sysinfo">служби:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">Режим:</v:String>- <v:String x:Key="title_motherbr_sysinfo">Материнська плата:</v:String>- <v:String x:Key="title_chipset_sysinfo">Чіпсет:</v:String>- <v:String x:Key="title_cpu_sysinfo">Процесор:</v:String>- <v:String x:Key="title_cores_sysinfo">Ядра:</v:String>- <v:String x:Key="title_threads_sysinfo">Потоки:</v:String>- <v:String x:Key="title_freq_sysinfo">Частота:</v:String>- <v:String x:Key="title_gpu_sysinfo">Графіка:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">Частота оновлення:</v:String>- <v:String x:Key="title_ram_sysinfo">Оперативна пам’ять:</v:String>- <v:String x:Key="title_mtype_sysinfo">Тип пам'яті:</v:String>- <v:String x:Key="title_storage_sysinfo">Пристрої зберігання даних:</v:String>- <v:String x:Key="title_storage_used_sysinfo">Зайнято:</v:String>- <v:String x:Key="title_storage_free_sysinfo">Вільно:</v:String>- <v:String x:Key="title_sound_sysinfo">Пристрої відтворення:</v:String>- <v:String x:Key="title_netadapter_sysinfo">Мережеві адаптери:</v:String>- <v:String x:Key="title_ip_sysinfo">Ваша IP-адреса:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">Версія</v:String>+ <v:String x:Key="label_serial_sysinfo">Серійний номер</v:String>+ <v:String x:Key="label_mode_sysinfo">Режим</v:String>+ <v:String x:Key="label_motherbr_sysinfo">Материнська плата</v:String>+ <v:String x:Key="label_name_sysinfo">Назва</v:String>+ <v:String x:Key="label_chipset_sysinfo">Чіпсет</v:String>+ <v:String x:Key="label_cpu_sysinfo">Процесор</v:String>+ <v:String x:Key="label_cores_sysinfo">Ядра</v:String>+ <v:String x:Key="label_threads_sysinfo">Потоки</v:String>+ <v:String x:Key="label_freq_sysinfo">Частота</v:String>+ <v:String x:Key="label_gpu_sysinfo">Графіка</v:String>+ <v:String x:Key="label_capacity_sysinfo">Ємність</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">Частота оновлення</v:String>+ <v:String x:Key="label_ram_sysinfo">Оперативна пам’ять</v:String>+ <v:String x:Key="label_mtype_sysinfo">Тип пам'яті</v:String>+ <v:String x:Key="label_storage_sysinfo">Пристрої зберігання даних</v:String>+ <v:String x:Key="label_itype_sysinfo">Тип інтерфейсу</v:String>+ <v:String x:Key="label_storage_used_sysinfo">Зайнято:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">Вільно:</v:String>+ <v:String x:Key="label_sound_sysinfo">Пристрої відтворення</v:String>+ <v:String x:Key="label_netadapter_sysinfo">Мережеві адаптери</v:String>+ <v:String x:Key="label_ip_sysinfo">Ваша IP-адреса</v:String><v:String x:Key="connection_limited_sysinfo">Доступ до мережі обмежено</v:String><v:String x:Key="connection_block_sysinfo">Підключення без доступу до мережі</v:String><v:String x:Key="connection_lose_sysinfo">Немає підключення до Інтернету</v:String>diff --git a/.Source/GTweak/Languages/zh-CN/Localize.xaml b/.Source/GTweak/Languages/zh-CN/Localize.xamlindex 209db491..356bd36d 100644--- a/.Source/GTweak/Languages/zh-CN/Localize.xaml+++ b/.Source/GTweak/Languages/zh-CN/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">操作系统:</v:String>- <v:String x:Key="title_win_ver_sysinfo">版本:</v:String>+ <v:String x:Key="label_win_name_sysinfo">操作系统:</v:String><v:String x:Key="label_proc_sysinfo">运行中的程序:</v:String><v:String x:Key="label_svc_sysinfo">服务:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">模式:</v:String>- <v:String x:Key="title_motherbr_sysinfo">主板:</v:String>- <v:String x:Key="title_chipset_sysinfo">芯片组:</v:String>- <v:String x:Key="title_cpu_sysinfo">处理器:</v:String>- <v:String x:Key="title_cores_sysinfo">核心数:</v:String>- <v:String x:Key="title_threads_sysinfo">运行绪数:</v:String>- <v:String x:Key="title_freq_sysinfo">频率:</v:String>- <v:String x:Key="title_gpu_sysinfo">显卡:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">刷新率:</v:String>- <v:String x:Key="title_ram_sysinfo">内存:</v:String>- <v:String x:Key="title_mtype_sysinfo">内存类型:</v:String>- <v:String x:Key="title_storage_sysinfo">存储设备:</v:String>- <v:String x:Key="title_storage_used_sysinfo">已使用:</v:String>- <v:String x:Key="title_storage_free_sysinfo">可用:</v:String>- <v:String x:Key="title_sound_sysinfo">播放设备:</v:String>- <v:String x:Key="title_netadapter_sysinfo">网络接口卡:</v:String>- <v:String x:Key="title_ip_sysinfo">您的 IP 地址:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">版本</v:String>+ <v:String x:Key="label_serial_sysinfo">序列号</v:String>+ <v:String x:Key="label_mode_sysinfo">模式</v:String>+ <v:String x:Key="label_motherbr_sysinfo">主板</v:String>+ <v:String x:Key="label_name_sysinfo">名称</v:String>+ <v:String x:Key="label_chipset_sysinfo">芯片组</v:String>+ <v:String x:Key="label_cpu_sysinfo">处理器</v:String>+ <v:String x:Key="label_cores_sysinfo">核心数</v:String>+ <v:String x:Key="label_threads_sysinfo">运行绪数</v:String>+ <v:String x:Key="label_freq_sysinfo">频率</v:String>+ <v:String x:Key="label_gpu_sysinfo">显卡</v:String>+ <v:String x:Key="label_capacity_sysinfo">容量</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">刷新率</v:String>+ <v:String x:Key="label_ram_sysinfo">内存</v:String>+ <v:String x:Key="label_mtype_sysinfo">内存类型</v:String>+ <v:String x:Key="label_storage_sysinfo">存储设备</v:String>+ <v:String x:Key="label_itype_sysinfo">接口类型</v:String>+ <v:String x:Key="label_storage_used_sysinfo">已使用:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">可用:</v:String>+ <v:String x:Key="label_sound_sysinfo">播放设备</v:String>+ <v:String x:Key="label_netadapter_sysinfo">网络接口卡</v:String>+ <v:String x:Key="label_ip_sysinfo">您的 IP 地址</v:String><v:String x:Key="connection_limited_sysinfo">网络连接受限</v:String><v:String x:Key="connection_block_sysinfo">网络存取受限</v:String><v:String x:Key="connection_lose_sysinfo">互联网连接中断</v:String>diff --git a/.Source/GTweak/Languages/zh-TW/Localize.xaml b/.Source/GTweak/Languages/zh-TW/Localize.xamlindex 53155f4d..c995bc6c 100644--- a/.Source/GTweak/Languages/zh-TW/Localize.xaml+++ b/.Source/GTweak/Languages/zh-TW/Localize.xaml@@ -514,28 +514,32 @@<!--#endregion--><!--#region System Information Page -->- <v:String x:Key="title_win_name_sysinfo">作業系統:</v:String>- <v:String x:Key="title_win_ver_sysinfo">版本:</v:String>+ <v:String x:Key="label_win_name_sysinfo">作業系統:</v:String><v:String x:Key="label_proc_sysinfo">執行中的程序:</v:String><v:String x:Key="label_svc_sysinfo">服務:</v:String>- <v:String x:Key="title_bios_sysinfo">BIOS:</v:String>- <v:String x:Key="title_mode_sysinfo">模式:</v:String>- <v:String x:Key="title_motherbr_sysinfo">主機板:</v:String>- <v:String x:Key="title_chipset_sysinfo">晶片組:</v:String>- <v:String x:Key="title_cpu_sysinfo">處理器:</v:String>- <v:String x:Key="title_cores_sysinfo">核心數:</v:String>- <v:String x:Key="title_threads_sysinfo">執行緒數:</v:String>- <v:String x:Key="title_freq_sysinfo">時脈:</v:String>- <v:String x:Key="title_gpu_sysinfo">顯示卡:</v:String>- <v:String x:Key="title_refreshrate_sysinfo">螢幕刷新率:</v:String>- <v:String x:Key="title_ram_sysinfo">記憶體:</v:String>- <v:String x:Key="title_mtype_sysinfo">記憶體類型:</v:String>- <v:String x:Key="title_storage_sysinfo">儲存裝置:</v:String>- <v:String x:Key="title_storage_used_sysinfo">已使用:</v:String>- <v:String x:Key="title_storage_free_sysinfo">可用:</v:String>- <v:String x:Key="title_sound_sysinfo">播放裝置:</v:String>- <v:String x:Key="title_netadapter_sysinfo">網路介面卡:</v:String>- <v:String x:Key="title_ip_sysinfo">您的 IP 位址:</v:String>+ <v:String x:Key="label_bios_sysinfo">BIOS</v:String>+ <v:String x:Key="label_verison_sysinfo">版本</v:String>+ <v:String x:Key="label_serial_sysinfo">序號</v:String>+ <v:String x:Key="label_mode_sysinfo">模式</v:String>+ <v:String x:Key="label_motherbr_sysinfo">主機板</v:String>+ <v:String x:Key="label_name_sysinfo">名稱</v:String>+ <v:String x:Key="label_chipset_sysinfo">晶片組</v:String>+ <v:String x:Key="label_cpu_sysinfo">處理器</v:String>+ <v:String x:Key="label_cores_sysinfo">核心數</v:String>+ <v:String x:Key="label_threads_sysinfo">執行緒數</v:String>+ <v:String x:Key="label_freq_sysinfo">時脈</v:String>+ <v:String x:Key="label_gpu_sysinfo">顯示卡</v:String>+ <v:String x:Key="label_capacity_sysinfo">容量</v:String>+ <v:String x:Key="label_refreshrate_sysinfo">螢幕刷新率</v:String>+ <v:String x:Key="label_ram_sysinfo">記憶體</v:String>+ <v:String x:Key="label_mtype_sysinfo">記憶體類型</v:String>+ <v:String x:Key="label_storage_sysinfo">儲存裝置</v:String>+ <v:String x:Key="label_itype_sysinfo">介面類型</v:String>+ <v:String x:Key="label_storage_used_sysinfo">已使用:</v:String>+ <v:String x:Key="label_storage_free_sysinfo">可用:</v:String>+ <v:String x:Key="label_sound_sysinfo">播放裝置</v:String>+ <v:String x:Key="label_netadapter_sysinfo">網路介面卡</v:String>+ <v:String x:Key="label_ip_sysinfo">您的 IP 位址</v:String><v:String x:Key="connection_limited_sysinfo">網路連線受限</v:String><v:String x:Key="connection_block_sysinfo">網路存取受限</v:String><v:String x:Key="connection_lose_sysinfo">網際網路連線中斷</v:String>diff --git a/.Source/GTweak/Styles/Themes/Dark/Colors.xaml b/.Source/GTweak/Styles/Themes/Dark/Colors.xamlindex 9e1448f4..309160ce 100644--- a/.Source/GTweak/Styles/Themes/Dark/Colors.xaml+++ b/.Source/GTweak/Styles/Themes/Dark/Colors.xaml@@ -8,6 +8,8 @@<SolidColorBrush x:Key="Brush_Background" Color="#FF1E1E1E"/><SolidColorBrush x:Key="Brush_Accent" Color="{StaticResource Color_Accent}"/>+ <SolidColorBrush x:Key="Brush_Accent_B" Color="#7BB5FF" />+ <SolidColorBrush x:Key="Brush_Accent_Y" Color="#FFD97B" /><SolidColorBrush x:Key="Brush_Inactive" Color="#808080"/><SolidColorBrush x:Key="Brush_Highlighted" Color="#FFFFFF"/><SolidColorBrush x:Key="Brush_Highlighted_Inverted" Color="#2C2E2D"/>@@ -46,7 +48,9 @@<SolidColorBrush x:Key="Brush_Toggle_Text_Hover" Color="#8BF0B7"/><SolidColorBrush x:Key="Brush_Background_Labels" Color="#213027"/>-+ <SolidColorBrush x:Key="Brush_Background_Labels_B" Color="#212830" />+ <SolidColorBrush x:Key="Brush_Background_Labels_Y" Color="#302B21" />+<SolidColorBrush x:Key="Brush_Background_Card" Color="#FF232323"/><SolidColorBrush x:Key="Brush_Border_Description" Color="#2F3030"/>diff --git a/.Source/GTweak/Styles/Themes/Light/Colors.xaml b/.Source/GTweak/Styles/Themes/Light/Colors.xamlindex 387d26f3..73ab71d6 100644--- a/.Source/GTweak/Styles/Themes/Light/Colors.xaml+++ b/.Source/GTweak/Styles/Themes/Light/Colors.xaml@@ -8,6 +8,8 @@<SolidColorBrush x:Key="Brush_Background" Color="#FFF3F3F3"/><SolidColorBrush x:Key="Brush_Accent" Color="{StaticResource Color_Accent}"/>+ <SolidColorBrush x:Key="Brush_Accent_B" Color="#0066CC" />+ <SolidColorBrush x:Key="Brush_Accent_Y" Color="#B88600" /><SolidColorBrush x:Key="Brush_Inactive" Color="#6D6D6D"/><SolidColorBrush x:Key="Brush_Highlighted" Color="#000000"/><SolidColorBrush x:Key="Brush_Highlighted_Inverted" Color="#D8D8D8"/>@@ -46,7 +48,9 @@<SolidColorBrush x:Key="Brush_Toggle_Text_Hover" Color="#008C47"/><SolidColorBrush x:Key="Brush_Background_Labels" Color="#C1E8D6"/>-+ <SolidColorBrush x:Key="Brush_Background_Labels_B" Color="#D6E8FA" />+ <SolidColorBrush x:Key="Brush_Background_Labels_Y" Color="#F8EFCB" />+<SolidColorBrush x:Key="Brush_Background_Card" Color="#FFE8E8E8"/><SolidColorBrush x:Key="Brush_Border_Description" Color="#CFCFCF"/>diff --git a/.Source/GTweak/Utilities/Configuration/HardwareData.cs b/.Source/GTweak/Utilities/Configuration/HardwareData.csindex 237dfc63..937b0eab 100644--- a/.Source/GTweak/Utilities/Configuration/HardwareData.cs+++ b/.Source/GTweak/Utilities/Configuration/HardwareData.cs@@ -1,3 +1,4 @@+using System.Collections.Generic;using System.Windows.Media;namespace GTweak.Utilities.Configuration@@ -17,11 +18,14 @@ namespace GTweak.Utilities.Configuration{internal string Data { get; set; } = string.Empty;internal string Mode { get; set; } = string.Empty;+ internal string SerialNumber { get; set; } = string.Empty;}internal sealed class MotherboardInfo{internal string Data { get; set; } = string.Empty;+ internal string Version { get; set; } = string.Empty;+ internal string SerialNumber { get; set; } = string.Empty;internal string Chipset { get; set; } = string.Empty;}@@ -34,18 +38,47 @@ namespace GTweak.Utilities.Configurationinternal string Frequency { get; set; } = string.Empty;}- internal sealed class MemoryInfo+ internal sealed class GraphicsInfo{internal string Data { get; set; } = string.Empty;+ internal string Memory { get; set; } = string.Empty;+ }++ internal sealed class MemoryInfo+ {internal int Usage { get; set; } = default;internal string Type { get; set; } = string.Empty;+ internal List<MemoryModuleInfo> Modules { get; set; } = new List<MemoryModuleInfo>();+ }++ internal sealed class MemoryModuleInfo+ {+ internal string Data { get; set; } = string.Empty;+ internal string Frequency { get; set; } = string.Empty;+ internal string Capacity { get; set; } = string.Empty;}internal sealed class StorageInfo{internal string Data { get; set; } = string.Empty;+ internal string Capacity { get; set; } = string.Empty;+ internal string StorageType { get; set; } = string.Empty;internal string UsedSpace { get; set; } = string.Empty;internal string FreeSpace { get; set; } = string.Empty;+ internal double UsedPercent { get; set; } = 0;+ internal List<string> DriveLetters { get; set; } = new List<string>();+ }++ internal sealed class AudioDeviceInfo+ {+ internal string Data { get; set; } = string.Empty;+ internal bool IsCapture { get; set; } = false;+ }++ internal sealed class NetworkAdapterInfo+ {+ internal string Data { get; set; } = string.Empty;+ internal bool IsConnected { get; set; } = true;}internal enum ConnectionStatus { Available, Lose, Block, Limited, }@@ -57,13 +90,14 @@ namespace GTweak.Utilities.Configurationinternal static BiosInfo Bios { get; set; } = new BiosInfo();internal static ProcessorInfo Processor { get; set; } = new ProcessorInfo();internal static MotherboardInfo Motherboard { get; set; } = new MotherboardInfo();- internal static string Graphics { get; set; } = string.Empty;+ internal static List<GraphicsInfo> Graphics { get; set; } = new List<GraphicsInfo>();internal static string MonitorRefreshRate { get; set; } = string.Empty;internal static MemoryInfo Memory { get; set; } = new MemoryInfo();- internal static StorageInfo Storage { get; set; } = new StorageInfo();- internal static string AudioDevice { get; set; } = string.Empty;- internal static string NetworkAdapter { get; set; } = string.Empty;+ internal static List<StorageInfo> Storage { get; set; } = new List<StorageInfo>();+ internal static List<AudioDeviceInfo> AudioDevices { get; set; } = new List<AudioDeviceInfo>();+ internal static List<NetworkAdapterInfo> NetworkAdapters { get; set; } = new List<NetworkAdapterInfo>();internal static string UserIPAddress { get; set; } = string.Empty;+ internal static string UserCountryCode { get; set; } = string.Empty;internal static ConnectionStatus CurrentConnection = ConnectionStatus.Lose;internal static class VendorDetectiondiff --git a/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs b/.Source/GTweak/Utilities/Configuration/HardwareProvider.csindex d066c12c..37dabc24 100644--- a/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs+++ b/.Source/GTweak/Utilities/Configuration/HardwareProvider.cs@@ -1,4 +1,5 @@using System;+using System.Collections.Generic;using System.Data;using System.Globalization;using System.IO;@@ -98,24 +99,23 @@ namespace GTweak.Utilities.Configuration{if (deviceType == DeviceType.Storage || deviceType == DeviceType.All){- Storage.Data = GetStorageDevices();+ Storage = GetStorageDevices();+ RefreshStorageSpace();}- if (deviceType == DeviceType.StorageSpace || deviceType == DeviceType.All || deviceType == DeviceType.Storage)+ if (deviceType == DeviceType.StorageSpace){- (string FreePercentage, string UsedPercentage) = GetStorageSpace();- Storage.FreeSpace = FreePercentage;- Storage.UsedSpace = UsedPercentage;+ RefreshStorageSpace();}if (deviceType == DeviceType.Audio || deviceType == DeviceType.All){- AudioDevice = GetAudioDevices();+ AudioDevices = GetAudioDevices();}if (deviceType == DeviceType.Network || deviceType == DeviceType.All){- NetworkAdapter = GetNetworkAdapters();+ NetworkAdapters = GetNetworkAdapters();}}@@ -198,7 +198,9 @@ namespace GTweak.Utilities.Configuration{string data = new string[] { "Name", "Caption", "Description", "SMBIOSBIOSVersion" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;string dataSN = managementObj["SerialNumber"]?.ToString() ?? string.Empty;- Bios.Data += !string.IsNullOrWhiteSpace(dataSN) && !dataSN.Any(char.IsWhiteSpace) ? $"{data}, S/N-{dataSN}\n" : $"{data}\n";++ Bios.Data = data;+ Bios.SerialNumber = !string.IsNullOrWhiteSpace(dataSN) && !dataSN.Any(char.IsWhiteSpace) ? dataSN : string.Empty;}}}@@ -221,14 +223,12 @@ namespace GTweak.Utilities.Configurationif (!string.IsNullOrWhiteSpace(dataVersion) && !dataVersion.Any(char.IsWhiteSpace)){- Motherboard.Data += $", V{dataVersion}";+ Motherboard.Version += dataVersion;}else if (!string.IsNullOrWhiteSpace(dataSN) && !dataSN.Any(char.IsWhiteSpace)){- Motherboard.Data += $", S/N-{dataSN}";+ Motherboard.SerialNumber += dataSN;}--}}}@@ -356,21 +356,21 @@ namespace GTweak.Utilities.Configurationreturn (false, string.Empty, string.Empty);}- using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM, PNPDeviceID from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true }))+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, AdapterRAM, PNPDeviceID from Win32_VideoController", new EnumerationOptions { ReturnImmediately = true });+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>()){- foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())+ using (managementObj){- using (managementObj)+ string data = managementObj["Name"] as string ?? string.Empty;+ (bool isFound, string dataMemoryReg, string driverDesc) = GetMemorySize(data);+ Graphics.Add(new GraphicsInfo{- string data = managementObj["Name"] as string ?? string.Empty;- (bool isFound, string dataMemoryReg, string driverDesc) = GetMemorySize(data);- Graphics += $"{(string.IsNullOrEmpty(data) && !string.IsNullOrEmpty(driverDesc) ? driverDesc : data)}, {(isFound && !string.IsNullOrEmpty(dataMemoryReg) ? dataMemoryReg : managementObj["AdapterRAM"] is uint valueRAM && managementObj["AdapterRAM"] != null ? SizeCalculationHelper(valueRAM) : "N/A")}\n";- VendorDetection.Nvidia |= managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10DE", StringComparison.OrdinalIgnoreCase) >= 0;- }+ Data = string.IsNullOrEmpty(data) && !string.IsNullOrEmpty(driverDesc) ? driverDesc : data,+ Memory = isFound && !string.IsNullOrEmpty(dataMemoryReg) ? dataMemoryReg : managementObj["AdapterRAM"] is uint valueRAM ? SizeCalculationHelper(valueRAM) : "N/A"+ });+ VendorDetection.Nvidia |= managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10DE", StringComparison.OrdinalIgnoreCase) >= 0;}}-- Graphics = Graphics.TrimEnd('\n', '\r');}/// <summary>@@ -379,29 +379,30 @@ namespace GTweak.Utilities.Configuration/// </summary>private void GetMemoryInfo(){- using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Name, Caption, Description, Tag, Capacity, ConfiguredClockSpeed, Speed, SMBIOSMemoryType from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true }))+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Manufacturer, Name, Caption, Description, Tag, Capacity, ConfiguredClockSpeed, Speed, SMBIOSMemoryType from Win32_PhysicalMemory", new EnumerationOptions { ReturnImmediately = true });+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>()){- foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())+ using (managementObj){- using (managementObj)+ string speedData = new string[] { "ConfiguredClockSpeed", "Speed" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(s => !string.IsNullOrEmpty(s) && s != "0");+ string data = new string[] { "Manufacturer", "Name", "Caption", "Description", "Tag" }.Select(prop => managementObj[prop] as string).FirstOrDefault(value => !string.IsNullOrWhiteSpace(value) && !string.Equals(value, "Unspecified", StringComparison.OrdinalIgnoreCase)) ?? string.Empty;+ Memory.Type = HardwareMappings.GetMemoryType(Convert.ToUInt32(managementObj["SMBIOSMemoryType"] ?? 0u));+ Memory.Modules.Add(new MemoryModuleInfo{- string speedData = new string[] { "ConfiguredClockSpeed", "Speed" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(s => !string.IsNullOrEmpty(s) && s != "0");- string data = new string[] { "Manufacturer", "Name", "Caption", "Description", "Tag" }.Select(prop => managementObj[prop] as string).FirstOrDefault(value => !string.IsNullOrWhiteSpace(value) && !string.Equals(value, "Unspecified", StringComparison.OrdinalIgnoreCase)) ?? string.Empty;- Memory.Type = HardwareMappings.GetMemoryType(Convert.ToUInt32(managementObj["SMBIOSMemoryType"] ?? 0u));- Memory.Data += $"{string.Concat(data, ", ")}{SizeCalculationHelper(Convert.ToUInt64(managementObj["Capacity"] ?? 0UL))}{(string.IsNullOrEmpty(speedData) ? "" : $", {speedData}MHz")}\n";- }+ Data = data,+ Frequency = string.IsNullOrEmpty(speedData) ? string.Empty : $"{speedData} MHz",+ Capacity = SizeCalculationHelper(Convert.ToUInt64(managementObj["Capacity"] ?? 0UL))+ });}}-- Memory.Data = Memory.Data.TrimEnd('\n', '\r');}/// <summary>/// The MSFT_PhysicalDisk class may be missing or malfunctioning; in such cases, it will be replaced by the universal Win32_DiskDrive class./// </summary>- private string GetStorageDevices()+ private List<StorageInfo> GetStorageDevices(){- StringBuilder result = new StringBuilder();+ List<StorageInfo> result = new List<StorageInfo>();static string GetStorageType(object mediaType, string deviceId, ushort busType, string interfaceType){@@ -443,12 +444,19 @@ namespace GTweak.Utilities.Configuration{using (managementObj){- string data = new string[] { "FriendlyName", "Model", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;+ string data = new[] { "FriendlyName", "Model", "Description" }.Select(p => managementObj[p] as string).FirstOrDefault(s => !string.IsNullOrEmpty(s)) ?? string.Empty;ushort mediaType = managementObj["MediaType"] is IConvertible m ? Convert.ToUInt16(m) : (ushort)0;ushort busType = managementObj["BusType"] is IConvertible b ? Convert.ToUInt16(b) : (ushort)0;- string storageType = GetStorageType(mediaType, $@"\\.\PhysicalDrive{managementObj["DeviceId"]?.ToString() ?? "0"}", busType, default);+ uint diskIndex = Convert.ToUInt32(managementObj["DeviceId"] ?? 0);+ string storageType = GetStorageType(mediaType, $@"\\.\PhysicalDrive{diskIndex}", busType, default);- result.AppendLine($"{SizeCalculationHelper(Convert.ToUInt64(managementObj["Size"] ?? 0UL))} [{data}] {storageType}");+ result.Add(new StorageInfo+ {+ Data = data,+ Capacity = SizeCalculationHelper(Convert.ToUInt64(managementObj["Size"] ?? 0UL)),+ StorageType = storageType,+ DriveLetters = GetDriveLetters(diskIndex)+ });}}}@@ -459,41 +467,99 @@ namespace GTweak.Utilities.Configuration{using (managementObj){- string data = new string[] { "Model", "Caption" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;+ string data = new[] { "Model", "Caption" }.Select(p => managementObj[p] as string).FirstOrDefault(s => !string.IsNullOrEmpty(s)) ?? string.Empty;string mediaType = managementObj["MediaType"]?.ToString() ?? string.Empty;string interfaceType = managementObj["InterfaceType"]?.ToString() ?? string.Empty;- string storageType = GetStorageType(mediaType, managementObj["DeviceID"] as string ?? string.Empty, default, interfaceType);+ string deviceId = managementObj["DeviceID"] as string ?? string.Empty;+ string storageType = GetStorageType(mediaType, deviceId, default, interfaceType);+ uint.TryParse(deviceId.Replace(@"\\.\PHYSICALDRIVE", "").Replace(@"\\.\PhysicalDrive", ""), out uint diskIndex);- result.AppendLine($"{SizeCalculationHelper(Convert.ToUInt64(managementObj["Size"] ?? 0UL))} [{data}] {storageType}");+ result.Add(new StorageInfo+ {+ Data = data,+ Capacity = SizeCalculationHelper(Convert.ToUInt64(managementObj["Size"] ?? 0UL)),+ StorageType = storageType,+ DriveLetters = GetDriveLetters(diskIndex)+ });}}}- return result.ToString().TrimEnd('\n', '\r');+ return result;+}- private (string FreePercentage, string UsedPercentage) GetStorageSpace()+ private static List<string> GetDriveLetters(uint diskIndex){- long totalSize = 0;- long totalFreeSpace = 0;+ List<string> letters = new List<string>();- foreach (DriveInfo drive in DriveInfo.GetDrives())+ try{- try+ using ManagementObjectSearcher partSearcher = new ManagementObjectSearcher(@"root\cimv2", $"select DeviceID from Win32_DiskPartition where DiskIndex = {diskIndex}", new EnumerationOptions { ReturnImmediately = true });+ foreach (ManagementObject partition in partSearcher.Get().Cast<ManagementObject>()){- if (drive.IsReady && (drive.DriveType == DriveType.Fixed || drive.DriveType == DriveType.Removable))+ using (partition){- totalSize += drive.TotalSize;- totalFreeSpace += drive.TotalFreeSpace;+ string partitionId = partition["DeviceID"]?.ToString() ?? string.Empty;+ if (string.IsNullOrEmpty(partitionId))+ {+ continue;+ }++ using ManagementObjectSearcher logicalSearcher = new ManagementObjectSearcher(@"root\cimv2", $"associators of {{Win32_DiskPartition.DeviceID='{partitionId}'}} where AssocClass=Win32_LogicalDiskToPartition", new EnumerationOptions { ReturnImmediately = true });+ foreach (ManagementObject logical in logicalSearcher.Get().Cast<ManagementObject>())+ {+ using (logical)+ {+ string letter = logical["DeviceID"]?.ToString();+ if (!string.IsNullOrEmpty(letter))+ {+ letters.Add(letter);+ }+ }+ }}}- catch (Exception ex) { ErrorLogging.LogDebug(ex); }}+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }++ return letters;+ }- string freePercent = totalSize > 0 ? $"{(Math.Round((double)totalFreeSpace / totalSize * 100, 1)).ToString("0.#", CultureInfo.InvariantCulture)}%" : string.Empty;- string usedPercent = totalSize > 0 ? $"{(Math.Round(100 - ((double)totalFreeSpace / totalSize * 100), 1)).ToString("0.#", CultureInfo.InvariantCulture)}%" : string.Empty;+ private void RefreshStorageSpace()+ {+ foreach (StorageInfo storageInfo in Storage)+ {+ long totalSize = 0;+ long totalFreeSpace = 0;- return (freePercent, usedPercent);+ foreach (string letter in storageInfo.DriveLetters)+ {+ try+ {+ DriveInfo drive = new DriveInfo(letter);+ if (drive.IsReady)+ {+ totalSize += drive.TotalSize;+ totalFreeSpace += drive.TotalFreeSpace;+ }+ }+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }+ }++ if (totalSize > 0)+ {+ storageInfo.UsedPercent = Math.Round(100 - (double)totalFreeSpace / totalSize * 100, 1);+ storageInfo.FreeSpace = SizeCalculationHelper((ulong)totalFreeSpace);+ storageInfo.UsedSpace = SizeCalculationHelper((ulong)(totalSize - totalFreeSpace));+ }+ else+ {+ storageInfo.UsedPercent = 0;+ storageInfo.FreeSpace = string.Empty;+ storageInfo.UsedSpace = string.Empty;+ }+ }}/// <summary>@@ -501,13 +567,13 @@ namespace GTweak.Utilities.Configuration/// Therefore, for such devices, the name lookup is performed through the registry./// The search for an identifier in Win32_PnPEntity is slow, although it is more convenient. However, it is inferior in speed./// </summary>- private string GetAudioDevices()+ private List<AudioDeviceInfo> GetAudioDevices(){- StringBuilder result = new StringBuilder();+ List<AudioDeviceInfo> result = new List<AudioDeviceInfo>();- static (bool, string) IsUsbAudioDevice(string deviceID)+ static (bool isUsb, string name, bool isCapture) IsUsbAudioDevice(string deviceID){- foreach (string basePath in new[] { @"SOFTWARE\Microsoft\Windows\CurrentVersion\MMDevices\Audio\Render", @"SOFTWARE\Microsoft\Windows\CurrentVersion\MMDevices\Audio\Capture" })+ foreach ((string basePath, bool isCapture) in new[] { (@"SOFTWARE\Microsoft\Windows\CurrentVersion\MMDevices\Audio\Render", false), (@"SOFTWARE\Microsoft\Windows\CurrentVersion\MMDevices\Audio\Capture", true) }){using RegistryKey regKey = Registry.LocalMachine.OpenSubKey(basePath);if (regKey != null)@@ -525,73 +591,68 @@ namespace GTweak.Utilities.Configurationstring valueID = RegistryHelp.GetValue(propsPath, "{b3f8fa53-0004-438e-9003-51a46e139bfc},2", string.Empty);if (!string.IsNullOrEmpty(valueID) && valueID.IndexOf(deviceID, StringComparison.OrdinalIgnoreCase) >= 0 &&- ((!string.IsNullOrEmpty(value5) && value5.IndexOf("wdma_usb.inf", StringComparison.OrdinalIgnoreCase) >= 0) ||- (!string.IsNullOrEmpty(value8) && value8.IndexOf(@"USB\Class_01", StringComparison.OrdinalIgnoreCase) >= 0) ||- (!string.IsNullOrEmpty(value6) && value6.IndexOf("USBAudio.inf", StringComparison.OrdinalIgnoreCase) >= 0) ||- (!string.IsNullOrEmpty(value24) && value24.IndexOf("usb", StringComparison.OrdinalIgnoreCase) >= 0)))+ ((!string.IsNullOrEmpty(value5) && value5.IndexOf("wdma_usb.inf", StringComparison.OrdinalIgnoreCase) >= 0) ||+ (!string.IsNullOrEmpty(value8) && value8.IndexOf(@"USB\Class_01", StringComparison.OrdinalIgnoreCase) >= 0) ||+ (!string.IsNullOrEmpty(value6) && value6.IndexOf("USBAudio.inf", StringComparison.OrdinalIgnoreCase) >= 0) ||+ (!string.IsNullOrEmpty(value24) && value24.IndexOf("usb", StringComparison.OrdinalIgnoreCase) >= 0))){-string nameValue6 = RegistryHelp.GetValue(propsPath, "{b3f8fa53-0004-438e-9003-51a46e139bfc},6", string.Empty).Trim();string typeNameValue2 = RegistryHelp.GetValue(propsPath, "{a45c254e-df1c-4efd-8020-67d146a850e0},2", string.Empty).Trim();+ string name = nameValue6.Length > 10 && !string.Equals(nameValue6, typeNameValue2, StringComparison.OrdinalIgnoreCase) ? nameValue6 : $"{typeNameValue2} {nameValue6}";- if (nameValue6.Length > 10 && !string.Equals(nameValue6, typeNameValue2, StringComparison.OrdinalIgnoreCase))- {- return (true, nameValue6);- }- else- {- return (true, $"{typeNameValue2} {nameValue6}");- }+ return (true, name, isCapture);}}}}}- return (false, string.Empty);+ return (false, string.Empty, false);}- using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select DeviceID, Name, Caption, Description, PNPDeviceID from Win32_SoundDevice where Status = 'OK'", new EnumerationOptions { ReturnImmediately = true }))+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select DeviceID, Name, Caption, Description, PNPDeviceID from Win32_SoundDevice where Status = 'OK'", new EnumerationOptions { ReturnImmediately = true });+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>()){- foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())+ using (managementObj){- using (managementObj)- {- (bool isUsbDevice, string data) = IsUsbAudioDevice(managementObj["DeviceID"]?.ToString() ?? string.Empty);-- if (isUsbDevice && !string.IsNullOrEmpty(data))- {- result.AppendLine(data);- }- else- {- result.AppendLine(new string[] { "Name", "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty);- }+ (bool isUsbDevice, string usbName, bool isCapture) = IsUsbAudioDevice(managementObj["DeviceID"]?.ToString() ?? string.Empty);- VendorDetection.Realtek |= (managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10EC", StringComparison.OrdinalIgnoreCase) ?? -1) >= 0;+ if (isUsbDevice && !string.IsNullOrEmpty(usbName))+ {+ result.Add(new AudioDeviceInfo { Data = usbName, IsCapture = isCapture });+ }+ else if (new[] { "Name", "Caption", "Description" }.Select(prop => managementObj[prop] as string).FirstOrDefault(info => !string.IsNullOrEmpty(info)) is string wmiName)+ {+ result.Add(new AudioDeviceInfo { Data = wmiName, IsCapture = false });}++ VendorDetection.Realtek |= (managementObj["PNPDeviceID"]?.ToString().IndexOf("VEN_10EC", StringComparison.OrdinalIgnoreCase) ?? -1) >= 0;}}- return result.ToString().TrimEnd('\n', '\r');+ return result;}- private string GetNetworkAdapters()+ private List<NetworkAdapterInfo> GetNetworkAdapters(){- StringBuilder result = new StringBuilder();+ List<NetworkAdapterInfo> result = new List<NetworkAdapterInfo>();- using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, Description, ProductName, Manufacturer from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true }))+ using ManagementObjectSearcher searcher = new ManagementObjectSearcher(@"root\cimv2", "select Name, Description, ProductName, Manufacturer, NetConnectionStatus from Win32_NetworkAdapter where NetConnectionStatus=2 or NetConnectionStatus=7", new EnumerationOptions { ReturnImmediately = true });+ foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>()){- foreach (ManagementObject managementObj in searcher.Get().Cast<ManagementObject>())+ using (managementObj){- using (managementObj)+ string name = new string[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty;+ ushort status = managementObj["NetConnectionStatus"] is IConvertible s ? Convert.ToUInt16(s) : (ushort)7;++ if (!string.IsNullOrEmpty(name)){- result.AppendLine(new string[] { "Name", "Description", "ProductName", "Manufacturer" }.Select(prop => managementObj[prop]?.ToString()).FirstOrDefault(info => !string.IsNullOrEmpty(info)) ?? string.Empty); ;+ result.Add(new NetworkAdapterInfo { Data = name, IsConnected = status == 2 });}}}- return result.ToString().TrimEnd('\n', '\r');+ return result;}private static string SizeCalculationHelper<T>(T sizeInBytes) where T : struct, IConvertiblediff --git a/.Source/GTweak/Utilities/Configuration/NetworkProvider.cs b/.Source/GTweak/Utilities/Configuration/NetworkProvider.csindex ef2caa9f..4c0c358f 100644--- a/.Source/GTweak/Utilities/Configuration/NetworkProvider.cs+++ b/.Source/GTweak/Utilities/Configuration/NetworkProvider.cs@@ -128,7 +128,8 @@ namespace GTweak.Utilities.Configurationif (ipMetadata != null && !string.IsNullOrWhiteSpace(ipMetadata.Ip) && !string.IsNullOrWhiteSpace(ipMetadata.Country) && IPAddress.TryParse(ipMetadata.Ip, out _)){CurrentConnection = ConnectionStatus.Available;- UserIPAddress = $"{ipMetadata.Ip} ({ipMetadata.Country})";+ UserIPAddress = ipMetadata.Ip;+ UserCountryCode = ipMetadata.Country;break;}@@ -163,7 +164,11 @@ namespace GTweak.Utilities.Configuration{ ConnectionStatus.Lose, "connection_lose_sysinfo" },{ ConnectionStatus.Block, "connection_block_sysinfo" },{ ConnectionStatus.Limited, "connection_limited_sysinfo" }- }.TryGetValue(CurrentConnection, out string resourceKey)) { UserIPAddress = (string)Application.Current.Resources[resourceKey]; }+ }.TryGetValue(CurrentConnection, out string resourceKey))+ {+ UserCountryCode = string.Empty;+ UserIPAddress = (string)Application.Current.Resources[resourceKey];+ }isIPAddressFormatValid = UserIPAddress.Any(char.IsDigit);}diff --git a/.Source/GTweak/View/AddonsView.xaml b/.Source/GTweak/View/AddonsView.xamlindex 2301946f..c2a0b3f1 100644--- a/.Source/GTweak/View/AddonsView.xaml+++ b/.Source/GTweak/View/AddonsView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"diff --git a/.Source/GTweak/View/ConfidentialityView.xaml b/.Source/GTweak/View/ConfidentialityView.xamlindex 3f361733..29e45b5f 100644--- a/.Source/GTweak/View/ConfidentialityView.xaml+++ b/.Source/GTweak/View/ConfidentialityView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:local="clr-namespace:GTweak.View"diff --git a/.Source/GTweak/View/DataSystemView.xaml b/.Source/GTweak/View/DataSystemView.xamlindex 50765dc3..a10ffd95 100644--- a/.Source/GTweak/View/DataSystemView.xaml+++ b/.Source/GTweak/View/DataSystemView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"@@ -16,6 +16,8 @@</UserControl.DataContext><UserControl.Resources><conv:AngleToPercentConverter x:Key="AngleToPercent"/>+ <conv:UsageToAngleConverter x:Key="UsageToAngle"/>+ <conv:PercentToWidthConverter x:Key="PercentToWidth"/></UserControl.Resources><Grid>@@ -46,326 +48,701 @@</Border></Popup>- <Grid Grid.Row="0">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="auto"/>- <ColumnDefinition Width="*"/>- <ColumnDefinition Width="auto"/>- </Grid.ColumnDefinitions>-- <Grid Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,5,10,0">- <Ellipse Height="90" Width="90" Stroke="{StaticResource Brush_Separator}" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="{StaticResource DataElement_Opacity}">- <Ellipse.CacheMode>- <BitmapCache RenderAtScale="2"/>- </Ellipse.CacheMode>- <Ellipse.Effect>- <DropShadowEffect Opacity="0.3"/>- </Ellipse.Effect>- </Ellipse>- <ui:Arc x:Name="CPULoad" Width="90" Height="90" Stroke="{StaticResource Brush_Accent}" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center" EndAngle="0">- <ui:Arc.CacheMode>- <BitmapCache RenderAtScale="2"/>- </ui:Arc.CacheMode>- <ui:Arc.Effect>- <DropShadowEffect BlurRadius="5" ShadowDepth="1" Direction="-90" Opacity="0.5" Color="{StaticResource Color_Shadow}"/>- </ui:Arc.Effect>- </ui:Arc>- <TextBlock Foreground="{StaticResource Brush_Inactive}" TextAlignment="Center" Style="{StaticResource TextDefault}" Margin="0,0,0,20">- <InlineUIContainer>- <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" anim:NumberAnimation.Value="{Binding ElementName=CPULoad, Path=EndAngle, Converter={StaticResource AngleToPercent}, FallbackValue=0}"/>- </InlineUIContainer><Run Text="%"/>- </TextBlock>- <TextBlock Text="CPU" Foreground="{StaticResource Brush_Inactive}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource TextDefault}" Margin="0,15,0,0"/>- </Grid>-- <Grid Grid.Column="1" VerticalAlignment="Top" Margin="30,15,30,0" HorizontalAlignment="Center">- <Grid.ColumnDefinitions>- <ColumnDefinition Width="Auto"/>- <ColumnDefinition Width="*"/>- </Grid.ColumnDefinitions>-- <Border Grid.Column="0" Width="70" Height="70" HorizontalAlignment="Right" Margin="0,0,15,0">- <Border.CacheMode>- <BitmapCache RenderAtScale="2"/>- </Border.CacheMode>- <Border.Background>- <ImageBrush ImageSource="{Binding DisplayWallpaper, TargetNullValue={StaticResource Icon_LogoWin}, Mode=OneWay}" Stretch="UniformToFill"/>- </Border.Background>- <Border.OpacityMask>- <ImageBrush ImageSource="{StaticResource Icon_LogoWin}" Stretch="Uniform"/>- </Border.OpacityMask>- <Border.Effect>- <DropShadowEffect Opacity="{StaticResource DataElement_Opacity}" BlurRadius="10" ShadowDepth="10"/>- </Border.Effect>- </Border>-- <StackPanel Grid.Column="1" Orientation="Vertical" VerticalAlignment="Center">- <TextBlock Style="{StaticResource TextDefault}" FontSize="14pt" TextWrapping="Wrap" VerticalAlignment="Center" Height="Auto">- <Run Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [OSName].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Foreground="{StaticResource Brush_Inactive}" Text="{Binding [OSVersion].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </TextBlock>-- <TextBlock HorizontalAlignment="Left" FontFamily="{StaticResource Jura}" FontSize="14" Foreground="{StaticResource Brush_TextBlock_Inactivity}" Margin="0,5,0,0" TextWrapping="Wrap">- <Run Text="{DynamicResource label_proc_sysinfo}"/>- <InlineUIContainer>- <TextBlock anim:NumberAnimation.Value="{Binding [Processes].Data}" Text="0" Margin="0,0.5,0,0" FontFamily="{StaticResource Play}" Typography.NumeralAlignment="Tabular" Typography.NumeralStyle="Lining" FontSize="13.5"/>- </InlineUIContainer>- <Run Text=" • "/>- <Run Text="{DynamicResource label_svc_sysinfo}"/>- <InlineUIContainer>- <TextBlock anim:NumberAnimation.Value="{Binding [Services].Data}" Text="0" Margin="0,0.5,0,0" FontFamily="{StaticResource Play}" Typography.NumeralAlignment="Tabular" Typography.NumeralStyle="Lining" FontSize="13.5"/>- </InlineUIContainer>- </TextBlock>- </StackPanel>- </Grid>-- <Grid Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,5,15,0">- <Ellipse Height="90" Width="90" Stroke="{StaticResource Brush_Separator}" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="{StaticResource DataElement_Opacity}">- <Ellipse.CacheMode>- <BitmapCache RenderAtScale="2" EnableClearType="True"/>- </Ellipse.CacheMode>- <Ellipse.Effect>- <DropShadowEffect Opacity="0.3"/>- </Ellipse.Effect>- </Ellipse>- <ui:Arc x:Name="RAMLoad" Width="90" Height="90" Stroke="{StaticResource Brush_Accent}" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center" EndAngle="0">- <ui:Arc.CacheMode>- <BitmapCache RenderAtScale="2"/>- </ui:Arc.CacheMode>- <ui:Arc.Effect>- <DropShadowEffect BlurRadius="5" ShadowDepth="1" Direction="-90" Opacity="0.5" Color="{StaticResource Color_Shadow}"/>- </ui:Arc.Effect>- </ui:Arc>- <TextBlock Foreground="{StaticResource Brush_Inactive}" TextAlignment="Center" Style="{StaticResource TextDefault}" Margin="0,0,0,20">- <InlineUIContainer>- <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" anim:NumberAnimation.Value="{Binding ElementName=RAMLoad, Path=EndAngle, Converter={StaticResource AngleToPercent}, FallbackValue=0}"/>- </InlineUIContainer><Run Text="%"/>- </TextBlock>- <TextBlock Text="RAM" Foreground="{StaticResource Brush_Inactive}" Height="auto" Width="auto" TextAlignment="Center" Style="{StaticResource TextDefault}" Margin="0,15,0,0"/>- </Grid>- </Grid>+ <Grid Grid.Row="0" Margin="10,10,10,0">+ <Border CornerRadius="8" Opacity="0.5" Background="{StaticResource Brush_ShadowOverlay}" IsHitTestVisible="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">+ <Border.RenderTransform>+ <TranslateTransform X="3" Y="6" />+ </Border.RenderTransform>+ </Border>- <Grid Grid.Row="1">- <ScrollViewer b:ScrollFadeBehavior.EnableFade="True" Margin="0,0,0,10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">- <Grid Margin="20">+ <Border x:Name="CardBody" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1" Background="{StaticResource Brush_Background_Card}" CornerRadius="8" Padding="15,12" HorizontalAlignment="Stretch" VerticalAlignment="Top" SnapsToDevicePixels="True">+ <Grid><Grid.ColumnDefinitions><ColumnDefinition Width="*"/>- <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/></Grid.ColumnDefinitions>- <WrapPanel Grid.Column="0" Orientation="Vertical">-- <StackPanel Orientation="Vertical">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_Bios}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_bios_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">- <Run Text="{Binding [Bios].Data}" IsEnabled="{Binding [Bios].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Text="{DynamicResource title_mode_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [Mode].Data}" IsEnabled="{Binding [Mode].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </TextBlock>- </StackPanel>+ <Grid Grid.Column="0" VerticalAlignment="Center" Margin="0,0,15,0">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto"/>+ <ColumnDefinition Width="*"/>+ </Grid.ColumnDefinitions>- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_Motherboard}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_motherbr_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">- <Run Text="{Binding [Motherboard].Data}" IsEnabled="{Binding [Motherboard].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Text="{DynamicResource title_chipset_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [Chipset].Data}" IsEnabled="{Binding [Chipset].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </TextBlock>- </StackPanel>+ <Border Grid.Column="0" VerticalAlignment="Stretch" Margin="0,0,12,0" Width="{Binding ActualHeight, RelativeSource={RelativeSource Self}}">+ <Border.CacheMode>+ <BitmapCache RenderAtScale="2"/>+ </Border.CacheMode>+ <Border.Background>+ <ImageBrush ImageSource="{Binding DisplayWallpaper, TargetNullValue={StaticResource Icon_LogoWin}, Mode=OneWay}" Stretch="UniformToFill"/>+ </Border.Background>+ <Border.OpacityMask>+ <ImageBrush ImageSource="{StaticResource Icon_LogoWin}" Stretch="Uniform"/>+ </Border.OpacityMask>+ <Border.Effect>+ <DropShadowEffect Opacity="{StaticResource DataElement_Opacity}" BlurRadius="8" ShadowDepth="4"/>+ </Border.Effect>+ </Border>- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_Processor}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_cpu_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">- <Run Text="{Binding [Processor].Data}" IsEnabled="{Binding [Processor].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Text="{DynamicResource title_cores_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [Cores].Data}"/>- <Run Text=" | " FontWeight="Bold" Foreground="{StaticResource Brush_Inactive}"/>- <Run Text="{DynamicResource title_threads_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [Threads].Data}"/><LineBreak/>- <Run Text="{DynamicResource title_freq_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [Frequency].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>+ <Grid Grid.Column="1" VerticalAlignment="Center">+ <Grid.RowDefinitions>+ <RowDefinition Height="Auto"/>+ <RowDefinition Height="Auto"/>+ </Grid.RowDefinitions>++ <TextBlock Grid.Row="0" Style="{StaticResource TextDefault}" FontSize="14pt" TextWrapping="Wrap">+ <Run Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [OSName].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>+ <Run Foreground="{StaticResource Brush_Inactive}" Text="{Binding [OSVersion].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/></TextBlock>- </StackPanel>- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_VideoCard}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_gpu_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>+ <TextBlock Grid.Row="1" FontFamily="{StaticResource Jura}" FontSize="13" Foreground="{StaticResource Brush_TextBlock_Inactivity}" Margin="0,3,0,0" TextWrapping="Wrap">+ <Run Text="{DynamicResource label_proc_sysinfo}"/>+ <InlineUIContainer>+ <TextBlock anim:NumberAnimation.Value="{Binding [Processes].Data}" Text="0" Margin="0,0.5,0,0" FontFamily="{StaticResource Play}" Typography.NumeralAlignment="Tabular" Typography.NumeralStyle="Lining" FontSize="12.5"/>+ </InlineUIContainer>+ <Run Text=" • "/>+ <Run Text="{DynamicResource label_svc_sysinfo}"/>+ <InlineUIContainer>+ <TextBlock anim:NumberAnimation.Value="{Binding [Services].Data}" Text="0" Margin="0,0.5,0,0" FontFamily="{StaticResource Play}" Typography.NumeralAlignment="Tabular" Typography.NumeralStyle="Lining" FontSize="12.5"/>+ </InlineUIContainer>+ </TextBlock>+ </Grid>+ </Grid>++ <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right">++ <StackPanel Orientation="Vertical" HorizontalAlignment="Center" Margin="0,0,10,0">+ <Grid Width="60" Height="60">+ <Ellipse Stroke="{StaticResource Brush_Separator}" StrokeThickness="3" Width="60" Height="60" Opacity="{StaticResource DataElement_Opacity}"/>+ <ui:Arc b:ArcAnimationBehavior.AnimatedAngle="{Binding [CPUAngle].Data, Converter={StaticResource UsageToAngle}}" x:Name="CPULoad" Width="60" Height="60" Stroke="{StaticResource Brush_Accent_B}" StrokeThickness="3" VerticalAlignment="Center" HorizontalAlignment="Center" EndAngle="0"/>+ <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Style="{StaticResource TextDefault}" FontSize="12" Foreground="{StaticResource Brush_Inactive}">+ <InlineUIContainer>+ <TextBlock Style="{StaticResource TextDefault}" FontSize="12" Foreground="{StaticResource Brush_Inactive}" anim:NumberAnimation.Value="{Binding ElementName=CPULoad, Path=EndAngle, Converter={StaticResource AngleToPercent}, FallbackValue=0}"/>+ </InlineUIContainer><Run Text="%"/>+ </TextBlock>+ </Grid>++ <Border Background="{StaticResource Brush_Background_Labels_B}" CornerRadius="5" Padding="8,2" Margin="0,4,0,0" HorizontalAlignment="Center">+ <TextBlock Text="CPU" Foreground="{StaticResource Brush_Accent_B}" Style="{StaticResource TextDefault}" FontSize="13"/></Border>- <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">- <Run Text="{Binding [Graphics].Data}" IsEnabled="{Binding [Graphics].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Text="{DynamicResource title_refreshrate_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [RefreshRate].Data}" IsEnabled="{Binding [RefreshRate].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </TextBlock></StackPanel>- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_Memory}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_ram_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>+ <StackPanel Orientation="Vertical" HorizontalAlignment="Center">+ <Grid Width="60" Height="60">+ <Ellipse Stroke="{StaticResource Brush_Separator}" StrokeThickness="3" Width="60" Height="60" Opacity="{StaticResource DataElement_Opacity}"/>+ <ui:Arc b:ArcAnimationBehavior.AnimatedAngle="{Binding [RAMAngle].Data, Converter={StaticResource UsageToAngle}}" x:Name="RAMLoad" Width="60" Height="60" Stroke="{StaticResource Brush_Accent}" StrokeThickness="3" VerticalAlignment="Center" HorizontalAlignment="Center" EndAngle="0"/>+ <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" Style="{StaticResource TextDefault}" FontSize="12" Foreground="{StaticResource Brush_Inactive}">+ <InlineUIContainer>+ <TextBlock Style="{StaticResource TextDefault}" FontSize="12" Foreground="{StaticResource Brush_Inactive}" anim:NumberAnimation.Value="{Binding ElementName=RAMLoad, Path=EndAngle, Converter={StaticResource AngleToPercent}, FallbackValue=0}"/>+ </InlineUIContainer><Run Text="%"/>+ </TextBlock>+ </Grid>++ <Border Background="{StaticResource Brush_Background_Labels}" CornerRadius="5" Padding="8,2" Margin="0,4,0,0" HorizontalAlignment="Center">+ <TextBlock Text="RAM" Foreground="{StaticResource Brush_Accent}" Style="{StaticResource TextDefault}" FontSize="13"/></Border>- <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">- <Run Text="{Binding [Memory].Data}" IsEnabled="{Binding [Memory].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Text="{DynamicResource title_mtype_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [Type].Data}" IsEnabled="{Binding [Type].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </TextBlock></StackPanel>- </WrapPanel>+ </StackPanel>++ </Grid>+ </Border>+ </Grid>- <WrapPanel Grid.Column="1" Orientation="Vertical">+ <Grid Grid.Row="1">+ <ScrollViewer b:ScrollFadeBehavior.EnableFade="True" Margin="0,0,0,10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">- <StackPanel Orientation="Vertical">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_Storage}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_storage_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <TextBlock Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto">- <Run Text="{Binding [Storage].Data}" IsEnabled="{Binding [Storage].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/><LineBreak/>- <Run Text="{DynamicResource title_storage_free_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [FreeSpace].Data}"/>- <Run Text=" | " FontWeight="Bold" Foreground="{StaticResource Brush_Inactive}"/>- <Run Text="{DynamicResource title_storage_used_sysinfo}" Foreground="{StaticResource Brush_Toggle_Text}"/>- <Run Text="{Binding [UsedSpace].Data}"/>- </TextBlock>- </StackPanel>+ <uc:FlowPanel Margin="5" ContentAlignment="Stretch" HorizontalSpacing="0" VerticalSpacing="0">- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_SoundDevices}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_sound_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <TextBlock Text="{Binding [Audio].Data}" IsEnabled="{Binding [Audio].IsEnabled}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </StackPanel>+ <StackPanel VerticalAlignment="Top">+ <uc:InfoCard Title="{DynamicResource label_bios_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Bios}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <StackPanel Orientation="Vertical">+ <Grid Margin="0,0,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_verison_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [Bios].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">- <Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_Network}"/>+ <Grid Margin="0,2,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_serial_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [BiosSerial].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>+ </Grid>++ <Grid Margin="0,2,0,0">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_mode_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <Border Grid.Column="2" Padding="8,2" CornerRadius="5">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Background" Value="{StaticResource Brush_Background_Labels}"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding [Mode].Data}" Value="Legacy Boot">+ <Setter Property="Background" Value="{StaticResource Brush_Background_Labels_B}"/>+ </DataTrigger>+ </Style.Triggers></Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_netadapter_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <TextBlock Text="{Binding [Network].Data}" IsEnabled="{Binding [Network].IsEnabled}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Margin="5,1,0,0" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>- </StackPanel>+ </Border.Style>+ <TextBlock>+ <TextBlock.Style>+ <Style TargetType="TextBlock" BasedOn="{StaticResource TextDefault}">+ <Setter Property="Foreground" Value="{StaticResource Brush_Accent}"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding [Mode].Data}" Value="Legacy Boot">+ <Setter Property="Foreground" Value="{StaticResource Brush_Accent_B}"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </TextBlock.Style>+ <Run Text="{Binding [Mode].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>+ </TextBlock>+ </Border>+ </Grid>+ </StackPanel>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_motherbr_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Motherboard}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <StackPanel Orientation="Vertical">+ <Grid Margin="0,0,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_name_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [Motherboard].Data}" IsEnabled="{Binding [Motherboard].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <Grid Margin="0,2,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_verison_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [MotherboardVersion].Data}" IsEnabled="{Binding [MotherboardVersion].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <Grid Margin="0,2,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_serial_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [MotherboardSerial].Data}" IsEnabled="{Binding [MotherboardSerial].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <Grid Margin="0,2,0,0">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_chipset_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [Chipset].Data}" IsEnabled="{Binding [Chipset].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>+ </StackPanel>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_cpu_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Processor}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <StackPanel Orientation="Vertical">+ <Grid Margin="0,0,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_name_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [Processor].Data}" IsEnabled="{Binding [Processor].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <Grid Margin="0,2,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis">+ <Run Text="{DynamicResource label_cores_sysinfo}"/>+ <Run Text=" / "/>+ <Run Text="{DynamicResource label_threads_sysinfo}"/>+ </TextBlock>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}">+ <Run Text="{Binding [Cores].Data}"/>+ <Run Text=" / " Foreground="{StaticResource Brush_Inactive}"/>+ <Run Text="{Binding [Threads].Data}"/>+ </TextBlock>+ </Grid>++ <Grid Margin="0,2,0,0">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_freq_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding [Frequency].Data}" IsEnabled="{Binding [Frequency].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Grid>+ </StackPanel>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_gpu_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_VideoCard}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <StackPanel Orientation="Vertical">+ <Grid Margin="0,0,0,4">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_name_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Text="{DynamicResource label_capacity_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <ItemsControl ItemsSource="{Binding [Graphics].Items}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <StackPanel>+ <Border Height="1" Background="{StaticResource Brush_Separator}" Opacity="0.4" Margin="0,4,0,4">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ </Border>+ <Grid Margin="0,2,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[0]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[1]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>+ </Grid>+ </StackPanel>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>++ <Border Background="{StaticResource Brush_Separator}" Height="1.2" CornerRadius="10" Margin="0,10,0,10"/>- <StackPanel Orientation="Vertical" Margin="0,20,0,0">- <Border Padding="5,3,10,3" Background="{StaticResource Brush_Background_Labels}" CornerRadius="7" HorizontalAlignment="Left">+ <Grid Margin="0,2,0,0">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_refreshrate_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}"/>+ <Border Grid.Column="2" Padding="8,2" CornerRadius="5" Background="{StaticResource Brush_Background_Labels_B}">+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Accent_B}" Text="{Binding [RefreshRate].Data}" IsEnabled="{Binding [RefreshRate].IsEnabled}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>+ </Border>+ </Grid>+ </StackPanel>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_ram_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Memory}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <StackPanel Orientation="Vertical" Grid.IsSharedSizeScope="True">+ <Grid Margin="0,0,0,4">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto" SharedSizeGroup="RamFreqColumn"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto" SharedSizeGroup="RamCapacityColumn"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_name_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Text="{DynamicResource label_freq_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="4" Text="{DynamicResource label_capacity_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <ItemsControl ItemsSource="{Binding [Memory].Items}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <StackPanel>+ <Border Height="1" Background="{StaticResource Brush_Separator}" Opacity="0.4" Margin="0,4,0,4">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ </Border>+ <Grid Margin="0,2,0,2">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto" SharedSizeGroup="RamFreqColumn"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto" SharedSizeGroup="RamCapacityColumn"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[0]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[1]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis" HorizontalAlignment="Right"/>+ <TextBlock Grid.Column="4" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[2]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis" HorizontalAlignment="Right"/>+ </Grid>+ </StackPanel>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>++ <Border Background="{StaticResource Brush_Separator}" Height="1.2" CornerRadius="10" Margin="0,10,0,10"/>++ <Grid Margin="0,2,0,0">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_mtype_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <Border Grid.Column="2" Padding="8,2" CornerRadius="5" Background="{StaticResource Brush_Background_Labels}" HorizontalAlignment="Left">+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Accent}" Text="{Binding [Type].Data}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand"/>+ </Border>+ </Grid>+ </StackPanel>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ </StackPanel>++ <StackPanel VerticalAlignment="Top">+ <uc:InfoCard Title="{DynamicResource label_storage_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Storage}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <StackPanel Orientation="Vertical" Grid.IsSharedSizeScope="True">+ <Grid Margin="0,0,0,4">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto" SharedSizeGroup="StorageTypeColumn"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Text="{DynamicResource label_name_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ <TextBlock Grid.Column="2" Text="{DynamicResource label_itype_sysinfo}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" TextTrimming="CharacterEllipsis"/>+ </Grid>++ <ItemsControl ItemsSource="{Binding [Storage].Items}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <StackPanel Margin="0,2,0,4">+ <Border Height="1" Background="{StaticResource Brush_Separator}" Opacity="0.4" Margin="0,4,0,8">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ </Border>++ <Grid>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="20"/>+ <ColumnDefinition Width="Auto" SharedSizeGroup="StorageTypeColumn"/>+ </Grid.ColumnDefinitions>+ <Grid Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center">+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>+ <TextBlock Grid.Column="0" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[0]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis" Margin="0,0,2,0"/>+ <TextBlock Grid.Column="1" Foreground="{StaticResource Brush_Accent_B}" TextTrimming="CharacterEllipsis">+ <TextBlock.Style>+ <Style TargetType="TextBlock" BasedOn="{StaticResource TextDefault}">+ <Setter Property="Text" Value="{Binding DataItems[1], StringFormat=' ({0})'}"/>+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding DataItems[1]}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ <DataTrigger Binding="{Binding DataItems[1]}" Value="">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </TextBlock.Style>+ </TextBlock>+ </Grid>+ <Border Grid.Column="2" Padding="8,2" CornerRadius="5" Background="{StaticResource Brush_Background_Labels}" HorizontalAlignment="Right" VerticalAlignment="Center">+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Accent}" Text="{Binding DataItems[2]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </Border>+ </Grid>++ <Grid Margin="0,5,0,4" Height="4">+ <Grid.Style>+ <Style TargetType="Grid">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding DataItems[3]}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ <DataTrigger Binding="{Binding DataItems[3]}" Value="">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Grid.Style>+ <Border CornerRadius="2" Background="{StaticResource Brush_Separator}"/>+ <Border CornerRadius="2" Background="{StaticResource Brush_Accent}" HorizontalAlignment="Left">+ <Border.Width>+ <MultiBinding Converter="{StaticResource PercentToWidth}">+ <Binding Path="DataItems[3]"/>+ <Binding RelativeSource="{RelativeSource AncestorType=Grid}" Path="ActualWidth"/>+ </MultiBinding>+ </Border.Width>+ </Border>+ </Grid>++ <Grid Margin="0,2,0,0">+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">+ <StackPanel.Style>+ <Style TargetType="StackPanel">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding DataItems[5]}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ <DataTrigger Binding="{Binding DataItems[5]}" Value="">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </StackPanel.Style>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" Text="{DynamicResource label_storage_used_sysinfo}" FontSize="13" TextTrimming="CharacterEllipsis"/>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[5]}" Margin="4,0,0,0" FontSize="13" TextTrimming="CharacterEllipsis"/>+ </StackPanel>++ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">+ <StackPanel.Style>+ <Style TargetType="StackPanel">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding DataItems[4]}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ <DataTrigger Binding="{Binding DataItems[4]}" Value="">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </StackPanel.Style>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}" Text="{DynamicResource label_storage_free_sysinfo}" FontSize="13"/>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[4]}" Margin="4,0,0,0" FontSize="13"/>+ </StackPanel>+ </Grid>+ </StackPanel>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </StackPanel>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_sound_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_SoundDevices}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <ItemsControl ItemsSource="{Binding [Audio].Items}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <StackPanel Orientation="Vertical">+ <Border Height="1" Background="{StaticResource Brush_Separator}" Opacity="0.4" Margin="0,4,0,4">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ </Border>+ <StackPanel Orientation="Horizontal" Margin="0,2,0,2">+ <Image Width="14" Height="14" VerticalAlignment="Center" Margin="0,0,6,0">+ <Image.Style>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Audio}"/>+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding DataItems[1]}" Value="1">+ <Setter Property="Source" Value="{StaticResource Icon_Microphone}"/>+ </DataTrigger>+ <DataTrigger Binding="{Binding DataItems[1], FallbackValue='Hide', TargetNullValue='Hide'}" Value="Hide">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Image.Style>+ </Image>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[0]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </StackPanel>+ </StackPanel>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_netadapter_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_Network}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent>+ <ItemsControl ItemsSource="{Binding [Network].Items}">+ <ItemsControl.ItemTemplate>+ <DataTemplate>+ <StackPanel Orientation="Vertical">+ <Border Height="1" Background="{StaticResource Brush_Separator}" Opacity="0.4" Margin="0,4,0,4">+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource PreviousData}}" Value="{x:Null}">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ </Border>+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,2,0,2">+ <Ellipse Width="8" Height="8" Margin="0,0,8,0" VerticalAlignment="Center">+ <Ellipse.Style>+ <Style TargetType="Ellipse">+ <Setter Property="Fill" Value="{StaticResource Brush_Accent}"/>+ <Setter Property="Visibility" Value="Visible"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding DataItems[1]}" Value="0">+ <Setter Property="Fill" Value="{StaticResource Brush_Accent_Y}"/>+ </DataTrigger>+ <DataTrigger Binding="{Binding DataItems[1], FallbackValue='Hide', TargetNullValue='Hide'}" Value="Hide">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Ellipse.Style>+ </Ellipse>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" Text="{Binding DataItems[0]}" PreviewMouseDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" TextTrimming="CharacterEllipsis"/>+ </StackPanel>+ </StackPanel>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>++ <uc:InfoCard Title="{DynamicResource label_ip_sysinfo}">+ <uc:InfoCard.IconStyle>+ <Style TargetType="Image">+ <Setter Property="Source" Value="{StaticResource Icon_IPaddress}" />+ </Style>+ </uc:InfoCard.IconStyle>+ <uc:InfoCard.CardContent><Grid>- <StackPanel Orientation="Horizontal">- <Image Height="16" Width="16" VerticalAlignment="Bottom">- <Image.Style>- <Style TargetType="{x:Type Image}">- <Setter Property="Source" Value="{StaticResource Icon_IPaddress}"/>- </Style>- </Image.Style>- </Image>- <TextBlock Margin="5,0,0,0" Text="{DynamicResource title_ip_sysinfo}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Accent}" Height="Auto" Width="Auto"/>- </StackPanel>- </Grid>- </Border>- <StackPanel Orientation="Horizontal" Margin="5,1,0,0">- <TextBlock x:Name="IpAddress" Text="{Binding [IpAddress].Data}" IsEnabled="{Binding [IpAddress].IsEnabled}" Style="{StaticResource TextDefault}" HorizontalAlignment="Left" Foreground="{StaticResource Brush_Highlighted}" Height="Auto" Width="Auto" PreviewMouseLeftButtonDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" anim:BlurAnimation.TargetRadius="{Binding SetBlurValue}">- <TextBlock.Effect>- <BlurEffect Radius="{Binding SetBlurValue}"/>- </TextBlock.Effect>- </TextBlock>- <ToggleButton x:Name="BtnVision" Margin="10,0,0,0" Width="24" Height="24" Visibility="{Binding SetVisibility}" VerticalAlignment="Center" Style="{StaticResource TglVision}" IsChecked="{Binding StateButtonVision, Mode=TwoWay}"/>- </StackPanel>- </StackPanel>+ <Grid.ColumnDefinitions>+ <ColumnDefinition Width="Auto"/>+ <ColumnDefinition Width="10"/>+ <ColumnDefinition Width="Auto"/>+ <ColumnDefinition Width="*"/>+ <ColumnDefinition Width="Auto"/>+ </Grid.ColumnDefinitions>- </WrapPanel>-- </Grid>+ <TextBlock Grid.Column="0" Text="{Binding [IpAddress].Data}" IsEnabled="{Binding [IpAddress].IsEnabled}" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Highlighted}" VerticalAlignment="Center" PreviewMouseLeftButtonDown="HandleCopyingData_PreviewMouseDown" Cursor="Hand" anim:BlurAnimation.TargetRadius="{Binding SetBlurValue}">+ <TextBlock.Effect>+ <BlurEffect Radius="{Binding SetBlurValue}"/>+ </TextBlock.Effect>+ </TextBlock>+ <Border Grid.Column="2" Padding="8,2" CornerRadius="5" Background="{StaticResource Brush_Background_Labels}" VerticalAlignment="Center">+ <Border.Effect>+ <BlurEffect Radius="{Binding SetBlurValue}"/>+ </Border.Effect>+ <Border.Style>+ <Style TargetType="Border">+ <Setter Property="Visibility" Value="{Binding SetVisibility}"/>+ <Style.Triggers>+ <DataTrigger Binding="{Binding [CountryCode].Data, FallbackValue='', TargetNullValue=''}" Value="">+ <Setter Property="Visibility" Value="Collapsed"/>+ </DataTrigger>+ </Style.Triggers>+ </Style>+ </Border.Style>+ <TextBlock Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Accent}" Text="{Binding [CountryCode].Data}"/>+ </Border>++ <ToggleButton Grid.Column="4" Width="24" Height="24" Visibility="{Binding SetVisibility}" VerticalAlignment="Center" Style="{StaticResource TglVision}" IsChecked="{Binding StateButtonVision, Mode=TwoWay}"/>+ </Grid>+ </uc:InfoCard.CardContent>+ </uc:InfoCard>+ </StackPanel>++ </uc:FlowPanel></ScrollViewer></Grid>-+</Grid></UserControl>diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.csindex 02674b1e..87e1e10b 100644--- a/.Source/GTweak/View/DataSystemView.xaml.cs+++ b/.Source/GTweak/View/DataSystemView.xaml.cs@@ -55,14 +55,13 @@ namespace GTweak.ViewHardwareData.UserIPAddress = (string)FindResource(resourceKey);UpdateDataContext();}++ (DataContext as DataSystemViewModel)?.RefreshFallback();}));}private void StartMonitoringData(){- CPULoad.EndAngle = Math.Min(HardwareData.Processor.Usage * 3.6, 359.9);- RAMLoad.EndAngle = Math.Min(HardwareData.Memory.Usage * 3.6, 359.9);-_timer = new TimerControlManager(TimeSpan.Zero, TimerControlManager.TimerMode.CountUp, async time =>{if ((int)time.TotalSeconds % 2 == 0)@@ -75,8 +74,6 @@ namespace GTweak.View_ = Dispatcher.BeginInvoke(new Action(() =>{- AnimateArcProgress(CPULoad, HardwareData.Processor.Usage);- AnimateArcProgress(RAMLoad, HardwareData.Memory.Usage);UpdateDataContext();}));}@@ -91,12 +88,10 @@ namespace GTweak.View{if (DataContext as DataSystemViewModel is var vm && vm != null){- vm.Update();+ vm.UpdateModel();}}- private void AnimateArcProgress(Wpf.Ui.Controls.Arc arc, double percent) => arc.BeginAnimation(Wpf.Ui.Controls.Arc.EndAngleProperty, FactoryAnimation.CreateIn(arc.EndAngle, Math.Min(percent * 3.6, 359.9), 0.2, useCubicEase: true));-private void HandleCopyingData_PreviewMouseDown(object sender, MouseButtonEventArgs e){object source = e.OriginalSource;diff --git a/.Source/GTweak/View/InterfaceView.xaml b/.Source/GTweak/View/InterfaceView.xamlindex 63a5285e..5609b386 100644--- a/.Source/GTweak/View/InterfaceView.xaml+++ b/.Source/GTweak/View/InterfaceView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:local="clr-namespace:GTweak.View"diff --git a/.Source/GTweak/View/PackagesView.xaml b/.Source/GTweak/View/PackagesView.xamlindex 2fbe64dc..68bfcdde 100644--- a/.Source/GTweak/View/PackagesView.xaml+++ b/.Source/GTweak/View/PackagesView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"diff --git a/.Source/GTweak/View/ServicesView.xaml b/.Source/GTweak/View/ServicesView.xamlindex 7a9a0cf7..21d9a249 100644--- a/.Source/GTweak/View/ServicesView.xaml+++ b/.Source/GTweak/View/ServicesView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:local="clr-namespace:GTweak.View"diff --git a/.Source/GTweak/View/SystemView.xaml b/.Source/GTweak/View/SystemView.xamlindex 212392b9..b65ab660 100644--- a/.Source/GTweak/View/SystemView.xaml+++ b/.Source/GTweak/View/SystemView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:local="clr-namespace:GTweak.View"diff --git a/.Source/GTweak/View/ToolsetView.xaml b/.Source/GTweak/View/ToolsetView.xamlindex ec6fdb15..a793730b 100644--- a/.Source/GTweak/View/ToolsetView.xaml+++ b/.Source/GTweak/View/ToolsetView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:vm="clr-namespace:GTweak.Core.ViewModel"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"diff --git a/.Source/GTweak/View/UtilsView.xaml b/.Source/GTweak/View/UtilsView.xamlindex 33d9e84e..c2db5637 100644--- a/.Source/GTweak/View/UtilsView.xaml+++ b/.Source/GTweak/View/UtilsView.xaml@@ -3,7 +3,7 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"xmlns:d="http://schemas.microsoft.com/expression/blend/2008"- xmlns:b="clr-namespace:GTweak.Utilities.Behaviors"+ xmlns:b="clr-namespace:GTweak.Core.Behaviors"xmlns:uc="clr-namespace:GTweak.Assets.UserControls"xmlns:local="clr-namespace:GTweak.View"mc:Ignorable="d" d:Width="1014" Style="{StaticResource LaunchPage}">diff --git a/Assets/DrawingImages/SystemInfo/Audio.svg b/Assets/DrawingImages/SystemInfo/Audio.svgnew file mode 100644index 00000000..66a5420a--- /dev/null+++ b/Assets/DrawingImages/SystemInfo/Audio.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96"><g id="surface1"><path d="M50.879 11.52c3.605 3.609 4.324 6.043 4.351 11.085.016 1.254.032 2.504.047 3.797l-.011 4.078q.004 2.104.015 4.208a944 944 0 0 1-.008 8.8c-.015 3.754.008 7.508.04 11.262.023 2.895.019 5.79.011 8.684 0 1.382.008 2.77.02 4.152.02 1.937 0 3.871-.02 5.809v3.335c-.789 3.864-2.363 5.32-5.402 7.75-3.219.274-4.934-.335-7.508-2.273-1.926-1.703-3.754-3.473-5.574-5.285-1.25-1.223-2.504-2.438-3.758-3.656-.547-.54-1.094-1.082-1.656-1.641-5.074-4.707-8.992-4.832-15.707-4.762-4.153-.09-7.684-.5-10.836-3.535C2.348 58.738 3.027 53.086 3.12 48l-.07-3.7c.054-8.417.054-8.417 1.847-11.644 2.625-2.531 4.903-2.914 8.461-3.238q2.052.072 4.102.16c6.133-.035 9.516-.793 14.16-5.156a471 471 0 0 0 4.86-5.223c1.687-1.515 3.406-3 5.16-4.437.738-.63 1.48-1.254 2.242-1.899 2.668-1.633 3.93-1.996 6.996-1.343M42.66 24.059l-2.676 2.375c-2.496 2.222-2.496 2.222-4.246 4.402-3.898 4.398-7.297 5.074-12.972 5.434-2.48.09-4.953.128-7.434.144-3.59-.379-3.59-.379-4.773 1.027a78 78 0 0 0-.125 4.68c-.004.945-.004 1.89-.004 2.863L10.44 48l-.011 3.016c0 .945 0 1.89.004 2.863 0 .875 0 1.75.004 2.648-.106 2.02-.106 2.02 1.082 2.993l3.578-.168c8.48-.332 14.433-.004 20.906 5.906 2.309 2.34 4.55 4.726 6.687 7.226 1.676 1.782 1.676 1.782 5.309 3.356V20.16c-2.012 0-3.977 2.656-5.34 3.899m36.06-8.699c2.273.1 2.273.1 4.8.96 9.114 12.368 10.223 28.856 8.192 43.582-1.508 6.836-4.016 14.114-8.191 19.778-2.47.918-2.47.918-4.801.96-.633-.632-1.266-1.269-1.918-1.921.355-3.656 1.687-6.57 3.3-9.84 5.774-12.531 5.77-24.863 1.653-38.024-.965-2.613-2.031-5-3.332-7.457-1.621-3.238-1.621-3.238-1.305-5.3.645-1.778.645-1.778 1.602-2.739m0 0" style="stroke:none;fill-rule:nonzero;fill:#000;fill-opacity:1"/><path d="M71.04 23.04c2.308.929 3.6 1.558 4.987 3.66 5.535 13.019 5.887 25.046 1.735 38.581-1.086 2.586-2.176 4.426-3.84 6.719-1.426.477-1.426.477-2.883.96-.95-.632-1.898-1.269-2.879-1.92.399-3.833.934-6.653 2.399-10.259 3.558-9.144 2.64-18.058-.48-27.18q-.957-1.922-1.919-3.84c-.3-2.523-.3-2.523 0-4.8zm0 0" style="stroke:none;fill-rule:nonzero;fill:#000;fill-opacity:1"/><path d="M60.48 33.602c2.22.058 2.22.058 4.801.957 4.051 6.011 3.477 13.164 2.88 20.16-.602 2.89-1.196 4.222-2.88 6.722-2.582.899-2.582.899-4.8.957-1.083-1.558-1.083-1.558-1.922-3.84.64-1.917 1.28-3.84 1.921-5.757.41-4.621.368-8.95-1.082-13.38l-.84-2.94c.637-.95 1.27-1.903 1.922-2.88m0 0" style="stroke:none;fill-rule:nonzero;fill:#000;fill-opacity:1"/></g></svg>\ No newline at end of filediff --git a/Assets/DrawingImages/SystemInfo/Microphone.svg b/Assets/DrawingImages/SystemInfo/Microphone.svgnew file mode 100644index 00000000..4e973290--- /dev/null+++ b/Assets/DrawingImages/SystemInfo/Microphone.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96"><g id="surface1"><path d="M56.035 4.656c4.899 2.723 7.922 6.602 10.203 11.664.645 3.188.676 6.266.64 9.508l.013 2.692a445 445 0 0 1-.024 5.593c-.027 2.84 0 5.676.028 8.512q-.002 2.735-.016 5.465c.008.84.02 1.68.027 2.543-.113 6.008-1.68 9.969-5.465 14.648-5.18 4.809-9.453 5.137-16.304 5.07-5.285-.496-8.227-2.609-11.836-6.511-2.371-3.512-3.774-6.063-3.836-10.344l-.047-2.43c-.004-.855-.008-1.714-.016-2.601l-.023-2.703q-.023-2.834-.027-5.668a704 704 0 0 0-.106-8.614c-.012-1.84-.02-3.675-.023-5.515-.02-.852-.035-1.703-.055-2.578.043-6.035 1.484-10.106 5.39-14.746 6.102-5.532 13.657-6.793 21.477-3.985M38.641 14.88c-2.918 3.504-2.332 7.902-2.356 12.203-.004.773-.012 1.547-.015 2.344-.012 1.633-.016 3.27-.02 4.902-.012 2.496-.04 4.988-.07 7.484q-.011 2.385-.016 4.77l-.035 2.254c.023 5.824 1.394 8.797 5.39 12.902 3.415 2.098 5.415 2.114 9.36 1.621 3.059-1.457 5.508-3.152 7.68-5.757 1.203-3.61 1.136-7.004 1.156-10.766l.015-2.34c.012-1.637.016-3.27.02-4.906.012-2.492.04-4.988.07-7.48q.011-2.39.016-4.774l.035-2.25c-.023-5.387-1.289-8.27-4.59-12.375-5.586-4.375-11.886-1.906-16.64 2.168m0 0" style="stroke:none;fill-rule:nonzero;fill:#000;fill-opacity:1"/><path d="M19.2 41.281c2.519.36 2.519.36 4.8.957l.285 3.301C25.47 58.73 25.47 58.73 32.762 69.422 37.926 73.46 43.98 75.27 50.52 74.82c7.066-1.183 11.914-4.18 16.464-9.656 3.098-4.75 3.614-9.55 4.176-15.062.082-.758.164-1.516.25-2.293q.304-2.783.59-5.57c2.281-.598 2.281-.598 4.8-.958 2.602 2.602 2.208 4.047 2.22 7.68-.196 10.453-3.114 19.219-10.684 26.676-4.711 3.863-9.652 5.55-15.535 6.922-.09 1.007-.09 1.007-.176 2.035l-.246 2.644c-.078.871-.156 1.739-.234 2.633-.305 2.29-.305 2.29-1.266 4.207H45.12c-1.168-2.336-1.27-4.238-1.5-6.84l-.246-2.644c-.086-1.008-.086-1.008-.176-2.035-.886-.196-.886-.196-1.797-.391-8.742-2.227-14.863-6.27-19.742-13.95-4.37-8.062-5.262-15.85-4.379-25.019zm0 0" style="stroke:none;fill-rule:nonzero;fill:#000;fill-opacity:1"/></g></svg>\ No newline at end of file