diff options
| author | sr55 <[email protected]> | 2011-03-13 12:35:48 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2011-03-13 12:35:48 +0000 |
| commit | 57224a250b66b28bed628f587486197c9900bc1d (patch) | |
| tree | 1e8a04f83cacafcd70b1eea74a4d76913875d34d /win/C# | |
| parent | fdc4b3187ae9c825793e9e665c5e0d4bc5ccbc25 (diff) | |
WinGui:
- Shuffle some more code around. Aiming to remove the framework library completely soon.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3842 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/C#')
20 files changed, 208 insertions, 254 deletions
diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index db3cd55ad..52d11a26d 100644 --- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -113,6 +113,8 @@ <Compile Include="Model\Encoding\SubtitleTrack.cs" />
<Compile Include="Model\Encoding\VideoEncoder.cs" />
<Compile Include="Model\Encoding\VideoEncodeRateMode.cs" />
+ <Compile Include="Model\General\UpdateCheckInformation.cs" />
+ <Compile Include="Model\General\UpdateCheckResult.cs" />
<Compile Include="Model\Preset.cs" />
<Compile Include="Model\QueueTask.cs" />
<Compile Include="Model\Encoding\SubtitleType.cs" />
@@ -139,6 +141,8 @@ <Compile Include="Services\QueueManager.cs" />
<Compile Include="Services\QueueProcessor.cs" />
<Compile Include="Services\ScanService.cs" />
+ <Compile Include="Services\UpdateService.cs" />
+ <Compile Include="Utilities\AppcastReader.cs" />
<Compile Include="Utilities\PlistUtility.cs" />
<Compile Include="Utilities\QueryParserUtility.cs" />
<Compile Include="Utilities\UtilityService.cs" />
diff --git a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs b/win/C#/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs index ff59dce72..5932aa402 100644 --- a/win/C#/HandBrake.Framework/Model/UpdateCheckInformation.cs +++ b/win/C#/HandBrake.ApplicationServices/Model/General/UpdateCheckInformation.cs @@ -3,10 +3,9 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Model
+namespace HandBrake.ApplicationServices.Model.General
{
using System;
- using HandBrake.Framework.Services.Interfaces;
/// <summary>
/// Provides information about an update check.
@@ -27,9 +26,24 @@ 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.
+ /// Gets or sets Information about an update to HandBrake
/// </summary>
- public IAppcastReader BuildInformation { get; set; }
+ public Uri DescriptionUrl { get; set; }
+
+ /// <summary>
+ /// Gets or sets HandBrake's version from the appcast.xml file.
+ /// </summary>
+ public string Version { get; set; }
+
+ /// <summary>
+ /// Gets or sets HandBrake's Build from the appcast.xml file.
+ /// </summary>
+ public string Build { get; set; }
+
+ /// <summary>
+ /// Gets or sets the URL for update file.
+ /// </summary>
+ public string DownloadFile { 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/Model/UpdateCheckResult.cs b/win/C#/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs index ba04100ca..2f7c7e874 100644 --- a/win/C#/HandBrake.Framework/Model/UpdateCheckResult.cs +++ b/win/C#/HandBrake.ApplicationServices/Model/General/UpdateCheckResult.cs @@ -3,7 +3,7 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Model
+namespace HandBrake.ApplicationServices.Model.General
{
using System;
using System.Threading;
@@ -14,7 +14,7 @@ namespace HandBrake.Framework.Model public class UpdateCheckResult : IAsyncResult
{
/// <summary>
- /// Initializes a new instance of the <see cref="HandBrake.Framework.Model.UpdateCheckResult"/> class.
+ /// Initializes a new instance of the <see cref="UpdateCheckResult"/> class.
/// </summary>
/// <param name="asyncState">
/// The async state.
@@ -22,7 +22,7 @@ namespace HandBrake.Framework.Model /// <param name="info">
/// The info.
/// </param>
- public UpdateCheckResult(object asyncState, UpdateCheckInformation info)
+ public UpdateCheckResult(object asyncState, ApplicationServices.Model.General.UpdateCheckInformation info)
{
this.AsyncState = asyncState;
this.Result = info;
@@ -36,7 +36,7 @@ namespace HandBrake.Framework.Model /// <summary>
/// Gets the result of the update check.
/// </summary>
- public UpdateCheckInformation Result { get; private set; }
+ public ApplicationServices.Model.General.UpdateCheckInformation Result { get; private set; }
/// <summary>
/// Gets AsyncWaitHandle.
diff --git a/win/C#/HandBrake.ApplicationServices/Services/UpdateService.cs b/win/C#/HandBrake.ApplicationServices/Services/UpdateService.cs new file mode 100644 index 000000000..5e65021e5 --- /dev/null +++ b/win/C#/HandBrake.ApplicationServices/Services/UpdateService.cs @@ -0,0 +1,97 @@ +namespace HandBrake.ApplicationServices.Services
+{
+ using System;
+ using System.IO;
+ using System.Net;
+ using System.Threading;
+
+ using HandBrake.ApplicationServices.Model.General;
+ using HandBrake.ApplicationServices.Utilities;
+
+ /// <summary>
+ /// The Update Service
+ /// </summary>
+ public class UpdateService
+ {
+ /// <summary>
+ /// Begins checking for an update to HandBrake.
+ /// </summary>
+ /// <param name="callback">
+ /// The method that will be called when the check is finished.
+ /// </param>
+ /// <param name="debug">
+ /// Whether or not to execute this in debug mode.
+ /// </param>
+ /// <param name="url">
+ /// The url.
+ /// </param>
+ /// <param name="currentBuild">
+ /// The current Build.
+ /// </param>
+ /// <param name="skipBuild">
+ /// The skip Build.
+ /// </param>
+ /// <param name="currentVersion">
+ /// The current Version.
+ /// </param>
+ public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild, string currentVersion)
+ {
+ ThreadPool.QueueUserWorkItem(delegate
+ {
+ try
+ {
+ // Initialize variables
+ WebRequest request = WebRequest.Create(url);
+ WebResponse response = request.GetResponse();
+ AppcastReader reader = new AppcastReader();
+
+ // Get the data, convert it to a string, and parse it into the AppcastReader
+ reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());
+
+ // Further parse the information
+ string build = reader.Build;
+
+ int latest = int.Parse(build);
+ int current = currentBuild;
+ int skip = skipBuild;
+
+ // If the user wanted to skip this version, don't report the update
+ if (latest == skip)
+ {
+ UpdateCheckInformation info = new UpdateCheckInformation { NewVersionAvailable = false };
+ callback(new UpdateCheckResult(debug, info));
+ return;
+ }
+
+ UpdateCheckInformation info2 = new UpdateCheckInformation
+ {
+ NewVersionAvailable = latest > current,
+ DescriptionUrl = reader.DescriptionUrl,
+ DownloadFile = reader.DownloadFile,
+ Build = reader.Build,
+ Version = reader.Version,
+ };
+ callback(new UpdateCheckResult(debug, info2));
+ }
+ catch (Exception exc)
+ {
+ callback(new UpdateCheckResult(debug, new UpdateCheckInformation { Error = exc }));
+ }
+ });
+ }
+
+ /// <summary>
+ /// End Check for Updates
+ /// </summary>
+ /// <param name="result">
+ /// The result.
+ /// </param>
+ /// <returns>
+ /// Update Check information
+ /// </returns>
+ public static UpdateCheckInformation EndCheckForUpdates(IAsyncResult result)
+ {
+ return ((UpdateCheckResult)result).Result;
+ }
+ }
+}
diff --git a/win/C#/HandBrake.Framework/Services/AppcastReader.cs b/win/C#/HandBrake.ApplicationServices/Utilities/AppcastReader.cs index 31bd853a7..a8173d5fe 100644 --- a/win/C#/HandBrake.Framework/Services/AppcastReader.cs +++ b/win/C#/HandBrake.ApplicationServices/Utilities/AppcastReader.cs @@ -3,7 +3,7 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Services
+namespace HandBrake.ApplicationServices.Utilities
{
using System;
using System.IO;
@@ -15,7 +15,7 @@ namespace HandBrake.Framework.Services /// <summary>
/// Appcast Reader - Used for parsing HandBrakes update file
/// </summary>
- public class AppcastReader : IAppcastReader
+ public class AppcastReader
{
/// <summary>
/// Gets Information about an update to HandBrake
diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj index e7a7664b6..9e625e5db 100644 --- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj +++ b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj @@ -55,9 +55,6 @@ <Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Services\AppcastReader.cs" />
- <Compile Include="Model\UpdateCheckResult.cs" />
- <Compile Include="Model\UpdateCheckInformation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -65,27 +62,13 @@ <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">
<SubType>Form</SubType>
</Compile>
<Compile Include="Views\ExceptionWindow.designer.cs">
<DependentUpon>ExceptionWindow.cs</DependentUpon>
</Compile>
- <Compile Include="Views\DownloadUpdate.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Views\DownloadUpdate.Designer.cs">
- <DependentUpon>DownloadUpdate.cs</DependentUpon>
- </Compile>
- <Compile Include="Views\UpdateInfo.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="Views\UpdateInfo.Designer.cs">
- <DependentUpon>UpdateInfo.cs</DependentUpon>
- </Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
@@ -95,14 +78,6 @@ <EmbeddedResource Include="Views\ExceptionWindow.resx">
<DependentUpon>ExceptionWindow.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Views\DownloadUpdate.resx">
- <DependentUpon>DownloadUpdate.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="Views\UpdateInfo.resx">
- <DependentUpon>UpdateInfo.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\copy.png" />
@@ -110,12 +85,6 @@ <ItemGroup>
<None Include="Resources\errorx.png" />
</ItemGroup>
- <ItemGroup>
- <None Include="Resources\logo64.png" />
- </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/Properties/Resources.Designer.cs b/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs index 5d5e113a0..b282e8b26 100644 --- a/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs +++ b/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs @@ -67,25 +67,11 @@ 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);
return ((System.Drawing.Bitmap)(obj));
}
}
-
- internal static System.Drawing.Bitmap logo64 {
- get {
- object obj = ResourceManager.GetObject("logo64", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
}
}
diff --git a/win/C#/HandBrake.Framework/Properties/Resources.resx b/win/C#/HandBrake.Framework/Properties/Resources.resx index 40e6440c4..f7606bf2c 100644 --- a/win/C#/HandBrake.Framework/Properties/Resources.resx +++ b/win/C#/HandBrake.Framework/Properties/Resources.resx @@ -124,11 +124,4 @@ <data name="ErrorX" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\errorx.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <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 differdeleted file mode 100644 index c3206626b..000000000 --- a/win/C#/HandBrake.Framework/Resources/download.png +++ /dev/null diff --git a/win/C#/HandBrake.Framework/Resources/logo64.png b/win/C#/HandBrake.Framework/Resources/logo64.png Binary files differdeleted file mode 100644 index 12808f636..000000000 --- a/win/C#/HandBrake.Framework/Resources/logo64.png +++ /dev/null diff --git a/win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs b/win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs deleted file mode 100644 index 7064a08d3..000000000 --- a/win/C#/HandBrake.Framework/Services/Interfaces/IAppcastReader.cs +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index 0bbd781f3..000000000 --- a/win/C#/HandBrake.Framework/Services/UpdateService.cs +++ /dev/null @@ -1,101 +0,0 @@ -/* UpdateService.cs $
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr>.
- It may be used under the terms of the GNU General Public License. */
-
-namespace HandBrake.Framework.Services
-{
- using System;
- using System.IO;
- using System.Net;
- using System.Threading;
-
- using HandBrake.Framework.Model;
- using HandBrake.Framework.Services.Interfaces;
-
- public class UpdateService
- {
- /// <summary>
- /// Begins checking for an update to HandBrake.
- /// </summary>
- /// <param name="callback">
- /// The method that will be called when the check is finished.
- /// </param>
- /// <param name="debug">
- /// Whether or not to execute this in debug mode.
- /// </param>
- /// <param name="url">
- /// The url.
- /// </param>
- /// <param name="currentBuild">
- /// The current Build.
- /// </param>
- /// <param name="skipBuild">
- /// The skip Build.
- /// </param>
- /// <param name="currentVersion">
- /// The current Version.
- /// </param>
- public static void BeginCheckForUpdates(AsyncCallback callback, bool debug, string url, int currentBuild, int skipBuild, string currentVersion)
- {
- ThreadPool.QueueUserWorkItem(new WaitCallback(delegate
- {
- try
- {
- // Initialize variables
- WebRequest request = WebRequest.Create(url);
- WebResponse response = request.GetResponse();
- IAppcastReader reader = new AppcastReader();
-
- // Get the data, convert it to a string, and parse it into the AppcastReader
- reader.GetUpdateInfo(new StreamReader(response.GetResponseStream()).ReadToEnd());
-
- // Further parse the information
- string build = reader.Build;
-
- int latest = int.Parse(build);
- int current = currentBuild;
- int skip = skipBuild;
-
- // If the user wanted to skip this version, don't report the update
- if (latest == skip)
- {
- UpdateCheckInformation info =
- new UpdateCheckInformation
- {
- NewVersionAvailable = false,
- BuildInformation = null
- };
- callback(new UpdateCheckResult(debug, info));
- return;
- }
-
- UpdateCheckInformation info2 = new UpdateCheckInformation
- {
- NewVersionAvailable = latest > current,
- BuildInformation = reader
- };
- callback(new UpdateCheckResult(debug, info2));
- }
- catch (Exception exc)
- {
- callback(new UpdateCheckResult(debug, new UpdateCheckInformation { Error = exc }));
- }
- }));
- }
-
- /// <summary>
- /// End Check for Updates
- /// </summary>
- /// <param name="result">
- /// The result.
- /// </param>
- /// <returns>
- /// Update Check information
- /// </returns>
- public static UpdateCheckInformation EndCheckForUpdates(IAsyncResult result)
- {
- return ((UpdateCheckResult)result).Result;
- }
- }
-}
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 4a3d04311..b1a8325fe 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -271,6 +271,12 @@ <Compile Include="ToolWindows\BatchAdd.Designer.cs">
<DependentUpon>BatchAdd.cs</DependentUpon>
</Compile>
+ <Compile Include="ToolWindows\DownloadUpdate.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ToolWindows\DownloadUpdate.Designer.cs">
+ <DependentUpon>DownloadUpdate.cs</DependentUpon>
+ </Compile>
<Compile Include="ToolWindows\PreviewOverlay.cs">
<SubType>Form</SubType>
</Compile>
@@ -283,6 +289,12 @@ <Compile Include="ToolWindows\TitleSpecificScan.Designer.cs">
<DependentUpon>TitleSpecificScan.cs</DependentUpon>
</Compile>
+ <Compile Include="ToolWindows\UpdateInfo.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="ToolWindows\UpdateInfo.Designer.cs">
+ <DependentUpon>UpdateInfo.cs</DependentUpon>
+ </Compile>
<EmbeddedResource Include="Controls\AudioPanel.resx">
<DependentUpon>AudioPanel.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -348,12 +360,20 @@ <EmbeddedResource Include="ToolWindows\BatchAdd.resx">
<DependentUpon>BatchAdd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ToolWindows\DownloadUpdate.resx">
+ <DependentUpon>DownloadUpdate.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="ToolWindows\PreviewOverlay.resx">
<DependentUpon>PreviewOverlay.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ToolWindows\TitleSpecificScan.resx">
<DependentUpon>TitleSpecificScan.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="ToolWindows\UpdateInfo.resx">
+ <DependentUpon>UpdateInfo.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<None Include="app.config" />
<None Include="Installer\MakeNightly.nsi.tmpl" />
<None Include="Installer\MakeNightly.nsi" />
diff --git a/win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs b/win/C#/ToolWindows/DownloadUpdate.Designer.cs index 3159034a3..74b0affe7 100644 --- a/win/C#/HandBrake.Framework/Views/DownloadUpdate.Designer.cs +++ b/win/C#/ToolWindows/DownloadUpdate.Designer.cs @@ -4,7 +4,7 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Views
+namespace Handbrake.ToolWindows
{
partial class DownloadUpdate
{
@@ -76,7 +76,7 @@ namespace HandBrake.Framework.Views //
// PictureBox1
//
- this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.download;
+ this.PictureBox1.Image = global::Handbrake.Properties.Resources.Download;
resources.ApplyResources(this.PictureBox1, "PictureBox1");
this.PictureBox1.Name = "PictureBox1";
this.tableLayoutPanel1.SetRowSpan(this.PictureBox1, 3);
@@ -87,7 +87,7 @@ namespace HandBrake.Framework.Views resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "DownloadUpdate";
diff --git a/win/C#/HandBrake.Framework/Views/DownloadUpdate.cs b/win/C#/ToolWindows/DownloadUpdate.cs index 3b12a640f..f359e09a4 100644 --- a/win/C#/HandBrake.Framework/Views/DownloadUpdate.cs +++ b/win/C#/ToolWindows/DownloadUpdate.cs @@ -3,7 +3,7 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Views
+namespace Handbrake.ToolWindows
{
using System;
using System.Diagnostics;
diff --git a/win/C#/HandBrake.Framework/Views/DownloadUpdate.resx b/win/C#/ToolWindows/DownloadUpdate.resx index db07d3ccb..db4b953de 100644 --- a/win/C#/HandBrake.Framework/Views/DownloadUpdate.resx +++ b/win/C#/ToolWindows/DownloadUpdate.resx @@ -112,16 +112,16 @@ <value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.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" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblProgress.Location" type="System.Drawing.Point, System.Drawing">
<value>73, 29</value>
</data>
@@ -138,7 +138,7 @@ <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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lblProgress.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@@ -146,7 +146,7 @@ <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" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.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>
@@ -163,7 +163,7 @@ <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>
+ <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>progress_download.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@@ -193,7 +193,7 @@ <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>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btn_cancel.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@@ -220,7 +220,7 @@ <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>
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>PictureBox1.Parent" xml:space="preserve">
<value>tableLayoutPanel1</value>
@@ -247,7 +247,7 @@ <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>
+ <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>tableLayoutPanel1.Parent" xml:space="preserve">
<value>$this</value>
@@ -258,7 +258,7 @@ <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">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
@@ -665,6 +665,6 @@ <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>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.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#/ToolWindows/UpdateInfo.Designer.cs index 6400a8772..9e0aa0d65 100644 --- a/win/C#/HandBrake.Framework/Views/UpdateInfo.Designer.cs +++ b/win/C#/ToolWindows/UpdateInfo.Designer.cs @@ -3,7 +3,7 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Views
+namespace Handbrake.ToolWindows
{
partial class UpdateInfo
{
@@ -52,9 +52,11 @@ namespace HandBrake.Framework.Views this.button_container = new System.Windows.Forms.SplitContainer();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.button_container)).BeginInit();
this.button_container.Panel1.SuspendLayout();
this.button_container.Panel2.SuspendLayout();
this.button_container.SuspendLayout();
@@ -132,7 +134,7 @@ namespace HandBrake.Framework.Views //
// PictureBox1
//
- this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.logo64;
+ this.PictureBox1.Image = global::Handbrake.Properties.Resources.logo64;
resources.ApplyResources(this.PictureBox1, "PictureBox1");
this.PictureBox1.Name = "PictureBox1";
this.PictureBox1.TabStop = false;
@@ -196,6 +198,7 @@ namespace HandBrake.Framework.Views this.Controls.Add(this.panel3);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.panel1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;
this.MaximizeBox = false;
this.Name = "UpdateInfo";
this.panel1.ResumeLayout(false);
@@ -203,11 +206,13 @@ namespace HandBrake.Framework.Views ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.button_container.Panel1.ResumeLayout(false);
this.button_container.Panel1.PerformLayout();
this.button_container.Panel2.ResumeLayout(false);
this.button_container.Panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.button_container)).EndInit();
this.button_container.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/win/C#/HandBrake.Framework/Views/UpdateInfo.cs b/win/C#/ToolWindows/UpdateInfo.cs index 906f11745..bca7d81cd 100644 --- a/win/C#/HandBrake.Framework/Views/UpdateInfo.cs +++ b/win/C#/ToolWindows/UpdateInfo.cs @@ -3,12 +3,13 @@ Homepage: <http://handbrake.fr>.
It may be used under the terms of the GNU General Public License. */
-namespace HandBrake.Framework.Views
+namespace Handbrake.ToolWindows
{
using System;
using System.Windows.Forms;
- using HandBrake.Framework.Services.Interfaces;
+ using HandBrake.ApplicationServices.Model.General;
+ using HandBrake.Framework.Views;
/// <summary>
/// A window to display update information.
@@ -18,7 +19,7 @@ namespace HandBrake.Framework.Views /// <summary>
/// An instance of the Appcast Reader
/// </summary>
- private readonly IAppcastReader appcast;
+ private readonly UpdateCheckInformation appcast;
/// <summary>
/// The Current Version
@@ -42,7 +43,7 @@ namespace HandBrake.Framework.Views /// <param name="currentBuild">
/// The current Build.
/// </param>
- public UpdateInfo(IAppcastReader reader, string currentVersion, string currentBuild)
+ public UpdateInfo(UpdateCheckInformation reader, string currentVersion, string currentBuild)
{
InitializeComponent();
diff --git a/win/C#/HandBrake.Framework/Views/UpdateInfo.resx b/win/C#/ToolWindows/UpdateInfo.resx index ab5aac9ec..4503c923b 100644 --- a/win/C#/HandBrake.Framework/Views/UpdateInfo.resx +++ b/win/C#/ToolWindows/UpdateInfo.resx @@ -112,16 +112,16 @@ <value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.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" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.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>
@@ -141,7 +141,7 @@ <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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label1.Parent" xml:space="preserve">
<value>panel1</value>
@@ -168,7 +168,7 @@ <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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label6.Parent" xml:space="preserve">
<value>panel1</value>
@@ -179,7 +179,7 @@ <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" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btn_skip.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
@@ -202,7 +202,7 @@ <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>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btn_skip.Parent" xml:space="preserve">
<value>button_container.Panel1</value>
@@ -235,7 +235,7 @@ <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>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btn_installUpdate.Parent" xml:space="preserve">
<value>button_container.Panel2</value>
@@ -268,7 +268,7 @@ <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>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btn_remindLater.Parent" xml:space="preserve">
<value>button_container.Panel2</value>
@@ -298,7 +298,7 @@ <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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>label3.Parent" xml:space="preserve">
<value>panel1</value>
@@ -325,7 +325,7 @@ <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>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lbl_update_text.Parent" xml:space="preserve">
<value>panel1</value>
@@ -349,7 +349,7 @@ <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>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel2.Parent" xml:space="preserve">
<value>panel1</value>
@@ -373,7 +373,7 @@ <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>
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>PictureBox1.Parent" xml:space="preserve">
<value>panel1</value>
@@ -397,7 +397,7 @@ <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>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel1.Parent" xml:space="preserve">
<value>$this</value>
@@ -405,7 +405,7 @@ <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">
+ <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
@@ -424,7 +424,7 @@ <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>
+ <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>statusStrip1.Parent" xml:space="preserve">
<value>$this</value>
@@ -448,7 +448,7 @@ <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>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel3.Parent" xml:space="preserve">
<value>$this</value>
@@ -472,7 +472,7 @@ <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>
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>panel5.Parent" xml:space="preserve">
<value>$this</value>
@@ -496,7 +496,7 @@ <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>
+ <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>wBrowser.Parent" xml:space="preserve">
<value>splitContainer1.Panel1</value>
@@ -520,7 +520,7 @@ <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>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel1.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -538,7 +538,7 @@ <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>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>button_container.Panel1.Parent" xml:space="preserve">
<value>button_container</value>
@@ -550,7 +550,7 @@ <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>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>button_container.Panel2.Parent" xml:space="preserve">
<value>button_container</value>
@@ -571,7 +571,7 @@ <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>
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>button_container.Parent" xml:space="preserve">
<value>splitContainer1.Panel2</value>
@@ -583,7 +583,7 @@ <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>
+ <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Panel2.Parent" xml:space="preserve">
<value>splitContainer1</value>
@@ -604,7 +604,7 @@ <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>
+ <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>splitContainer1.Parent" xml:space="preserve">
<value>$this</value>
@@ -612,7 +612,7 @@ <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">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
@@ -1016,6 +1016,6 @@ <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>
+ <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 0a8305dbe..884c4a4f4 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -19,10 +19,8 @@ namespace Handbrake using Functions;
using HandBrake.ApplicationServices.EventArgs;
+ using HandBrake.ApplicationServices.Model.General;
using HandBrake.ApplicationServices.Utilities;
- using HandBrake.Framework.Model;
- using HandBrake.Framework.Services;
- using HandBrake.Framework.Views;
using HandBrake.ApplicationServices.Functions;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Parsing;
@@ -41,6 +39,7 @@ namespace Handbrake /// </summary>
public partial class frmMain : Form
{
+ #region Private Varibles
// Objects which may be used by one or more other objects *************
private IQueueProcessor queueProcessor = new QueueProcessor(Program.InstanceId);
private PresetService presetHandler = new PresetService();
@@ -66,6 +65,8 @@ namespace Handbrake // Delegates **********************************************************
private delegate void UpdateWindowHandler();
+ #endregion
+
// Applicaiton Startup ************************************************
#region Properties
@@ -216,7 +217,7 @@ namespace Handbrake if (info.NewVersionAvailable)
{
- UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());
+ UpdateInfo updateWindow = new UpdateInfo(info, Settings.Default.hb_version, Settings.Default.hb_build.ToString());
updateWindow.ShowDialog();
}
}
@@ -2452,9 +2453,9 @@ namespace Handbrake // Get the information about the new build, if any, and close the window
info = UpdateService.EndCheckForUpdates(result);
- if (info.NewVersionAvailable && info.BuildInformation != null)
+ if (info.NewVersionAvailable)
{
- UpdateInfo updateWindow = new UpdateInfo(info.BuildInformation, Settings.Default.hb_version, Settings.Default.hb_build.ToString());
+ UpdateInfo updateWindow = new UpdateInfo(info, Settings.Default.hb_version, Settings.Default.hb_build.ToString());
updateWindow.ShowDialog();
}
else
|
