Hotfix/tool bar style

src/Atc.Wpf.Components/Atc.Wpf.Components.csproj

@@ -57,4 +57,78 @@
     <ProjectReference Include="..\Atc.Wpf\Atc.Wpf.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Resources\DualListSelector.Designer.cs">
+      <DependentUpon>DualListSelector.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+    <Compile Update="Resources\JsonViewer.Designer.cs">
+      <DependentUpon>JsonViewer.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+    <Compile Update="Resources\Miscellaneous.Designer.cs">
+      <DependentUpon>Miscellaneous.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+    <Compile Update="Resources\TerminalViewer.Designer.cs">
+      <DependentUpon>TerminalViewer.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\DualListSelector.da-DK.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\DualListSelector.de-DE.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\DualListSelector.resx">
+      <LastGenOutput>DualListSelector.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\JsonViewer.da-DK.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\JsonViewer.de-DE.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\JsonViewer.resx">
+      <LastGenOutput>JsonViewer.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Miscellaneous.da-DK.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Miscellaneous.de-DE.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\Miscellaneous.resx">
+      <LastGenOutput>Miscellaneous.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\TerminalViewer.da-DK.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\TerminalViewer.de-DE.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Update="Resources\TerminalViewer.resx">
+      <LastGenOutput>TerminalViewer.Designer.cs</LastGenOutput>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBox.xaml

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:atc="https://github.com/atc-net/atc-wpf/tree/main/schemas"
+    xmlns:atcTranslation="https://github.com/atc-net/atc-wpf/tree/main/schemas/translations"
     xmlns:atcValueConverters="https://github.com/atc-net/atc-wpf/tree/main/schemas/value-converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dialogs="clr-namespace:Atc.Wpf.Theming.Themes.Dialogs;assembly=Atc.Wpf.Theming"
@@ -51,7 +52,7 @@
                     Background="{DynamicResource AtcApps.Brushes.ThemeBackground}"
                     Command="{Binding Path=OkCommand}"
                     CommandParameter="{Binding ElementName=DialogApplicationSettings}"
-                    Content="OK"
+                    Content="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Ok}"
                     Foreground="{DynamicResource AtcApps.Brushes.Text}"
                     IsDefault="True" />
                 <Button
@@ -60,7 +61,7 @@
                     Background="{DynamicResource AtcApps.Brushes.ThemeBackground}"
                     Command="{Binding Path=CancelCommand}"
                     CommandParameter="{Binding ElementName=DialogApplicationSettings}"
-                    Content="Cancel"
+                    Content="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Cancel}"
                     Foreground="{DynamicResource AtcApps.Brushes.Text}"
                     IsCancel="True" />
             </atc:UniformSpacingPanel>

src/Atc.Wpf.Components/Dialogs/BasicApplicationSettingsDialogBoxViewModel.cs

@@ -1,3 +1,5 @@
+using SharedMisc = Atc.Wpf.Resources.Miscellaneous;
+
 namespace Atc.Wpf.Components.Dialogs;
 
 public class BasicApplicationSettingsDialogBoxViewModel : ViewModelBase
@@ -19,7 +21,7 @@ public BasicApplicationSettingsDialogBoxViewModel(
         ApplicationSettings = basicApplicationSettingsViewModel.Clone();
         applicationSettingsBackup = basicApplicationSettingsViewModel.Clone();
 
-        TitleBarText = Miscellaneous.ApplicationSettings;
+        TitleBarText = SharedMisc.ApplicationSettings;
 
         ThemeManager.Current.ThemeChanged += OnThemeChanged;
         CultureManager.UiCultureChanged += OnUiCultureChanged;
@@ -49,7 +51,7 @@ public void SetHeaderControlInsteadOfTitleBarText()
             VerticalAlignment = VerticalAlignment.Center,
             Content = new TextBlock
             {
-                Text = Miscellaneous.ApplicationSettings,
+                Text = SharedMisc.ApplicationSettings,
                 FontSize = 24,
             },
         };

src/Atc.Wpf.Components/Flyouts/Flyout.xaml

@@ -1,6 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:atcTranslation="https://github.com/atc-net/atc-wpf/tree/main/schemas/translations"
     xmlns:flyouts="clr-namespace:Atc.Wpf.Components.Flyouts">
 
     <!--  Pin button style  -->
@@ -13,7 +14,7 @@
         <Setter Property="Height" Value="32" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="ToolTip" Value="Pin (keep open)" />
