OSDN Git Service

(root) / handbrake-jp / handbrake-jp-git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d6b71fc)
WinGui:
authorsr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 1 Nov 2010 20:23:19 +0000 (20:23 +0000)
committersr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Mon, 1 Nov 2010 20:23:19 +0000 (20:23 +0000)
- Some re factoring of the Framework library

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

18 files changed:
win/C#/HandBrake.Framework/HandBrake.Framework.csproj patch | blob | history
win/C#/HandBrake.Framework/Helpers/EnumHelper.cs patch | blob | history
win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs patch | blob | history
win/C#/HandBrake.Framework/Properties/Resources.Designer.cs patch | blob | history
win/C#/HandBrake.Framework/Properties/Resources.resx patch | blob | history
win/C#/HandBrake.Framework/Resources/download.png [new file with mode: 0644] patch | blob
win/C#/HandBrake.Framework/Services/AppcastReader.cs [moved from win/C#/HandBrake.Framework/Helpers/AppcastReader.cs with 92% similarity] patch | blob | history
win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs [new file with mode: 0644] patch | blob
win/C#/HandBrake.Framework/Services/UpdateService.cs patch | blob | history
win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs patch | blob | history
win/C#/HandBrake.Framework/Views/DownloadUpdate.cs patch | blob | history
win/C#/HandBrake.Framework/Views/DownloadUpdate.resx patch | blob | history
win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs patch | blob | history
win/C#/HandBrake.Framework/Views/ExceptionWindow.resx patch | blob | history
win/C#/HandBrake.Framework/Views/UpdateInfo.Designer.cs patch | blob | history
win/C#/HandBrake.Framework/Views/UpdateInfo.cs patch | blob | history
win/C#/HandBrake.Framework/Views/UpdateInfo.resx patch | blob | history
win/C#/HandBrake.Framework/WindsorInstaller.cs patch | blob | history

diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
index 18f20ab..a1e7e5e 100644 (file)
--- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
+++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
@@ -57,7 +57,7 @@
     <Reference Include="System.Xml" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="Helpers\AppcastReader.cs" />\r
+    <Compile Include="Services\AppcastReader.cs" />\r
     <Compile Include="Helpers\EnumHelper.cs" />\r
     <Compile Include="Model\UpdateCheckResult.cs" />\r
     <Compile Include="Model\UpdateCheckInformation.cs" />\r
@@ -68,6 +68,7 @@
       <DependentUpon>Resources.resx</DependentUpon>\r
     </Compile>\r
     <Compile Include="Services\ErrorService.cs" />\r
+    <Compile Include="Services\Interfaces\IAppcastReader.cs" />\r
     <Compile Include="Services\Interfaces\IErrorService.cs" />\r
     <Compile Include="Services\UpdateService.cs" />\r
     <Compile Include="Views\ExceptionWindow.cs">\r
@@ -116,7 +117,9 @@
   <ItemGroup>\r
     <None Include="Resources\logo64.png" />\r
   </ItemGroup>\r
