<Compile Include="Model\Encoding\SubtitleTrack.cs" />\r
<Compile Include="Model\Encoding\VideoEncoder.cs" />\r
<Compile Include="Model\Encoding\VideoEncodeRateMode.cs" />\r
+ <Compile Include="Model\General\UpdateCheckInformation.cs" />\r
+ <Compile Include="Model\General\UpdateCheckResult.cs" />\r
<Compile Include="Model\Preset.cs" />\r
<Compile Include="Model\QueueTask.cs" />\r
<Compile Include="Model\Encoding\SubtitleType.cs" />\r
<Compile Include="Services\QueueManager.cs" />\r
<Compile Include="Services\QueueProcessor.cs" />\r
<Compile Include="Services\ScanService.cs" />\r
+ <Compile Include="Services\UpdateService.cs" />\r
+ <Compile Include="Utilities\AppcastReader.cs" />\r
<Compile Include="Utilities\PlistUtility.cs" />\r
<Compile Include="Utilities\QueryParserUtility.cs" />\r
<Compile Include="Utilities\UtilityService.cs" />\r
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Model\r
+namespace HandBrake.ApplicationServices.Model.General\r
{\r
using System;\r
- using HandBrake.Framework.Services.Interfaces;\r
\r
/// <summary>\r
/// Provides information about an update check.\r
}\r
\r
/// <summary>\r
- /// Gets or sets information about the new build, if any. This will be null if there is no new verison.\r
+ /// Gets or sets Information about an update to HandBrake\r
/// </summary>\r
- public IAppcastReader BuildInformation { get; set; }\r
+ public Uri DescriptionUrl { get; set; }\r
+\r
+ /// <summary>\r
+ /// Gets or sets HandBrake's version from the appcast.xml file.\r
+ /// </summary>\r
+ public string Version { get; set; }\r
+\r
+ /// <summary>\r
+ /// Gets or sets HandBrake's Build from the appcast.xml file.\r
+ /// </summary>\r
+ public string Build { get; set; }\r
+\r
+ /// <summary>\r
+ /// Gets or sets the URL for update file.\r
+ /// </summary>\r
+ public string DownloadFile { get; set; }\r
\r
/// <summary>\r
/// Gets or sets the error that occurred, if any. This will be null if no error occured.\r
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Model\r
+namespace HandBrake.ApplicationServices.Model.General\r
{\r
using System;\r
using System.Threading;\r
public class UpdateCheckResult : IAsyncResult\r
{\r
/// <summary>\r
- /// Initializes a new instance of the <see cref="HandBrake.Framework.Model.UpdateCheckResult"/> class.\r
+ /// Initializes a new instance of the <see cref="UpdateCheckResult"/> class.\r
/// </summary>\r
/// <param name="asyncState">\r
/// The async state.\r
/// <param name="info">\r
/// The info.\r
/// </param>\r
- public UpdateCheckResult(object asyncState, UpdateCheckInformation info)\r
+ public UpdateCheckResult(object asyncState, ApplicationServices.Model.General.UpdateCheckInformation info)\r
{\r
this.AsyncState = asyncState;\r
this.Result = info;\r
/// <summary>\r
/// Gets the result of the update check.\r
/// </summary>\r
- public UpdateCheckInformation Result { get; private set; }\r
+ public ApplicationServices.Model.General.UpdateCheckInformation Result { get; private set; }\r
\r
/// <summary>\r
/// Gets AsyncWaitHandle.\r
--- /dev/null
+namespace HandBrake.ApplicationServices.Services\r
+{\r
+ using System;\r
+ using System.IO;\r
+ using System.Net;\r
+ using System.Threading;\r
+\r
+ using HandBrake.ApplicationServices.Model.General;\r
+ using HandBrake.ApplicationServices.Utilities;\r
+\r
+ /// <summary>\r
+ /// The Update Service\r
+ /// </summary>\r
+ public class UpdateService\r
+ {\r
+ /// <summary>\r
+ /// Begins checking for an update to HandBrake.\r
+ /// </summary>\r
+ /// <param name="callback">\r
+ /// The method that will be called when the check is finished.\r
+ /// </param>\r
+ /// <param name="debug">\r
+ /// Whether or not to execute this in debug mode.\r
+ /// </param>\r
+ /// <param name="url">\r
+ /// The url.\r
+ /// </param>\r
+ /// <param name="currentBuild">\r
+ /// The current Build.\r
+ /// </param>\r
+ /// <param name="skipBuild">\r
+ /// The skip Build.\r
+ /// </param>\r
+ /// <param name="currentVersion">\r
+ /// The current Version.\r
+ /// </param>\r
+ public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild, string currentVersion)\r
+ {\r
+ ThreadPool.QueueUserWorkItem(delegate\r
+ {\r
+ try\r
+ {\r
+ // Initialize variables\r
+ WebRequest request = WebRequest.Create(url);\r
+ WebResponse response = request.GetResponse();\r
+ AppcastReader reader = new AppcastReader();\r
+\r
+ // Get the data, convert it to a string, and parse it into the AppcastReader\r
+ reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());\r
+\r
+ // Further parse the information\r
+ string build = reader.Build;\r
+\r
+ int latest = int.Parse(build);\r
+ int current = currentBuild;\r
+ int skip = skipBuild;\r
+\r
+ // If the user wanted to skip this version, don't report the update\r
+ if (latest == skip)\r
+ {\r
+ UpdateCheckInformation info = new UpdateCheckInformation { NewVersionAvailable = false };\r
+ callback(new UpdateCheckResult(debug, info));\r
+ return;\r
+ }\r
+\r
+ UpdateCheckInformation info2 = new UpdateCheckInformation\r
+ {\r
+ NewVersionAvailable = latest > current,\r
+ DescriptionUrl = reader.DescriptionUrl,\r
+ DownloadFile = reader.DownloadFile,\r
+ Build = reader.Build,\r
+ Version = reader.Version,\r
+ };\r
+ callback(new UpdateCheckResult(debug, info2));\r
+ }\r
+ catch (Exception exc)\r
+ {\r
+ callback(new UpdateCheckResult(debug, new UpdateCheckInformation { Error = exc }));\r
+ }\r
+ });\r
+ }\r
+\r
+ /// <summary>\r
+ /// End Check for Updates\r
+ /// </summary>\r
+ /// <param name="result">\r
+ /// The result.\r
+ /// </param>\r
+ /// <returns>\r
+ /// Update Check information\r
+ /// </returns>\r
+ public static UpdateCheckInformation EndCheckForUpdates(IAsyncResult result)\r
+ {\r
+ return ((UpdateCheckResult)result).Result;\r
+ }\r
+ }\r
+}\r
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Services\r
+namespace HandBrake.ApplicationServices.Utilities\r
{\r
using System;\r
using System.IO;\r
/// <summary>\r
/// Appcast Reader - Used for parsing HandBrakes update file\r
/// </summary>\r
- public class AppcastReader : IAppcastReader\r
+ public class AppcastReader\r
{\r
/// <summary>\r
/// Gets Information about an update to HandBrake\r
<Reference Include="System.Xml" />\r
</ItemGroup>\r
<ItemGroup>\r
- <Compile Include="Services\AppcastReader.cs" />\r
- <Compile Include="Model\UpdateCheckResult.cs" />\r
- <Compile Include="Model\UpdateCheckInformation.cs" />\r
<Compile Include="Properties\AssemblyInfo.cs" />\r
<Compile Include="Properties\Resources.Designer.cs">\r
<AutoGen>True</AutoGen>\r
<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
<SubType>Form</SubType>\r
</Compile>\r
<Compile Include="Views\ExceptionWindow.designer.cs">\r
<DependentUpon>ExceptionWindow.cs</DependentUpon>\r
</Compile>\r
- <Compile Include="Views\DownloadUpdate.cs">\r
- <SubType>Form</SubType>\r
- </Compile>\r
- <Compile Include="Views\DownloadUpdate.Designer.cs">\r
- <DependentUpon>DownloadUpdate.cs</DependentUpon>\r
- </Compile>\r
- <Compile Include="Views\UpdateInfo.cs">\r
- <SubType>Form</SubType>\r
- </Compile>\r
- <Compile Include="Views\UpdateInfo.Designer.cs">\r
- <DependentUpon>UpdateInfo.cs</DependentUpon>\r
- </Compile>\r
</ItemGroup>\r
<ItemGroup>\r
<EmbeddedResource Include="Properties\Resources.resx">\r
<EmbeddedResource Include="Views\ExceptionWindow.resx">\r
<DependentUpon>ExceptionWindow.cs</DependentUpon>\r
</EmbeddedResource>\r
- <EmbeddedResource Include="Views\DownloadUpdate.resx">\r
- <DependentUpon>DownloadUpdate.cs</DependentUpon>\r
- <SubType>Designer</SubType>\r
- </EmbeddedResource>\r
- <EmbeddedResource Include="Views\UpdateInfo.resx">\r
- <DependentUpon>UpdateInfo.cs</DependentUpon>\r
- <SubType>Designer</SubType>\r
- </EmbeddedResource>\r
</ItemGroup>\r
<ItemGroup>\r
<None Include="Resources\copy.png" />\r
<ItemGroup>\r
<None Include="Resources\errorx.png" />\r
</ItemGroup>\r
- <ItemGroup>\r
- <None Include="Resources\logo64.png" />\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
}\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
return ((System.Drawing.Bitmap)(obj));\r
}\r
}\r
- \r
- internal static System.Drawing.Bitmap logo64 {\r
- get {\r
- object obj = ResourceManager.GetObject("logo64", resourceCulture);\r
- return ((System.Drawing.Bitmap)(obj));\r
- }\r
- }\r
}\r
}\r
<data name="ErrorX" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
<value>..\Resources\errorx.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
</data>\r
- <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
+++ /dev/null
-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
+++ /dev/null
-/* UpdateService.cs $\r
- This file is part of the HandBrake source code.\r
- Homepage: <http://handbrake.fr>.\r
- It may be used under the terms of the GNU General Public License. */\r
-\r
-namespace HandBrake.Framework.Services\r
-{\r
- using System;\r
- using System.IO;\r
- using System.Net;\r
- using System.Threading;\r
-\r
- using HandBrake.Framework.Model;\r
- using HandBrake.Framework.Services.Interfaces;\r
-\r
- public class UpdateService\r
- {\r
- /// <summary>\r
- /// Begins checking for an update to HandBrake.\r
- /// </summary>\r
- /// <param name="callback">\r
- /// The method that will be called when the check is finished.\r
- /// </param>\r
- /// <param name="debug">\r
- /// Whether or not to execute this in debug mode.\r
- /// </param>\r
- /// <param name="url">\r
- /// The url.\r
- /// </param>\r
- /// <param name="currentBuild">\r
- /// The current Build.\r
- /// </param>\r
- /// <param name="skipBuild">\r
- /// The skip Build.\r
- /// </param>\r
- /// <param name="currentVersion">\r
- /// The current Version.\r
- /// </param>\r
- public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild, string currentVersion)\r
- {\r
- ThreadPool.QueueUserWorkItem(new WaitCallback(delegate\r
- {\r
- try\r
- {\r
- // Initialize variables\r
- WebRequest request = WebRequest.Create(url);\r
- WebResponse response = request.GetResponse();\r
- IAppcastReader reader = new AppcastReader();\r
-\r
- // Get the data, convert it to a string, and parse it into the AppcastReader\r
- reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());\r
-\r
- // Further parse the information\r
- string build = reader.Build;\r
-\r
- int latest = int.Parse(build);\r
- int current = currentBuild;\r
- int skip = skipBuild;\r
-\r
- // If the user wanted to skip this version, don't report the update\r
- if (latest == skip)\r
- {\r
- UpdateCheckInformation info =\r
- new UpdateCheckInformation\r
- {\r
- NewVersionAvailable = false,\r
- BuildInformation = null\r
- };\r
- callback(new UpdateCheckResult(debug, info));\r
- return;\r
- }\r
-\r
- UpdateCheckInformation info2 = new UpdateCheckInformation\r
- {\r
- NewVersionAvailable = latest > current,\r
- BuildInformation = reader\r
- };\r
- callback(new UpdateCheckResult(debug, info2));\r
- }\r
- catch (Exception exc)\r
- {\r
- callback(new UpdateCheckResult(debug, new UpdateCheckInformation { Error = exc }));\r
- }\r
- }));\r
- }\r
-\r
- /// <summary>\r
- /// End Check for Updates\r
- /// </summary>\r
- /// <param name="result">\r
- /// The result.\r
- /// </param>\r
- /// <returns>\r
- /// Update Check information\r
- /// </returns>\r
- public static UpdateCheckInformation EndCheckForUpdates(IAsyncResult result)\r
- {\r
- return ((UpdateCheckResult)result).Result;\r
- }\r
- }\r
-}\r
<Compile Include="ToolWindows\BatchAdd.Designer.cs">\r
<DependentUpon>BatchAdd.cs</DependentUpon>\r
</Compile>\r
+ <Compile Include="ToolWindows\DownloadUpdate.cs">\r
+ <SubType>Form</SubType>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\DownloadUpdate.Designer.cs">\r
+ <DependentUpon>DownloadUpdate.cs</DependentUpon>\r
+ </Compile>\r
<Compile Include="ToolWindows\PreviewOverlay.cs">\r
<SubType>Form</SubType>\r
</Compile>\r
<Compile Include="ToolWindows\TitleSpecificScan.Designer.cs">\r
<DependentUpon>TitleSpecificScan.cs</DependentUpon>\r
</Compile>\r
+ <Compile Include="ToolWindows\UpdateInfo.cs">\r
+ <SubType>Form</SubType>\r
+ </Compile>\r
+ <Compile Include="ToolWindows\UpdateInfo.Designer.cs">\r
+ <DependentUpon>UpdateInfo.cs</DependentUpon>\r
+ </Compile>\r
<EmbeddedResource Include="Controls\AudioPanel.resx">\r
<DependentUpon>AudioPanel.cs</DependentUpon>\r
<SubType>Designer</SubType>\r
<EmbeddedResource Include="ToolWindows\BatchAdd.resx">\r
<DependentUpon>BatchAdd.cs</DependentUpon>\r
</EmbeddedResource>\r
+ <EmbeddedResource Include="ToolWindows\DownloadUpdate.resx">\r
+ <DependentUpon>DownloadUpdate.cs</DependentUpon>\r
+ <SubType>Designer</SubType>\r
+ </EmbeddedResource>\r
<EmbeddedResource Include="ToolWindows\PreviewOverlay.resx">\r
<DependentUpon>PreviewOverlay.cs</DependentUpon>\r
</EmbeddedResource>\r
<EmbeddedResource Include="ToolWindows\TitleSpecificScan.resx">\r
<DependentUpon>TitleSpecificScan.cs</DependentUpon>\r
</EmbeddedResource>\r
+ <EmbeddedResource Include="ToolWindows\UpdateInfo.resx">\r
+ <DependentUpon>UpdateInfo.cs</DependentUpon>\r
+ <SubType>Designer</SubType>\r
+ </EmbeddedResource>\r
<None Include="app.config" />\r
<None Include="Installer\MakeNightly.nsi.tmpl" />\r
<None Include="Installer\MakeNightly.nsi" />\r
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Views\r
+namespace Handbrake.ToolWindows\r
{\r
partial class DownloadUpdate\r
{\r
// \r
// PictureBox1\r
// \r
- this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.download;\r
+ this.PictureBox1.Image = global::Handbrake.Properties.Resources.Download;\r
resources.ApplyResources(this.PictureBox1, "PictureBox1");\r
this.PictureBox1.Name = "PictureBox1";\r
this.tableLayoutPanel1.SetRowSpan(this.PictureBox1, 3);\r
resources.ApplyResources(this, "$this");\r
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
this.Controls.Add(this.tableLayoutPanel1);\r
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;\r
this.MaximizeBox = false;\r
this.MinimizeBox = false;\r
this.Name = "DownloadUpdate";\r
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Views\r
+namespace Handbrake.ToolWindows\r
{\r
using System;\r
using System.Diagnostics;\r
<value>2.0</value>\r
</resheader>\r
<resheader name="reader">\r
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</resheader>\r
<resheader name="writer">\r
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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
+ <assembly alias="mscorlib" name="mscorlib, Version=4.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
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.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
<value>lblProgress</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>lblProgress.Parent" xml:space="preserve">\r
<value>tableLayoutPanel1</value>\r
<data name=">>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
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.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
<value>progress_download</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>progress_download.Parent" xml:space="preserve">\r
<value>tableLayoutPanel1</value>\r
<value>btn_cancel</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>btn_cancel.Parent" xml:space="preserve">\r
<value>tableLayoutPanel1</value>\r
<value>PictureBox1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>PictureBox1.Parent" xml:space="preserve">\r
<value>tableLayoutPanel1</value>\r
<value>tableLayoutPanel1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>tableLayoutPanel1.Parent" xml:space="preserve">\r
<value>$this</value>\r
<data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">\r
<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>\r
</data>\r
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.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>DownloadUpdate</value>\r
</data>\r
<data name=">>$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
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
</root>
\ No newline at end of file
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Views\r
+namespace Handbrake.ToolWindows\r
{\r
partial class UpdateInfo\r
{\r
this.button_container = new System.Windows.Forms.SplitContainer();\r
this.panel1.SuspendLayout();\r
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();\r
this.splitContainer1.Panel1.SuspendLayout();\r
this.splitContainer1.Panel2.SuspendLayout();\r
this.splitContainer1.SuspendLayout();\r
+ ((System.ComponentModel.ISupportInitialize)(this.button_container)).BeginInit();\r
this.button_container.Panel1.SuspendLayout();\r
this.button_container.Panel2.SuspendLayout();\r
this.button_container.SuspendLayout();\r
// \r
// PictureBox1\r
// \r
- this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.logo64;\r
+ this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo64;\r
resources.ApplyResources(this.PictureBox1, "PictureBox1");\r
this.PictureBox1.Name = "PictureBox1";\r
this.PictureBox1.TabStop = false;\r
this.Controls.Add(this.panel3);\r
this.Controls.Add(this.statusStrip1);\r
this.Controls.Add(this.panel1);\r
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;\r
this.MaximizeBox = false;\r
this.Name = "UpdateInfo";\r
this.panel1.ResumeLayout(false);\r
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
this.splitContainer1.Panel1.ResumeLayout(false);\r
this.splitContainer1.Panel2.ResumeLayout(false);\r
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();\r
this.splitContainer1.ResumeLayout(false);\r
this.button_container.Panel1.ResumeLayout(false);\r
this.button_container.Panel1.PerformLayout();\r
this.button_container.Panel2.ResumeLayout(false);\r
this.button_container.Panel2.PerformLayout();\r
+ ((System.ComponentModel.ISupportInitialize)(this.button_container)).EndInit();\r
this.button_container.ResumeLayout(false);\r
this.ResumeLayout(false);\r
this.PerformLayout();\r
Homepage: <http://handbrake.fr>.\r
It may be used under the terms of the GNU General Public License. */\r
\r
-namespace HandBrake.Framework.Views\r
+namespace Handbrake.ToolWindows\r
{\r
using System;\r
using System.Windows.Forms;\r
\r
- using HandBrake.Framework.Services.Interfaces;\r
+ using HandBrake.ApplicationServices.Model.General;\r
+ using HandBrake.Framework.Views;\r
\r
/// <summary>\r
/// A window to display update information.\r
/// <summary>\r
/// An instance of the Appcast Reader\r
/// </summary>\r
- private readonly IAppcastReader appcast;\r
+ private readonly UpdateCheckInformation appcast;\r
\r
/// <summary>\r
/// The Current Version\r
/// <param name="currentBuild">\r
/// The current Build.\r
/// </param>\r
- public UpdateInfo(IAppcastReader reader, string currentVersion, string currentBuild)\r
+ public UpdateInfo(UpdateCheckInformation reader, string currentVersion, string currentBuild)\r
{\r
InitializeComponent();\r
\r
<value>2.0</value>\r
</resheader>\r
<resheader name="reader">\r
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</resheader>\r
<resheader name="writer">\r
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.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
+ <assembly alias="mscorlib" name="mscorlib, Version=4.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
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.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
<value>label1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>label1.Parent" xml:space="preserve">\r
<value>panel1</value>\r
<value>label6</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>label6.Parent" xml:space="preserve">\r
<value>panel1</value>\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
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.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
<value>btn_skip</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>btn_skip.Parent" xml:space="preserve">\r
<value>button_container.Panel1</value>\r
<value>btn_installUpdate</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>btn_installUpdate.Parent" xml:space="preserve">\r
<value>button_container.Panel2</value>\r
<value>btn_remindLater</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>btn_remindLater.Parent" xml:space="preserve">\r
<value>button_container.Panel2</value>\r
<value>label3</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>label3.Parent" xml:space="preserve">\r
<value>panel1</value>\r
<value>lbl_update_text</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>lbl_update_text.Parent" xml:space="preserve">\r
<value>panel1</value>\r
<value>panel2</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>panel2.Parent" xml:space="preserve">\r
<value>panel1</value>\r
<value>PictureBox1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>PictureBox1.Parent" xml:space="preserve">\r
<value>panel1</value>\r
<value>panel1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>panel1.Parent" xml:space="preserve">\r
<value>$this</value>\r
<data name=">>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
+ <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
<value>17, 17</value>\r
</metadata>\r
<data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">\r
<value>statusStrip1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>statusStrip1.Parent" xml:space="preserve">\r
<value>$this</value>\r
<value>panel3</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>panel3.Parent" xml:space="preserve">\r
<value>$this</value>\r
<value>panel5</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>panel5.Parent" xml:space="preserve">\r
<value>$this</value>\r
<value>wBrowser</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>wBrowser.Parent" xml:space="preserve">\r
<value>splitContainer1.Panel1</value>\r
<value>splitContainer1.Panel1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">\r
<value>splitContainer1</value>\r
<value>button_container.Panel1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>button_container.Panel1.Parent" xml:space="preserve">\r
<value>button_container</value>\r
<value>button_container.Panel2</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>button_container.Panel2.Parent" xml:space="preserve">\r
<value>button_container</value>\r
<value>button_container</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>button_container.Parent" xml:space="preserve">\r
<value>splitContainer1.Panel2</value>\r
<value>splitContainer1.Panel2</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">\r
<value>splitContainer1</value>\r
<value>splitContainer1</value>\r
</data>\r
<data name=">>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
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
<data name=">>splitContainer1.Parent" xml:space="preserve">\r
<value>$this</value>\r
<data name=">>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
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.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>UpdateInfo</value>\r
</data>\r
<data name=">>$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
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
</data>\r
</root>
\ No newline at end of file
using Functions;\r
\r
using HandBrake.ApplicationServices.EventArgs;\r
+ using HandBrake.ApplicationServices.Model.General;\r
using HandBrake.ApplicationServices.Utilities;\r
- using HandBrake.Framework.Model;\r
- using HandBrake.Framework.Services;\r
- using HandBrake.Framework.Views;\r
using HandBrake.ApplicationServices.Functions;\r
using HandBrake.ApplicationServices.Model;\r
using HandBrake.ApplicationServices.Parsing;\r
/// </summary>\r
public partial class frmMain : Form\r
{\r
+ #region Private Varibles\r
// Objects which may be used by one or more other objects *************\r
private IQueueProcessor queueProcessor = new QueueProcessor(Program.InstanceId);\r
private PresetService presetHandler = new PresetService();\r
// Delegates **********************************************************\r
private delegate void UpdateWindowHandler();\r
\r
+ #endregion\r
+\r
// Applicaiton Startup ************************************************\r
\r
#region Properties\r
\r
if (info.NewVersionAvailable)\r
{\r
- UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());\r
+ UpdateInfo updateWindow = new UpdateInfo(info, Settings.Default.hb_version, Settings.Default.hb_build.ToString());\r
updateWindow.ShowDialog();\r
}\r
}\r
// Get the information about the new build, if any, and close the window\r
info = UpdateService.EndCheckForUpdates(result);\r
\r
- if (info.NewVersionAvailable && info.BuildInformation != null)\r
+ if (info.NewVersionAvailable)\r
{\r
- UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());\r
+ UpdateInfo updateWindow = new UpdateInfo(info, Settings.Default.hb_version, Settings.Default.hb_build.ToString());\r
updateWindow.ShowDialog();\r
}\r
else\r
projects / handbrake / commitdiff
