summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2019-04-08 20:35:28 +0100
committersr55 <[email protected]>2019-04-08 20:35:28 +0100
commit991d7e40952db864f331ef181e1e468272c45644 (patch)
treeb9e197e3409dfa6606c9efa23f12fee151b6f341
parent06c2f31cb61488d0f451aa7a0a672076d8f9a4de (diff)
WinGui: Improve the failed scan information window. #2025
-rw-r--r--win/CS/HandBrakeWPF/Controls/AlertPanel.xaml4
-rw-r--r--win/CS/HandBrakeWPF/Controls/StatusPanel.xaml4
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs5
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx1
4 files changed, 7 insertions, 7 deletions
diff --git a/win/CS/HandBrakeWPF/Controls/AlertPanel.xaml b/win/CS/HandBrakeWPF/Controls/AlertPanel.xaml
index 06cbdfe3d..5b1d2e857 100644
--- a/win/CS/HandBrakeWPF/Controls/AlertPanel.xaml
+++ b/win/CS/HandBrakeWPF/Controls/AlertPanel.xaml
@@ -24,7 +24,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="220" MinHeight="220">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="240" MinHeight="220">
<Image Source="../Views/Images/information64.png" VerticalAlignment="Center" Height="64" Margin="18,10" />
@@ -41,7 +41,7 @@
/>
</StackPanel>
- <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,0"
+ <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,5"
x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" HorizontalAlignment="Right" IsDefault="True"
Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
diff --git a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
index 97a358a71..e2542c840 100644
--- a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
+++ b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
@@ -25,7 +25,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="220" MinHeight="220">
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="260" MinHeight="220">
<ctr:Loading HorizontalAlignment="Center" VerticalAlignment="Center" Height="45" Margin="18,10" />
<StackPanel VerticalAlignment="Center" Orientation="Vertical" >
@@ -47,7 +47,7 @@
x:Name="SecondaryActionCtl" Click="PerformSecondaryAction" Padding="8,2" Visibility="{Binding IsActionButton2Visibile, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
<Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,0"
- x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2"
+ x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" IsCancel="True"
Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
</StackPanel>
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 0a34c24c8..05fd34f41 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1456,10 +1456,9 @@ namespace HandBrakeWPF.Properties {
/// <summary>
/// Looks up a localized string similar to HandBrake will not be able to encode the selected source as it did not find a valid source with titles to encode.
///This could be due to one of the following reasons:
+ ///- The duration of each source title is below the &quot;Minimum Title Duration&quot; threshold option in &apos;Preferences &gt; Advanced&apos;.
///- The source file is not a valid video file or is in a format that HandBrake does not support.
- ///- The source may be copy protected or include DRM. Please note that HandBrake does not support the removal of copy protections.
- ///
- ///The Activity log may have further information..
+ ///- The source may be copy protected or include DRM. Please note that HandBrake does not support the removal of copy protections [rest of string was truncated]&quot;;.
/// </summary>
public static string Main_ScanNoTitlesFoundMessage {
get {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 4df1fbf68..f867760b7 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -388,6 +388,7 @@ If you continue, your non-burned subtitles will be lost.</value>
<data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
<value>HandBrake will not be able to encode the selected source as it did not find a valid source with titles to encode.
This could be due to one of the following reasons:
+- The duration of each source title is below the "Minimum Title Duration" threshold option in 'Preferences &gt; Advanced'.
- The source file is not a valid video file or is in a format that HandBrake does not support.
- The source may be copy protected or include DRM. Please note that HandBrake does not support the removal of copy protections.