WinGui: Update the About Window GPL statement & Fix an issue on the subtitles tab where it would refuse to allow an SRT to be imported when doing a queue edit.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4068 b64f7644-9d1e-0410-96f1-a4d463321fa5

5 files changed, 19 insertions, 9 deletions

diff --git a/win/CS/Controls/Subtitles.cs b/win/CS/Controls/Subtitles.cs
index ba4195d29..e277a8c1a 100644
--- a/win/CS/Controls/Subtitles.cs
+++ b/win/CS/Controls/Subtitles.cs
@@ -227,6 +227,7 @@ namespace Handbrake.Controls
         {

             lv_subList.Items.Clear();

             subList.Clear();

+            srtFiles.Clear();

         }

         #endregion

 

diff --git a/win/CS/frmAbout.resx b/win/CS/frmAbout.resx
index c3802fbe8..c8eac0bfc 100644
--- a/win/CS/frmAbout.resx
+++ b/win/CS/frmAbout.resx
@@ -118,11 +118,19 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

   <data name="richTextBox1.Text" xml:space="preserve">

-    <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.
+    <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.
 
-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 for more details.
+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 for more details.
 
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</value>

+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.</value>

   </data>

   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index ec2dda043..34cd082c0 100644
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -826,7 +826,7 @@ namespace Handbrake
             this.AudioSettings.Location = new System.Drawing.Point(0, 0);

             this.AudioSettings.Name = "AudioSettings";

             this.AudioSettings.ScannedTracks = ((System.ComponentModel.BindingList<HandBrake.ApplicationServices.Parsing.Audio>)(resources.GetObject("AudioSettings.ScannedTracks")));

-            this.AudioSettings.Size = new System.Drawing.Size(715, 310);

+            this.AudioSettings.Size = new System.Drawing.Size(720, 310);

             this.AudioSettings.TabIndex = 0;

             // 

             // AudioMenuRowHeightHack

@@ -1892,7 +1892,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripButton tb_preview;

         private System.Diagnostics.Process hbproc;

         private TabPage tab_subtitles;

-        internal Handbrake.Controls.AudioPanel AudioSettings;

         internal Handbrake.Controls.Subtitles Subtitles;

         internal Handbrake.Controls.Filters Filters;

         private ToolStripStatusLabel lbl_updateCheck;

@@ -1952,5 +1951,6 @@ namespace Handbrake
         internal RadioButton radio_constantFramerate;

         private Panel panel1;

         internal Controls.AdvancedEncoderOpts advancedEncoderOpts;

+        public Controls.AudioPanel AudioSettings;

     }

 }
\ No newline at end of file
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 24cc41b57..62ec2471f 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -2586,6 +2586,7 @@ namespace Handbrake
 

         #endregion

 

+

         // This is the END of the road ****************************************

     }

 }
\ No newline at end of file
diff --git a/win/CS/frmMain.resx b/win/CS/frmMain.resx
index f38d530d2..a7a22f02a 100644
--- a/win/CS/frmMain.resx
+++ b/win/CS/frmMain.resx
@@ -238,17 +238,17 @@ to make bitrate allocation decisions.</value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAElTeXN0ZW0sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0

         cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAACrAVN5c3RlbS5Db21wb25lbnRN

         b2RlbC5CaW5kaW5nTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1

-        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDQwLCBDdWx0

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDYxLCBDdWx0

         dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQgAAAAJYWRkTmV3UG9zFnJhaXNlTGlzdENo

         YW5nZWRFdmVudHMWcmFpc2VJdGVtQ2hhbmdlZEV2ZW50cwhhbGxvd05ldwlhbGxvd0VkaXQLYWxsb3dS

         ZW1vdmUPdXNlclNldEFsbG93TmV3EkNvbGxlY3Rpb25gMStpdGVtcwAAAAAAAAADCAEBAQEBAakBU3lz

         dGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNl

         cy5QYXJzaW5nLkF1ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjku

-        NS40MDQwLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA

-        CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDQw

+        NS40MDYxLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA

+        CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDYx

         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAwAAAKkBU3lzdGVtLkNvbGxlY3Rp

         b25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1

-        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDQwLCBDdWx0

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDYxLCBDdWx0

         dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9u

         BAAALUhhbmRCcmFrZS5BcHBsaWNhdGlvblNlcnZpY2VzLlBhcnNpbmcuQXVkaW9bXQQAAAAICAkFAAAA

         AQAAAAEAAAAHBQAAAAABAAAABAAAAAQrSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu