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