WinGui:

- Moved the AudioPanel to it's own userControl.
- Tweaks to the Audio Track list to improve usability. Now shows track ID's to indicate which track is selected.
- Added missing file headers to some files.
- Moved subtitles onto their own tab in preparation for the new subtitle features.
- Improved control (widget) appearance on the Advanced tab.


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

3 files changed, 14 insertions, 6 deletions

diff --git a/win/C#/Functions/Encode.cs b/win/C#/Functions/Encode.cs
index d5c6577e5..8d93b780c 100644
--- a/win/C#/Functions/Encode.cs
+++ b/win/C#/Functions/Encode.cs
@@ -1,4 +1,4 @@
-/*  CLI.cs $

+/*  Encode.cs $

  	

  	   This file is part of the HandBrake source code.

  	   Homepage: <http://handbrake.fr>.

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 8fabbe61e..9ad6375fc 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -1,4 +1,10 @@
-using System;

+/*  PresetLoader.cs $

+ 	

+ 	   This file is part of the HandBrake source code.

+ 	   Homepage: <http://handbrake.fr>.

+ 	   It may be used under the terms of the GNU General Public License. */

+

+using System;

 using System.Windows.Forms;

 

 namespace Handbrake.Functions

@@ -223,18 +229,20 @@ namespace Handbrake.Functions
 

             #region Audio

             // Clear the audio listing

-            mainWindow.lv_audioList.Items.Clear();

+            mainWindow.audioPanel.clearAudioList();

 

             if (presetQuery.AudioInformation != null)

                 foreach (AudioTrack track in presetQuery.AudioInformation)

                 {

-                    ListViewItem newTrack = new ListViewItem("Automatic");

+                    ListViewItem newTrack = new ListViewItem(mainWindow.audioPanel.getNewID().ToString());

+

+                    newTrack.SubItems.Add("Automatic");

                     newTrack.SubItems.Add(track.Encoder);

                     newTrack.SubItems.Add(track.MixDown);

                     newTrack.SubItems.Add(track.SampleRate);

                     newTrack.SubItems.Add(track.Bitrate);

                     newTrack.SubItems.Add(track.DRC);

-                    mainWindow.lv_audioList.Items.Add(newTrack);

+                    mainWindow.audioPanel.addTrackForPreset(newTrack);

                 }

 

             // Subtitle Stuff

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index e043d85fc..224a05f1a 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -247,7 +247,7 @@ namespace Handbrake.Functions
 

             #region Audio Settings Tab

 

-            ListView audioTracks = mainWindow.lv_audioList;

+            ListView audioTracks = mainWindow.audioPanel.getAudioPanel();

             List<string> tracks = new List<string>();

             List<string> codecs = new List<string>();

             List<string> mixdowns = new List<string>();