WinGui: Better keyboard navigation in the GUI. Added an encode progress bar back in.

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

2 files changed, 8 insertions, 3 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index c7fcbd0ae..222b8a71c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -922,6 +922,8 @@ namespace HandBrakeWPF.ViewModels
             }

         }

 

+        public int ProgressPercentage { get; set; }

+

         #endregion

 

         #region Load and Shutdown Handling

@@ -1910,6 +1912,8 @@ namespace HandBrakeWPF.ViewModels
                         }

 

                         lastEncodePercentage = percent;

+                        this.ProgressPercentage = percent;

+                        this.NotifyOfPropertyChange(() => ProgressPercentage);

                     }

                     else

                     {

@@ -2016,14 +2020,16 @@ namespace HandBrakeWPF.ViewModels
                 Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/folder.png")), Width = 16, Height = 16 },

                 Text = "Open Folder",

                 Command = new SourceMenuCommand(this.FolderScan),

-                IsDrive = false

+                IsDrive = false,

+                InputGestureText = "Ctrl + R"

             };

             SourceMenuItem fileScan = new SourceMenuItem

             {

                 Image = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/HandBrake;component/Views/Images/Movies.png")), Width = 16, Height = 16 },

                 Text = "Open File",

                 Command = new SourceMenuCommand(this.FileScan),

-                IsDrive = false

+                IsDrive = false,

+                InputGestureText = "Ctrl + F"

             };

 

             SourceMenuItem titleSpecific = new SourceMenuItem { Text = "Title Specific Scan" };

diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 0df0c47a9..a59c9c32f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -951,7 +951,6 @@ namespace HandBrakeWPF.ViewModels
                 width = 720;

             }

 

-            // TODO figure out what is wrong with this??

             return HandBrakeUtils.CreateX264OptionsString(preset, tunes, this.ExtraArguments, profile, this.H264Level, width, height);

         }