-  <ItemGroup />\r
+  <ItemGroup>\r
+    <None Include="Resources\download.png" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
diff --git a/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs b/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs
index 74953c3..6400811 100644 (file)
--- a/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs
+++ b/win/C#/HandBrake.Framework/Helpers/EnumHelper.cs
@@ -25,9 +25,9 @@ namespace HandBrake.Framework.Helpers
         /// </returns>\r
         public static string GetDescription(Enum value)\r
         {\r
-            FieldInfo fi = value.GetType().GetField(value.ToString());\r
+            FieldInfo fieldInfo = value.GetType().GetField(value.ToString());\r
             DescriptionAttribute[] attributes =\r
-                  (DescriptionAttribute[])fi.GetCustomAttributes(\r
+                  (DescriptionAttribute[])fieldInfo.GetCustomAttributes(\r
                   typeof(DescriptionAttribute), false);\r
             return (attributes.Length > 0) ? attributes[0].Description : value.ToString();\r
         }\r
diff --git a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs b/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs
index 6c1fd12..668d8a6 100644 (file)
--- a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs
+++ b/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs
@@ -7,6 +7,8 @@ namespace HandBrake.Framework.Model
 {\r
     using System;\r
     using HandBrake.Framework.Helpers;\r
+    using HandBrake.Framework.Services;\r
+    using HandBrake.Framework.Services.Interfaces;\r
 \r
     /// <summary>\r
     /// Provides information about an update check.\r
@@ -29,7 +31,7 @@ namespace HandBrake.Framework.Model
         /// <summary>\r
         /// Gets or sets information about the new build, if any. This will be null if there is no new verison.\r
         /// </summary>\r
-        public AppcastReader BuildInformation { get; set; }\r
+        public IAppcastReader BuildInformation { get; set; }\r
 \r
         /// <summary>\r
         /// Gets or sets the error that occurred, if any. This will be null if no error occured.\r
diff --git a/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs b/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs
index 0a0ed63..5d5e113 100644 (file)
--- a/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs
+++ b/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs
@@ -67,6 +67,13 @@ namespace HandBrake.Framework.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 ErrorX {\r
             get {\r
                 object obj = ResourceManager.GetObject("ErrorX", resourceCulture);\r
diff --git a/win/C#/HandBrake.Framework/Properties/Resources.resx b/win/C#/HandBrake.Framework/Properties/Resources.resx
index 347b5fe..40e6440 100644 (file)
--- a/win/C#/HandBrake.Framework/Properties/Resources.resx
+++ b/win/C#/HandBrake.Framework/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="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
@@ -127,4 +127,8 @@
   <data name="logo64" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\logo64.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#/HandBrake.Framework/Resources/download.png b/win/C#/HandBrake.Framework/Resources/download.png
new file mode 100644 (file)
index 0000000..c320662
Binary files /dev/null and b/win/C#/HandBrake.Framework/Resources/download.png differ
diff --git a/win/C#/HandBrake.Framework/Helpers/AppcastReader.cs b/win/C#/HandBrake.Framework/Services/AppcastReader.cs
similarity index 92%
rename from win/C#/HandBrake.Framework/Helpers/AppcastReader.cs
rename to win/C#/HandBrake.Framework/Services/AppcastReader.cs
index cba2e18..31bd853 100644 (file)
--- a/win/C#/HandBrake.Framework/Helpers/AppcastReader.cs
+++ b/win/C#/HandBrake.Framework/Services/AppcastReader.cs
@@ -3,17 +3,19 @@
     Homepage: <http://handbrake.fr>.\r
     It may be used under the terms of the GNU General Public License. */\r
 \r
-namespace HandBrake.Framework.Helpers\r
+namespace HandBrake.Framework.Services\r
 {\r
     using System;\r
     using System.IO;\r
     using System.Text.RegularExpressions;\r
     using System.Xml;\r
 \r
+    using HandBrake.Framework.Services.Interfaces;\r
+\r
     /// <summary>\r
     /// Appcast Reader - Used for parsing HandBrakes update file\r
     /// </summary>\r
-    public class AppcastReader\r
+    public class AppcastReader : IAppcastReader\r
     {\r
         /// <summary>\r
         /// Gets Information about an update to HandBrake\r
@@ -41,7 +43,7 @@ namespace HandBrake.Framework.Helpers
         /// <param name="input">\r
         /// The input.\r
         /// </param>\r
-        public void GetInfo(string input)\r
+        public void GetUpdateInfo(string input)\r
         {\r
             try\r
             {\r
diff --git a/win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs b/win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs
new file mode 100644 (file)
index 0000000..7064a08
--- /dev/null
+++ b/win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs
@@ -0,0 +1,35 @@
+namespace HandBrake.Framework.Services.Interfaces\r
+{\r
+    using System;\r
+\r
+    public interface IAppcastReader\r
+    {\r
+        /// <summary>\r
+        /// Gets Information about an update to HandBrake\r
+        /// </summary>\r
+        Uri DescriptionUrl { get; }\r
+\r
+        /// <summary>\r
+        /// Gets HandBrake's version from the appcast.xml file.\r
+        /// </summary>\r
+        string Version { get; }\r
+\r
+        /// <summary>\r
+        /// Gets HandBrake's Build from the appcast.xml file.\r
+        /// </summary>\r
+        string Build { get; }\r
+\r
+        /// <summary>\r
+        /// Gets the URL for update file.\r
+        /// </summary>\r
+        string DownloadFile { get; }\r
+\r
+        /// <summary>\r
+        /// Get the build information from the required appcasts. Run before accessing the public vars.\r
+        /// </summary>\r
+        /// <param name="input">\r
+        /// The input.\r
+        /// </param>\r
+        void GetUpdateInfo(string input);\r
+    }\r
+}
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/Services/UpdateService.cs b/win/C#/HandBrake.Framework/Services/UpdateService.cs
index 21688e0..31fb855 100644 (file)
--- a/win/C#/HandBrake.Framework/Services/UpdateService.cs
+++ b/win/C#/HandBrake.Framework/Services/UpdateService.cs
@@ -12,6 +12,7 @@ namespace HandBrake.Framework.Services
 \r
     using HandBrake.Framework.Helpers;\r
     using HandBrake.Framework.Model;\r
+    using HandBrake.Framework.Services.Interfaces;\r
 \r
     public class UpdateService\r
     {\r
@@ -45,10 +46,10 @@ namespace HandBrake.Framework.Services
                     // Initialize variables\r
                     WebRequest request = WebRequest.Create(url);\r
                     WebResponse response = request.GetResponse();\r
-                    AppcastReader reader = new AppcastReader();\r
+                    IAppcastReader reader = new AppcastReader();\r
 \r
                     // Get the data, convert it to a string, and parse it into the AppcastReader\r
-                    reader.GetInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());\r
+                    reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());\r
 \r
                     // Further parse the information\r
                     string build = reader.Build;\r
diff --git a/win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs b/win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs
index 1311fa2..3159034 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs
+++ b/win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs
@@ -46,85 +46,53 @@ namespace HandBrake.Framework.Views
             // \r
             // lblProgress\r
             // \r
-            this.lblProgress.AutoSize = true;\r
-            this.lblProgress.Location = new System.Drawing.Point(73, 29);\r
+            resources.ApplyResources(this.lblProgress, "lblProgress");\r
             this.lblProgress.Name = "lblProgress";\r
-            this.lblProgress.Size = new System.Drawing.Size(98, 13);\r
-            this.lblProgress.TabIndex = 10;\r
-            this.lblProgress.Text = "Awaiting Download";\r
             // \r
             // progress_download\r
             // \r
-            this.progress_download.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));\r
-            this.progress_download.Location = new System.Drawing.Point(73, 3);\r
+            resources.ApplyResources(this.progress_download, "progress_download");\r
             this.progress_download.Name = "progress_download";\r
-            this.progress_download.Size = new System.Drawing.Size(277, 23);\r
             this.progress_download.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
-            this.progress_download.TabIndex = 9;\r
             // \r
             // btn_cancel\r
             // \r
-            this.btn_cancel.Anchor = System.Windows.Forms.AnchorStyles.Right;\r
+            resources.ApplyResources(this.btn_cancel, "btn_cancel");\r
             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_cancel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_cancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_cancel.Location = new System.Drawing.Point(279, 46);\r
             this.btn_cancel.Name = "btn_cancel";\r
-            this.btn_cancel.Size = new System.Drawing.Size(71, 22);\r
-            this.btn_cancel.TabIndex = 26;\r
             this.btn_cancel.TabStop = false;\r
-            this.btn_cancel.Text = "Cancel";\r
             this.btn_cancel.UseVisualStyleBackColor = true;\r
-            this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);\r
+            this.btn_cancel.Click += new System.EventHandler(this.BtnCancelClick);\r
             // \r
             // tableLayoutPanel1\r
             // \r
-            this.tableLayoutPanel1.ColumnCount = 2;\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+            resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");\r
             this.tableLayoutPanel1.Controls.Add(this.PictureBox1, 0, 0);\r
             this.tableLayoutPanel1.Controls.Add(this.btn_cancel, 1, 2);\r
             this.tableLayoutPanel1.Controls.Add(this.progress_download, 1, 0);\r
             this.tableLayoutPanel1.Controls.Add(this.lblProgress, 1, 1);\r
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(9, 9);\r
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";\r
-            this.tableLayoutPanel1.RowCount = 3;\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(353, 73);\r
-            this.tableLayoutPanel1.TabIndex = 27;\r
             // \r
             // PictureBox1\r
             // \r
-            this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.logo64;\r
-            this.PictureBox1.InitialImage = null;\r
-            this.PictureBox1.Location = new System.Drawing.Point(3, 3);\r
+            this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.download;\r
+            resources.ApplyResources(this.PictureBox1, "PictureBox1");\r
             this.PictureBox1.Name = "PictureBox1";\r
             this.tableLayoutPanel1.SetRowSpan(this.PictureBox1, 3);\r
-            this.PictureBox1.Size = new System.Drawing.Size(64, 64);\r
-            this.PictureBox1.TabIndex = 25;\r
             this.PictureBox1.TabStop = false;\r
             // \r
-            // frmDownload\r
+            // DownloadUpdate\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+            resources.ApplyResources(this, "$this");\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.AutoSize = true;\r
-            this.ClientSize = new System.Drawing.Size(371, 91);\r
             this.Controls.Add(this.tableLayoutPanel1);\r
-            this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MinimizeBox = false;\r
             this.Name = "DownloadUpdate";\r
-            this.Padding = new System.Windows.Forms.Padding(9);\r
             this.ShowIcon = false;\r
             this.ShowInTaskbar = false;\r
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
-            this.Text = "Downloading Update";\r
             this.tableLayoutPanel1.ResumeLayout(false);\r
             this.tableLayoutPanel1.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
diff --git a/win/C#/HandBrake.Framework/Views/DownloadUpdate.cs b/win/C#/HandBrake.Framework/Views/DownloadUpdate.cs
index dc4aef1..3b12a64 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/DownloadUpdate.cs
+++ b/win/C#/HandBrake.Framework/Views/DownloadUpdate.cs
@@ -81,7 +81,7 @@ namespace HandBrake.Framework.Views
             }\r
             catch\r
             {\r
-                // Do Nothing \r
+                lblProgress.Text = "An Error Occured. Please try again later.";\r
             }\r
         }\r
 \r
@@ -109,7 +109,7 @@ namespace HandBrake.Framework.Views
             btn_cancel.Text = "Close";\r
         }\r
 \r
-        private void btn_cancel_Click(object sender, EventArgs e)\r
+        private void BtnCancelClick(object sender, EventArgs e)\r
         {\r
             this.killThread = true;\r
             lblProgress.Text = "Cancelling ...";\r
diff --git a/win/C#/HandBrake.Framework/Views/DownloadUpdate.resx b/win/C#/HandBrake.Framework/Views/DownloadUpdate.resx
index 37f9290..db07d3c 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/DownloadUpdate.resx
+++ b/win/C#/HandBrake.Framework/Views/DownloadUpdate.resx
@@ -117,7 +117,162 @@
   <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="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="lblProgress.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="lblProgress.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>73, 29</value>\r
+  </data>\r
+  <data name="lblProgress.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>98, 13</value>\r
+  </data>\r
+  <data name="lblProgress.TabIndex" type="System.Int32, mscorlib">\r
+    <value>10</value>\r
+  </data>\r
+  <data name="lblProgress.Text" xml:space="preserve">\r
+    <value>Awaiting Download</value>\r
+  </data>\r
+  <data name="&gt;&gt;lblProgress.Name" xml:space="preserve">\r
+    <value>lblProgress</value>\r
+  </data>\r
+  <data name="&gt;&gt;lblProgress.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;lblProgress.Parent" xml:space="preserve">\r
+    <value>tableLayoutPanel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;lblProgress.ZOrder" xml:space="preserve">\r
+    <value>3</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="progress_download.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">\r
+    <value>Left, Right</value>\r
+  </data>\r
+  <data name="progress_download.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>73, 3</value>\r
+  </data>\r
+  <data name="progress_download.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>277, 23</value>\r
+  </data>\r
+  <data name="progress_download.TabIndex" type="System.Int32, mscorlib">\r
+    <value>9</value>\r
+  </data>\r
+  <data name="&gt;&gt;progress_download.Name" xml:space="preserve">\r
+    <value>progress_download</value>\r
+  </data>\r
+  <data name="&gt;&gt;progress_download.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;progress_download.Parent" xml:space="preserve">\r
+    <value>tableLayoutPanel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;progress_download.ZOrder" xml:space="preserve">\r
+    <value>2</value>\r
+  </data>\r
+  <data name="btn_cancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">\r
+    <value>Right</value>\r
+  </data>\r
+  <data name="btn_cancel.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="btn_cancel.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>279, 46</value>\r
+  </data>\r
+  <data name="btn_cancel.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>71, 22</value>\r
+  </data>\r
+  <data name="btn_cancel.TabIndex" type="System.Int32, mscorlib">\r
+    <value>26</value>\r
+  </data>\r
+  <data name="btn_cancel.Text" xml:space="preserve">\r
+    <value>Cancel</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_cancel.Name" xml:space="preserve">\r
+    <value>btn_cancel</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_cancel.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_cancel.Parent" xml:space="preserve">\r
+    <value>tableLayoutPanel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_cancel.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">\r
+    <value>2</value>\r
+  </data>\r
+  <data name="PictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">\r
+    <value />\r
+  </data>\r
+  <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>3, 3</value>\r
+  </data>\r
+  <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>64, 64</value>\r
+  </data>\r
+  <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>25</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Name" xml:space="preserve">\r
+    <value>PictureBox1</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">\r
+    <value>tableLayoutPanel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Fill</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>9, 9</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">\r
+    <value>3</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>353, 73</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>27</value>\r
+  </data>\r
+  <data name="&gt;&gt;tableLayoutPanel1.Name" xml:space="preserve">\r
+    <value>tableLayoutPanel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;tableLayoutPanel1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;tableLayoutPanel1.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;tableLayoutPanel1.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">\r
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="PictureBox1" Row="0" RowSpan="3" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="btn_cancel" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="progress_download" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="lblProgress" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,AutoSize,0" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>\r
+  </data>\r
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">\r
+    <value>6, 13</value>\r
+  </data>\r
+  <data name="$this.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">\r
+    <value>371, 91</value>\r
+  </data>\r
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 8.25pt</value>\r
+  </data>\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
@@ -497,4 +652,19 @@
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==\r
 </value>\r
   </data>\r
+  <data name="$this.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">\r
+    <value>9, 9, 9, 9</value>\r
+  </data>\r
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">\r
+    <value>CenterScreen</value>\r
+  </data>\r
+  <data name="$this.Text" xml:space="preserve">\r
+    <value>Downloading Update</value>\r
+  </data>\r
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">\r
+    <value>DownloadUpdate</value>\r
+  </data>\r
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
 </root>
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs b/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
index 3a0abf6..79bd6b2 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
+++ b/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
@@ -57,107 +57,69 @@
             this.panel1.Controls.Add(this.label3);\r
             this.panel1.Controls.Add(this.label1);\r
             this.panel1.Controls.Add(this.lbl_shortError);\r
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.panel1.Location = new System.Drawing.Point(0, 0);\r
+            resources.ApplyResources(this.panel1, "panel1");\r
             this.panel1.Name = "panel1";\r
-            this.panel1.Size = new System.Drawing.Size(669, 97);\r
-            this.panel1.TabIndex = 61;\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
+            resources.ApplyResources(this.panel2, "panel2");\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(669, 10);\r
-            this.panel2.TabIndex = 59;\r
             // \r
             // PictureBox1\r
             // \r
             this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.ErrorX;\r
-            this.PictureBox1.InitialImage = null;\r
-            this.PictureBox1.Location = new System.Drawing.Point(12, 12);\r
+            resources.ApplyResources(this.PictureBox1, "PictureBox1");\r
             this.PictureBox1.Name = "PictureBox1";\r
-            this.PictureBox1.Size = new System.Drawing.Size(64, 64);\r
-            this.PictureBox1.TabIndex = 24;\r
             this.PictureBox1.TabStop = false;\r
             // \r
             // label3\r
             // \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, 63);\r
+            resources.ApplyResources(this.label3, "label3");\r
             this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(80, 13);\r
-            this.label3.TabIndex = 57;\r
-            this.label3.Text = "Error Details:";\r
             // \r
             // label1\r
             // \r
-            this.label1.AutoSize = true;\r
-            this.label1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label1.Location = new System.Drawing.Point(84, 12);\r
+            resources.ApplyResources(this.label1, "label1");\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(150, 16);\r
-            this.label1.TabIndex = 25;\r
-            this.label1.Text = "An Error has occured.";\r
             // \r
             // lbl_shortError\r
             // \r
-            this.lbl_shortError.Location = new System.Drawing.Point(84, 33);\r
+            resources.ApplyResources(this.lbl_shortError, "lbl_shortError");\r
             this.lbl_shortError.Name = "lbl_shortError";\r
-            this.lbl_shortError.Size = new System.Drawing.Size(573, 30);\r
-            this.lbl_shortError.TabIndex = 58;\r
-            this.lbl_shortError.Text = "An Unknown Error has occured.";\r
             // \r
             // panel3\r
             // \r
-            this.panel3.Dock = System.Windows.Forms.DockStyle.Left;\r
-            this.panel3.Location = new System.Drawing.Point(0, 97);\r
+            resources.ApplyResources(this.panel3, "panel3");\r
             this.panel3.Name = "panel3";\r
-            this.panel3.Size = new System.Drawing.Size(76, 216);\r
-            this.panel3.TabIndex = 68;\r
             // \r
             // panel5\r
             // \r
-            this.panel5.Dock = System.Windows.Forms.DockStyle.Right;\r
-            this.panel5.Location = new System.Drawing.Point(640, 97);\r
+            resources.ApplyResources(this.panel5, "panel5");\r
             this.panel5.Name = "panel5";\r
-            this.panel5.Size = new System.Drawing.Size(29, 216);\r
-            this.panel5.TabIndex = 69;\r
             // \r
             // panel4\r
             // \r
             this.panel4.Controls.Add(this.panel6);\r
-            this.panel4.Dock = System.Windows.Forms.DockStyle.Bottom;\r
-            this.panel4.Location = new System.Drawing.Point(0, 313);\r
+            resources.ApplyResources(this.panel4, "panel4");\r
             this.panel4.Name = "panel4";\r
-            this.panel4.Size = new System.Drawing.Size(669, 42);\r
-            this.panel4.TabIndex = 69;\r
             // \r
             // panel6\r
             // \r
             this.panel6.Controls.Add(this.btn_close);\r
             this.panel6.Controls.Add(this.btn_copy);\r
-            this.panel6.Dock = System.Windows.Forms.DockStyle.Right;\r
-            this.panel6.Location = new System.Drawing.Point(491, 0);\r
+            resources.ApplyResources(this.panel6, "panel6");\r
             this.panel6.Name = "panel6";\r
-            this.panel6.Size = new System.Drawing.Size(178, 42);\r
-            this.panel6.TabIndex = 58;\r
             // \r
             // btn_close\r
             // \r
             this.btn_close.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            resources.ApplyResources(this.btn_close, "btn_close");\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(105, 8);\r
             this.btn_close.Name = "btn_close";\r
-            this.btn_close.Size = new System.Drawing.Size(70, 25);\r
-            this.btn_close.TabIndex = 56;\r
-            this.btn_close.Text = "OK";\r
             this.btn_close.UseVisualStyleBackColor = false;\r
             this.btn_close.Click += new System.EventHandler(this.BtnCloseClick);\r
             // \r
@@ -165,48 +127,35 @@
             // \r
             this.btn_copy.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            resources.ApplyResources(this.btn_copy, "btn_copy");\r
             this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.btn_copy.Image = global::HandBrake.Framework.Properties.Resources.copy;\r
-            this.btn_copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
-            this.btn_copy.Location = new System.Drawing.Point(14, 8);\r
             this.btn_copy.Name = "btn_copy";\r
-            this.btn_copy.Size = new System.Drawing.Size(85, 25);\r
-            this.btn_copy.TabIndex = 57;\r
-            this.btn_copy.Text = "Copy";\r
             this.btn_copy.UseVisualStyleBackColor = false;\r
             this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);\r
             // \r
             // rtf_exceptionFull\r
             // \r
-            this.rtf_exceptionFull.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.rtf_exceptionFull.Location = new System.Drawing.Point(76, 97);\r
+            resources.ApplyResources(this.rtf_exceptionFull, "rtf_exceptionFull");\r
             this.rtf_exceptionFull.Name = "rtf_exceptionFull";\r
-            this.rtf_exceptionFull.Size = new System.Drawing.Size(564, 216);\r
-            this.rtf_exceptionFull.TabIndex = 70;\r
-            this.rtf_exceptionFull.Text = "";\r
             // \r
             // mnu_copy_log\r
             // \r
             this.mnu_copy_log.Image = global::HandBrake.Framework.Properties.Resources.copy;\r
             this.mnu_copy_log.Name = "mnu_copy_log";\r
-            this.mnu_copy_log.Size = new System.Drawing.Size(152, 22);\r
-            this.mnu_copy_log.Text = "Copy";\r
+            resources.ApplyResources(this.mnu_copy_log, "mnu_copy_log");\r
             this.mnu_copy_log.Click += new System.EventHandler(this.MnuCopyLogClick);\r
             // \r
             // ExceptionWindow\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+            resources.ApplyResources(this, "$this");\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(669, 355);\r
             this.Controls.Add(this.rtf_exceptionFull);\r
             this.Controls.Add(this.panel3);\r
             this.Controls.Add(this.panel5);\r
             this.Controls.Add(this.panel4);\r
             this.Controls.Add(this.panel1);\r
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.Name = "ExceptionWindow";\r
-            this.Text = "Error";\r
             this.panel1.ResumeLayout(false);\r
             this.panel1.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.resx b/win/C#/HandBrake.Framework/Views/ExceptionWindow.resx
index ff217dc..6492d07 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/ExceptionWindow.resx
+++ b/win/C#/HandBrake.Framework/Views/ExceptionWindow.resx
@@ -117,7 +117,360 @@
   <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
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Bottom</value>\r
+  </data>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 87</value>\r
+  </data>\r
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>669, 10</value>\r
+  </data>\r
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">\r
+    <value>59</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">\r
+    <value>panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="PictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">\r
+    <value />\r
+  </data>\r
+  <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>12, 12</value>\r
+  </data>\r
+  <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>64, 64</value>\r
+  </data>\r
+  <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>24</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Name" xml:space="preserve">\r
+    <value>PictureBox1</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="label3.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 63</value>\r
+  </data>\r
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>80, 13</value>\r
+  </data>\r
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">\r
+    <value>57</value>\r
+  </data>\r
+  <data name="label3.Text" xml:space="preserve">\r
+    <value>Error Details:</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">\r
+    <value>label3</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">\r
+    <value>2</value>\r
+  </data>\r
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="label1.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 9.75pt, style=Bold</value>\r
+  </data>\r
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 12</value>\r
+  </data>\r
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>150, 16</value>\r
+  </data>\r
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>25</value>\r
+  </data>\r
+  <data name="label1.Text" xml:space="preserve">\r
+    <value>An Error has occured.</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">\r
+    <value>label1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">\r
+    <value>3</value>\r
+  </data>\r
+  <data name="lbl_shortError.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 33</value>\r
+  </data>\r
+  <data name="lbl_shortError.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>573, 30</value>\r
+  </data>\r
+  <data name="lbl_shortError.TabIndex" type="System.Int32, mscorlib">\r
+    <value>58</value>\r
+  </data>\r
+  <data name="lbl_shortError.Text" xml:space="preserve">\r
+    <value>An Unknown Error has occured.</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_shortError.Name" xml:space="preserve">\r
+    <value>lbl_shortError</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_shortError.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_shortError.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_shortError.ZOrder" xml:space="preserve">\r
+    <value>4</value>\r
+  </data>\r
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Top</value>\r
+  </data>\r
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 0</value>\r
+  </data>\r
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>669, 97</value>\r
+  </data>\r
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>61</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">\r
+    <value>4</value>\r
+  </data>\r
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Left</value>\r
+  </data>\r
+  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 97</value>\r
+  </data>\r
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>76, 216</value>\r
+  </data>\r
+  <data name="panel3.TabIndex" type="System.Int32, mscorlib">\r
+    <value>68</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.Name" xml:space="preserve">\r
+    <value>panel3</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="panel5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Right</value>\r
+  </data>\r
+  <data name="panel5.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>640, 97</value>\r
+  </data>\r
+  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>29, 216</value>\r
+  </data>\r
+  <data name="panel5.TabIndex" type="System.Int32, mscorlib">\r
+    <value>69</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.Name" xml:space="preserve">\r
+    <value>panel5</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.ZOrder" xml:space="preserve">\r
+    <value>2</value>\r
+  </data>\r
+  <data name="btn_close.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="btn_close.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>105, 8</value>\r
+  </data>\r
+  <data name="btn_close.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>70, 25</value>\r
+  </data>\r
+  <data name="btn_close.TabIndex" type="System.Int32, mscorlib">\r
+    <value>56</value>\r
+  </data>\r
+  <data name="btn_close.Text" xml:space="preserve">\r
+    <value>OK</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_close.Name" xml:space="preserve">\r
+    <value>btn_close</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_close.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_close.Parent" xml:space="preserve">\r
+    <value>panel6</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_close.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="btn_copy.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="btn_copy.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">\r
+    <value>MiddleLeft</value>\r
+  </data>\r
+  <data name="btn_copy.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>14, 8</value>\r
+  </data>\r
+  <data name="btn_copy.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>85, 25</value>\r
+  </data>\r
+  <data name="btn_copy.TabIndex" type="System.Int32, mscorlib">\r
+    <value>57</value>\r
+  </data>\r
+  <data name="btn_copy.Text" xml:space="preserve">\r
+    <value>Copy</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_copy.Name" xml:space="preserve">\r
+    <value>btn_copy</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_copy.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_copy.Parent" xml:space="preserve">\r
+    <value>panel6</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_copy.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="panel6.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Right</value>\r
+  </data>\r
+  <data name="panel6.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>491, 0</value>\r
+  </data>\r
+  <data name="panel6.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>178, 42</value>\r
+  </data>\r
+  <data name="panel6.TabIndex" type="System.Int32, mscorlib">\r
+    <value>58</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel6.Name" xml:space="preserve">\r
+    <value>panel6</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel6.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel6.Parent" xml:space="preserve">\r
+    <value>panel4</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel6.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Bottom</value>\r
+  </data>\r
+  <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 313</value>\r
+  </data>\r
+  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>669, 42</value>\r
+  </data>\r
+  <data name="panel4.TabIndex" type="System.Int32, mscorlib">\r
+    <value>69</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel4.Name" xml:space="preserve">\r
+    <value>panel4</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel4.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel4.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel4.ZOrder" xml:space="preserve">\r
+    <value>3</value>\r
+  </data>\r
+  <data name="rtf_exceptionFull.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Fill</value>\r
+  </data>\r
+  <data name="rtf_exceptionFull.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>76, 97</value>\r
+  </data>\r
+  <data name="rtf_exceptionFull.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>564, 216</value>\r
+  </data>\r
+  <data name="rtf_exceptionFull.TabIndex" type="System.Int32, mscorlib">\r
+    <value>70</value>\r
+  </data>\r
+  <data name="rtf_exceptionFull.Text" xml:space="preserve">\r
+    <value />\r
+  </data>\r
+  <data name="&gt;&gt;rtf_exceptionFull.Name" xml:space="preserve">\r
+    <value>rtf_exceptionFull</value>\r
+  </data>\r
+  <data name="&gt;&gt;rtf_exceptionFull.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.RichTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;rtf_exceptionFull.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;rtf_exceptionFull.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="mnu_copy_log.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>152, 22</value>\r
+  </data>\r
+  <data name="mnu_copy_log.Text" xml:space="preserve">\r
+    <value>Copy</value>\r
+  </data>\r
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">\r
+    <value>6, 13</value>\r
+  </data>\r
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">\r
+    <value>669, 355</value>\r
+  </data>\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
@@ -497,4 +850,19 @@
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==\r
 </value>\r
   </data>\r
+  <data name="$this.Text" xml:space="preserve">\r
+    <value>Error</value>\r
+  </data>\r
+  <data name="&gt;&gt;mnu_copy_log.Name" xml:space="preserve">\r
+    <value>mnu_copy_log</value>\r
+  </data>\r
+  <data name="&gt;&gt;mnu_copy_log.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">\r
+    <value>ExceptionWindow</value>\r
+  </data>\r
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
 </root>
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/Views/UpdateInfo.Designer.cs b/win/C#/HandBrake.Framework/Views/UpdateInfo.Designer.cs
index 986af5c..6400a87 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/UpdateInfo.Designer.cs
+++ b/win/C#/HandBrake.Framework/Views/UpdateInfo.Designer.cs
@@ -62,89 +62,53 @@ namespace HandBrake.Framework.Views
             // \r
             // label1\r
             // \r
-            this.label1.AutoSize = true;\r
-            this.label1.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label1.Location = new System.Drawing.Point(84, 12);\r
+            resources.ApplyResources(this.label1, "label1");\r
             this.label1.Name = "label1";\r
-            this.label1.Size = new System.Drawing.Size(273, 16);\r
-            this.label1.TabIndex = 25;\r
-            this.label1.Text = "A New Version of Handbrake is available!";\r
             // \r
             // label6\r
             // \r
-            this.label6.AutoSize = true;\r
-            this.label6.Location = new System.Drawing.Point(84, 46);\r
+            resources.ApplyResources(this.label6, "label6");\r
             this.label6.Name = "label6";\r
-            this.label6.Size = new System.Drawing.Size(175, 13);\r
-            this.label6.TabIndex = 30;\r
-            this.label6.Text = "Would you like to download it now?";\r
             // \r
             // btn_skip\r
             // \r
-            this.btn_skip.AutoSize = true;\r
-            this.btn_skip.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
+            resources.ApplyResources(this.btn_skip, "btn_skip");\r
             this.btn_skip.BackColor = System.Drawing.Color.Transparent;\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(0, 3);\r
             this.btn_skip.Name = "btn_skip";\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
             this.btn_skip.Click += new System.EventHandler(this.BtnSkipClick);\r
             // \r
             // btn_installUpdate\r
             // \r
-            this.btn_installUpdate.AutoSize = true;\r
-            this.btn_installUpdate.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
+            resources.ApplyResources(this.btn_installUpdate, "btn_installUpdate");\r
             this.btn_installUpdate.BackColor = System.Drawing.Color.Transparent;\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(153, 3);\r
             this.btn_installUpdate.Name = "btn_installUpdate";\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
             this.btn_installUpdate.Click += new System.EventHandler(this.BtnInstallUpdateClick);\r
             // \r
             // btn_remindLater\r
             // \r
-            this.btn_remindLater.AutoSize = true;\r
-            this.btn_remindLater.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;\r
+            resources.ApplyResources(this.btn_remindLater, "btn_remindLater");\r
             this.btn_remindLater.BackColor = System.Drawing.Color.Transparent;\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(19, 3);\r
             this.btn_remindLater.Name = "btn_remindLater";\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
             this.btn_remindLater.Click += new System.EventHandler(this.BtnRemindLaterClick);\r
             // \r
             // label3\r
             // \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, 63);\r
+            resources.ApplyResources(this.label3, "label3");\r
             this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(90, 13);\r
-            this.label3.TabIndex = 57;\r
-            this.label3.Text = "Release Notes:";\r
             // \r
             // lbl_update_text\r
             // \r
-            this.lbl_update_text.AutoSize = true;\r
-            this.lbl_update_text.Location = new System.Drawing.Point(84, 33);\r
+            resources.ApplyResources(this.lbl_update_text, "lbl_update_text");\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
-            this.lbl_update_text.Text = "HandBrake {0.0.0} (000000000) is now available. (You have: {0.0.0} (000000000))";\r
             // \r
             // panel1\r
             // \r
@@ -155,74 +119,50 @@ namespace HandBrake.Framework.Views
             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
+            resources.ApplyResources(this.panel1, "panel1");\r
             this.panel1.Name = "panel1";\r
-            this.panel1.Size = new System.Drawing.Size(710, 97);\r
-            this.panel1.TabIndex = 60;\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
+            resources.ApplyResources(this.panel2, "panel2");\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
             // PictureBox1\r
             // \r
             this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.logo64;\r
-            this.PictureBox1.InitialImage = null;\r
-            this.PictureBox1.Location = new System.Drawing.Point(12, 12);\r
+            resources.ApplyResources(this.PictureBox1, "PictureBox1");\r
             this.PictureBox1.Name = "PictureBox1";\r
-            this.PictureBox1.Size = new System.Drawing.Size(64, 64);\r
-            this.PictureBox1.TabIndex = 24;\r
             this.PictureBox1.TabStop = false;\r
             // \r
             // statusStrip1\r
             // \r
-            this.statusStrip1.Location = new System.Drawing.Point(0, 346);\r
+            resources.ApplyResources(this.statusStrip1, "statusStrip1");\r
             this.statusStrip1.Name = "statusStrip1";\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, 97);\r
