WinGui: Fix a few bugs:

- Advanced query getting nulled out for QSV due to some dead code.
- Updated the regex for the decomb value to accept unquoted value as well as quoted.
- Remapped Ctrl-F to Ctrl-O to be more standard.

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

1 files changed, 0 insertions, 72 deletions

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs b/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs
index 9f12972be..8a0842a96 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs
@@ -9,14 +9,8 @@
 

 namespace HandBrakeWPF.Views

 {

-    using System.Collections.Generic;

-    using System.Windows;

     using System.Windows.Controls;

 

-    using HandBrake.ApplicationServices.Model;

-

-    using HandBrakeWPF.ViewModels;

-

     /// <summary>

     /// Interaction logic for VideoView.xaml

     /// </summary>

@@ -29,71 +23,5 @@ namespace HandBrakeWPF.Views
         {

             InitializeComponent();

         }

-

-        /// <summary>

-        /// The qsv_preset_radiobutton.

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void qsv_preset_radiobutton(object sender, System.Windows.RoutedEventArgs e)

-        {

-            qsv_preset_ValueChanged(sender, null);

-        }

-

-        /// <summary>

-        /// The qsv_preset_ value changed.

-        /// </summary>

-        /// <param name="sender">

-        /// The sender.

-        /// </param>

-        /// <param name="e">

-        /// The e.

-        /// </param>

-        private void qsv_preset_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)

-        {

-            VideoViewModel mvm = ((VideoViewModel)this.DataContext);

-            EncodeTask task = mvm.Task;

-

-            string full_string = string.Empty;

-

-            IDictionary<string, string> newOptions = new Dictionary<string, string>();

-            string[] existingSegments = full_string.Split(':');

-            foreach (string existingSegment in existingSegments)

-            {

-                string optionName = existingSegment;

-                string optionValue = string.Empty;

-                int equalsIndex = existingSegment.IndexOf('=');

-                if (equalsIndex >= 0)

-                {

-                    optionName = existingSegment.Substring(

-                        0, existingSegment.IndexOf("=", System.StringComparison.Ordinal));

-                    optionValue = existingSegment.Substring(equalsIndex);

-                }

-

-                if (optionName != string.Empty)

-                {

-                    if (newOptions.ContainsKey(optionName))

-                        newOptions.Remove(optionName);

-                    newOptions.Add(optionName, optionValue);

-                }

-            }

-

-            full_string = string.Empty;

-            foreach (KeyValuePair<string, string> entry in newOptions)

-            {

-                full_string += entry.Key;

-                if (entry.Value != string.Empty)

-                    full_string += entry.Value;

-                full_string += ":";

-            }

-            full_string = full_string.TrimEnd(':');

-

-            task.AdvancedEncoderOptions = full_string;

-            task.NotifyOfPropertyChange(() => task.AdvancedEncoderOptions);

-        }

     }

 }