summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-08-22 17:17:15 +0000
committersr55 <[email protected]>2013-08-22 17:17:15 +0000
commit723ce53bb4e6fb48c04c0e9fc9ab72e3270d3b29 (patch)
tree50efbb3baf387021ffbfd7ae15c1089468ac3a11 /win
parentc0ad015d6ef51b4edf229d98803d35c781e8b67f (diff)
WinGui: Cosmetic fixes around the new libhb scanning.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5733 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win')
-rw-r--r--win/CS/HandBrake.ApplicationServices/Parsing/Audio.cs7
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs16
-rw-r--r--win/CS/HandBrakeWPF/Views/MainView.xaml1
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>