+            resources.ApplyResources(this.panel3, "panel3");\r
             this.panel3.Name = "panel3";\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(681, 97);\r
+            resources.ApplyResources(this.panel5, "panel5");\r
             this.panel5.Name = "panel5";\r
-            this.panel5.Size = new System.Drawing.Size(29, 249);\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
+            resources.ApplyResources(this.wBrowser, "wBrowser");\r
             this.wBrowser.MinimumSize = new System.Drawing.Size(20, 20);\r
             this.wBrowser.Name = "wBrowser";\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
+            resources.ApplyResources(this.splitContainer1, "splitContainer1");\r
             this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;\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
             // \r
             // splitContainer1.Panel1\r
             // \r
@@ -231,15 +171,11 @@ namespace HandBrake.Framework.Views
             // splitContainer1.Panel2\r
             // \r
             this.splitContainer1.Panel2.Controls.Add(this.button_container);\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
             // \r
-            this.button_container.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            resources.ApplyResources(this.button_container, "button_container");\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
@@ -250,27 +186,18 @@ namespace HandBrake.Framework.Views
             // \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(594, 42);\r
-            this.button_container.SplitterDistance = 318;\r
-            this.button_container.TabIndex = 0;\r
             // \r
             // UpdateInfo\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+            resources.ApplyResources(this, "$this");\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\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
             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(540, 300);\r
             this.Name = "UpdateInfo";\r
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
-            this.Text = "Update";\r
             this.panel1.ResumeLayout(false);\r
             this.panel1.PerformLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
