WinGui:

- Update GrowlConnector to 2.0.2.8
- Few UI tweaks to the updater.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 89e3403767c0caea9a32fd23edc9f591409ce942..9990bc9e91956ee50014b0dd323e504c0760ad9c 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -393,6 +393,7 @@
     <None Include="Resources\Help16.png" />\r
     <None Include="Resources\info16.png" />\r
     <None Include="Resources\folder.png" />\r
+    <None Include="Resources\download.png" />\r
     <Content Include="Resources\Output_Small.png" />\r
     <None Include="Resources\Pause.png" />\r
     <None Include="Resources\Play.png" />\r
@@ -503,5 +504,4 @@
        makensis MakeNightly.nsi\r
        </PostBuildEvent>\r
   </PropertyGroup>\r
-\r
 </Project>
\ No newline at end of file

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 137e9233aca342ebf86f783a2c91fec58f405cbd..65b127d237259a96781787522afffb647624f863 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -102,6 +102,13 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Download {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Download", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap folder {\r
             get {\r
                 object obj = ResourceManager.GetObject("folder", resourceCulture);\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index d5524c82b7d842acb96b5a4b493b59f88f23b316..bb7f7bc0232f07e51c65957f86c143e8223cb8a3 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
   <data name="General_Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
@@ -202,4 +202,8 @@
   <data name="Play_small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Play_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="Download" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\download.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/Resources/download.png b/win/C#/Resources/download.png
new file mode 100644 (file)
index 0000000..c320662
Binary files /dev/null and b/win/C#/Resources/download.png differ

diff --git a/win/C#/frmUpdater.Designer.cs b/win/C#/frmUpdater.Designer.cs
index 26b57695e0c0352f84df6b771dd179960c9afe30..af529ccf422a6671675d7c63c77c354b4719e97b 100644 (file)
--- a/win/C#/frmUpdater.Designer.cs
+++ b/win/C#/frmUpdater.Designer.cs
@@ -50,6 +50,7 @@ namespace Handbrake
             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
+            this.panel2 = new System.Windows.Forms.Panel();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
             this.panel1.SuspendLayout();\r
             this.splitContainer1.Panel1.SuspendLayout();\r
@@ -73,7 +74,7 @@ namespace Handbrake
             // label6\r
             // \r
             this.label6.AutoSize = true;\r
-            this.label6.Location = new System.Drawing.Point(82, 49);\r
+            this.label6.Location = new System.Drawing.Point(84, 46);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(175, 13);\r
             this.label6.TabIndex = 30;\r
@@ -131,7 +132,7 @@ namespace Handbrake
             // \r
             this.label3.AutoSize = true;\r
             this.label3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(84, 87);\r
+            this.label3.Location = new System.Drawing.Point(84, 63);\r
             this.label3.Name = "label3";\r
             this.label3.Size = new System.Drawing.Size(90, 13);\r
             this.label3.TabIndex = 57;\r
@@ -150,7 +151,7 @@ namespace Handbrake
             // lbl_update_text\r
             // \r
             this.lbl_update_text.AutoSize = true;\r
-            this.lbl_update_text.Location = new System.Drawing.Point(84, 36);\r
+            this.lbl_update_text.Location = new System.Drawing.Point(84, 33);\r
             this.lbl_update_text.Name = "lbl_update_text";\r
             this.lbl_update_text.Size = new System.Drawing.Size(409, 13);\r
             this.lbl_update_text.TabIndex = 58;\r
@@ -158,6 +159,8 @@ namespace Handbrake
             // \r
             // panel1\r
             // \r
+            this.panel1.BackColor = System.Drawing.Color.White;\r
+            this.panel1.Controls.Add(this.panel2);\r
             this.panel1.Controls.Add(this.PictureBox1);\r
             this.panel1.Controls.Add(this.label3);\r
             this.panel1.Controls.Add(this.label1);\r
@@ -166,31 +169,31 @@ namespace Handbrake
             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.Size = new System.Drawing.Size(710, 97);\r
             this.panel1.TabIndex = 60;\r
             // \r
             // statusStrip1\r
             // \r
-            this.statusStrip1.Location = new System.Drawing.Point(0, 419);\r
+            this.statusStrip1.Location = new System.Drawing.Point(0, 346);\r
             this.statusStrip1.Name = "statusStrip1";\r
-            this.statusStrip1.Size = new System.Drawing.Size(712, 22);\r
+            this.statusStrip1.Size = new System.Drawing.Size(710, 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.Location = new System.Drawing.Point(0, 97);\r
             this.panel3.Name = "panel3";\r
-            this.panel3.Size = new System.Drawing.Size(87, 314);\r
+            this.panel3.Size = new System.Drawing.Size(87, 249);\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.Location = new System.Drawing.Point(681, 97);\r
             this.panel5.Name = "panel5";\r
-            this.panel5.Size = new System.Drawing.Size(29, 314);\r
+            this.panel5.Size = new System.Drawing.Size(29, 249);\r
             this.panel5.TabIndex = 68;\r
             // \r
             // wBrowser\r
@@ -199,14 +202,14 @@ namespace Handbrake
             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.Size = new System.Drawing.Size(594, 203);\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.Location = new System.Drawing.Point(87, 97);\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
@@ -218,8 +221,8 @@ namespace Handbrake
             // 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.Size = new System.Drawing.Size(594, 249);\r
+            this.splitContainer1.SplitterDistance = 203;\r
             this.splitContainer1.TabIndex = 69;\r
             // \r
             // button_container\r
@@ -237,15 +240,26 @@ namespace Handbrake
             // \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.Size = new System.Drawing.Size(594, 42);\r
+            this.button_container.SplitterDistance = 318;\r
             this.button_container.TabIndex = 0;\r
             // \r
+            // panel2\r
+            // \r
+            this.panel2.BackColor = System.Drawing.SystemColors.Control;\r
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;\r
+            this.panel2.Location = new System.Drawing.Point(0, 87);\r
+            this.panel2.MaximumSize = new System.Drawing.Size(0, 10);\r
+            this.panel2.MinimumSize = new System.Drawing.Size(0, 10);\r
+            this.panel2.Name = "panel2";\r
+            this.panel2.Size = new System.Drawing.Size(710, 10);\r
+            this.panel2.TabIndex = 59;\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(712, 441);\r
+            this.ClientSize = new System.Drawing.Size(710, 368);\r
             this.Controls.Add(this.splitContainer1);\r
             this.Controls.Add(this.panel5);\r
             this.Controls.Add(this.panel3);\r
@@ -254,7 +268,7 @@ namespace Handbrake
             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.MinimumSize = new System.Drawing.Size(540, 300);\r
             this.Name = "frmUpdater";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Update";\r
@@ -291,5 +305,6 @@ namespace Handbrake
         private System.Windows.Forms.WebBrowser wBrowser;\r
         private System.Windows.Forms.SplitContainer splitContainer1;\r
         private System.Windows.Forms.SplitContainer button_container;\r
+        private System.Windows.Forms.Panel panel2;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/libraries/Growl.Connector.dll b/win/C#/libraries/Growl.Connector.dll
index 83b06218819dc63227a1d7091aefbbabbec391d1..62958a834a1afa8b6f6803b848e918cc7849b40d 100644 (file)
Binary files a/win/C#/libraries/Growl.Connector.dll and b/win/C#/libraries/Growl.Connector.dll differ

diff --git a/win/C#/libraries/Growl.CoreLibrary.dll b/win/C#/libraries/Growl.CoreLibrary.dll
index c2da5016a99242a9498534529bbfa5bb84cdb7f2..06429c0c9ad37e679ed22d34f6c9c41cffd1c119 100644 (file)
Binary files a/win/C#/libraries/Growl.CoreLibrary.dll and b/win/C#/libraries/Growl.CoreLibrary.dll differ