WinGui: Fix an unusual issue with the DataBinding on the AudioTrack dropdown control. Seems to no longer get the ListChanged events when the model object is marked as serializable.

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

3 files changed, 11 insertions, 11 deletions

diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs
index a77294c5d..20f4a0908 100644
--- a/win/CS/Controls/AudioPanel.cs
+++ b/win/CS/Controls/AudioPanel.cs
@@ -7,6 +7,7 @@ namespace Handbrake.Controls
 {

     using System;

     using System.Collections.Generic;

+    using System.Collections.ObjectModel;

     using System.ComponentModel;

     using System.Drawing;

     using System.Linq;

@@ -41,7 +42,7 @@ namespace Handbrake.Controls
         {

             InitializeComponent();

 

-            this.ScannedTracks = new BindingList<Audio>

+            this.ScannedTracks = new ObservableCollection<Audio>

                 {

                     AudioHelper.NoneFound 

                 };

@@ -66,7 +67,7 @@ namespace Handbrake.Controls
 

         #region Properties

 

-        public BindingList<Audio> ScannedTracks { get; set; }

+        public ObservableCollection<Audio> ScannedTracks { get; set; }

 

         /// <summary>

         /// Gets the AudioTracks Collection

@@ -200,10 +201,8 @@ namespace Handbrake.Controls
             // Setup the Audio track source dropdown with the new audio tracks.

             this.ScannedTracks.Clear();

             this.drp_audioTrack.SelectedItem = null;

-            foreach (var item in selectedTitle.AudioTracks)

-            {

-                this.ScannedTracks.Add(item);

-            }

+            this.ScannedTracks = new ObservableCollection<Audio>(selectedTitle.AudioTracks);

+            drp_audioTrack.DataSource = this.ScannedTracks;

 

             drp_audioTrack.SelectedItem = this.ScannedTracks.FirstOrDefault();

             this.drp_audioTrack.Refresh();

diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs
index fb00665b3..6f634b683 100644
--- a/win/CS/frmMain.Designer.cs
+++ b/win/CS/frmMain.Designer.cs
@@ -8,6 +8,8 @@ using System.Windows.Forms;
 

 namespace Handbrake

 {

+    using System.Collections.ObjectModel;

+

     partial class frmMain

     {

         /// <summary>

@@ -823,7 +825,6 @@ namespace Handbrake
             this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             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.TabIndex = 0;

             // 

diff --git a/win/CS/frmMain.resx b/win/CS/frmMain.resx
index 331aa148f..b1ce84a3b 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

-        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTg5LCBDdWx0

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTkzLCBDdWx0

         dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQgAAAAJYWRkTmV3UG9zFnJhaXNlTGlzdENo

         YW5nZWRFdmVudHMWcmFpc2VJdGVtQ2hhbmdlZEV2ZW50cwhhbGxvd05ldwlhbGxvd0VkaXQLYWxsb3dS

         ZW1vdmUPdXNlclNldEFsbG93TmV3EkNvbGxlY3Rpb25gMStpdGVtcwAAAAAAAAADCAEBAQEBAakBU3lz

         dGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNl

         cy5QYXJzaW5nLkF1ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjku

-        NS4zOTg5LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA

-        CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTg5

+        NS4zOTkzLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA

+        CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTkz

         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAwAAAKkBU3lzdGVtLkNvbGxlY3Rp

         b25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1

-        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTg5LCBDdWx0

+        ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTkzLCBDdWx0

         dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9u

         BAAALUhhbmRCcmFrZS5BcHBsaWNhdGlvblNlcnZpY2VzLlBhcnNpbmcuQXVkaW9bXQQAAAAICAkFAAAA

         AQAAAAEAAAAHBQAAAAABAAAABAAAAAQrSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu