WinGui:

- Resizeable Update window.

git-svn-id: svn://localhost/HandBrake/trunk@1799 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index b09ad06..54ba647 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -143,7 +143,7 @@
     <Compile Include="frmUpdater.cs">\r
       <SubType>Form</SubType>\r
     </Compile>\r
-    <Compile Include="frmUpdater.Designer.cs">\r
+    <Compile Include="frmUpdater.designer.cs">\r
       <DependentUpon>frmUpdater.cs</DependentUpon>\r
     </Compile>\r
     <Compile Include="Functions\SystemInfo.cs" />\r
@@ -191,7 +191,6 @@
       <DependentUpon>frmQueue.cs</DependentUpon>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="frmUpdater.resx">\r
-      <SubType>Designer</SubType>\r
       <DependentUpon>frmUpdater.cs</DependentUpon>\r
     </EmbeddedResource>\r
     <EmbeddedResource Include="Properties\Resources.resx">\r

diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs
index 2522ea8..336b29b 100644 (file)
--- a/win/C#/frmUpdater.Designer.cs
+++ b/win/C#/frmUpdater.Designer.cs
@@ -37,21 +37,34 @@ namespace Handbrake
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmUpdater));\r
             this.label1 = new System.Windows.Forms.Label();\r
             this.label6 = new System.Windows.Forms.Label();\r
-            this.wBrowser = new System.Windows.Forms.WebBrowser();\r
             this.btn_skip = new System.Windows.Forms.Button();\r
             this.btn_installUpdate = new System.Windows.Forms.Button();\r
             this.btn_remindLater = new System.Windows.Forms.Button();\r
             this.label3 = new System.Windows.Forms.Label();\r
             this.PictureBox1 = new System.Windows.Forms.PictureBox();\r
             this.lbl_update_text = new System.Windows.Forms.Label();\r
+            this.panel1 = new System.Windows.Forms.Panel();\r
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();\r
+            this.panel3 = new System.Windows.Forms.Panel();\r
+            this.panel5 = new System.Windows.Forms.Panel();\r
+            this.wBrowser = new System.Windows.Forms.WebBrowser();\r
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();\r
+            this.button_container = new System.Windows.Forms.SplitContainer();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
+            this.panel1.SuspendLayout();\r
+            this.splitContainer1.Panel1.SuspendLayout();\r
+            this.splitContainer1.Panel2.SuspendLayout();\r
+            this.splitContainer1.SuspendLayout();\r
+            this.button_container.Panel1.SuspendLayout();\r
+            this.button_container.Panel2.SuspendLayout();\r
+            this.button_container.SuspendLayout();\r
             this.SuspendLayout();\r
             // \r
             // label1\r
             // \r
             this.label1.AutoSize = true;\r
             this.label1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label1.Location = new System.Drawing.Point(91, 9);\r
+            this.label1.Location = new System.Drawing.Point(82, 12);\r
             this.label1.Name = "label1";\r
             this.label1.Size = new System.Drawing.Size(305, 16);\r
             this.label1.TabIndex = 25;\r
@@ -61,28 +74,22 @@ namespace Handbrake
             // \r
             this.label6.AutoSize = true;\r
             this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label6.Location = new System.Drawing.Point(91, 46);\r
+            this.label6.Location = new System.Drawing.Point(82, 49);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(208, 13);\r
             this.label6.TabIndex = 30;\r
             this.label6.Text = "Would you like to download it now?";\r
             // \r
-            // wBrowser\r
-            // \r
-            this.wBrowser.Location = new System.Drawing.Point(94, 88);\r
-            this.wBrowser.MinimumSize = new System.Drawing.Size(20, 20);\r
-            this.wBrowser.Name = "wBrowser";\r
-            this.wBrowser.Size = new System.Drawing.Size(503, 155);\r
-            this.wBrowser.TabIndex = 31;\r
-            // \r
             // btn_skip\r
             // \r
+            this.btn_skip.AutoSize = true;\r
+            this.btn_skip.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
             this.btn_skip.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_skip.Location = new System.Drawing.Point(94, 250);\r
+            this.btn_skip.Location = new System.Drawing.Point(0, 3);\r
             this.btn_skip.Name = "btn_skip";\r
-            this.btn_skip.Size = new System.Drawing.Size(133, 22);\r
+            this.btn_skip.Size = new System.Drawing.Size(129, 23);\r
             this.btn_skip.TabIndex = 54;\r
             this.btn_skip.Text = "Skip This Version";\r
             this.btn_skip.UseVisualStyleBackColor = false;\r
@@ -90,12 +97,14 @@ namespace Handbrake
             // \r
             // btn_installUpdate\r
             // \r
+            this.btn_installUpdate.AutoSize = true;\r
+            this.btn_installUpdate.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
             this.btn_installUpdate.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_installUpdate.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_installUpdate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_installUpdate.Location = new System.Drawing.Point(464, 250);\r
+            this.btn_installUpdate.Location = new System.Drawing.Point(153, 3);\r
             this.btn_installUpdate.Name = "btn_installUpdate";\r
-            this.btn_installUpdate.Size = new System.Drawing.Size(133, 22);\r
+            this.btn_installUpdate.Size = new System.Drawing.Size(109, 23);\r
             this.btn_installUpdate.TabIndex = 55;\r
             this.btn_installUpdate.Text = "Install Update";\r
             this.btn_installUpdate.UseVisualStyleBackColor = false;\r
@@ -103,12 +112,14 @@ namespace Handbrake
             // \r
             // btn_remindLater\r
             // \r
+            this.btn_remindLater.AutoSize = true;\r
+            this.btn_remindLater.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
             this.btn_remindLater.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_remindLater.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_remindLater.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_remindLater.Location = new System.Drawing.Point(325, 250);\r
+            this.btn_remindLater.Location = new System.Drawing.Point(19, 3);\r
             this.btn_remindLater.Name = "btn_remindLater";\r
-            this.btn_remindLater.Size = new System.Drawing.Size(133, 22);\r
+            this.btn_remindLater.Size = new System.Drawing.Size(127, 23);\r
             this.btn_remindLater.TabIndex = 56;\r
             this.btn_remindLater.Text = "Remind me Later";\r
             this.btn_remindLater.UseVisualStyleBackColor = false;\r
@@ -118,7 +129,7 @@ namespace Handbrake
             // \r
             this.label3.AutoSize = true;\r
             this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(91, 72);\r
+            this.label3.Location = new System.Drawing.Point(82, 84);\r
             this.label3.Name = "label3";\r
             this.label3.Size = new System.Drawing.Size(103, 13);\r
             this.label3.TabIndex = 57;\r
@@ -128,7 +139,7 @@ namespace Handbrake
             // \r
             this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo64;\r
             this.PictureBox1.InitialImage = null;\r
-            this.PictureBox1.Location = new System.Drawing.Point(12, 5);\r
+            this.PictureBox1.Location = new System.Drawing.Point(12, 12);\r
             this.PictureBox1.Name = "PictureBox1";\r
             this.PictureBox1.Size = new System.Drawing.Size(64, 64);\r
             this.PictureBox1.TabIndex = 24;\r
@@ -138,31 +149,125 @@ namespace Handbrake
             // \r
             this.lbl_update_text.AutoSize = true;\r
             this.lbl_update_text.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_update_text.Location = new System.Drawing.Point(91, 31);\r
+            this.lbl_update_text.Location = new System.Drawing.Point(82, 34);\r
             this.lbl_update_text.Name = "lbl_update_text";\r
             this.lbl_update_text.Size = new System.Drawing.Size(489, 13);\r
             this.lbl_update_text.TabIndex = 58;\r
             this.lbl_update_text.Text = "HandBrake {0.0.0} (000000000) is now available. (You have: {0.0.0} (000000000))";\r
             // \r
