From 11878dc76a979b93d1362cde313bf2763ae66d33 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Mon, 13 Jan 2020 21:00:42 +0000
Subject: WinGui: Split the Copyright away from the GPL license information.
 Fixes #2551

---
 win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 17 +++++++++++++----
 win/CS/HandBrakeWPF/Properties/Resources.resx        |  7 ++++---
 win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs     |  8 ++++++++
 win/CS/HandBrakeWPF/Views/AboutView.xaml             |  2 +-
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index d33d1dff2..d34a8483b 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -61,9 +61,16 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Copyright (C) 2003-2020 The HandBrake Team
-        ///
-        ///This program is free software; you can redistribute it and/or
+        ///   Looks up a localized string similar to Copyright (C) 2003-2020 The HandBrake Team.
+        /// </summary>
+        public static string About_Copyright {
+            get {
+                return ResourceManager.GetString("About_Copyright", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This program is free software; you can redistribute it and/or
         ///modify it under the terms of the GNU General Public License
         ///as published by the Free Software Foundation; either version 2
         ///of the License, or (at your option) any later version.
@@ -71,7 +78,9 @@ namespace HandBrakeWPF.Properties {
         ///This program is distributed in the hope that it will be useful,
         ///but WITHOUT ANY WARRANTY; without even the implied warranty of
         ///MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        ///GNU General Public License f [rest of string was truncated]&quot;;.
+        ///GNU General Public License for more details.
+        ///
+        ///You should have received a [rest of string was truncated]&quot;;.
         /// </summary>
         public static string About_GPL {
             get {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 74944cf17..1293d8ab0 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -147,9 +147,7 @@ Custom: You can optionally set a Maximum width and Height. When doing this an en
 Source Maximum:  Always encode at the sources resolution where possible.</value>
   </data>
   <data name="About_GPL" xml:space="preserve">
-    <value>Copyright (C) 2003-2020 The HandBrake Team
-
-This program is free software; you can redistribute it and/or
+    <value>This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
@@ -2188,4 +2186,7 @@ Where supported, any user presets will have been imported.</value>
   <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
     <value>A new version of HandBrake is available!</value>
   </data>
+  <data name="About_Copyright" xml:space="preserve">
+    <value>Copyright (C) 2003-2020 The HandBrake Team</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
index 471384e56..551ce5e1a 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs
@@ -9,8 +9,11 @@
 
 namespace HandBrakeWPF.ViewModels
 {
+    using System;
+
     using HandBrake.Interop.Utilities;
 
+    using HandBrakeWPF.Properties;
     using HandBrakeWPF.ViewModels.Interfaces;
 
     /// <summary>
@@ -37,6 +40,11 @@ namespace HandBrakeWPF.ViewModels
             }
         }
 
+        public string License
+        {
+            get => string.Format("{0}{1}{1}{2}", Resources.About_Copyright, Environment.NewLine, Resources.About_GPL);
+        }
+
         /// <summary>
         /// Close this window.
         /// </summary>
diff --git a/win/CS/HandBrakeWPF/Views/AboutView.xaml b/win/CS/HandBrakeWPF/Views/AboutView.xaml
index a8b8e9ae7..258cd2de4 100644
--- a/win/CS/HandBrakeWPF/Views/AboutView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AboutView.xaml
@@ -57,7 +57,7 @@
 
                 <TextBlock Grid.Row="3" Margin="5,10,0,5" Text="{x:Static Properties:Resources.AboutView_License}" />
 
-                <TextBox Text="{x:Static Properties:Resources.About_GPL}" Grid.Row="4" Margin="10,0,10,10" HorizontalAlignment="Stretch"
+                <TextBox Text="{Binding License, Mode=OneWay}" Grid.Row="4" Margin="10,0,10,10" HorizontalAlignment="Stretch"
                          VerticalAlignment="Stretch" IsReadOnly="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />
 
          
-- 
cgit v1.2.3