WinGui:

- Cleanup more StyleCop warnings.

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

1 files changed, 73 insertions, 47 deletions

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index 0059ede32..436688565 100644
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -1,24 +1,26 @@
-using System;

-using System.Windows.Forms;

-using System.Threading;

-using System.Diagnostics;

-using System.Runtime.InteropServices;

-using System.IO;

-using Handbrake.EncodeQueue;

-using Handbrake.Functions;

-using QTOControlLib;

-using QTOLibrary;

-

-namespace Handbrake

+namespace Handbrake

 {

+    using System;

+    using System.Diagnostics;

+    using System.IO;

+    using System.Runtime.InteropServices;

+    using System.Threading;

+    using System.Windows.Forms;

+    using EncodeQueue;

+    using Functions;

+    using QTOControlLib;

+    using QTOLibrary;

+

     public partial class frmPreview : Form

     {

-        readonly Queue Process = new Queue();

+        private readonly Queue Process = new Queue();

+

         private delegate void UpdateUIHandler();

-        String CurrentlyPlaying = "";

-        readonly frmMain MainWindow;

+

+        private string CurrentlyPlaying = string.Empty;

+        private readonly frmMain MainWindow;

         private Thread Player;

-        private readonly Boolean NoQT;

+        private readonly bool NoQT;

 

         public frmPreview(frmMain mw)

         {

@@ -41,20 +43,22 @@ namespace Handbrake
         }

 

         #region Encode Sample

+

         private void btn_playVLC_Click(object sender, EventArgs e)

         {

             lbl_status.Visible = true;

             try

             {

                 if (!NoQT)

-                    QTControl.URL = "";

+                    QTControl.URL = string.Empty;

 

                 if (File.Exists(CurrentlyPlaying))

                     File.Delete(CurrentlyPlaying);

             }

             catch (Exception)

             {

-                MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

+                MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", 

+                                "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

             }

 

             btn_playQT.Enabled = false;

@@ -62,20 +66,23 @@ namespace Handbrake
             lbl_status.Text = "Encoding Sample for (VLC) ...";

             int duration;

             int.TryParse(cb_duration.Text, out duration);

-            String query = QueryGenerator.GenerateCliQuery(MainWindow, 3, duration, cb_preview.Text);

+            string query = QueryGenerator.GenerateCliQuery(MainWindow, 3, duration, cb_preview.Text);

             ThreadPool.QueueUserWorkItem(ProcMonitor, query);

         }

+

         private void btn_playQT_Click(object sender, EventArgs e)

         {

             if (NoQT)

             {

-                MessageBox.Show(this, "It would appear QuickTime 7 is not installed or not accessible. Please (re)install QuickTime.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                MessageBox.Show(this, 

+                                "It would appear QuickTime 7 is not installed or not accessible. Please (re)install QuickTime.", 

+                                "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

                 return;

             }

             if (MainWindow.text_destination.Text.Contains(".mkv"))

             {

-                MessageBox.Show(this,

-                                "The QuickTime Control does not support MKV files, It is recommended you use VLC option instead.",

+                MessageBox.Show(this, 

+                                "The QuickTime Control does not support MKV files, It is recommended you use VLC option instead.", 

                                 "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

             }

             else

@@ -83,13 +90,15 @@ namespace Handbrake
                 lbl_status.Visible = true;

                 try

                 {

-                    QTControl.URL = "";

+                    QTControl.URL = string.Empty;

                     if (File.Exists(CurrentlyPlaying))

                         File.Delete(CurrentlyPlaying);

                 }

                 catch (Exception)

                 {

-                    MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

+                    MessageBox.Show(this, 

+                                    "Unable to delete previous preview file. You may need to restart the application.", 

+                                    "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

                 }

 

                 btn_playQT.Enabled = false;

@@ -97,19 +106,21 @@ namespace Handbrake
                 lbl_status.Text = "Encoding Sample for (QT) ...";

                 int duration;

                 int.TryParse(cb_duration.Text, out duration);

-                String query = QueryGenerator.GenerateCliQuery(MainWindow, 3, duration, cb_preview.Text);

+                string query = QueryGenerator.GenerateCliQuery(MainWindow, 3, duration, cb_preview.Text);

 

                 ThreadPool.QueueUserWorkItem(ProcMonitor, query);

             }

         }

+

         private void ProcMonitor(object state)

         {

             // Make sure we are not already encoding and if we are then display an error.

             if (Process.HbProcess != null)

-                MessageBox.Show(this, "Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                MessageBox.Show(this, "Handbrake is already encoding a video!", "Status", MessageBoxButtons.OK, 

+                                MessageBoxIcon.Warning);

             else

             {

-                Process.CreatePreviewSample((string)state);

+                Process.CreatePreviewSample((string) state);

                 if (Process.HbProcess != null)

                 {

                     Process.HbProcess.WaitForExit();

@@ -118,6 +129,7 @@ namespace Handbrake
                 EncodeCompleted();

             }

         }

+

         private void EncodeCompleted()

         {

             try

@@ -132,13 +144,16 @@ namespace Handbrake
                 btn_playVLC.Enabled = true;

 

                 // Decide which Player to use.

-                String playerSelection = lbl_status.Text.Contains("QT") ? "QT" : "VLC";

+                string playerSelection = lbl_status.Text.Contains("QT") ? "QT" : "VLC";

 

                 lbl_status.Text = "Loading Clip ...";

 

                 // Get the sample filename

-                if (MainWindow.text_destination.Text != "")

-                    CurrentlyPlaying = MainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".mkv", "_sample.mkv"); ;

+                if (MainWindow.text_destination.Text != string.Empty)

+                    CurrentlyPlaying =

+                        MainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").

+                            Replace(".mkv", "_sample.mkv");

+                ;

 

                 // Play back in QT or VLC

                 if (playerSelection == "QT")

@@ -146,13 +161,15 @@ namespace Handbrake
                 else

                     PlayVLC();

 

-                lbl_status.Text = "";

+                lbl_status.Text = string.Empty;

             }

             catch (Exception exc)

             {

-                MessageBox.Show(this, "frmPreview.cs EncodeCompleted " + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

+                MessageBox.Show(this, "frmPreview.cs EncodeCompleted " + exc, "Error", MessageBoxButtons.OK, 

+                                MessageBoxIcon.Error);

             }

         }

+

         #endregion

 

         #region Playback

@@ -162,7 +179,7 @@ namespace Handbrake
         /// </summary>

         private void Play()

         {

-            Player = new Thread(OpenMovie) { IsBackground = true };

+            Player = new Thread(OpenMovie) {IsBackground = true};

             Player.Start();

             lbl_status.Visible = false;

         }

@@ -173,20 +190,23 @@ namespace Handbrake
         private void PlayVLC()

         {

             // Launch VLC and Play video.

-            if (CurrentlyPlaying != "")

+            if (CurrentlyPlaying != string.Empty)

             {

                 if (File.Exists(CurrentlyPlaying))

                 {

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

                     string vlcPath;

-                    

-                    if (8 == IntPtr.Size || (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))

+

+                    if (8 == IntPtr.Size ||

+                        (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))

                         vlcPath = Environment.GetEnvironmentVariable("ProgramFiles(x86)");

                     else

                         vlcPath = Environment.GetEnvironmentVariable("ProgramFiles");

-      

-                    vlcPath = vlcPath != null ? vlcPath + @"\VideoLAN\VLC\vlc.exe" : @"C:\Program Files (x86)\VideoLAN\VLC\vlc.exe";

-                    

+

+                    vlcPath = vlcPath != null

+                                  ? vlcPath + @"\VideoLAN\VLC\vlc.exe"

+                                  : @"C:\Program Files (x86)\VideoLAN\VLC\vlc.exe";

+

                     if (!File.Exists(Properties.Settings.Default.VLC_Path))

                     {

                         if (File.Exists(vlcPath))

@@ -196,23 +216,24 @@ namespace Handbrake
                         }

                         else

                         {

-                            MessageBox.Show(this,

-                                            "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\") ",

+                            MessageBox.Show(this, 

+                                            "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\") ", 

                                             "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);

                         }

                     }

 

                     if (File.Exists(Properties.Settings.Default.VLC_Path))

                     {

-                        String args = "\"" + CurrentlyPlaying + "\"";

+                        string args = "\"" + CurrentlyPlaying + "\"";

                         ProcessStartInfo vlc = new ProcessStartInfo(Properties.Settings.Default.VLC_Path, args);

                         System.Diagnostics.Process.Start(vlc);

                         lbl_status.Text = "VLC will now launch.";

                     }

-

                 }

                 else

-                    MessageBox.Show(this, "Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                    MessageBox.Show(this, 

+                                    "Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.", 

+                                    "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);

             }

             lbl_status.Visible = false;

         }

@@ -241,13 +262,18 @@ namespace Handbrake
             catch (COMException ex)

             {

                 QTUtils qtu = new QTUtils();

-                MessageBox.Show(this, "Unable to open movie:\n\nError Code: " + ex.ErrorCode.ToString("X") + "\nQT Error code : " + qtu.QTErrorFromErrorCode(ex.ErrorCode), "QT", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                MessageBox.Show(this, 

+                                "Unable to open movie:\n\nError Code: " + ex.ErrorCode.ToString("X") +

+                                "\nQT Error code : " + qtu.QTErrorFromErrorCode(ex.ErrorCode), "QT", 

+                                MessageBoxButtons.OK, MessageBoxIcon.Warning);

             }

             catch (Exception ex)

             {

-                MessageBox.Show(this, "Unable to open movie:\n\n" + ex, "QT", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+                MessageBox.Show(this, "Unable to open movie:\n\n" + ex, "QT", MessageBoxButtons.OK, 

+                                MessageBoxIcon.Warning);

             }

         }

+

         #endregion

     }

-}

+}
\ No newline at end of file