+        <Setter Property="ToolTip" Value="{atcTranslation:Resx ResxName=Atc.Wpf.Components.Resources.Miscellaneous, Key=PinKeepOpen}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Width" Value="32" />
         <Setter Property="Template">
@@ -51,7 +52,7 @@
                                 </Setter.Value>
                             </Setter>
                             <Setter TargetName="PinIcon" Property="Fill" Value="{DynamicResource AtcApps.Brushes.Accent}" />
-                            <Setter Property="ToolTip" Value="Unpin" />
+                            <Setter Property="ToolTip" Value="{atcTranslation:Resx ResxName=Atc.Wpf.Components.Resources.Miscellaneous, Key=Unpin}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="PinIcon" Property="Fill" Value="{DynamicResource AtcApps.Brushes.Gray6}" />
@@ -263,7 +264,7 @@
                                             <Button
                                                 x:Name="PART_CloseButton"
                                                 Style="{StaticResource AtcApps.Styles.Flyout.CloseButton}"
-                                                ToolTip="Close" />
+                                                ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Close}" />
                                         </StackPanel>
                                     </Grid>
                                 </Border>

src/Atc.Wpf.Components/GlobalUsings.cs

@@ -31,7 +31,6 @@
 global using Atc.Wpf.Components.Settings;
 global using Atc.Wpf.Components.ValueConverters;
 global using Atc.Wpf.Controls.Progressing;
-global using Atc.Wpf.Controls.Resources;
 global using Atc.Wpf.Controls.Zoom;
 global using Atc.Wpf.Data;
 global using Atc.Wpf.Dialogs;
@@ -45,6 +44,7 @@
 global using Atc.Wpf.Options;
 global using Atc.Wpf.Printing;
 global using Atc.Wpf.Progressing;
+global using Atc.Wpf.Resources;
 global using Atc.Wpf.Theming.Themes.Dialogs;
 global using Atc.Wpf.Translation;
 global using Atc.Wpf.Viewers.JsonTree;

src/Atc.Wpf.Components/Monitoring/ApplicationMonitorView.xaml

@@ -24,7 +24,7 @@
                             Height="16"
                             Margin="1,1,0,0"
                             Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/eraser.png"
-                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Miscellaneous,
                                                           Key=ClearAll}" />
                     </Button>
 
@@ -34,13 +34,13 @@
                             Height="16"
                             Margin="1,1,0,0"
                             Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/scrollrefresh.png"
-                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
                                                           Key=Auto}" />
                     </ToggleButton>
 
                     <ToggleButton
                         IsChecked="{Binding Path=IsPaused, Mode=TwoWay}"
-                        ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                        ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Components.Resources.Miscellaneous,
                                                       Key=PauseResumeIncomingEntriesTooltip}"
                         Visibility="{Binding Path=ShowPauseInToolbar, Converter={x:Static atcValueConverters:BoolToVisibilityVisibleValueConverter.Instance}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ApplicationMonitorView}}}">
                         <StackPanel Orientation="Horizontal">
@@ -78,7 +78,7 @@
                             Height="16"
                             Margin="1,1,0,0"
                             Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/error.png"
-                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
                                                           Key=Errors}" />
                     </ToggleButton>
 
@@ -88,7 +88,7 @@
                             Height="16"
                             Margin="1,1,0,0"
                             Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/warning.png"
-                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
                                                           Key=Warnings}" />
                     </ToggleButton>
 
@@ -98,7 +98,7 @@
                             Height="16"
                             Margin="1,1,0,0"
                             Source="pack://application:,,,/Atc.Wpf.Components;component/Resources/Images/information.png"
-                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                            ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word,
                                                           Key=Information}" />
                     </ToggleButton>
 
@@ -115,7 +115,7 @@
 
                     <Button
                         Command="{Binding Path=ExportCommand}"
-                        ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                        ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Components.Resources.Miscellaneous,
                                                       Key=ExportVisibleEntriesTooltip}"
                         Visibility="{Binding Path=ShowExportInToolbar, Converter={x:Static atcValueConverters:BoolToVisibilityVisibleValueConverter.Instance}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ApplicationMonitorView}}}">
                         <Grid
@@ -148,15 +148,15 @@
                 <ListView.ContextMenu>
                     <ContextMenu>
                         <!--  ReSharper disable Xaml.BindingWithContextNotResolved  -->
