Skip to content

Portable Tool for an Ideal Windows Setup

chng. update banner

Greedeks849d56e4ed85
diff --git a/.Source/GTweak/Utilities/Maintenance/WindowsLicense.cs b/.Source/GTweak/Utilities/Maintenance/WindowsLicense.cs
index f6ceccc7..ade9b796 100644
--- a/.Source/GTweak/Utilities/Maintenance/WindowsLicense.cs
+++ b/.Source/GTweak/Utilities/Maintenance/WindowsLicense.cs
@@ -34,8 +34,12 @@ namespace GTweak.Utilities.Maintenance
}
catch (COMException)
{
- string output = await CommandExecutor.GetCommandOutput("cscript //B \"$env:windir\\system32\\slmgr.vbs\" /ato; $code = $LASTEXITCODE; ($code -eq 0 -or $code -eq -2147024773)", true);
- bool.TryParse(output, out IsWindowsActivated);
+ try
+ {
+ string output = await CommandExecutor.GetCommandOutput("cscript //B \"$env:windir\\system32\\slmgr.vbs\" /ato; $code = $LASTEXITCODE; ($code -eq 0 -or $code -eq -2147024773)", true);
+ bool.TryParse(output, out IsWindowsActivated);
+ }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index ddb4e1c4..49e878e2 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -273,35 +273,43 @@
</Grid>
- <Border x:Name="UpdateBanner" Visibility="Collapsed" Grid.Row="2" Panel.ZIndex="200" Opacity="0" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,10,0,0" Background="{StaticResource Brush_Background_NavPanel}" CornerRadius="7" Padding="10,10">
- <Border.RenderTransform>
+ <Grid x:Name="UpdateBanner" Grid.Row="2" Panel.ZIndex="200" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,12,0,0" Visibility="Collapsed" Opacity="0">
+ <Grid.RenderTransform>
<TranslateTransform Y="-20"/>
- </Border.RenderTransform>
- <Border.Effect>
- <DropShadowEffect Opacity="0.3"/>
- </Border.Effect>
- <StackPanel Orientation="Horizontal">
- <StackPanel>
- <DockPanel VerticalAlignment="Center" HorizontalAlignment="Left" LastChildFill="True">
- <ui:SymbolIcon Symbol="Note16" FontSize="20px" Foreground="{StaticResource Brush_Accent}" Margin="15,0,0,0" HorizontalAlignment="Center"/>
- <TextBlock Style="{StaticResource TextDefault}" Text="{DynamicResource title_update}" Margin="5,0,0,0"/>
- </DockPanel>
- <TextBlock Style="{StaticResource TextDefault}" Margin="15,0,0,0">
- <Run Text="{Binding CurrentVersion, Mode=OneWay}" Foreground="{StaticResource Brush_Accent}"/>
- <Run Text="➔"/>
- <Run Text="{Binding DownloadVersion, Mode=OneWay}" Foreground="{StaticResource Brush_Accent}"/>
- </TextBlock>
- </StackPanel>
-
- <Button Style="{StaticResource ButtonContent}" HorizontalAlignment="Right" Margin="50,0,0,0" Height="30" PreviewMouseLeftButtonUp="BtnUpdate_PreviewMouseLeftButtonUp">
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ui:SymbolIcon Symbol="ArrowClockwise20" FontSize="15" Margin="0,0,5,0"/>
- <TextBlock Text="{DynamicResource btn_upd}" VerticalAlignment="Center"/>
+ </Grid.RenderTransform>
+
+ <Border Background="#33000000" Opacity="0.7" IsHitTestVisible="False" CornerRadius="10" Panel.ZIndex="0">
+ <Border.RenderTransform>
+ <TranslateTransform X="3" Y="4"/>
+ </Border.RenderTransform>
+ </Border>
+
+ <Border Background="{StaticResource Brush_Background_TextBox}" Padding="14,10" CornerRadius="10" Panel.ZIndex="1" BorderBrush="{StaticResource Brush_Separator}" BorderThickness="1">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="4"/>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+
+ <Border Grid.Column="0" Background="{StaticResource Brush_Separator}" CornerRadius="2"/>
+
+ <ui:SymbolIcon Grid.Column="1" Symbol="Pin20" FontSize="25" Foreground="{StaticResource Brush_Accent}" Margin="12,0,10,0" VerticalAlignment="Center"/>
+
+ <StackPanel Grid.Column="2" VerticalAlignment="Center">
+ <TextBlock Text="{DynamicResource title_update}" Style="{StaticResource TextDefault}"/>
+ <TextBlock FontSize="13" Style="{StaticResource TextDefault}" Foreground="{StaticResource Brush_Inactive}">
+ <Run Text="{Binding CurrentVersion, Mode=OneWay}"/>
+ <Run Text=" → "/>
+ <Run Text="{Binding DownloadVersion, Mode=OneWay}"/>
+ </TextBlock>
</StackPanel>
- </Button>
-
- </StackPanel>
- </Border>
+ <Button Grid.Column="3" Style="{StaticResource ButtonContent_Inverted}" Content="{DynamicResource btn_upd}" Height="28" Margin="16,0,0,0" PreviewMouseLeftButtonUp="BtnUpdate_PreviewMouseLeftButtonUp"/>
+ </Grid>
+ </Border>
+ </Grid>
+
</Grid>
</ui:FluentWindow>
\ No newline at end of file