WinGui: Make the "Version" label in options and about selectable and copyable. Useful...

Also added a link to the github issue tracker on the About page.

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index 7672bf06af68f767a243b85ae6edf238b301deda..a8b8e9ae784fcec9a909216664a22a681617d5f8 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -29,14 +29,16 @@
                     <RowDefinition Height="Auto" />\r
                     <RowDefinition Height="Auto" />\r
                     <RowDefinition Height="Auto" />\r
+                    <RowDefinition Height="Auto" />\r
                     <RowDefinition Height="*" />\r
                 </Grid.RowDefinitions>\r
 \r
                 <StackPanel Grid.Row="0"\r
                             Margin="5,10,0,0"\r
                             Orientation="Horizontal">\r
-                    <TextBlock Margin="0,0,5,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:Resources.AboutView_Version}" />\r
-                    <TextBlock Margin="0,0,0,1" FontSize="16" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version}" />\r
+                    <TextBlock Margin="0,0,0,0" FontSize="16" FontFamily="Segoe UI Light" Text="{x:Static Properties:Resources.AboutView_Version}" />\r
+                    <TextBox Margin="0,0,0,0" BorderThickness="0" FontSize="16" IsReadOnly="True" FontFamily="Segoe UI Light" VerticalAlignment="Bottom" Text="{Binding Version, Mode=OneWay}"\r
+                             MouseDoubleClick="AboutTextBox_OnMouseDoubleClick" x:Name="versionTextBox" />\r
                 </StackPanel>\r
 \r
                 <StackPanel Orientation="Horizontal" Grid.Row="1"  Margin="5,5,0,0">\r
@@ -46,9 +48,16 @@
                     </TextBlock>\r
                 </StackPanel>\r
 \r
-                <TextBlock Grid.Row="2" Margin="5,10,0,5" Text="{x:Static Properties:Resources.AboutView_License}" />\r
+                <StackPanel Orientation="Horizontal" Grid.Row="2"  Margin="5,5,0,0">\r
+                    <TextBlock Text="GitHub Issue Tracker: " />\r
+                    <TextBlock>           \r
+                        <Hyperlink x:Name="githubWebsite" NavigateUri="/" RequestNavigate="GithubWebsite_OnRequestNavigate"  >https://github.com/HandBrake/HandBrake/issues</Hyperlink>\r
+                    </TextBlock>\r
+                </StackPanel>\r
+\r
+                <TextBlock Grid.Row="3" Margin="5,10,0,5" Text="{x:Static Properties:Resources.AboutView_License}" />\r
 \r
-                <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="3" Margin="10,0,10,10" HorizontalAlignment="Stretch"\r
+                <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="4" Margin="10,0,10,10" HorizontalAlignment="Stretch"\r
                          VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />\r
 \r
          \r

diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs b/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
index e2dc357ba8537fcfea1a940894ba17e02f21cd89..d624cc74c4d3b42c373f3d92d6f8e57bfe9698d3 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs
@@ -11,6 +11,7 @@ namespace HandBrakeWPF.Views
 {\r
     using System.Diagnostics;\r
     using System.Windows.Controls;\r
+    using System.Windows.Input;\r
     using System.Windows.Navigation;\r
 \r
     /// <summary>\r
@@ -23,7 +24,7 @@ namespace HandBrakeWPF.Views
         /// </summary>\r
         public AboutView()\r
         {\r
-            InitializeComponent();\r
+            this.InitializeComponent();\r
         }\r
 \r
         /// <summary>\r
@@ -39,5 +40,15 @@ namespace HandBrakeWPF.Views
         {\r
             Process.Start("https://handbrake.fr");\r
         }\r
+\r
+        private void GithubWebsite_OnRequestNavigate(object sender, RequestNavigateEventArgs e)\r
+        {\r
+            Process.Start("https://github.com/HandBrake/HandBrake/issues");\r
+        }\r
+\r
+        private void AboutTextBox_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)\r
+        {\r
+            this.versionTextBox.SelectAll();\r
+        }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index bde4b730306dff2dab578efa20cbe747ab5034f5..e32227c20243068f203fac4c537eb4233ea295e1 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -367,13 +367,13 @@
 \r
                     <Grid Margin="20,10,0,20">\r
                         <Grid.ColumnDefinitions>\r
-                            <ColumnDefinition Width="70" />\r
+                            <ColumnDefinition Width="Auto" />\r
                             <ColumnDefinition Width="Auto" />\r
                         </Grid.ColumnDefinitions>\r
 \r
                         <!-- Version -->\r
-                        <TextBlock Grid.Column="0" Margin="0,0,5,0" Text="{x:Static Properties:Resources.Options_Version}" />\r
-                        <TextBlock Grid.Column="1" Margin="0,0,0,1" VerticalAlignment="Bottom" Text="{Binding Version}" />\r
+                        <TextBlock Grid.Column="0" Margin="0,0,0,0" Text="{x:Static Properties:Resources.Options_Version}" />\r
+                        <TextBox Grid.Column="1" Margin="0,0,0,0" VerticalAlignment="Bottom" Text="{Binding Version, Mode=OneWay}" BorderThickness="0" x:Name="versionTextBox" MouseDoubleClick="VersionTextBox_OnMouseDoubleClick" />\r
                     </Grid>\r
 \r
                     <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" FontSize="14" Margin="0,10,0,10"/>\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs b/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs
index b8fd4b33d2ebcc95ecfd018eb4c57ee24eaa1c8c..31fad983db182397ecec4b940be5b92178cfb793 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs
@@ -11,6 +11,7 @@ namespace HandBrakeWPF.Views
 {\r
     using System.Windows;\r
     using System.Windows.Controls;\r
+    using System.Windows.Input;\r
 \r
     /// <summary>\r
     /// Interaction logic for OptionsView.xaml\r
@@ -24,5 +25,10 @@ namespace HandBrakeWPF.Views
         {\r
             InitializeComponent();\r
         }\r
+\r
+        private void VersionTextBox_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)\r
+        {\r
+            this.versionTextBox.SelectAll();\r
+        }\r
     }\r
 }\r