From e1cd56c97a15f25ec33f925d39ca574f966dfbc0 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 13 Mar 2011 13:14:55 +0000
Subject: [PATCH] WinGui: - Complete work to remove the framework library. -
 Fix a couple of issues with the build script and updated the nsis scripts/

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3843 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/C#/Functions/Main.cs                      |  15 +--
 .../HandBrake.ApplicationServices.csproj      |   6 -
 .../Utilities/AppcastReader.cs                |   2 -
 .../HandBrake.Framework.csproj                |  97 -------------
 .../Properties/AssemblyInfo.cs                |  36 -----
 .../Properties/Resources.Designer.cs          |  77 -----------
 .../Properties/Resources.resx                 | 127 ------------------
 win/C#/HandBrake.Framework/Resources/copy.png | Bin 3291 -> 0 bytes
 .../HandBrake.Framework/Resources/errorx.png  | Bin 10369 -> 0 bytes
 .../Services/ErrorService.cs                  | 109 ---------------
 .../Services/Interfaces/IErrorService.cs      |  41 ------
 win/C#/HandBrake.Framework/Settings.StyleCop  |   1 -
 win/C#/HandBrake10.sln                        |  26 ----
 win/C#/HandBrakeCS.csproj                     |  27 ++--
 win/C#/Installer/Installer.nsi                |  15 +--
 win/C#/Installer/MakeNightly.nsi.tmpl         |  28 +---
 win/C#/Program.cs                             |   2 +-
 .../Views => ToolWindows}/ExceptionWindow.cs  |   2 +-
 .../ExceptionWindow.designer.cs               |   8 +-
 .../ExceptionWindow.resx                      |   0
 win/C#/ToolWindows/UpdateInfo.cs              |   1 -
 win/C#/frmActivityWindow.cs                   |  13 +-
 22 files changed, 43 insertions(+), 590 deletions(-)
 delete mode 100644 win/C#/HandBrake.Framework/HandBrake.Framework.csproj
 delete mode 100644 win/C#/HandBrake.Framework/Properties/AssemblyInfo.cs
 delete mode 100644 win/C#/HandBrake.Framework/Properties/Resources.Designer.cs
 delete mode 100644 win/C#/HandBrake.Framework/Properties/Resources.resx
 delete mode 100644 win/C#/HandBrake.Framework/Resources/copy.png
 delete mode 100644 win/C#/HandBrake.Framework/Resources/errorx.png
 delete mode 100644 win/C#/HandBrake.Framework/Services/ErrorService.cs
 delete mode 100644 win/C#/HandBrake.Framework/Services/Interfaces/IErrorService.cs
 delete mode 100644 win/C#/HandBrake.Framework/Settings.StyleCop
 rename win/C#/{HandBrake.Framework/Views => ToolWindows}/ExceptionWindow.cs (95%)
 rename win/C#/{HandBrake.Framework/Views => ToolWindows}/ExceptionWindow.designer.cs (94%)
 rename win/C#/{HandBrake.Framework/Views => ToolWindows}/ExceptionWindow.resx (100%)

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index f78d38a97..ae53efe90 100644
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -16,23 +16,18 @@ namespace Handbrake.Functions
     using System.Windows.Forms;
     using System.Xml.Serialization;
 
-    using HandBrake.Framework.Services;
-    using HandBrake.Framework.Services.Interfaces;
+
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Parsing;
     using HandBrake.ApplicationServices.Services.Interfaces;