diff --git a/win/C#/HandBrake.Framework/Views/UpdateInfo.cs b/win/C#/HandBrake.Framework/Views/UpdateInfo.cs
index abeb9c3..906f117 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/UpdateInfo.cs
+++ b/win/C#/HandBrake.Framework/Views/UpdateInfo.cs
@@ -8,7 +8,7 @@ namespace HandBrake.Framework.Views
     using System;\r
     using System.Windows.Forms;\r
 \r
-    using HandBrake.Framework.Helpers;\r
+    using HandBrake.Framework.Services.Interfaces;\r
 \r
     /// <summary>\r
     /// A window to display update information.\r
@@ -18,7 +18,7 @@ namespace HandBrake.Framework.Views
         /// <summary>\r
         /// An instance of the Appcast Reader\r
         /// </summary>\r
-        private readonly AppcastReader appcast;\r
+        private readonly IAppcastReader appcast;\r
 \r
         /// <summary>\r
         /// The Current Version\r
@@ -42,7 +42,7 @@ namespace HandBrake.Framework.Views
         /// <param name="currentBuild">\r
         /// The current Build.\r
         /// </param>\r
-        public UpdateInfo(AppcastReader reader, string currentVersion, string currentBuild)\r
+        public UpdateInfo(IAppcastReader reader, string currentVersion, string currentBuild)\r
         {\r
             InitializeComponent();\r
 \r
@@ -72,9 +72,9 @@ namespace HandBrake.Framework.Views
         /// </summary>\r
         private void SetVersions()\r
         {\r
-            string old = "(You have: " + currentVersion + " / " + currentBuild + ")";\r
+            string old = string.Format("(You have: {0} / {1})", this.currentVersion, this.currentBuild);\r
             string newBuild = appcast.Version.Trim() + " (" + appcast.Build + ")";\r
-            lbl_update_text.Text = "HandBrake " + newBuild + " is now available. " + old;\r
+            lbl_update_text.Text = string.Format("HandBrake {0} is now available. {1}", newBuild, old);\r
         }\r
 \r
         /// <summary>\r
diff --git a/win/C#/HandBrake.Framework/Views/UpdateInfo.resx b/win/C#/HandBrake.Framework/Views/UpdateInfo.resx
index 99dc4ae..ab5aac9 100644 (file)
--- a/win/C#/HandBrake.Framework/Views/UpdateInfo.resx
+++ b/win/C#/HandBrake.Framework/Views/UpdateInfo.resx
@@ -117,10 +117,513 @@
   <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="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="label1.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 9.75pt, style=Bold</value>\r
+  </data>\r
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 12</value>\r
+  </data>\r
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>273, 16</value>\r
+  </data>\r
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>25</value>\r
+  </data>\r
+  <data name="label1.Text" xml:space="preserve">\r
+    <value>A New Version of Handbrake is available!</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">\r
+    <value>label1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">\r
+    <value>3</value>\r
+  </data>\r
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 46</value>\r
+  </data>\r
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>175, 13</value>\r
+  </data>\r
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">\r
+    <value>30</value>\r
+  </data>\r
+  <data name="label6.Text" xml:space="preserve">\r
+    <value>Would you like to download it now?</value>\r
+  </data>\r
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">\r
+    <value>label6</value>\r
+  </data>\r
+  <data name="&gt;&gt;label6.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">\r
+    <value>5</value>\r
+  </data>\r
+  <data name="btn_skip.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</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="btn_skip.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">\r
+    <value>GrowAndShrink</value>\r
+  </data>\r
+  <data name="btn_skip.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="btn_skip.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 3</value>\r
+  </data>\r
+  <data name="btn_skip.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>129, 23</value>\r
+  </data>\r
+  <data name="btn_skip.TabIndex" type="System.Int32, mscorlib">\r
+    <value>54</value>\r
+  </data>\r
+  <data name="btn_skip.Text" xml:space="preserve">\r
+    <value>Skip This Version</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_skip.Name" xml:space="preserve">\r
+    <value>btn_skip</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_skip.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_skip.Parent" xml:space="preserve">\r
+    <value>button_container.Panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_skip.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="btn_installUpdate.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="btn_installUpdate.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">\r
+    <value>GrowAndShrink</value>\r
+  </data>\r
+  <data name="btn_installUpdate.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="btn_installUpdate.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>153, 3</value>\r
+  </data>\r
+  <data name="btn_installUpdate.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>109, 23</value>\r
+  </data>\r
+  <data name="btn_installUpdate.TabIndex" type="System.Int32, mscorlib">\r
+    <value>55</value>\r
+  </data>\r
+  <data name="btn_installUpdate.Text" xml:space="preserve">\r
+    <value>Install Update</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_installUpdate.Name" xml:space="preserve">\r
+    <value>btn_installUpdate</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_installUpdate.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_installUpdate.Parent" xml:space="preserve">\r
+    <value>button_container.Panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_installUpdate.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="btn_remindLater.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="btn_remindLater.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">\r
+    <value>GrowAndShrink</value>\r
+  </data>\r
+  <data name="btn_remindLater.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Verdana, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="btn_remindLater.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>19, 3</value>\r
+  </data>\r
+  <data name="btn_remindLater.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>127, 23</value>\r
+  </data>\r
+  <data name="btn_remindLater.TabIndex" type="System.Int32, mscorlib">\r
+    <value>56</value>\r
+  </data>\r
+  <data name="btn_remindLater.Text" xml:space="preserve">\r
+    <value>Remind me Later</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_remindLater.Name" xml:space="preserve">\r
+    <value>btn_remindLater</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_remindLater.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_remindLater.Parent" xml:space="preserve">\r
+    <value>button_container.Panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;btn_remindLater.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="label3.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 8.25pt, style=Bold</value>\r
+  </data>\r
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 63</value>\r
+  </data>\r
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>90, 13</value>\r
+  </data>\r
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">\r
+    <value>57</value>\r
+  </data>\r
+  <data name="label3.Text" xml:space="preserve">\r
+    <value>Release Notes:</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">\r
+    <value>label3</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">\r
+    <value>2</value>\r
+  </data>\r
+  <data name="lbl_update_text.AutoSize" type="System.Boolean, mscorlib">\r
+    <value>True</value>\r
+  </data>\r
+  <data name="lbl_update_text.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>84, 33</value>\r
+  </data>\r
+  <data name="lbl_update_text.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>409, 13</value>\r
+  </data>\r
+  <data name="lbl_update_text.TabIndex" type="System.Int32, mscorlib">\r
+    <value>58</value>\r
+  </data>\r
+  <data name="lbl_update_text.Text" xml:space="preserve">\r
+    <value>HandBrake {0.0.0} (000000000) is now available. (You have: {0.0.0} (000000000))</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_update_text.Name" xml:space="preserve">\r
+    <value>lbl_update_text</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_update_text.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_update_text.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;lbl_update_text.ZOrder" xml:space="preserve">\r
+    <value>4</value>\r
+  </data>\r
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Bottom</value>\r
+  </data>\r
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 87</value>\r
+  </data>\r
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>710, 10</value>\r
+  </data>\r
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">\r
+    <value>59</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">\r
+    <value>panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="PictureBox1.InitialImage" type="System.Resources.ResXNullRef, System.Windows.Forms">\r
+    <value />\r
+  </data>\r
+  <data name="PictureBox1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>12, 12</value>\r
+  </data>\r
+  <data name="PictureBox1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>64, 64</value>\r
+  </data>\r
+  <data name="PictureBox1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>24</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Name" xml:space="preserve">\r
+    <value>PictureBox1</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.Parent" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;PictureBox1.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Top</value>\r
+  </data>\r
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 0</value>\r
+  </data>\r
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>710, 97</value>\r
+  </data>\r
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>60</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">\r
+    <value>panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">\r
+    <value>4</value>\r
+  </data>\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="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 346</value>\r
+  </data>\r
+  <data name="statusStrip1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>710, 22</value>\r
+  </data>\r
+  <data name="statusStrip1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>65</value>\r
+  </data>\r
+  <data name="statusStrip1.Text" xml:space="preserve">\r
+    <value>statusStrip1</value>\r
+  </data>\r
+  <data name="&gt;&gt;statusStrip1.Name" xml:space="preserve">\r
+    <value>statusStrip1</value>\r
+  </data>\r
+  <data name="&gt;&gt;statusStrip1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;statusStrip1.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;statusStrip1.ZOrder" xml:space="preserve">\r
+    <value>3</value>\r
+  </data>\r
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Left</value>\r
+  </data>\r
+  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 97</value>\r
+  </data>\r
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>87, 249</value>\r
+  </data>\r
+  <data name="panel3.TabIndex" type="System.Int32, mscorlib">\r
+    <value>67</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.Name" xml:space="preserve">\r
+    <value>panel3</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">\r
+    <value>2</value>\r
+  </data>\r
+  <data name="panel5.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Right</value>\r
+  </data>\r
+  <data name="panel5.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>681, 97</value>\r
+  </data>\r
+  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>29, 249</value>\r
+  </data>\r
+  <data name="panel5.TabIndex" type="System.Int32, mscorlib">\r
+    <value>68</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.Name" xml:space="preserve">\r
+    <value>panel5</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;panel5.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="wBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Fill</value>\r
+  </data>\r
+  <data name="wBrowser.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 0</value>\r
+  </data>\r
+  <data name="wBrowser.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>594, 203</value>\r
+  </data>\r
+  <data name="wBrowser.TabIndex" type="System.Int32, mscorlib">\r
+    <value>31</value>\r
+  </data>\r
+  <data name="&gt;&gt;wBrowser.Name" xml:space="preserve">\r
+    <value>wBrowser</value>\r
+  </data>\r
+  <data name="&gt;&gt;wBrowser.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;wBrowser.Parent" xml:space="preserve">\r
+    <value>splitContainer1.Panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;wBrowser.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="splitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Fill</value>\r
+  </data>\r
+  <data name="splitContainer1.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>87, 97</value>\r
+  </data>\r
+  <data name="splitContainer1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">\r
+    <value>0, 0, 0, 0</value>\r
+  </data>\r
+  <data name="splitContainer1.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">\r
+    <value>Horizontal</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel1.Name" xml:space="preserve">\r
+    <value>splitContainer1.Panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel1.Parent" xml:space="preserve">\r
+    <value>splitContainer1</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel1.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="button_container.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">\r
+    <value>Fill</value>\r
+  </data>\r
+  <data name="button_container.Location" type="System.Drawing.Point, System.Drawing">\r
+    <value>0, 0</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel1.Name" xml:space="preserve">\r
+    <value>button_container.Panel1</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel1.Parent" xml:space="preserve">\r
+    <value>button_container</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel1.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel2.Name" xml:space="preserve">\r
+    <value>button_container.Panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel2.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel2.Parent" xml:space="preserve">\r
+    <value>button_container</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Panel2.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="button_container.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>594, 42</value>\r
+  </data>\r
+  <data name="button_container.SplitterDistance" type="System.Int32, mscorlib">\r
+    <value>318</value>\r
+  </data>\r
+  <data name="button_container.TabIndex" type="System.Int32, mscorlib">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Name" xml:space="preserve">\r
+    <value>button_container</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.Parent" xml:space="preserve">\r
+    <value>splitContainer1.Panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;button_container.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel2.Name" xml:space="preserve">\r
+    <value>splitContainer1.Panel2</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel2.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel2.Parent" xml:space="preserve">\r
+    <value>splitContainer1</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Panel2.ZOrder" xml:space="preserve">\r
+    <value>1</value>\r
+  </data>\r
+  <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">\r
+    <value>594, 249</value>\r
+  </data>\r
+  <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">\r
+    <value>203</value>\r
+  </data>\r
+  <data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">\r
+    <value>69</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Name" xml:space="preserve">\r
+    <value>splitContainer1</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.Parent" xml:space="preserve">\r
+    <value>$this</value>\r
+  </data>\r
+  <data name="&gt;&gt;splitContainer1.ZOrder" xml:space="preserve">\r
+    <value>0</value>\r
+  </data>\r
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">\r
+    <value>6, 13</value>\r
+  </data>\r
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">\r
+    <value>710, 368</value>\r
+  </data>\r
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">\r
+    <value>Tahoma, 8.25pt</value>\r
+  </data>\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA\r
@@ -500,4 +1003,19 @@
         AAD6AQAA4AEAAMABAACAAQAAgAEAAMBBAADAYQAAjGEAAIRhAADc+wAA3/8AAA==\r
 </value>\r
   </data>\r
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">\r
+    <value>540, 300</value>\r
+  </data>\r
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">\r
+    <value>CenterScreen</value>\r
+  </data>\r
+  <data name="$this.Text" xml:space="preserve">\r
+    <value>Update</value>\r
+  </data>\r
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">\r
+    <value>UpdateInfo</value>\r
+  </data>\r
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">\r
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+  </data>\r
 </root>
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/WindsorInstaller.cs b/win/C#/HandBrake.Framework/WindsorInstaller.cs
index 0362c7f..87bdbf0 100644 (file)
--- a/win/C#/HandBrake.Framework/WindsorInstaller.cs
+++ b/win/C#/HandBrake.Framework/WindsorInstaller.cs
@@ -28,6 +28,7 @@ namespace HandBrake.Framework
         public void Install(IWindsorContainer container, IConfigurationStore store)\r
         {\r
             container.AddComponent<IErrorService, ErrorService>();\r
+            container.AddComponent<IAppcastReader, AppcastReader>();\r
         }\r
     }\r
 }\r
githubのコードからのfolk
About OSDN
Find Software
Develop Software
Help