summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--win/CS/HandBrakeWPF/Controls/SourceSelection.xaml4
-rw-r--r--win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs15
-rw-r--r--win/CS/HandBrakeWPF/Views/AboutView.xaml13
-rw-r--r--win/CS/HandBrakeWPF/Views/AboutView.xaml.cs16
-rw-r--r--win/CS/HandBrakeWPF/Views/OptionsView.xaml4
5 files changed, 48 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index b5726fb40..f73103b88 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -110,6 +110,10 @@
</TextBlock>
<TextBlock Text="|" Margin="5,0,5,0"/>
<TextBlock>
+ <Hyperlink x:Name="help" NavigateUri="/" RequestNavigate="Help_OnRequestNavigate" >Help</Hyperlink>
+ </TextBlock>
+ <TextBlock Text="|" Margin="5,0,5,0"/>
+ <TextBlock>
<Hyperlink x:Name="AboutHandBrake" NavigateUri="/" RequestNavigate="AboutHandBrake_OnRequestNavigate" >About HandBrake</Hyperlink>
</TextBlock>
</StackPanel>
diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs
index cf8285292..5eab79b49 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs
@@ -9,6 +9,7 @@
namespace HandBrakeWPF.Controls
{
+ using System.Diagnostics;
using System.Windows.Controls;
using System.Windows.Navigation;
@@ -56,5 +57,19 @@ namespace HandBrakeWPF.Controls
MainViewModel vm = this.DataContext as MainViewModel;
vm.OpenOptionsWindow();
}
+
+ /// <summary>
+ /// The help_ on request navigate.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void Help_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
+ {
+ Process.Start("https://handbrake.fr/community.php");
+ }
}
}
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index 0b0358251..6c640b459 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -28,6 +28,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
@@ -38,11 +39,19 @@
<TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />
</StackPanel>
- <TextBlock Grid.Row="1" Margin="5,10,0,5" Text="{x:Static Properties:ResourcesUI.AboutView_License}" />
+ <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="5,5,0,0">
+ <TextBlock Text="Website: " />
+ <TextBlock>
+ <Hyperlink x:Name="handbrakeWebsite" NavigateUri="/" RequestNavigate="HandbrakeWebsite_OnRequestNavigate" >https://handbrake.fr</Hyperlink>
+ </TextBlock>
+ </StackPanel>
+
+ <TextBlock Grid.Row="2" Margin="5,10,0,5" Text="{x:Static Properties:ResourcesUI.AboutView_License}" />
- <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="2" Margin="10,0,10,10" HorizontalAlignment="Stretch"
+ <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="3" Margin="10,0,10,10" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />
+
</Grid>
</Grid>
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs b/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
index 2be3fd009..e2dc357ba 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
@@ -9,7 +9,9 @@
namespace HandBrakeWPF.Views
{
+ using System.Diagnostics;
using System.Windows.Controls;
+ using System.Windows.Navigation;
/// <summary>
/// Interaction logic for AboutView.xaml
@@ -23,5 +25,19 @@ namespace HandBrakeWPF.Views
{
InitializeComponent();
}
+
+ /// <summary>
+ /// The handbrake website_ on request navigate.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void HandbrakeWebsite_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
+ {
+ Process.Start("https://handbrake.fr");
+ }
}
}
diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 61942c7f5..777264526 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -104,11 +104,11 @@
<StackPanel Orientation="Vertical" Margin="20,0,0,0">
<StackPanel Orientation="Horizontal">
<ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions}" SelectedItem="{Binding WhenDone}" Width="120" HorizontalAlignment="Left" />
-
+ <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="5,0,0,0" IsChecked="{Binding ResetWhenDoneAction}" />
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <CheckBox Content="{x:Static Properties:ResourcesUI.Options_ResetDoNothing}" VerticalAlignment="Center" IsChecked="{Binding ResetWhenDoneAction}" />
+
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">