Skip to content

Commit

Permalink
Improving multilingual feature of AppControl Manager (#597)
Browse files Browse the repository at this point in the history 
Made lots of changes to the XAML to separate the strings from the code to make it easier to translate the AppControl Manager into other languages.

More changes like this will be made in the future to make the AppControl Manager completely and easily translatable to any other languages.

Improved a log message to be more accurate.
  • Loading branch information
@HotCakeX
HotCakeX authored Feb 14, 2025
1 parent 10fc39a commit 5870d79
Show file tree
Hide file tree
Showing 30 changed files with 528 additions and 356 deletions.
4 changes: 2 additions & 2 deletions AppControl Manager/CustomUIElements/SigningDetailsDialog.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<controls:WrapPanel Orientation="Vertical" VerticalSpacing="10" HorizontalSpacing="10">

<Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" Content="Browse"/>
<Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" x:Uid="FileBrowseButton"/>
<TextBox MaxWidth="700" x:Name="CertFilePathTextBox" TextWrapping="Wrap" PlaceholderText=".cer file path" />

</controls:WrapPanel>
Expand Down Expand Up @@ -105,7 +105,7 @@
<TextBlock Text="Auto Acquire" Margin="0,8.7,0,0" />
</StackPanel>

<Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" Content="Browse"/>
<Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" x:Uid="FileBrowseButton"/>
<TextBox MaxWidth="700" x:Name="SignToolPathTextBox" PlaceholderText="SignTool.exe Path" TextWrapping="Wrap"/>

</controls:WrapPanel>
Expand Down
6 changes: 3 additions & 3 deletions AppControl Manager/CustomUIElements/SigningDetailsDialogForRemoval.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

<controls:WrapPanel Orientation="Vertical" VerticalSpacing="10" HorizontalSpacing="10">

<Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" Content="Browse"/>
<Button x:Name="CertFileBrowseButton" HorizontalAlignment="Center" Click="CertFileBrowseButton_Click" x:Uid="FileBrowseButton"/>
<TextBox MaxWidth="700" x:Name="CertFilePathTextBox" TextWrapping="Wrap" PlaceholderText=".cer file path" />

</controls:WrapPanel>
Expand Down Expand Up @@ -105,7 +105,7 @@
<TextBlock Text="Auto Acquire" Margin="0,8.7,0,0" />
</StackPanel>

<Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" Content="Browse"/>
<Button x:Name="SignToolBrowseButton" Click="SignToolBrowseButton_Click" HorizontalAlignment="Center" x:Uid="FileBrowseButton"/>
<TextBox MaxWidth="700" x:Name="SignToolPathTextBox" PlaceholderText="SignTool.exe Path" TextWrapping="Wrap"/>

</controls:WrapPanel>
Expand All @@ -121,7 +121,7 @@

<controls:WrapPanel VerticalSpacing="10" HorizontalSpacing="10" Orientation="Vertical">

<Button x:Name="XMLPolicyFileBrowseButton" Click="XMLPolicyFileBrowseButton_Click" HorizontalAlignment="Center" Content="Browse"/>
<Button x:Name="XMLPolicyFileBrowseButton" Click="XMLPolicyFileBrowseButton_Click" HorizontalAlignment="Center" x:Uid="FileBrowseButton"/>

<TextBox MaxWidth="700" x:Name="XMLPolicyFileTextBox" PlaceholderText="XML file path" TextWrapping="Wrap"/>

Expand Down
2 changes: 1 addition & 1 deletion AppControl Manager/IntelGathering/FileIdentityTimeBasedHashSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public bool Add(FileIdentity item)
if (existingItem.TimeCreated.HasValue && item.TimeCreated.HasValue &&
existingItem.TimeCreated < item.TimeCreated)
{
Logger.Write($"Replacing an older FileIdentity item with a newer one in MDE Advanced Hunting Logs " +
Logger.Write($"Replacing an older FileIdentity item with a newer one in the Logs " +
$"for the file with name {existingItem.FileName} and SHA256 hash {existingItem.SHA256Hash}.");

// Remove the existing older item and add the newer one
Expand Down
20 changes: 10 additions & 10 deletions AppControl Manager/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@

<!-- App icon -->
<Image x:Name="TitleBarIcon" Source="ms-appx:///Assets/StoreLogo.png" Grid.Column="3"
Width="16" Height="16"
Margin="8,0,4,0"/>
Width="16" Height="16"
Margin="8,0,4,0"/>

<!-- App title bar -->
<TextBlock x:Name="TitleBarTextBlock"
Expand All @@ -118,7 +118,7 @@
VerticalAlignment="Center"
MaxWidth="600" TextChanged="SearchBox_TextChanged"
SuggestionChosen="SearchBox_SuggestionChosen"
PlaceholderText="Search menu items..." Margin="0"/>
x:Uid="MainSearchAutoSuggestBox" Margin="0"/>

<!-- Sidebar access point -->
<Button x:Name="SidebarButton" Click="SidebarButton_Click" Grid.Column="8"
Expand Down Expand Up @@ -228,7 +228,7 @@

<NavigationView.FooterMenuItems>

<NavigationViewItem x:Name="UpdateNavItem" Content="Update" ToolTipService.ToolTip="Check for updates">
<NavigationViewItem x:Name="UpdateNavItem" x:Uid="UpdateNavItem">
<NavigationViewItem.InfoBadge>
<InfoBadge x:Name="AvailableUpdateInfoBadge"
Opacity="{x:Bind ViewModel.InfoBadgeOpacity, Mode=OneWay}"
Expand Down Expand Up @@ -349,12 +349,12 @@

<HyperlinkButton HorizontalAlignment="Center" ToolTipService.ToolTip="Sidebar usage guide on GitHub wiki" Content="Sidebar Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Sidebar" />

<Button HorizontalAlignment="Center" x:Name="OpenConfigDirectoryButton" ToolTipService.ToolTip="Open the directory where user configurations and user generated files are stored" Click="OpenConfigDirectoryButton_Click">
<Button HorizontalAlignment="Center" x:Name="OpenConfigDirectoryButton" x:Uid="OpenConfigDirectoryButton" Click="OpenConfigDirectoryButton_Click">
<Button.Content>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
<FontIcon Glyph="&#xE8A7;" Margin="0,0,8,0" />
<TextBlock Text="Open User Config Directory"/>
<TextBlock x:Uid="OpenConfigDirectoryButtonText"/>
</StackPanel>
</StackPanel>
</Button.Content>
Expand Down Expand Up @@ -392,10 +392,10 @@

<!-- Note the use of a TwoWay binding here, this is required for this control to work. -->
<controls:PropertySizer HorizontalAlignment="Left" Grid.Row="1"
Binding="{x:Bind MainNavigation.OpenPaneLength, Mode=TwoWay}"
Maximum="640"
Minimum="60"
Visibility="{x:Bind MainNavigation.IsPaneOpen, Mode=OneWay}" />
Binding="{x:Bind MainNavigation.OpenPaneLength, Mode=TwoWay}"
Maximum="640"
Minimum="60"
Visibility="{x:Bind MainNavigation.IsPaneOpen, Mode=OneWay}" />

<!-- Global margin settings for every page's content -->
<Frame x:Name="ContentFrame" Margin="15,15,15,10" Grid.Row="1" />
Expand Down
10 changes: 5 additions & 5 deletions AppControl Manager/Pages/AllowNewApps/AllowNewApps.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@

<NavigationView.MenuItems>

<NavigationViewItem Content="Start allowing apps or files" ToolTipService.ToolTip="Start" Tag="Start" >
<NavigationViewItem x:Uid="AllowNewAppsInternalMainNavItem" Tag="Start" >
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xE83D;" />
</NavigationViewItem.Icon>
</NavigationViewItem>

<NavigationViewItem Content="Review the Local Files" ToolTipService.ToolTip="Local Files" Tag="LocalFiles" >
<NavigationViewItem x:Uid="ReviewLocalFilesNavItem" Tag="LocalFiles" >
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xE83D;" />
</NavigationViewItem.Icon>
Expand All @@ -49,15 +49,15 @@

</NavigationViewItem>

<NavigationViewItem Content="Review the Event Logs" ToolTipService.ToolTip="Event Logs" Tag="EventLogs" >
<NavigationViewItem x:Uid="ReviewEventLogsNavItem" Tag="EventLogs" >
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xE964;" />
</NavigationViewItem.Icon>

<NavigationViewItem.InfoBadge>
<InfoBadge x:Name="EventLogsCountInfoBadge"
Value="0" Opacity="0"
Style="{ThemeResource AttentionIconInfoBadgeStyle}">
Value="0" Opacity="0"
Style="{ThemeResource AttentionIconInfoBadgeStyle}">
<InfoBadge.IconSource>
<FontIconSource Glyph="&#xEA6A;"/>
</InfoBadge.IconSource>
Expand Down
14 changes: 7 additions & 7 deletions AppControl Manager/Pages/AllowNewApps/AllowNewAppsEventLogsDataGrid.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@

<ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />

<DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
<DropDownButton x:Uid="ExtraActionsDropDownButton">
<DropDownButton.Flyout>

<MenuFlyout Placement="Bottom">

<MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
<MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE762;"/>
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>

<MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
<MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE8E6;"/>
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>

<MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
<MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
<MenuFlyoutItem.Icon>
<SymbolIcon Symbol="Delete" />
</MenuFlyoutItem.Icon>
Expand All @@ -52,13 +52,13 @@
</DropDownButton.Flyout>
</DropDownButton>

<TextBox PlaceholderText="Total logs: 0"
<TextBox x:Uid="TotalLogsTextBlock"
x:Name="TotalCountOfTheFilesTextBox"
IsReadOnly="True"
VerticalAlignment="Center"
VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the logs"/>
VerticalContentAlignment="Center"/>

<TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
<TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />

</controls:WrapPanel>
</Border>
Expand Down
10 changes: 5 additions & 5 deletions AppControl Manager/Pages/AllowNewApps/AllowNewAppsLocalFilesDataGrid.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@

<ProgressRing x:Name="SelectLogsProgressRing" Visibility="Collapsed" IsActive="False" />

<DropDownButton Content="Actions" ToolTipService.ToolTip="Multiple actions to take on the logs">
<DropDownButton x:Uid="ExtraActionsDropDownButton">
<DropDownButton.Flyout>

<MenuFlyout Placement="Bottom">

<MenuFlyoutItem Text="Select All" Click="SelectAll_Click">
<MenuFlyoutItem x:Uid="SelectAllMenuFlyoutItem" Click="SelectAll_Click">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE762;"/>
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>

<MenuFlyoutItem Text="De-Select All" Click="DeSelectAll_Click">
<MenuFlyoutItem x:Uid="DeSelectAllMenuFlyoutItem" Click="DeSelectAll_Click">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE8E6;"/>
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>

<MenuFlyoutItem Text="Clear Data" Click="ClearDataButton_Click" ToolTipService.ToolTip="Clears all of the displayed data">
<MenuFlyoutItem Click="ClearDataButton_Click" x:Uid="ClearDataMenuFlyoutItem">
<MenuFlyoutItem.Icon>
<SymbolIcon Symbol="Delete" />
</MenuFlyoutItem.Icon>
Expand All @@ -58,7 +58,7 @@
VerticalAlignment="Center"
VerticalContentAlignment="Center" ToolTipService.ToolTip="The total number of the files"/>

<TextBox x:Name="SearchBox" Width="300" PlaceholderText="Search data..." TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTipService.ToolTip="Search the data" />
<TextBox x:Name="SearchBox" Width="300" x:Uid="SearchBoxTextBox" TextChanged="SearchBox_TextChanged" VerticalAlignment="Center" VerticalContentAlignment="Center" />

</controls:WrapPanel>
</Border>
Expand Down
11 changes: 5 additions & 6 deletions AppControl Manager/Pages/AllowNewApps/AllowNewAppsStart.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@
<controls:WrapPanel Grid.Row="0" VerticalSpacing="15" HorizontalSpacing="15" Orientation="Horizontal" Margin="6,10,6,5">

<TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">

<Span>
Use this page to <Run Foreground="{ThemeResource SystemAccentColor}">Allow</Run>
new or already installed apps or files to run on the system.
</Span>
</TextBlock>

<HyperlinkButton Margin="0,-8,0,8" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Allow-New-Apps" />
<HyperlinkButton Margin="0,-8,0,8" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Allow-New-Apps" />

<StackPanel Orientation="Horizontal" Spacing="15" Margin="0,-6,0,10">

Expand Down Expand Up @@ -79,9 +78,9 @@

<controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">

<Button Content="Clear" Click="BrowseForXMLPolicyButton_Flyout_Clear_Click" />
<Button x:Uid="ClearButton" Click="BrowseForXMLPolicyButton_Flyout_Clear_Click" />

<TextBlock Text="View the Base policy path you selected." TextWrapping="WrapWholeWords" />
<TextBlock x:Uid="ViewSelectedBasePolicyTextBlock" TextWrapping="WrapWholeWords" />

<TextBox x:Name="BrowseForXMLPolicyButton_SelectedBasePolicyTextBox"
TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="False"
Expand Down Expand Up @@ -154,9 +153,9 @@ LargeChange="10" Minimum="2" Maximum="1000000" ValueChanged="LogSizeNumberBox_Va

<controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">

<Button Content="Clear" Click="ClearSelectedDirectoriesButton_Click" />
<Button x:Uid="ClearButton" Click="ClearSelectedDirectoriesButton_Click" />

<TextBlock Text="View the directories you selected." TextWrapping="WrapWholeWords" Width="400" />
<TextBlock x:Uid="ViewSelectedFoldersTextBlock" TextWrapping="WrapWholeWords" Width="400" />

<TextBox x:Name="SelectedDirectoriesTextBox"
TextWrapping="Wrap" AcceptsReturn="True" IsSpellCheckEnabled="True"
Expand Down
3 changes: 1 addition & 2 deletions AppControl Manager/Pages/BuildNewCertificate.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@
<controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,5,6,5">

<TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">

<Span>
Build <Bold>Code Signing</Bold> Certificates that are suitable for signing <Run Foreground="{ThemeResource SystemAccentColor}">App Control</Run> Policies.
</Span>
</TextBlock>

<HyperlinkButton Margin="0,-6,0,0" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Build-New-Certificate" />
<HyperlinkButton Margin="0,-6,0,0" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Build-New-Certificate" />

</controls:WrapPanel>

Expand Down
9 changes: 4 additions & 5 deletions AppControl Manager/Pages/ConfigurePolicyRuleOptions.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@
<controls:WrapPanel Grid.Row="0" VerticalSpacing="4" HorizontalSpacing="4" Orientation="Horizontal" Margin="6,5,6,5">

<TextBlock TextWrapping="WrapWholeWords" Style="{StaticResource BodyTextBlockStyle}">

<Span>
Configure <Italic>App Control for Business</Italic>
<Span>
Configure <Italic>App Control for Business</Italic>
<Run Foreground="{ThemeResource SystemAccentColor}">policies'</Run>
<Bold>rule options</Bold>.
</Span>
</TextBlock>

<HyperlinkButton Margin="0,-6,0,0" Content="Guide" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Configure-Policy-Rule-Options" />
<HyperlinkButton Margin="0,-6,0,0" x:Uid="GuideButtonAtTop" NavigateUri="https://github.com/HotCakeX/Harden-Windows-Security/wiki/Configure-Policy-Rule-Options" />

</controls:WrapPanel>

Expand All @@ -44,7 +43,7 @@

<controls:WrapPanel Orientation="Vertical" HorizontalSpacing="15" VerticalSpacing="15">

<Button Content="Clear" Click="PickPolicyFileButton_FlyOut_Clear_Click" />
<Button x:Uid="ClearButton" Click="PickPolicyFileButton_FlyOut_Clear_Click" />

<TextBlock Text="View the policy path you selected." TextWrapping="WrapWholeWords" />

Expand Down
Loading

0 comments on commit 5870d79

Please sign in to comment.