-    using Model;
+
+    using Handbrake.ToolWindows;
 
     /// <summary>
     /// Useful functions which various screens can use.
     /// </summary>
     public static class Main
     {
-        /// <summary>
-        /// The Error Service
-        /// </summary>
-        private static readonly IErrorService errorService = new ErrorService();
-
         /// <summary>
         /// The XML Serializer
         /// </summary>
@@ -706,7 +701,9 @@ namespace Handbrake.Functions
         /// </param>
         public static void ShowExceptiowWindow(string shortError, string longError)
         {
-            errorService.ShowError(shortError, longError);
+            ExceptionWindow window = new ExceptionWindow();
+            window.Setup(shortError, longError);
+            window.ShowDialog();
         }
 
         /// <summary>
diff --git a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 52d11a26d..07aef5609 100644
--- a/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/C#/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -162,12 +162,6 @@
   <ItemGroup>
     <None Include="Resources\logo64.png" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\HandBrake.Framework\HandBrake.Framework.csproj">
-      <Project>{49AD42C1-BF9B-4D78-A644-020878FAADE6}</Project>
-      <Name>HandBrake.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.4\Microsoft.StyleCop.targets" />
diff --git a/win/C#/HandBrake.ApplicationServices/Utilities/AppcastReader.cs b/win/C#/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
index a8173d5fe..8b0053a86 100644
--- a/win/C#/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
+++ b/win/C#/HandBrake.ApplicationServices/Utilities/AppcastReader.cs
@@ -10,8 +10,6 @@ namespace HandBrake.ApplicationServices.Utilities
     using System.Text.RegularExpressions;
     using System.Xml;
 
-    using HandBrake.Framework.Services.Interfaces;
-
     /// <summary>
     /// Appcast Reader - Used for parsing HandBrakes update file
     /// </summary>
diff --git a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj b/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
deleted file mode 100644
index 9e625e5db..000000000
--- a/win/C#/HandBrake.Framework/HandBrake.Framework.csproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{49AD42C1-BF9B-4D78-A644-020878FAADE6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HandBrake.Framework</RootNamespace>
-    <AssemblyName>HandBrake.Framework</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU' ">
-    <OutputPath>bin\NightlyBuild\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Services\ErrorService.cs" />
-    <Compile Include="Services\Interfaces\IErrorService.cs" />
-    <Compile Include="Views\ExceptionWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Views\ExceptionWindow.designer.cs">
-      <DependentUpon>ExceptionWindow.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\ExceptionWindow.resx">
-      <DependentUpon>ExceptionWindow.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\copy.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\errorx.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. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/Properties/AssemblyInfo.cs b/win/C#/HandBrake.Framework/Properties/AssemblyInfo.cs
deleted file mode 100644
index d6b958c94..000000000
--- a/win/C#/HandBrake.Framework/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("HandBrake.Framework")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("HandBrake Team")]
-[assembly: AssemblyProduct("HandBrake.Framework")]
-[assembly: AssemblyCopyright("Copyright © HandBrake Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("85248e69-53e0-4a37-a1a6-95c2e99fc750")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.5.0")]
-[assembly: AssemblyFileVersion("0.9.5.0")]
diff --git a/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs b/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs
deleted file mode 100644
index b282e8b26..000000000
--- a/win/C#/HandBrake.Framework/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace HandBrake.Framework.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HandBrake.Framework.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        internal static System.Drawing.Bitmap copy {
-            get {
-                object obj = ResourceManager.GetObject("copy", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap ErrorX {
-            get {
-                object obj = ResourceManager.GetObject("ErrorX", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}
diff --git a/win/C#/HandBrake.Framework/Properties/Resources.resx b/win/C#/HandBrake.Framework/Properties/Resources.resx
deleted file mode 100644
index f7606bf2c..000000000
--- a/win/C#/HandBrake.Framework/Properties/Resources.resx
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <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>
-  </resheader>
-  <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=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>
-  <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>
-</root>
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/Resources/copy.png b/win/C#/HandBrake.Framework/Resources/copy.png
deleted file mode 100644
index c11c6a7531ddc1c8e599605f27799bca6fe81a65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3291
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
Z4FC)YHPc@^8TtSK002ovPDHLkV1l|97|s9y

diff --git a/win/C#/HandBrake.Framework/Resources/errorx.png b/win/C#/HandBrake.Framework/Resources/errorx.png
deleted file mode 100644
index 75c63c08a43e16593aaa81fd876191bd02ec82c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10369
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
P;|0h|t4P%X&A$E*z79Nq

diff --git a/win/C#/HandBrake.Framework/Services/ErrorService.cs b/win/C#/HandBrake.Framework/Services/ErrorService.cs
deleted file mode 100644
index 3858f1674..000000000
--- a/win/C#/HandBrake.Framework/Services/ErrorService.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  ErrorService.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.Threading;
-    using System.Windows.Forms;
-
-    using HandBrake.Framework.Services.Interfaces;
-    using HandBrake.Framework.Views;
-
-    /// <summary>
-    /// The Error Service
-    /// </summary>
-    public class ErrorService : IErrorService
-    {
-        private int exceptionCount;
-
-        /// <summary>
-        /// Show an Error Window
-        /// </summary>
-        /// <param name="shortError">
-        /// The short error message for the user to read
-        /// </param>
-        /// <param name="longError">
-        /// Exception string or advanced details
-        /// </param>
-        public void ShowError(string shortError, string longError)
-        {
-            exceptionCount++;
-
-            try
-            {
-                Thread newThread = new Thread(new ParameterizedThreadStart(this.LogError));
-                newThread.Start(shortError + Environment.NewLine + longError);
-            }
-            catch (Exception)
-            {
-                // Do Nothing
-            }
-
-            if (exceptionCount > 30)
-            {
-                // If we are getting a large number of exceptions, just die out. We don't want to fill the users drive with a ton 
-                // of exception files.
-                return;
-            }
-
-            ExceptionWindow window = new ExceptionWindow();
-            window.Setup(shortError, longError);
-
-            // This seems far from ideal so maybe have a think about a better way of doing this.
-            // This method can be called from UI and worker threads, so the ExcWindow needs to be called on the UI thread or on it's on UI thread.
-            Application.Run(window); 
-        }
-
-        /// <summary>
-        /// Show a Notice or Warning Message.
-        /// </summary>
-        /// <param name="notice">
-        /// The text to display to the user
-        /// </param>
-        /// <param name="isWarning">
-        /// Is a warning window, show the warning icon instead of the notice
-        /// </param>
-        public void ShowNotice(string notice, bool isWarning)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Write Exceptions out to log files
-        /// </summary>
-        /// <param name="state">
-        /// The state.
-        /// </param>
-        public void LogError(object state)
-        {
-            try
-            {
-                if (exceptionCount > 30)
-                {
-                    // If we are getting a large number of exceptions, just die out. We don't want to fill the users drive with a ton 
-                    // of exception files.
-                    return;
-                }
-
-                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";
-                string file = Path.Combine(logDir, string.Format("Exception_{0}.txt", DateTime.Now.Ticks));
-
-                if (!File.Exists(file))
-                {
-                    using (StreamWriter streamWriter = new StreamWriter(file))
-                    {
-                        streamWriter.WriteLine(state.ToString());
-                    }
-                }
-            }
-            catch
-            {
-                return; // Game over. Stop digging.
-            }
-        }
-    }
-}
diff --git a/win/C#/HandBrake.Framework/Services/Interfaces/IErrorService.cs b/win/C#/HandBrake.Framework/Services/Interfaces/IErrorService.cs
deleted file mode 100644
index 9eceead57..000000000
--- a/win/C#/HandBrake.Framework/Services/Interfaces/IErrorService.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  IErrorService.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.Interfaces
-{
-    /// <summary>
-    /// The Error service for showing the exception window.
-    /// </summary>
-    public interface IErrorService
-    {
-        /// <summary>
-        /// Show an Error Window
-        /// </summary>
-        /// <param name="shortError">
-        /// The short error message for the user to read
-        /// </param>
-        /// <param name="longError">
-        /// Exception string or advanced details
-        /// </param>
-        void ShowError(string shortError, string longError);
-
-        /// <summary>
-        /// Show a Notice or Warning Message.
-        /// </summary>
-        /// <param name="notice">
-        /// The text to display to the user
-        /// </param>
-        /// <param name="isWarning">
-        /// Is a warning window, show the warning icon instead of the notice
-        /// </param>
-        void ShowNotice(string notice, bool isWarning);
-
-        /// <summary>
-        /// Log the error
-        /// </summary>
-        /// <param name="state">The error message</param>
-        void LogError(object state);
-    }
-}
\ No newline at end of file
diff --git a/win/C#/HandBrake.Framework/Settings.StyleCop b/win/C#/HandBrake.Framework/Settings.StyleCop
deleted file mode 100644
index 7f55ce6c6..000000000
--- a/win/C#/HandBrake.Framework/Settings.StyleCop
+++ /dev/null
@@ -1 +0,0 @@
-<StyleCopSettings Version="4.3" />
\ No newline at end of file
diff --git a/win/C#/HandBrake10.sln b/win/C#/HandBrake10.sln
index 56c85201d..f6a702238 100644
--- a/win/C#/HandBrake10.sln
+++ b/win/C#/HandBrake10.sln
@@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServices", "HandBrake.ApplicationServices\HandBrake.ApplicationServices.csproj", "{087A2BA8-BAC2-4577-A46F-07FF9D420016}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Framework", "HandBrake.Framework\HandBrake.Framework.csproj", "{49AD42C1-BF9B-4D78-A644-020878FAADE6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}"
 EndProject
 Global
@@ -81,30 +79,6 @@ Global
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x64.ActiveCfg = Release|Any CPU
 		{087A2BA8-BAC2-4577-A46F-07FF9D420016}.Release|x86.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Install|Any CPU.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Install|Any CPU.Build.0 = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Install|Mixed Platforms.ActiveCfg = NightlyBuild|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Install|Mixed Platforms.Build.0 = NightlyBuild|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Install|x64.ActiveCfg = NightlyBuild|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Install|x86.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.NightlyBuild|Any CPU.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.NightlyBuild|Any CPU.Build.0 = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.NightlyBuild|Mixed Platforms.ActiveCfg = NightlyBuild|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.NightlyBuild|Mixed Platforms.Build.0 = NightlyBuild|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.NightlyBuild|x64.ActiveCfg = NightlyBuild|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.NightlyBuild|x86.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Release|x64.ActiveCfg = Release|Any CPU
-		{49AD42C1-BF9B-4D78-A644-020878FAADE6}.Release|x86.ActiveCfg = Release|Any CPU
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{DADE66CB-0E12-4959-ADE5-0ACD31D27C59}.Debug|Mixed Platforms.Build.0 = Debug|x86
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index b1a8325fe..b36ec5987 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -277,6 +277,12 @@
     <Compile Include="ToolWindows\DownloadUpdate.Designer.cs">
       <DependentUpon>DownloadUpdate.cs</DependentUpon>
     </Compile>
+    <Compile Include="ToolWindows\ExceptionWindow.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolWindows\ExceptionWindow.designer.cs">
+      <DependentUpon>ExceptionWindow.cs</DependentUpon>
+    </Compile>
     <Compile Include="ToolWindows\PreviewOverlay.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -364,6 +370,9 @@
       <DependentUpon>DownloadUpdate.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="ToolWindows\ExceptionWindow.resx">
+      <DependentUpon>ExceptionWindow.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ToolWindows\PreviewOverlay.resx">
       <DependentUpon>PreviewOverlay.cs</DependentUpon>
     </EmbeddedResource>
@@ -487,10 +496,6 @@
       <Project>{087A2BA8-BAC2-4577-A46F-07FF9D420016}</Project>
       <Name>HandBrake.ApplicationServices</Name>
     </ProjectReference>
-    <ProjectReference Include="HandBrake.Framework\HandBrake.Framework.csproj">
-      <Project>{49AD42C1-BF9B-4D78-A644-020878FAADE6}</Project>
-      <Name>HandBrake.Framework</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -508,18 +513,16 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'NightlyBuild' ">
     <PostBuildEvent>
-	cd ../../
-	copy Installer\MakeNightly.nsi bin\NightlyBuild /Y
-	copy handbrakepineapple.ico bin\NightlyBuild /Y
-	xcopy doc bin\NightlyBuild\doc /I /Y
-	cd bin\NightlyBuild
-	makensis MakeNightly.nsi
-	</PostBuildEvent>
+      copy "$(ProjectDir)\Installer\MakeNightly.nsi" "$(ProjectDir)\bin\x86\NightlyBuild" /Y
+      copy "$(ProjectDir)\handbrakepineapple.ico" "$(ProjectDir)\bin\x86\NightlyBuild" /Y
+      xcopy "$(ProjectDir)\doc" "$(ProjectDir)\bin\x86\NightlyBuild\doc" /I /Y
+      makensis "$(ProjectDir)\bin\x86\NightlyBuild\MakeNightly.nsi"
+    </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>
 	subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
 	subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
-subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>
+  subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index 9283fdd01..a4d70f3e0 100644
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -8,15 +8,15 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "0.9.5"
-!define PRODUCT_VERSION_NUMBER "0.9.5"
+!define PRODUCT_VERSION "0.9.6"
+!define PRODUCT_VERSION_NUMBER "0.9.6"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
 ;Required .NET framework
-!define MIN_FRA_MAJOR "3"
-!define MIN_FRA_MINOR "5"
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
 !define MIN_FRA_BUILD "*"
 
 SetCompressor lzma
@@ -100,18 +100,18 @@ Section "Handbrake" SEC01
   Call CheckFramework
      StrCmp $0 "1" +3
         StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 3.5 SP1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."
      Pop $0
 
   ; Get .NET if required
   ${If} $InstallDotNET == "Yes"
      SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 3.5" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=ab99342f-5d1a-413d-8319-81da479ab0d7&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f0%2f6%2f1%2f061f001c-8752-4600-a198-53214c69b51f%2fdotnetfx35setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
      Pop $1
 
      ${If} $1 != "OK"
            Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 3.5 Framework"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
      ${EndIf}
 
      ExecWait "$INSTDIR\dotnetfx.exe"
@@ -133,7 +133,6 @@ Section "Handbrake" SEC01
   File "Growl.CoreLibrary.dll"
   File "Handbrake.exe.config"
   File "HandBrake.ApplicationServices.dll"
-  File "HandBrake.Framework.dll"
   File "Microsoft.WindowsAPICodePack.Shell.dll"
   File "Microsoft.WindowsAPICodePack.dll"
   File "HandBrakeInterop.dll"
diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl
index b7b6a2ed5..3c5768a20 100644
--- a/win/C#/Installer/MakeNightly.nsi.tmpl
+++ b/win/C#/Installer/MakeNightly.nsi.tmpl
@@ -15,8 +15,8 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
 ;Required .NET framework
-!define MIN_FRA_MAJOR "3"
-!define MIN_FRA_MINOR "5"
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
 !define MIN_FRA_BUILD "*"
 
 SetCompressor lzma
@@ -100,18 +100,18 @@ Section "Handbrake" SEC01
   Call CheckFramework
      StrCmp $0 "1" +3
         StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 3.5 SP1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."
      Pop $0
 
   ; Get .NET if required
   ${If} $InstallDotNET == "Yes"
      SetDetailsView hide
-     inetc::get /caption "Downloading .NET Framework 3.5" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=ab99342f-5d1a-413d-8319-81da479ab0d7&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f0%2f6%2f1%2f061f001c-8752-4600-a198-53214c69b51f%2fdotnetfx35setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
      Pop $1
 
      ${If} $1 != "OK"
            Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 3.5 Framework"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
      ${EndIf}
 
      ExecWait "$INSTDIR\dotnetfx.exe"
@@ -133,19 +133,10 @@ Section "Handbrake" SEC01
   File "Growl.CoreLibrary.dll"
   File "Handbrake.exe.config"
   File "HandBrake.ApplicationServices.dll"
-  File "HandBrake.Framework.dll"
   File "Microsoft.WindowsAPICodePack.Shell.dll"
   File "Microsoft.WindowsAPICodePack.dll"
   File "HandBrakeInterop.dll"
 
-  ;File "Caliburn.Castle.dll"
-  ;File "Caliburn.Core.dll"
-  ;File "Castle.Core.dll"
-  ;File "Castle.DynamicProxy2.dll"
-  ;File "Castle.MicroKernel.dll"
-  ;File "Castle.Windsor.dll"
-  ;File "Microsoft.Practices.ServiceLocation.dll"
-
   ; Copy the standard doc set into the doc folder
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
@@ -195,19 +186,10 @@ Section Uninstall
   Delete "$INSTDIR\Growl.CoreLibrary.dll"
   Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
   Delete "$INSTDIR\HandBrake.ApplicationServices.dll"
-  Delete "$INSTDIR\HandBrake.Framework.dll"
   Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"
   Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"
   Delete "$INSTDIR\HandBrakeInterop.dll"
 
-  Delete "$INSTDIR\Caliburn.Castle.dll"
-  Delete "$INSTDIR\Caliburn.Core.dll"
-  Delete "$INSTDIR\Castle.Core.dll"
-  Delete "$INSTDIR\Castle.DynamicProxy2.dll"
-  Delete "$INSTDIR\Castle.MicroKernel.dll"
-  Delete "$INSTDIR\Castle.Windsor.dll"
-  Delete "$INSTDIR\Microsoft.Practices.ServiceLocation.dll"
-
   Delete "$INSTDIR\doc\AUTHORS"
   Delete "$INSTDIR\doc\COPYING"
   Delete "$INSTDIR\doc\CREDITS"
diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index bf90c2da7..f8a9c8683 100644
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -13,9 +13,9 @@ namespace Handbrake
 
     using HandBrake.ApplicationServices;
     using HandBrake.ApplicationServices.Services;
-    using HandBrake.Framework.Views;
 
     using Handbrake.Properties;
+    using Handbrake.ToolWindows;
 
     /// <summary>
     /// HandBrake Starts Here
diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.cs b/win/C#/ToolWindows/ExceptionWindow.cs
similarity index 95%
rename from win/C#/HandBrake.Framework/Views/ExceptionWindow.cs
rename to win/C#/ToolWindows/ExceptionWindow.cs
index 25dc6fd3e..d329ad0cc 100644
--- a/win/C#/HandBrake.Framework/Views/ExceptionWindow.cs
+++ b/win/C#/ToolWindows/ExceptionWindow.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.Windows.Forms;
diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs b/win/C#/ToolWindows/ExceptionWindow.designer.cs
similarity index 94%
rename from win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
rename to win/C#/ToolWindows/ExceptionWindow.designer.cs
index f8df557f5..4865f3f21 100644
--- a/win/C#/HandBrake.Framework/Views/ExceptionWindow.designer.cs
+++ b/win/C#/ToolWindows/ExceptionWindow.designer.cs
@@ -1,4 +1,4 @@
-namespace HandBrake.Framework.Views
+namespace Handbrake.ToolWindows
 {
     partial class ExceptionWindow
     {
@@ -70,7 +70,7 @@
             // 
             // PictureBox1
             // 
-            this.PictureBox1.Image = global::HandBrake.Framework.Properties.Resources.ErrorX;
+            this.PictureBox1.Image = Properties.Resources.ErrorX;
             resources.ApplyResources(this.PictureBox1, "PictureBox1");
             this.PictureBox1.Name = "PictureBox1";
             this.PictureBox1.TabStop = false;
@@ -129,7 +129,7 @@
             this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             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.Image = Properties.Resources.copy;
             this.btn_copy.Name = "btn_copy";
             this.btn_copy.UseVisualStyleBackColor = false;
             this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);
@@ -141,7 +141,7 @@
             // 
             // mnu_copy_log
             // 
-            this.mnu_copy_log.Image = global::HandBrake.Framework.Properties.Resources.copy;
+            this.mnu_copy_log.Image = Properties.Resources.copy;
             this.mnu_copy_log.Name = "mnu_copy_log";
             resources.ApplyResources(this.mnu_copy_log, "mnu_copy_log");
             this.mnu_copy_log.Click += new System.EventHandler(this.MnuCopyLogClick);
diff --git a/win/C#/HandBrake.Framework/Views/ExceptionWindow.resx b/win/C#/ToolWindows/ExceptionWindow.resx
similarity index 100%
rename from win/C#/HandBrake.Framework/Views/ExceptionWindow.resx
rename to win/C#/ToolWindows/ExceptionWindow.resx
diff --git a/win/C#/ToolWindows/UpdateInfo.cs b/win/C#/ToolWindows/UpdateInfo.cs
index bca7d81cd..f86b0dbd7 100644
--- a/win/C#/ToolWindows/UpdateInfo.cs
+++ b/win/C#/ToolWindows/UpdateInfo.cs
@@ -9,7 +9,6 @@ namespace Handbrake.ToolWindows
     using System.Windows.Forms;
 
     using HandBrake.ApplicationServices.Model.General;
-    using HandBrake.Framework.Views;
 
     /// <summary>
     /// A window to display update information.
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index de25ef955..b5e81ba37 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -13,10 +13,10 @@ namespace Handbrake
     using System.Threading;
     using System.Windows.Forms;
 
-    using HandBrake.Framework.Services;
-    using HandBrake.Framework.Services.Interfaces;
     using HandBrake.ApplicationServices.Services.Interfaces;
 
+    using Handbrake.Functions;
+
     using Model;
     using Timer = System.Threading.Timer;
 
@@ -37,11 +37,6 @@ namespace Handbrake
         /// </summary>
         private readonly IScan scan;
 
-        /// <summary>
-        /// The Error service
-        /// </summary>
-        private readonly IErrorService errorService = new ErrorService();
-
         /// <summary>
         /// The current position in the log file
         /// </summary>
@@ -182,7 +177,7 @@ namespace Handbrake
             }
             catch (Exception exc)
             {
-                errorService.ShowError("Error during load.", exc.ToString());
+                Main.ShowExceptiowWindow("Error during load.", exc.ToString());
             }
         }
 
@@ -287,7 +282,7 @@ namespace Handbrake
             catch (Exception exc)
             {
                 windowTimer.Dispose();
-                errorService.ShowError("GetLog() Error", exc.ToString());
+                Main.ShowExceptiowWindow("GetLog() Error.", exc.ToString());
             }
 
             return appendText;
-- 
2.40.0