WinGui: Make the new WPF UI default. (the old UI exe is still included in the build. Handbrake_old.exe)

Also includes bug fixes to the audio and subtitles panels.

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

2 files changed, 9 insertions, 4 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 55b53ffa1..7b3fede44 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1154,9 +1154,11 @@ namespace HandBrakeWPF.ViewModels
         /// <summary>

         /// Show Release Notes

         /// </summary>

-        public void ReleaseNotes()

+        public void ShowReleaseNotes()

         {

-            Process.Start("https://forum.handbrake.fr/viewtopic.php?f=11&t=23843");

+            string path =

+                Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);

+            Process.Start(path + "\\releasenotes.html");

         }

 

         #endregion

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index a67bc293e..b4d8d65ab 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -7,6 +7,8 @@
 // </summary>

 // --------------------------------------------------------------------------------------------------------------------

 

+using System.IO;

+

 namespace HandBrakeWPF.ViewModels

 {

     using System.Collections.Generic;

@@ -156,11 +158,12 @@ namespace HandBrakeWPF.ViewModels
             {

                 SubtitleTrack track = new SubtitleTrack

                     {

-                        SrtFileName = srtFile, 

+                        SrtFileName = Path.GetFileNameWithoutExtension(srtFile), 

                         SrtOffset = 0, 

                         SrtCharCode = "UTF-8", 

                         SrtLang = "English", 

-                        SubtitleType = SubtitleType.SRT

+                        SubtitleType = SubtitleType.SRT,

+                        SrtPath = srtFile

                     };

                 this.Task.SubtitleTracks.Add(track);

             }