WinGui:

- AppcastReader.cs re-factored. Reduces number of connections to the server.
- Few UI tweaks to the updater / downloader

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

1 files changed, 20 insertions, 59 deletions

diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs
index b8b2bf82c..d51d50005 100644
--- a/win/C#/frmUpdater.Designer.cs
+++ b/win/C#/frmUpdater.Designer.cs
@@ -36,10 +36,6 @@ namespace Handbrake
         {

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmUpdater));

             this.label1 = new System.Windows.Forms.Label();

-            this.label2 = new System.Windows.Forms.Label();

-            this.lbl_newVersion = new System.Windows.Forms.Label();

-            this.label4 = new System.Windows.Forms.Label();

-            this.lbl_oldVersion = new System.Windows.Forms.Label();

             this.label6 = new System.Windows.Forms.Label();

             this.wBrowser = new System.Windows.Forms.WebBrowser();

             this.btn_skip = new System.Windows.Forms.Button();

@@ -47,6 +43,7 @@ namespace Handbrake
             this.btn_remindLater = new System.Windows.Forms.Button();

             this.label3 = new System.Windows.Forms.Label();

             this.PictureBox1 = new System.Windows.Forms.PictureBox();

+            this.lbl_update_text = new System.Windows.Forms.Label();

             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();

             this.SuspendLayout();

             // 

@@ -60,46 +57,6 @@ namespace Handbrake
             this.label1.TabIndex = 25;

             this.label1.Text = "A New Version of Handbrake is available!";

             // 

-            // label2

-            // 

-            this.label2.AutoSize = true;

-            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label2.Location = new System.Drawing.Point(91, 33);

-            this.label2.Name = "label2";

-            this.label2.Size = new System.Drawing.Size(69, 13);

-            this.label2.TabIndex = 26;

-            this.label2.Text = "Handbrake";

-            // 

-            // lbl_newVersion

-            // 

-            this.lbl_newVersion.AutoSize = true;

-            this.lbl_newVersion.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_newVersion.Location = new System.Drawing.Point(155, 33);

-            this.lbl_newVersion.Name = "lbl_newVersion";

-            this.lbl_newVersion.Size = new System.Drawing.Size(120, 13);

-            this.lbl_newVersion.TabIndex = 27;

-            this.lbl_newVersion.Text = "0.0.0 (0000000000)";

-            // 

-            // label4

-            // 

-            this.label4.AutoSize = true;

-            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label4.Location = new System.Drawing.Point(274, 33);

-            this.label4.Name = "label4";

-            this.label4.Size = new System.Drawing.Size(98, 13);

-            this.label4.TabIndex = 28;

-            this.label4.Text = "is now available";

-            // 

-            // lbl_oldVersion

-            // 

-            this.lbl_oldVersion.AutoSize = true;

-            this.lbl_oldVersion.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.lbl_oldVersion.Location = new System.Drawing.Point(370, 33);

-            this.lbl_oldVersion.Name = "lbl_oldVersion";

-            this.lbl_oldVersion.Size = new System.Drawing.Size(103, 13);

-            this.lbl_oldVersion.TabIndex = 29;

-            this.lbl_oldVersion.Text = "(you have 0.0.0)";

-            // 

             // label6

             // 

             this.label6.AutoSize = true;

@@ -112,10 +69,10 @@ namespace Handbrake
             // 

             // wBrowser

             // 

-            this.wBrowser.Location = new System.Drawing.Point(94, 82);

+            this.wBrowser.Location = new System.Drawing.Point(94, 88);

             this.wBrowser.MinimumSize = new System.Drawing.Size(20, 20);

             this.wBrowser.Name = "wBrowser";

-            this.wBrowser.Size = new System.Drawing.Size(471, 155);

+            this.wBrowser.Size = new System.Drawing.Size(503, 155);

             this.wBrowser.TabIndex = 31;

             // 

             // btn_skip

