WinGui: Cosmetic fixes around the new libhb scanning.

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

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs
index d925d2d3af7efeeb3044fa11d40dd931896f143e..942ae37a13a55f7f3ac2a8a22a51ffdc28887bde 100644 (file)
--- 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;\r
             }\r
 \r
-            if (this.Description == null)\r
-            {\r
-                return string.Format("{0} {1} ({2})", this.TrackNumber, this.Language, this.Format);\r
-            }\r
-\r
-            return string.Format("{0} {1} ({2}) ({3})", this.TrackNumber, this.Language, this.Format, this.Description);\r
+            return string.Format("{0} {1}", this.TrackNumber, this.Description);\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index d673e6983fd1020114507c2e724635b07f8846e1..8279c9adf1798a4e72ec083203fcee1623d40421 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1360,21 +1360,6 @@ namespace HandBrakeWPF.ViewModels
                 MessageBoxImage.Information);\r
         }\r
 \r
-        /// <summary>\r
-        /// The debug scan log.\r
-        /// </summary>\r
-        public void DebugScanLog()\r
-        {\r
-            OpenFileDialog dialog = new OpenFileDialog();\r
-\r
-            dialog.ShowDialog();\r
-\r
-            if (File.Exists(dialog.FileName))\r
-            {\r
-                this.scanService.DebugScanLog(dialog.FileName);\r
-            }\r
-        }\r
-\r
         #endregion\r
 \r
         #region Main Window Public Methods\r
@@ -1916,7 +1901,6 @@ namespace HandBrakeWPF.ViewModels
                 Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture),\r
                 out percent);\r
 \r
-\r
             Execute.OnUIThread(\r
                 () =>\r
                 {\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index e900053c2a2213b50244e72806f269f407cee108..c9d87f870bcbe6755233c9f13edb37a71107a3e3 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -179,7 +179,6 @@
 \r
                 <MenuItem Header="_Debug" Visibility="{Binding ShowDebugMenu, Converter={StaticResource boolToVisConverter}}" >\r
                     <MenuItem Header="_Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />\r
-                    <MenuItem Header="_Debug Scan Log" Micro:Message.Attach="[Event Click] = [Action DebugScanLog]" />\r
                 </MenuItem>\r
             </Menu>\r
 \r