-                        <MenuItem Command="{Binding Path=PlacementTarget.DataContext.CopySelectedCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous, Key=CopySelectedToClipboard}" />
-                        <MenuItem Command="{Binding Path=PlacementTarget.DataContext.CopyAllCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous, Key=CopyAllToClipboard}" />
+                        <MenuItem Command="{Binding Path=PlacementTarget.DataContext.CopySelectedCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Miscellaneous, Key=CopySelectedToClipboard}" />
+                        <MenuItem Command="{Binding Path=PlacementTarget.DataContext.CopyAllCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Miscellaneous, Key=CopyAllToClipboard}" />
                         <!--  ReSharper restore Xaml.BindingWithContextNotResolved  -->
                     </ContextMenu>
                 </ListView.ContextMenu>
                 <ListView.View>
                     <GridView>
 
-                        <GridViewColumn Width="120" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous, Key=Timestamp}">
+                        <GridViewColumn Width="120" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Timestamp}">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate DataType="local:ApplicationEventEntry">
                                     <TextBlock Text="{Binding Path=Timestamp, StringFormat=yyyy-MM-dd HH:mm:ss}" />
@@ -179,7 +179,7 @@
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
 
-                        <GridViewColumn Header="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous, Key=Area}">
+                        <GridViewColumn Header="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Area}">
                             <GridViewColumn.Width>
                                 <MultiBinding Converter="{x:Static atcValueConverters:BoolAndDoubleToDoubleMultiValueConverter.Instance}">
                                     <Binding Path="ShowColumnArea" />
@@ -193,7 +193,7 @@
                             </GridViewColumn.CellTemplate>
                         </GridViewColumn>
 
-                        <GridViewColumn Width="{Binding Path=MessageColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ApplicationMonitorView}}}" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous, Key=Message}">
+                        <GridViewColumn Width="{Binding Path=MessageColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ApplicationMonitorView}}}" Header="{atcTranslation:Resx ResxName=Atc.Wpf.Resources.Word, Key=Message}">
                             <GridViewColumn.CellTemplate>
                                 <DataTemplate DataType="local:ApplicationEventEntry">
                                     <TextBlock Text="{Binding Path=Message}" />
@@ -213,14 +213,14 @@
                 Background="{DynamicResource AtcApps.Brushes.Accent}"
                 Click="OnJumpToLiveClick"
                 Foreground="White"
-                ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                ToolTip="{atcTranslation:Resx ResxName=Atc.Wpf.Components.Resources.Miscellaneous,
                                               Key=ResumeTailModeTooltip}"
                 Visibility="{Binding Path=IsDetachedFromTail, Converter={x:Static atcValueConverters:BoolToVisibilityVisibleValueConverter.Instance}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ApplicationMonitorView}}}">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock
                         VerticalAlignment="Center"
                         FontWeight="SemiBold"
-                        Text="{atcTranslation:Resx ResxName=Atc.Wpf.Controls.Resources.Miscellaneous,
+                        Text="{atcTranslation:Resx ResxName=Atc.Wpf.Components.Resources.Miscellaneous,
                                                    Key=JumpToLive}" />
                     <Border
                         Margin="6,0,0,0"

src/Atc.Wpf.Components/Monitoring/ApplicationMonitorViewModel.cs

@@ -1,3 +1,5 @@
+using ComponentsMisc = Atc.Wpf.Components.Resources.Miscellaneous;
+
 namespace Atc.Wpf.Components.Monitoring;
 
 public sealed partial class ApplicationMonitorViewModel : ViewModelBase, IDisposable
@@ -448,7 +450,7 @@ private void Export()
             FilterIndex = 1,
             FileName = "log-" + DateTime.Now.ToString("yyyyMMdd-HHmmss", GlobalizationConstants.EnglishCultureInfo) + ".csv",
             AddExtension = true,
-            Title = Miscellaneous.ExportLog,
+            Title = ComponentsMisc.ExportLog,
         };
 
         if (dialog.ShowDialog() != true)
@@ -480,12 +482,12 @@ private static void ShowExportFailureDialog(Exception ex)
 
         var settings = new DialogBoxSettings(DialogBoxType.Ok, LogCategoryType.Error)
         {
-            TitleBarText = Miscellaneous.ExportFailed,
+            TitleBarText = ComponentsMisc.ExportFailed,
         };
 
         var message = string.Format(
             CultureInfo.CurrentCulture,
-            Miscellaneous.CouldNotExportLogFormat1,
+            ComponentsMisc.CouldNotExportLogFormat1,
             ex.Message);
 
         var dialog = new InfoDialogBox(owner, settings, message);