@@ -125,7 +82,7 @@ namespace Handbrake
             this.btn_skip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_skip.Location = new System.Drawing.Point(94, 244);

+            this.btn_skip.Location = new System.Drawing.Point(94, 250);

             this.btn_skip.Name = "btn_skip";

             this.btn_skip.Size = new System.Drawing.Size(133, 22);

             this.btn_skip.TabIndex = 54;

@@ -140,7 +97,7 @@ namespace Handbrake
             this.btn_installUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_installUpdate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_installUpdate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_installUpdate.Location = new System.Drawing.Point(432, 244);

+            this.btn_installUpdate.Location = new System.Drawing.Point(464, 250);

             this.btn_installUpdate.Name = "btn_installUpdate";

             this.btn_installUpdate.Size = new System.Drawing.Size(133, 22);

             this.btn_installUpdate.TabIndex = 55;

@@ -155,7 +112,7 @@ namespace Handbrake
             this.btn_remindLater.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_remindLater.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_remindLater.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_remindLater.Location = new System.Drawing.Point(293, 244);

+            this.btn_remindLater.Location = new System.Drawing.Point(325, 250);

             this.btn_remindLater.Name = "btn_remindLater";

             this.btn_remindLater.Size = new System.Drawing.Size(133, 22);

             this.btn_remindLater.TabIndex = 56;

@@ -167,7 +124,7 @@ namespace Handbrake
             // 

             this.label3.AutoSize = true;

             this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label3.Location = new System.Drawing.Point(91, 66);

+            this.label3.Location = new System.Drawing.Point(91, 72);

             this.label3.Name = "label3";

             this.label3.Size = new System.Drawing.Size(103, 13);

             this.label3.TabIndex = 57;

@@ -183,21 +140,28 @@ namespace Handbrake
             this.PictureBox1.TabIndex = 24;

             this.PictureBox1.TabStop = false;

             // 

+            // lbl_update_text

+            // 

+            this.lbl_update_text.AutoSize = true;

+            this.lbl_update_text.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.lbl_update_text.Location = new System.Drawing.Point(91, 31);

+            this.lbl_update_text.Name = "lbl_update_text";

+            this.lbl_update_text.Size = new System.Drawing.Size(489, 13);

+            this.lbl_update_text.TabIndex = 58;

+            this.lbl_update_text.Text = "HandBrake {0.0.0} (000000000) is now available. (You have: {0.0.0} (000000000))";

+            // 

             // frmUpdater

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(577, 272);

+            this.ClientSize = new System.Drawing.Size(609, 288);

+            this.Controls.Add(this.lbl_update_text);

             this.Controls.Add(this.label3);

             this.Controls.Add(this.btn_remindLater);

             this.Controls.Add(this.btn_installUpdate);

             this.Controls.Add(this.btn_skip);

             this.Controls.Add(this.wBrowser);

             this.Controls.Add(this.label6);

-            this.Controls.Add(this.lbl_oldVersion);

-            this.Controls.Add(this.label4);

-            this.Controls.Add(this.lbl_newVersion);

-            this.Controls.Add(this.label2);

             this.Controls.Add(this.label1);

             this.Controls.Add(this.PictureBox1);

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

@@ -214,15 +178,12 @@ namespace Handbrake
 

         internal System.Windows.Forms.PictureBox PictureBox1;

         private System.Windows.Forms.Label label1;

-        private System.Windows.Forms.Label label2;

-        private System.Windows.Forms.Label lbl_newVersion;

-        private System.Windows.Forms.Label label4;

-        private System.Windows.Forms.Label lbl_oldVersion;

         private System.Windows.Forms.Label label6;

         private System.Windows.Forms.WebBrowser wBrowser;

         internal System.Windows.Forms.Button btn_skip;

         internal System.Windows.Forms.Button btn_installUpdate;

         internal System.Windows.Forms.Button btn_remindLater;

         private System.Windows.Forms.Label label3;

+        private System.Windows.Forms.Label lbl_update_text;

     }

 }
\ No newline at end of file