WinGui: Cosmetic fixes around the new libhb scanning.

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

3 files changed, 1 insertions, 23 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs
index d925d2d3a..942ae37a1 100644
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs
@@ -105,12 +105,7 @@ namespace HandBrake.ApplicationServices.Parsing
                 return this.Description;

             }

 

-            if (this.Description == null)

-            {

-                return string.Format("{0} {1} ({2})", this.TrackNumber, this.Language, this.Format);

-            }

-

-            return string.Format("{0} {1} ({2}) ({3})", this.TrackNumber, this.Language, this.Format, this.Description);

+            return string.Format("{0} {1}", this.TrackNumber, this.Description);

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index d673e6983..8279c9adf 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1360,21 +1360,6 @@ namespace HandBrakeWPF.ViewModels
                 MessageBoxImage.Information);

         }

 

-        /// <summary>

-        /// The debug scan log.

-        /// </summary>

-        public void DebugScanLog()

-        {

-            OpenFileDialog dialog = new OpenFileDialog();

-

-            dialog.ShowDialog();

-

-            if (File.Exists(dialog.FileName))

-            {

-                this.scanService.DebugScanLog(dialog.FileName);

-            }

-        }

-

         #endregion

 

         #region Main Window Public Methods

@@ -1916,7 +1901,6 @@ namespace HandBrakeWPF.ViewModels
                 Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture),

                 out percent);

 

-

             Execute.OnUIThread(

                 () =>

                 {

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index e900053c2..c9d87f870 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -179,7 +179,6 @@
 

                 <MenuItem Header="_Debug" Visibility="{Binding ShowDebugMenu, Converter={StaticResource boolToVisConverter}}" >

                     <MenuItem Header="_Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />

-                    <MenuItem Header="_Debug Scan Log" Micro:Message.Attach="[Event Click] = [Action DebugScanLog]" />

                 </MenuItem>

             </Menu>