diff options
| author | sr55 <[email protected]> | 2020-09-29 18:47:29 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2020-09-29 18:48:22 +0100 |
| commit | 8ab3a7da2004643da5a3204b0f947d467e65b067 (patch) | |
| tree | f3907688e8f7ece78ea038e3a541a00bbb0326ca /win/CS | |
| parent | e9ed112a73e26f1636cf4c3e4ab7860fe125ce31 (diff) | |
WinGui: Couple of localisation issues fixed. Fixes #3162 and #3161
Small performance improvement on the log window.
Diffstat (limited to 'win/CS')
| -rw-r--r-- | win/CS/HandBrakeWPF/Controls/SourceSelection.xaml | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/LogView.xaml.cs | 7 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/OptionsView.xaml | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml index e24c1f245..c82a6da5b 100644 --- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml +++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml @@ -121,7 +121,7 @@ <!-- Cancel Window -->
<StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
- <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" IsCancel="True" Padding="8,2" />
+ <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="{x:Static Properties:Resources.Generic_Cancel}" IsCancel="True" Padding="8,2" />
</StackPanel>
<StackPanel Grid.Row="9" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
@@ -146,7 +146,7 @@ <Border.BorderBrush>
<SolidColorBrush Color="White" Opacity=".65"/>
</Border.BorderBrush>
- <TextBlock Text="{x:Static Properties:Resources.SourceSelection_DropFileHere}" Foreground="White" Margin="100,125,100,125" FontSize="26" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.SourceSelection_DropFileHere}" TextWrapping="WrapWithOverflow" Foreground="White" Margin="100,125,100,125" FontSize="26" FontFamily="Segoe UI Light" />
</Border>
</Grid>
</Grid>
diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs index 096032a04..13a58403a 100644 --- a/win/CS/HandBrakeWPF/Views/LogView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/LogView.xaml.cs @@ -14,7 +14,10 @@ namespace HandBrakeWPF.Views using System.Windows;
using System.Windows.Controls;
+ using Caliburn.Micro;
+
using HandBrakeWPF.Services.Logging.EventArgs;
+ using HandBrakeWPF.Utilities;
using HandBrakeWPF.ViewModels;
/// <summary>
@@ -22,6 +25,8 @@ namespace HandBrakeWPF.Views /// </summary>
public partial class LogView : Window
{
+ private DelayedActionProcessor delayProcessor = new DelayedActionProcessor();
+
/// <summary>
/// Initializes a new instance of the <see cref="LogView"/> class.
/// </summary>
@@ -87,7 +92,7 @@ namespace HandBrakeWPF.Views if (this.AutoScroll.IsChecked)
{
- this.logText.ScrollToEnd();
+ delayProcessor.PerformTask(() => Execute.OnUIThreadAsync(() => this.logText.ScrollToEnd()), 100);
}
}
}
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index a9d410b48..7cf09423a 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -400,9 +400,9 @@ </StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceLevelText}" Width="250" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceLevelText}" TextWrapping="Wrap" Width="250" />
- <TextBox x:Name="PauseOnLowDiskspaceLevel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}" Width="120"/>
+ <TextBox x:Name="PauseOnLowDiskspaceLevel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" Width="120"/>
<TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceSizeGB}" VerticalAlignment="Center" Margin="5,0,0,0" />
</StackPanel>
|