WinGui:

- Removed old settings debug tab, Code refactoring and some tweaks to stylecop so it's less noisy. Upgraded to Stylecop 4.4.0

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

1 files changed, 32 insertions, 29 deletions

diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index a3067e17d..f3ae682c1 100644
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -12,15 +12,18 @@ namespace Handbrake
     using System.Threading;

     using System.Windows.Forms;

 

+    /// <summary>

+    /// The Update Download Screen

+    /// </summary>

     public partial class frmDownload : Form

     {

-        private readonly Thread _downloadThread;

-        private Stream _responceStream;

-        private Stream _loacalStream;

-        private HttpWebRequest _webRequest;

-        private HttpWebResponse _webResponse;

-        private static int _progress;

-        private bool _killThread;

+        private readonly Thread downloadThread;

+        private Stream responceStream;

+        private Stream loacalStream;

+        private HttpWebRequest webRequest;

+        private HttpWebResponse webResponse;

+        private static int progress;

+        private bool killThread;

 

         private delegate void UpdateProgessCallback(long bytesRead, long totalBytes);

 

@@ -32,14 +35,14 @@ namespace Handbrake
         {

             InitializeComponent();

 

-            _downloadThread = new Thread(Download);

-            _downloadThread.Start(filename);

+            downloadThread = new Thread(Download);

+            downloadThread.Start(filename);

         }

 

         private void Download(object file)

         {

             string tempPath = Path.Combine(Path.GetTempPath(), "handbrake-setup.exe");

-            string hbUpdate = (string) file;

+            string hbUpdate = (string)file;

             WebClient wcDownload = new WebClient();

 

             try

@@ -47,29 +50,29 @@ namespace Handbrake
                 if (File.Exists(tempPath))

                     File.Delete(tempPath);

 

-                _webRequest = (HttpWebRequest) WebRequest.Create(hbUpdate);

-                _webRequest.Credentials = CredentialCache.DefaultCredentials;

-                _webResponse = (HttpWebResponse) _webRequest.GetResponse();

-                long fileSize = _webResponse.ContentLength;

+                webRequest = (HttpWebRequest)WebRequest.Create(hbUpdate);

+                webRequest.Credentials = CredentialCache.DefaultCredentials;

+                webResponse = (HttpWebResponse)webRequest.GetResponse();

+                long fileSize = webResponse.ContentLength;

 

-                _responceStream = wcDownload.OpenRead(hbUpdate);

-                _loacalStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);

+                responceStream = wcDownload.OpenRead(hbUpdate);

+                loacalStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);

 

                 int bytesSize;

                 byte[] downBuffer = new byte[2048];

 

                 long flength = 0;

-                while ((bytesSize = _responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)

+                while ((bytesSize = responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)

                 {

-                    if (_killThread)

+                    if (killThread)

                         return;

-                    _loacalStream.Write(downBuffer, 0, bytesSize);

-                    flength = _loacalStream.Length;

-                    Invoke(new UpdateProgessCallback(this.UpdateProgress), new object[] {_loacalStream.Length, fileSize});

+                    loacalStream.Write(downBuffer, 0, bytesSize);

+                    flength = loacalStream.Length;

+                    Invoke(new UpdateProgessCallback(this.UpdateProgress), new object[] {loacalStream.Length, fileSize});

                 }

 

-                _responceStream.Close();

-                _loacalStream.Close();

+                responceStream.Close();

+                loacalStream.Close();

 

                 if (flength != fileSize)

                     Invoke(new DownloadFailedCallback(this.DownloadFailed));

@@ -85,8 +88,8 @@ namespace Handbrake
         private void UpdateProgress(long bytesRead, long totalBytes)

         {

             long p = (bytesRead * 100) / totalBytes;

-            int.TryParse(p.ToString(), out _progress);

-            progress_download.Value = _progress;

+            int.TryParse(p.ToString(), out progress);

+            progress_download.Value = progress;

             lblProgress.Text = (bytesRead / 1024) + "k of " + (totalBytes / 1024) + "k ";

         }

 

@@ -108,11 +111,11 @@ namespace Handbrake
 

         private void btn_cancel_Click(object sender, EventArgs e)

         {

-            _killThread = true;

+            killThread = true;

             lblProgress.Text = "Cancelling ...";

-            if (_webResponse != null) _webResponse.Close();

-            if (_responceStream != null) _responceStream.Close();

-            if (_loacalStream != null) _loacalStream.Close();

+            if (webResponse != null) webResponse.Close();

+            if (responceStream != null) responceStream.Close();

+            if (loacalStream != null) loacalStream.Close();

             this.Close();

         }

     }