+            // panel1\r
+            // \r
+            this.panel1.Controls.Add(this.PictureBox1);\r
+            this.panel1.Controls.Add(this.label3);\r
+            this.panel1.Controls.Add(this.label1);\r
+            this.panel1.Controls.Add(this.lbl_update_text);\r
+            this.panel1.Controls.Add(this.label6);\r
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.panel1.Location = new System.Drawing.Point(0, 0);\r
+            this.panel1.Name = "panel1";\r
+            this.panel1.Size = new System.Drawing.Size(712, 105);\r
+            this.panel1.TabIndex = 60;\r
+            // \r
+            // statusStrip1\r
+            // \r
+            this.statusStrip1.Location = new System.Drawing.Point(0, 419);\r
+            this.statusStrip1.Name = "statusStrip1";\r
+            this.statusStrip1.Size = new System.Drawing.Size(712, 22);\r
+            this.statusStrip1.TabIndex = 65;\r
+            this.statusStrip1.Text = "statusStrip1";\r
+            // \r
+            // panel3\r
+            // \r
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Left;\r
+            this.panel3.Location = new System.Drawing.Point(0, 105);\r
+            this.panel3.Name = "panel3";\r
+            this.panel3.Size = new System.Drawing.Size(87, 314);\r
+            this.panel3.TabIndex = 67;\r
+            // \r
+            // panel5\r
+            // \r
+            this.panel5.Dock = System.Windows.Forms.DockStyle.Right;\r
+            this.panel5.Location = new System.Drawing.Point(683, 105);\r
+            this.panel5.Name = "panel5";\r
+            this.panel5.Size = new System.Drawing.Size(29, 314);\r
+            this.panel5.TabIndex = 68;\r
+            // \r
+            // wBrowser\r
+            // \r
+            this.wBrowser.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.wBrowser.Location = new System.Drawing.Point(0, 0);\r
+            this.wBrowser.MinimumSize = new System.Drawing.Size(20, 20);\r
+            this.wBrowser.Name = "wBrowser";\r
+            this.wBrowser.Size = new System.Drawing.Size(596, 264);\r
+            this.wBrowser.TabIndex = 31;\r
+            // \r
+            // splitContainer1\r
+            // \r
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;\r
+            this.splitContainer1.Location = new System.Drawing.Point(87, 105);\r
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(0);\r
+            this.splitContainer1.Name = "splitContainer1";\r
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;\r
+            // \r
+            // splitContainer1.Panel1\r
+            // \r
+            this.splitContainer1.Panel1.Controls.Add(this.wBrowser);\r
+            // \r
+            // splitContainer1.Panel2\r
+            // \r
+            this.splitContainer1.Panel2.Controls.Add(this.button_container);\r
+            this.splitContainer1.Size = new System.Drawing.Size(596, 314);\r
+            this.splitContainer1.SplitterDistance = 264;\r
+            this.splitContainer1.TabIndex = 69;\r
+            // \r
+            // button_container\r
+            // \r
+            this.button_container.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.button_container.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;\r
+            this.button_container.Location = new System.Drawing.Point(0, 0);\r
+            this.button_container.Name = "button_container";\r
+            // \r
+            // button_container.Panel1\r
+            // \r
+            this.button_container.Panel1.Controls.Add(this.btn_skip);\r
+            // \r
+            // button_container.Panel2\r
+            // \r
+            this.button_container.Panel2.Controls.Add(this.btn_remindLater);\r
+            this.button_container.Panel2.Controls.Add(this.btn_installUpdate);\r
+            this.button_container.Size = new System.Drawing.Size(596, 46);\r
+            this.button_container.SplitterDistance = 330;\r
+            this.button_container.TabIndex = 0;\r
+            // \r
             // frmUpdater\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(609, 282);\r
-            this.Controls.Add(this.lbl_update_text);\r
-            this.Controls.Add(this.label3);\r
-            this.Controls.Add(this.btn_remindLater);\r
-            this.Controls.Add(this.btn_installUpdate);\r
-            this.Controls.Add(this.btn_skip);\r
-            this.Controls.Add(this.wBrowser);\r
-            this.Controls.Add(this.label6);\r
-            this.Controls.Add(this.label1);\r
-            this.Controls.Add(this.PictureBox1);\r
+            this.ClientSize = new System.Drawing.Size(712, 441);\r
+            this.Controls.Add(this.splitContainer1);\r
+            this.Controls.Add(this.panel5);\r
+            this.Controls.Add(this.panel3);\r
+            this.Controls.Add(this.statusStrip1);\r
+            this.Controls.Add(this.panel1);\r
+            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
+            this.MaximizeBox = false;\r
+            this.MinimumSize = new System.Drawing.Size(720, 470);\r
             this.Name = "frmUpdater";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Update";\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
+            this.panel1.ResumeLayout(false);\r
+            this.panel1.PerformLayout();\r
+            this.splitContainer1.Panel1.ResumeLayout(false);\r
+            this.splitContainer1.Panel2.ResumeLayout(false);\r
+            this.splitContainer1.ResumeLayout(false);\r
+            this.button_container.Panel1.ResumeLayout(false);\r
+            this.button_container.Panel1.PerformLayout();\r
+            this.button_container.Panel2.ResumeLayout(false);\r
+            this.button_container.Panel2.PerformLayout();\r
+            this.button_container.ResumeLayout(false);\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -173,11 +278,17 @@ namespace Handbrake
         internal System.Windows.Forms.PictureBox PictureBox1;\r
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.Label label6;\r
-        private System.Windows.Forms.WebBrowser wBrowser;\r
         internal System.Windows.Forms.Button btn_skip;\r
         internal System.Windows.Forms.Button btn_installUpdate;\r
         internal System.Windows.Forms.Button btn_remindLater;\r
         private System.Windows.Forms.Label label3;\r
         private System.Windows.Forms.Label lbl_update_text;\r
+        private System.Windows.Forms.Panel panel1;\r
+        private System.Windows.Forms.StatusStrip statusStrip1;\r
+        private System.Windows.Forms.Panel panel3;\r
+        private System.Windows.Forms.Panel panel5;\r
+        private System.Windows.Forms.WebBrowser wBrowser;\r
+        private System.Windows.Forms.SplitContainer splitContainer1;\r
+        private System.Windows.Forms.SplitContainer button_container;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmUpdater.resx b/win/C#/frmUpdater.resx
index 37f9290..99dc4ae 100644 (file)
--- a/win/C#/frmUpdater.resx
+++ b/win/C#/frmUpdater.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 17</value>\r
+  </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r