Skip to content

Portable Tool for an Ideal Windows Setup

-added user control - card, for 'more' page -edit method reset icon db

Greedekse6dd536b78f4
diff --git a/.Source/GTweak/Assets/UserControl/Card.xaml b/.Source/GTweak/Assets/UserControl/Card.xaml
new file mode 100644
index 00000000..038214d0
--- /dev/null
+++ b/.Source/GTweak/Assets/UserControl/Card.xaml
@@ -0,0 +1,21 @@
+<UserControl x:Class="GTweak.Assets.UserControl.Card"
+ 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.UserControl"
+ mc:Ignorable="d"
+ d:Height="auto" d:Width="auto" SnapsToDevicePixels="True" UseLayoutRounding="True">
+ <Grid Width="Auto">
+ <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
+ <StackPanel Orientation="Vertical" >
+ <Grid Width="Auto" Height="Auto" Margin="0,15,0,0" HorizontalAlignment="Center" VerticalAlignment="Center">
+ <Image x:Name="CardImage" Height="60" Width="60" Stretch="Uniform"/>
+ </Grid>
+ <TextBlock x:Name="CardTitle" Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="Title"/>
+ <TextBlock x:Name="CardText" Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="Text"/>
+ <Button x:Name="CardButton" Content="Content" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="CardButton_PreviewMouseDown"/>
+ </StackPanel>
+ </Border>
+ </Grid>
+</UserControl>
diff --git a/.Source/GTweak/Assets/UserControl/Card.xaml.cs b/.Source/GTweak/Assets/UserControl/Card.xaml.cs
new file mode 100644
index 00000000..c779525f
--- /dev/null
+++ b/.Source/GTweak/Assets/UserControl/Card.xaml.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace GTweak.Assets.UserControl
+{
+ public partial class Card
+ {
+ /// <summary>
+ /// Custom Event - Processing keypresses only for the button
+ /// </summary>
+ internal event EventHandler ClickButton;
+
+ internal ImageSource ImageSource { get => CardImage.Source; set { CardImage.Source = value; } }
+ internal DynamicResourceExtension Title { set => CardTitle.SetResourceReference(TextBlock.TextProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey)); }
+ internal DynamicResourceExtension Description { set => CardText.SetResourceReference(TextBlock.TextProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey)); }
+ internal DynamicResourceExtension BtnContent { set => CardButton.SetResourceReference(ContentProperty, new DynamicResourceExtensionConverter().ConvertToString(value.ResourceKey)); }
+
+ internal static readonly DependencyProperty TextProperty =
+ DependencyProperty.Register("DescriptionBlock", typeof(string), typeof(TextBlock), new PropertyMetadata("", (s, e) => ((TextBlock)s).Text = (string)e.NewValue));
+
+ internal new static readonly DependencyProperty ContentProperty =
+ DependencyProperty.Register("ContentButton", typeof(string), typeof(Button), new PropertyMetadata("", (s, e) => ((Button)s).Content = (string)e.NewValue));
+
+ public Card()
+ {
+ InitializeComponent();
+ }
+
+ private void CardButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ {
+ if (e.LeftButton == MouseButtonState.Pressed && ClickButton != null)
+ {
+ ClickButton(this, EventArgs.Empty);
+ }
+ }
+ }
+}
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index b87a1c75..00bf33ab 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -242,6 +242,9 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
+ <Compile Include="Assets\UserControl\Card.xaml.cs">
+ <DependentUpon>Card.xaml</DependentUpon>
+ </Compile>
<Compile Include="Core\Model\MainModel.cs" />
<Compile Include="Utilities\BlockRunTweaker.cs" />
<Compile Include="Utilities\DisablingWinKeys.cs" />
@@ -297,6 +300,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Assets\UserControl\Card.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Assets\UserControl\ToggleButton.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
diff --git a/.Source/GTweak/Languages/en/Lang.xaml b/.Source/GTweak/Languages/en/Lang.xaml
index 57af2885..285ff333 100644
--- a/.Source/GTweak/Languages/en/Lang.xaml
+++ b/.Source/GTweak/Languages/en/Lang.xaml
@@ -250,7 +250,7 @@
<!--#region Services Page -->
<v:String x:Key="tgl1_services">Services related to Windows Search</v:String>
<v:String x:Key="tgl2_services">Services related to Xbox</v:String>
- <v:String x:Key="tgl3_services">Services related to the operation of USB modems</v:String>
+ <v:String x:Key="tgl3_services">Services related to USB modems and routers</v:String>
<v:String x:Key="tgl4_services">Services related to Windows Store</v:String>
<v:String x:Key="tgl5_services">Performance Counter Services</v:String>
<v:String x:Key="tgl6_services">Windows Biometric Service</v:String>
diff --git a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
index 60a41c67..e19af30a 100644
--- a/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
+++ b/.Source/GTweak/Utilities/Tweaks/ClearingMemory.cs
@@ -7,6 +7,7 @@ using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
+using XamlRadialProgressBar;
namespace GTweak.Utilities.Tweaks
{
@@ -174,16 +175,48 @@ namespace GTweak.Utilities.Tweaks
return num != 0;
}
- private static void ClearTempSystemCache()
+ private static async void ClearTempSystemCache()
{
Process.Start(new ProcessStartInfo()
{
- Arguments = @"/c rd /s /q " + Settings.PathSystemDisk + @"Windows\Temp & rd /s /q %localappdata%\Temp &
- del /a /q ""%localappdata%\IconCache.db"" & del /a /f /q ""%localappdata%\Microsoft\Windows\Explorer\iconcache*""",
+ Arguments = @"/c rd /s /q " + Settings.PathSystemDisk + @"Windows\Temp & rd /s /q %localappdata%\Temp",
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true,
FileName = "cmd.exe"
});
+
+ foreach (Process process in Process.GetProcesses())
+ {
+ try
+ {
+ if (string.Compare(process.MainModule?.FileName, $"{Environment.GetEnvironmentVariable("WINDIR")}\\{"explorer.exe"}", StringComparison.OrdinalIgnoreCase) == 0)
+ {
+ process.Kill();
+ Process.Start(new ProcessStartInfo()
+ {
+ Arguments = @"/c attrib -h -r -s IconCache.db & del /a /q ""%localappdata%\IconCache.db"" & del /a /f /q ""%localappdata%\Microsoft\Windows\Explorer\iconcache*""",
+ WindowStyle = ProcessWindowStyle.Hidden,
+ CreateNoWindow = true,
+ FileName = "cmd.exe"
+ });
+ await Task.Delay(100);
+ process.Start();
+ }
+ }
+ catch (Exception ex) { Debug.WriteLine(ex.Message.ToString()); }
+ finally
+ {
+ Process[] explorer = Process.GetProcessesByName("explorer");
+ if (explorer.Length == 0)
+ {
+ using Process launchExplorer = new Process();
+ launchExplorer.StartInfo.FileName = $"{Environment.GetEnvironmentVariable("WINDIR")}\\{"explorer.exe"}";
+ launchExplorer.StartInfo.UseShellExecute = true;
+ launchExplorer.Start();
+ }
+
+ }
+ }
}
internal static void StartMemoryCleanup()
diff --git a/.Source/GTweak/View/MoreView.xaml b/.Source/GTweak/View/MoreView.xaml
index 4dde9702..7017b3ff 100644
--- a/.Source/GTweak/View/MoreView.xaml
+++ b/.Source/GTweak/View/MoreView.xaml
@@ -1,9 +1,10 @@
-<UserControl x:Class="GTweak.View.MoreView"
+<UserControl
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.View"
+ xmlns:UserControl="clr-namespace:GTweak.Assets.UserControl" x:Class="GTweak.View.MoreView"
mc:Ignorable="d"
d:DesignHeight="550" d:DesignWidth="1100"
Style="{StaticResource LaunchPage}">
@@ -14,11 +15,7 @@
</Grid.RowDefinitions>
<Grid Grid.Row="0">
- <TextBlock Width="Auto" Height="auto" FontFamily="{StaticResource Jura}" FontSize="13pt" Foreground="{StaticResource Color_TetBlock_Inactivity}" HorizontalAlignment="Center" VerticalAlignment="Top" KeyboardNavigation.IsTabStop="False" Margin="0,10,0,0">
- <Run Text="{DynamicResource text0_more}"/>
- <Run Text="{DynamicResource text1_more}" Foreground="{StaticResource Color_Accent}"/>
- <Run Text="{DynamicResource text2_more}"/>
- </TextBlock>
+ <TextBlock Width="Auto" Height="auto" FontFamily="{StaticResource Jura}" FontSize="13pt" Foreground="{StaticResource Color_TetBlock_Inactivity}" HorizontalAlignment="Center" VerticalAlignment="Top" KeyboardNavigation.IsTabStop="False" Margin="0,10,0,0"><Run Text="{DynamicResource text0_more}"/><Run Text=" "/><Run Text="{DynamicResource text1_more}" Foreground="{StaticResource Color_Accent}"/><Run Text=" "/><Run Text="{DynamicResource text2_more}"/></TextBlock>
</Grid>
<Grid Grid.Row="1" Margin="0,20,0,0">
@@ -34,56 +31,17 @@
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
-
+
<Grid Grid.Column="0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
- <StackPanel Orientation="Vertical" >
- <Image Height="60" Width="60" Margin="0,15,0,0" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_LicenseWindows}"/>
- </Style>
- </Image.Style>
- </Image>
- <TextBlock Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_licens_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_licens_more}"/>
- <Button x:Name="BtnWinLicense" Content="{DynamicResource btntext_licens_more}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnWinLicense_PreviewMouseDown"/>
- </StackPanel>
- </Border>
+ <UserControl:Card ImageSource="{StaticResource DI_LicenseWindows}" Title="{DynamicResource title_licens_more}" Description="{DynamicResource text_licens_more}" BtnContent="{DynamicResource btntext_licens_more}" ClickButton="BtnLicenseWindows_ClickButton"/>
</Grid>
<Grid Grid.Column="1">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
- <StackPanel Orientation="Vertical" >
- <Image Height="60" Width="60" Margin="0,15,0,0" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_BackupSystem}"/>
- </Style>
- </Image.Style>
- </Image>
- <TextBlock Style="{StaticResource Text}" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_createpoint_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_createpoint_more}"/>
- <Button x:Name="BtnRestorePoint" Content="{DynamicResource btntext_createpoint_more}" FontSize="10pt" VerticalAlignment="Bottom" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnRestorePoint_PreviewMouseDown"/>
- </StackPanel>
- </Border>
+ <UserControl:Card ImageSource="{StaticResource DI_BackupSystem}" Title="{DynamicResource title_createpoint_more}" Description="{DynamicResource text_createpoint_more}" BtnContent="{DynamicResource btntext_createpoint_more}" ClickButton="BtnRestorePoint_ClickButton"/>
</Grid>
<Grid Grid.Column="2">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
- <StackPanel Orientation="Vertical" >
- <Image Height="60" Width="60" Margin="0,15,0,0" Stretch="Uniform" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_RecoverySystem}"/>
- </Style>
- </Image.Style>
- </Image>
- <TextBlock Style="{StaticResource Text}" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_recovery_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_recovery_more}"/>
- <Button x:Name="BtnRecoveyLaunch" Content="{DynamicResource btntext_recovery_more}" FontSize="10pt" VerticalAlignment="Bottom" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnRecoveyLaunch_PreviewMouseDown"/>
- </StackPanel>
- </Border>
+ <UserControl:Card x:Name="CardRecoveyLaunch" ImageSource="{StaticResource DI_RecoverySystem}" Title="{DynamicResource title_recovery_more}" Description="{DynamicResource text_recovery_more}" BtnContent="{DynamicResource btntext_recovery_more}" ClickButton="BtnRecoveyLaunch_ClickButton"/>
</Grid>
</Grid>
@@ -94,42 +52,14 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Margin="180,0,0,0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
- <StackPanel Orientation="Vertical" >
- <Image Height="60" Width="60" Stretch="Uniform" Margin="0,15,0,0" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_Trash}"/>
- </Style>
- </Image.Style>
- </Image>
- <TextBlock Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_clear_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_clear_more}"/>
- <Button x:Name="BtnClear" Content="{DynamicResource btntext_clear_more}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnClear_PreviewMouseDown"/>
- </StackPanel>
- </Border>
+ <UserControl:Card ImageSource="{StaticResource DI_Trash}" Title="{DynamicResource title_clear_more}" Description="{DynamicResource text_clear_more}" BtnContent="{DynamicResource btntext_clear_more}" ClickButton="BtnClear_ClickButton"/>
</Grid>
<Grid Grid.Column="1" Margin="0,0,180,0">
- <Border CornerRadius="10" Height="230" Width="230" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Color_Background_Dark}" Margin="0,-30,0,0">
- <StackPanel Orientation="Vertical" >
- <Image Height="60" Width="60" Stretch="Uniform" Margin="0,15,0,0" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Setter Property="Source" Value="{StaticResource DI_DisableRecovery}"/>
- </Style>
- </Image.Style>
- </Image>
- <TextBlock Style="{StaticResource Text}" Margin="0,5,0,0" FontSize="11pt" Width="Auto" Height="Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource title_disablepoint_more}"/>
- <TextBlock Style="{StaticResource Text}" Foreground="{StaticResource Color_TetBlock_Inactivity}" Margin="0,10,0,0" FontSize="11pt" Width="218" Height="70" HorizontalAlignment="Center" TextAlignment="Center" Text="{DynamicResource text_disablepoint_more}"/>
- <Button x:Name="BtnDisableRecovery" Content="{DynamicResource btntext_disablepoint_more}" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="150" Height="30" Margin="0,10,0,0" Cursor="Hand" PreviewMouseDown="BtnDisableRecovery_PreviewMouseDown"/>
- </StackPanel>
- </Border>
+ <UserControl:Card ImageSource="{StaticResource DI_DisableRecovery}" Title="{DynamicResource title_disablepoint_more}" Description="{DynamicResource text_disablepoint_more}" BtnContent="{DynamicResource btntext_disablepoint_more}" ClickButton="BtnDisableRecovery_ClickButton"/>
</Grid>
</Grid>
-
</Grid>
</Grid>
</Grid>
-
</UserControl>
diff --git a/.Source/GTweak/View/MoreView.xaml.cs b/.Source/GTweak/View/MoreView.xaml.cs
index 77b6232b..c9c8f869 100644
--- a/.Source/GTweak/View/MoreView.xaml.cs
+++ b/.Source/GTweak/View/MoreView.xaml.cs
@@ -5,7 +5,6 @@ using System.ComponentModel;
using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows.Controls;
-using System.Windows.Input;
namespace GTweak.View
{
@@ -16,66 +15,54 @@ namespace GTweak.View
InitializeComponent();
}
- private async void BtnRestorePoint_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ private void BtnLicenseWindows_ClickButton(object sender, EventArgs e)
{
- if (e.LeftButton == MouseButtonState.Pressed)
- {
- if (RecoveryPoint.IsAlreadyPoint() == false)
- {
- new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("createpoint_notification"));
-
- await Task.Delay(100);
-
- BackgroundWorker backgroundWorker = new BackgroundWorker();
- backgroundWorker.DoWork += delegate
- {
- try { RecoveryPoint.Create((string)FindResource("textpoint_more")); }
- catch { new ViewNotification().Show("", (string)FindResource("title0_notification"), (string)FindResource("notsuccessfulpoint_notification")); }
- finally { new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("successpoint_notification")); };
- };
- backgroundWorker.RunWorkerCompleted += delegate
- {
- new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("successpoint_notification"));
- backgroundWorker.Dispose();
- };
- backgroundWorker.RunWorkerAsync();
- }
- else
- new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("readypoint_notification"));
- }
- }
+ if (WindowsLicense.statusLicense == 1)
+ new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("readyactivate_notification"));
- private void BtnRecoveyLaunch_PreviewMouseDown(object sender, MouseButtonEventArgs e)
- {
- if (e.LeftButton == MouseButtonState.Pressed)
+ else if (WindowsLicense.statusLicense != 1)
{
- try { RecoveryPoint.Run(); }
- catch { new ViewNotification().Show("", (string)FindResource("title0_notification"), (string)FindResource("notsuccessfulrecovery_notification")); }
+ new ViewNotification().Show("", (string)FindResource("title0_notification"), (string)FindResource("activatewin_notification"));
+ WindowsLicense.StartActivation();
}
}
- private void BtnWinLicense_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ private async void BtnRestorePoint_ClickButton(object sender, EventArgs e)
{
- if (e.LeftButton == MouseButtonState.Pressed)
+ if (RecoveryPoint.IsAlreadyPoint() == false)
{
- if (WindowsLicense.statusLicense == 1)
- new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("readyactivate_notification"));
+ new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("createpoint_notification"));
+
+ await Task.Delay(100);
- else if (WindowsLicense.statusLicense != 1)
+ BackgroundWorker backgroundWorker = new BackgroundWorker();
+ backgroundWorker.DoWork += delegate
{
- new ViewNotification().Show("", (string)FindResource("title0_notification"), (string)FindResource("activatewin_notification"));
- WindowsLicense.StartActivation();
- }
+ try { RecoveryPoint.Create((string)FindResource("textpoint_more")); }
+ catch { new ViewNotification().Show("", (string)FindResource("title0_notification"), (string)FindResource("notsuccessfulpoint_notification")); }
+ finally { new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("successpoint_notification")); };
+ };
+ backgroundWorker.RunWorkerCompleted += delegate
+ {
+ new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("successpoint_notification"));
+ backgroundWorker.Dispose();
+ };
+ backgroundWorker.RunWorkerAsync();
}
+ else
+ new ViewNotification().Show("", (string)FindResource("title1_notification"), (string)FindResource("readypoint_notification"));
}
- private void BtnClear_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ private void BtnRecoveyLaunch_ClickButton(object sender, EventArgs e)
{
- if (e.LeftButton == MouseButtonState.Pressed)
- ClearingMemory.StartMemoryCleanup();
+ try { RecoveryPoint.Run(); }
+ catch { new ViewNotification().Show("", (string)FindResource("title0_notification"), (string)FindResource("notsuccessfulrecovery_notification")); }
}
- private void BtnDisableRecovery_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+ private void BtnClear_ClickButton(object sender, EventArgs e) => ClearingMemory.StartMemoryCleanup();
+
+
+ private void BtnDisableRecovery_ClickButton(object sender, EventArgs e)
{
if (!RecoveryPoint.IsSystemRestoreDisabled())
{
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index b386e11b..a56a7b5f 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -158,7 +158,7 @@
<Border HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="1" Height="550" Background="{StaticResource Color_Background_Dark}" CornerRadius="10 0 0 10">
<Border.Effect>
- <DropShadowEffect BlurRadius="10" ShadowDepth="1" Direction="-90" Color="{StaticResource Color_Shadow}" />
+ <DropShadowEffect BlurRadius="10" ShadowDepth="1" Direction="-90" Color="#000000" />
</Border.Effect>
</Border>
@@ -244,9 +244,27 @@
<Grid Grid.Column="0">
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
- <Image x:Uid="git" Source="{StaticResource DI_Git}" Style="{StaticResource Apps}" Width="31" Height="auto" PreviewMouseDown="BtnContats_PreviewMouseDown" Cursor="Hand"/>
- <Image x:Uid="tg" Source="{StaticResource DI_Telegram}" Style="{StaticResource Apps}" Width="31" Height="auto" PreviewMouseDown="BtnContats_PreviewMouseDown" Cursor="Hand"/>
- <Image x:Uid="steam" Source="{StaticResource DI_Steam}" Style="{StaticResource Apps}" Width="31" Height="auto" PreviewMouseDown="BtnContats_PreviewMouseDown" Cursor="Hand"/>
+ <Image x:Uid="git" Width="31" Height="auto" PreviewMouseDown="BtnContats_PreviewMouseDown" Cursor="Hand">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource DI_Git}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Uid="tg" Width="31" Height="auto" PreviewMouseDown="BtnContats_PreviewMouseDown" Cursor="Hand">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource DI_Telegram}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Uid="steam" Width="31" Height="auto" PreviewMouseDown="BtnContats_PreviewMouseDown" Cursor="Hand">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource DI_Steam}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
</Grid>
<Grid Grid.Column="1">
@@ -258,7 +276,7 @@
</Grid>
</Grid>
- <Grid x:Name="NavigationBar" Grid.Row="2">
+ <Grid x:Name="Sidebar" Grid.Row="2">
<Border Background="{DynamicResource Color_Background_Dark}" CornerRadius="0,0,7,7">
<Grid>
<Grid.ColumnDefinitions>