WinGui: cleanup some warnings.

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

12 files changed, 39 insertions, 40 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs b/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs
index fa659d232..7989d6b06 100644
--- a/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/FullPathToFileNameConverter.cs
@@ -40,7 +40,7 @@ namespace HandBrakeWPF.Converters
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)

         {

             string path = value as string;

-            if (!string.IsNullOrEmpty(path) && ! path.EndsWith("\\"))

+            if (!string.IsNullOrEmpty(path) && !path.EndsWith("\\"))

             {

                 return Path.GetFileName(path);

             }

diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
index 77106e397..aff1d2e5d 100644
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs
@@ -1,7 +1,12 @@
-/*  AssemblyInfo.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Assembly Info

+// </summary>

+// <auto-generated/>

+// --------------------------------------------------------------------------------------------------------------------

 

 using System.Reflection;

 using System.Resources;

diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl
index 0a30129c7..6a5f3b8bc 100644
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.Nightly.tmpl
@@ -1,7 +1,12 @@
-/*  AssemblyInfo.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Assembly Info

+// </summary>

+// <auto-generated/>

+// --------------------------------------------------------------------------------------------------------------------

 

 using System.Reflection;

 using System.Resources;

diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl
index d42127e97..b3b43f99c 100644
--- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl
+++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs.tmpl
@@ -1,7 +1,12 @@
-/*  AssemblyInfo.cs $

-    This file is part of the HandBrake source code.

-    Homepage: <http://handbrake.fr>.

-    It may be used under the terms of the GNU General Public License. */

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="ListBoxHelper.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Assembly Info

+// </summary>

+// <auto-generated/>

+// --------------------------------------------------------------------------------------------------------------------

 

 using System.Reflection;

 using System.Resources;

diff --git a/win/CS/HandBrakeWPF/Services/NotificationService.cs b/win/CS/HandBrakeWPF/Services/NotificationService.cs
index 306a2f5d2..e451460d8 100644
--- a/win/CS/HandBrakeWPF/Services/NotificationService.cs
+++ b/win/CS/HandBrakeWPF/Services/NotificationService.cs
@@ -55,7 +55,7 @@ namespace HandBrakeWPF.Services
         {

             if (userSettingService.GetUserSetting<bool>(UserSettingConstants.GrowlQueue))

             {

-               //  GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");

+               // GrowlCommunicator.Notify("Queue Completed", "Put down that cocktail...\nyour Handbrake queue is done.");

             }

         }

 

diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
index 387a950ec..379fcec91 100644
--- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
+++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
@@ -122,7 +122,7 @@ namespace HandBrakeWPF.Startup
         /// The Service Requested

         /// </returns>

         protected override object GetInstance(Type service, string key)

-        {

+        {    

             return string.IsNullOrWhiteSpace(key) ? this.windsorContainer.Resolve(service) : this.windsorContainer.Resolve(key, new { });

         }

 

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index 5ef1d70dc..129f031b5 100644
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -144,7 +144,7 @@ namespace HandBrakeWPF
         /// <summary>

         /// Vlc Path

         /// </summary>

-        public const string VLC_Path = "VLC_Path";

+        public const string VLCPath = "VLC_Path";

 

         /// <summary>

         /// The enable process isolation.

diff --git a/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs b/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs
index 14d70c691..4da6f598f 100644
--- a/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs
+++ b/win/CS/HandBrakeWPF/Utilities/DelayedActionProcessor.cs
@@ -44,7 +44,6 @@ namespace HandBrakeWPF.Utilities
                 timer.Close();                

             }

 

-

             timer = new Timer(timems) { AutoReset = true };

             timer.Elapsed += this.timer_Elapsed;

             task = taskReset;

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index ca3280a2c..0499e7157 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1545,20 +1545,12 @@ namespace HandBrakeWPF.ViewModels
                 {

                     if (!presetService.CanUpdatePreset(preset.Name))

                     {

-                        MessageBox.Show(

-                            Resources.Main_PresetErrorBuiltInName,

-                            Resources.Error,

-                            MessageBoxButton.OK,

-                            MessageBoxImage.Error);

+                        MessageBox.Show(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);

                         return;

                     }

 

                     MessageBoxResult result =

-                        MessageBox.Show(

-                            Resources.Main_PresetOverwriteWarning,

-                            Resources.Overwrite,

-                            MessageBoxButton.YesNo,

-                            MessageBoxImage.Warning);

+                        MessageBox.Show(Resources.Main_PresetOverwriteWarning, Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);

                     if (result == MessageBoxResult.Yes)

                     {

                         presetService.Update(preset);

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 7e717c20e..b6b301d2b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -1849,7 +1849,7 @@ namespace HandBrakeWPF.ViewModels
             // #############################

 

             // VLC Path

-            this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path) ?? string.Empty;

+            this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath) ?? string.Empty;

 

             // #############################

             // Audio and Subtitles Tab

@@ -2019,7 +2019,7 @@ namespace HandBrakeWPF.ViewModels
             this.userSettingService.SetUserSetting(UserSettingConstants.RemovePunctuation, this.RemovePunctuation);

 

             /* Previews */

-            this.userSettingService.SetUserSetting(UserSettingConstants.VLC_Path, this.VLCPath);

+            this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath);

 

             /* Audio and Subtitles */

             this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguage, this.SelectedPreferredLangauge);

diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
index b398a1b5c..932978e85 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs
@@ -17,7 +17,6 @@ namespace HandBrakeWPF.ViewModels
     using System.Threading;

     using System.Windows;

 

-    using HandBrake.ApplicationServices;

     using HandBrake.ApplicationServices.Model;

     using HandBrake.ApplicationServices.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Interfaces;

@@ -327,7 +326,7 @@ namespace HandBrakeWPF.ViewModels
                     }

                     else

                     {

-                        if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))

+                        if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))

                         {

                             // Attempt to find VLC if it doesn't exist in the default set location.

                             string vlcPath;

@@ -344,7 +343,7 @@ namespace HandBrakeWPF.ViewModels
 

                             if (File.Exists(vlcPath))

                             {

-                                UserSettingService.SetUserSetting(UserSettingConstants.VLC_Path, vlcPath);

+                                UserSettingService.SetUserSetting(UserSettingConstants.VLCPath, vlcPath);

                             }

                             else

                             {

@@ -353,9 +352,9 @@ namespace HandBrakeWPF.ViewModels
                             }

                         }

 

-                        if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))

+                        if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))

                         {

-                            ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path), args);

+                            ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath), args);

                             Process.Start(vlc);

                         }

                     }

diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index c4a26e033..d836f6d49 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -189,12 +189,6 @@ namespace HandBrakeWPF.ViewModels
             this.PreviewImage = image;

         }

 

-        protected override void OnActivate()

-        {

-            Console.Write("test");

-            base.OnActivate();

-        }

-

         /// <summary>

         ///     The update preview frame.

         /// </summary>