WinGui: Added implementation of IWindsorInstaller to the AppServices library and...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4251 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 412719085a600b6f255199e12eff50c32ed357a1..6265e1cf4b0f8ae033b4510f16cd99f47d09ba07 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -41,6 +41,13 @@
     <Optimize>true</Optimize>\r
   </PropertyGroup>\r
   <ItemGroup>\r
+    <Reference Include="Castle.Core">\r
+      <HintPath>..\libraries\caliburn\Castle.Core.dll</HintPath>\r
+    </Reference>\r
+    <Reference Include="Castle.Windsor">\r
+      <HintPath>..\libraries\caliburn\Castle.Windsor.dll</HintPath>\r
+      <EmbedInteropTypes>False</EmbedInteropTypes>\r
+    </Reference>\r
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=MSIL">\r
       <SpecificVersion>False</SpecificVersion>\r
       <HintPath>..\libraries\Growl.Connector.dll</HintPath>\r
@@ -122,6 +129,7 @@
       <DependentUpon>Resources.resx</DependentUpon>\r
     </Compile>\r
     <Compile Include="ServiceManager.cs" />\r
+    <Compile Include="ServicesWindsorInstaller.cs" />\r
     <Compile Include="Services\Base\EncodeBase.cs" />\r
     <Compile Include="Services\Encode.cs" />\r
     <Compile Include="Services\Interfaces\IEncode.cs" />\r

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
index 3d71688cbc0e24ede406674bbfcbf422e3ad9508..ad26355569948bceab167fbb5d76c505d2b5e08a 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IQueueProcessor.cs
@@ -1,3 +1,8 @@
+/*  IQueueProcessor.cs $\r
+    This file is part of the HandBrake source code.\r
+    Homepage: <http://handbrake.fr/>.\r
+    It may be used under the terms of the GNU General Public License. */\r
+\r
 namespace HandBrake.ApplicationServices.Services.Interfaces\r
 {\r
     using System;\r

diff --git a/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
new file mode 100644 (file)
index 0000000..a250aa2
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/ServicesWindsorInstaller.cs
@@ -0,0 +1,33 @@
+namespace HandBrake.ApplicationServices\r
+{\r
+    using Castle.MicroKernel.Registration;\r
+    using Castle.MicroKernel.SubSystems.Configuration;\r
+    using Castle.Windsor;\r
+\r
+    using HandBrake.ApplicationServices.Services;\r
+    using HandBrake.ApplicationServices.Services.Interfaces;\r
+\r
+    /// <summary>\r
+    /// An Implimentation of IWindsorInstaller for this library.\r
+    /// </summary>\r
+    public class ServicesWindsorInstaller : IWindsorInstaller\r
+    {\r
+        #region Implementation of IWindsorInstaller\r
+\r
+        /// <summary>\r
+        /// Performs the installation in the <see cref="T:Castle.Windsor.IWindsorContainer"/>.\r
+        /// </summary>\r
+        /// <param name="container">The container.</param><param name="store">The configuration store.</param>\r
+        public void Install(IWindsorContainer container, IConfigurationStore store)\r
+        {\r
+            container.Register(Component.For<IPresetService>().ImplementedBy<PresetService>());\r
+            container.Register(Component.For<IQueueManager>().ImplementedBy<QueueManager>());\r
+            container.Register(Component.For<IQueueProcessor>().ImplementedBy<QueueProcessor>());\r
+            container.Register(Component.For<IUserSettingService>().ImplementedBy<UserSettingService>());\r
+            container.Register(Component.For<IScan>().ImplementedBy<ScanService>());\r
+            container.Register(Component.For<IEncode>().ImplementedBy<Encode>());\r
+        }\r
+\r
+        #endregion\r
+    }\r
+}\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
index c6ffc4194ca5af5b964972bfcd18a8f2826c08bc..645a64cb61a82c8cd097674ece94d54ac8af20b5 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/PlistUtility.cs
@@ -28,12 +28,6 @@ namespace HandBrake.ApplicationServices.Utilities
         /// </summary>\r
         private static IUserSettingService userSettingService = ServiceManager.UserSettingService;\r
 \r
-        /**\r
-         * TODO:\r
-         * - Update with the new vfr,pfr,cfr keys\r
-         * - Clean up this code, it's pretty nasty right now.\r
-         **/\r
-\r
         #region Import\r
 \r
         public static EncodeTask Import(string filename)\r

diff --git a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
index 22811d3488c2f4e652cbde23d9f7a5dbaea762c5..02710b161d4e0b3f0b2f93a4202398734d3eb07e 100644 (file)
--- a/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
+++ b/win/CS/HandBrakeWPF/Startup/CastleBootstrapper.cs
@@ -11,6 +11,8 @@
     using Castle.MicroKernel.Registration;\r
     using Castle.Windsor;\r
 \r
+    using HandBrake.ApplicationServices;\r
+\r
     using HandBrakeWPF.ViewModels;\r
     using HandBrakeWPF.ViewModels.Interfaces;\r
 \r
@@ -33,6 +35,10 @@
             this.windsorContainer.Register(Component.For<IWindowManager>().ImplementedBy<WindowManager>());\r
             this.windsorContainer.Register(Component.For<IEventAggregator>().ImplementedBy<EventAggregator>());\r
 \r
+            // Initialise the ApplicationServices IWindsorInstaller\r
+            this.windsorContainer.Register(Component.For<IWindsorInstaller>().ImplementedBy<ServicesWindsorInstaller>());\r
+            this.windsorContainer.Install(windsorContainer.ResolveAll<IWindsorInstaller>());\r
+\r
             // Shell\r
             this.windsorContainer.Register(Component.For<IMainViewModel>().ImplementedBy<MainViewModel>().LifeStyle.Is(LifestyleType.Singleton));\r
         }\r

diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config
index f76deb94ff2864cf71e37b294f4d90f7219e5ef2..31b594129b6d822f69b6d8a19f2e0a7ae0c60578 100644 (file)
--- a/win/CS/HandBrakeWPF/app.config
+++ b/win/CS/HandBrakeWPF/app.config
@@ -1,3 +1,6 @@
 <?xml version="1.0"?>\r
 <configuration>\r
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>\r
+  <startup>\r
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>\r
+  </startup>\r
+</configuration>
\ No newline at end of file

diff --git a/win/CS/Installer/Installer.nsi b/win/CS/Installer/Installer.nsi
index 607bfb6979b0c3987e179dfff0f7bfd0441d1c68..278eb3d8a8c5b7759f3a1bfed1473f729b3eeaa1 100644 (file)
--- a/win/CS/Installer/Installer.nsi
+++ b/win/CS/Installer/Installer.nsi
@@ -124,39 +124,18 @@ Section "Handbrake" SEC01
   ${EndIf}\r
   \r
   ; Install Files\r
-  File "Handbrake.exe"\r
-  File "HandBrakeCLI.exe"\r
+  File "*.exe"\r
   CreateDirectory "$SMPROGRAMS\Handbrake"\r
   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
-  File "Growl.Connector.dll"\r
-  File "Growl.CoreLibrary.dll"\r
-  File "Handbrake.exe.config"\r
-  File "HandBrake.ApplicationServices.dll"\r
-  File "Microsoft.WindowsAPICodePack.Shell.dll"\r
-  File "Microsoft.WindowsAPICodePack.dll"\r
-  File "HandBrakeInterop.dll"\r
-  File "SplitButton.dll"\r
-  File "Ookii.Dialogs.Wpf.dll"\r
-  File "defaultsettings.xml"\r
-\r
-  ;File "Caliburn.Castle.dll"\r
-  ;File "Caliburn.Core.dll"\r
-  ;File "Castle.Core.dll"\r
-  ;File "Castle.DynamicProxy2.dll"\r
-  ;File "Castle.MicroKernel.dll"\r
-  ;File "Castle.Windsor.dll"\r
-  ;File "Microsoft.Practices.ServiceLocation.dll"\r
+  File "*.dll"\r
+  File "*.config"\r
+  File "*.xml"\r
 \r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
-  File "doc\AUTHORS"\r
-  File "doc\COPYING"\r
-  File "doc\CREDITS"\r
-  File "doc\NEWS"\r
-  File "doc\THANKS"\r
-  File "doc\TRANSLATIONS"\r
+  File "doc\*.*"\r
 SectionEnd\r
 \r
 Section -AdditionalIcons\r
@@ -186,39 +165,8 @@ FunctionEnd
 Section Uninstall\r
   Delete "$INSTDIR\uninst.exe"\r
   \r
-  Delete "$INSTDIR\Interop.QTOLibrary.dll"\r
-  Delete "$INSTDIR\Interop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\HandBrakeCLI.exe"\r
-  Delete "$INSTDIR\handbrakepineapple.ico"\r
-  Delete "$INSTDIR\Handbrake.exe"\r
-  Delete "$INSTDIR\Handbrake.exe.config"\r
-  Delete "$INSTDIR\Growl.Connector.dll"\r
-  Delete "$INSTDIR\Growl.CoreLibrary.dll"\r
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"\r
-  Delete "$INSTDIR\HandBrake.ApplicationServices.dll"\r
-  Delete "$INSTDIR\HandBrake.Framework.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"\r
-  Delete "$INSTDIR\HandBrakeInterop.dll"\r
-  Delete "$INSTDIR\SplitButton.dll"\r
-  Delete "$INSTDIR\defaultsettings.dll"\r
-\r
-  Delete "$INSTDIR\Caliburn.Castle.dll"\r
-  Delete "$INSTDIR\Caliburn.Core.dll"\r
-  Delete "$INSTDIR\Castle.Core.dll"\r
-  Delete "$INSTDIR\Castle.DynamicProxy2.dll"\r
-  Delete "$INSTDIR\Castle.MicroKernel.dll"\r
-  Delete "$INSTDIR\Castle.Windsor.dll"\r
-  Delete "$INSTDIR\Microsoft.Practices.ServiceLocation.dll"\r
-  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"\r
-\r
-  Delete "$INSTDIR\doc\AUTHORS"\r
-  Delete "$INSTDIR\doc\COPYING"\r
-  Delete "$INSTDIR\doc\CREDITS"\r
-  Delete "$INSTDIR\doc\NEWS"\r
-  Delete "$INSTDIR\doc\THANKS"\r
-  Delete "$INSTDIR\doc\TRANSLATIONS"\r
+  Delete "$INSTDIR\*.*"\r
+  Delete "$INSTDIR\doc\*.*"\r
   RMDir  "$INSTDIR\doc"\r
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"\r
   Delete "$DESKTOP\Handbrake.lnk"\r

diff --git a/win/CS/Installer/Installer64.nsi b/win/CS/Installer/Installer64.nsi
index ae63028a459b830ae45402030c86c22f2d9106f3..ad93519bacd2982e00abee200d4611336a6414a1 100644 (file)
--- a/win/CS/Installer/Installer64.nsi
+++ b/win/CS/Installer/Installer64.nsi
@@ -129,34 +129,14 @@ Section "Handbrake" SEC01
   CreateDirectory "$SMPROGRAMS\Handbrake"\r
   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
-  File "Growl.Connector.dll"\r
-  File "Growl.CoreLibrary.dll"\r
-  File "Handbrake.exe.config"\r
-  File "HandBrake.ApplicationServices.dll"\r
-  File "Microsoft.WindowsAPICodePack.Shell.dll"\r
-  File "Microsoft.WindowsAPICodePack.dll"\r
-  File "HandBrakeInterop.dll"\r
-  File "SplitButton.dll"\r
-  File "Ookii.Dialogs.Wpf.dll"\r
-  File "defaultsettings.xml"\r
-\r
-  ;File "Caliburn.Castle.dll"\r
-  ;File "Caliburn.Core.dll"\r
-  ;File "Castle.Core.dll"\r
-  ;File "Castle.DynamicProxy2.dll"\r
-  ;File "Castle.MicroKernel.dll"\r
-  ;File "Castle.Windsor.dll"\r
-  ;File "Microsoft.Practices.ServiceLocation.dll"\r
+  File "*.dll"\r
+  File "*.config"\r
+  File "*.xml"\r
 \r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
-  File "doc\AUTHORS"\r
-  File "doc\COPYING"\r
-  File "doc\CREDITS"\r
-  File "doc\NEWS"\r
-  File "doc\THANKS"\r
-  File "doc\TRANSLATIONS"\r
+  File "doc\*.*"\r
 SectionEnd\r
 \r
 Section -AdditionalIcons\r
@@ -186,39 +166,8 @@ FunctionEnd
 Section Uninstall\r
   Delete "$INSTDIR\uninst.exe"\r
   \r
-  Delete "$INSTDIR\Interop.QTOLibrary.dll"\r
-  Delete "$INSTDIR\Interop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\HandBrakeCLI.exe"\r
-  Delete "$INSTDIR\handbrakepineapple.ico"\r
-  Delete "$INSTDIR\Handbrake.exe"\r
-  Delete "$INSTDIR\Handbrake.exe.config"\r
-  Delete "$INSTDIR\Growl.Connector.dll"\r
-  Delete "$INSTDIR\Growl.CoreLibrary.dll"\r
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"\r
-  Delete "$INSTDIR\HandBrake.ApplicationServices.dll"\r
-  Delete "$INSTDIR\HandBrake.Framework.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"\r
-  Delete "$INSTDIR\HandBrakeInterop.dll"\r
-  Delete "$INSTDIR\SplitButton.dll"\r
-  Delete "$INSTDIR\defaultsettings.dll"\r
-\r
-  Delete "$INSTDIR\Caliburn.Castle.dll"\r
-  Delete "$INSTDIR\Caliburn.Core.dll"\r
-  Delete "$INSTDIR\Castle.Core.dll"\r
-  Delete "$INSTDIR\Castle.DynamicProxy2.dll"\r
-  Delete "$INSTDIR\Castle.MicroKernel.dll"\r
-  Delete "$INSTDIR\Castle.Windsor.dll"\r
-  Delete "$INSTDIR\Microsoft.Practices.ServiceLocation.dll"\r
-  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"\r
-\r
-  Delete "$INSTDIR\doc\AUTHORS"\r
-  Delete "$INSTDIR\doc\COPYING"\r
-  Delete "$INSTDIR\doc\CREDITS"\r
-  Delete "$INSTDIR\doc\NEWS"\r
-  Delete "$INSTDIR\doc\THANKS"\r
-  Delete "$INSTDIR\doc\TRANSLATIONS"\r
+  Delete "$INSTDIR\*.*"\r
+  Delete "$INSTDIR\doc\*.*"\r
   RMDir  "$INSTDIR\doc"\r
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"\r
   Delete "$DESKTOP\Handbrake.lnk"\r

diff --git a/win/CS/Installer/MakeNightly.nsi.tmpl b/win/CS/Installer/MakeNightly.nsi.tmpl
index 865da9c3652d2623da1cbf2c9a79be7204d8c59f..e33ee26fcb979e546caad2ac30ad05723687c2e3 100644 (file)
--- a/win/CS/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly.nsi.tmpl
@@ -124,31 +124,19 @@ Section "Handbrake" SEC01
   ${EndIf}\r
   \r
   ; Install Files\r
-  File "Handbrake.exe"\r
-  File "HandBrakeCLI.exe"\r
+  ; Install Files\r
+  File "*.exe"\r
   CreateDirectory "$SMPROGRAMS\Handbrake"\r
   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
-  File "Growl.Connector.dll"\r
-  File "Growl.CoreLibrary.dll"\r
-  File "Handbrake.exe.config"\r
-  File "HandBrake.ApplicationServices.dll"\r
-  File "Microsoft.WindowsAPICodePack.Shell.dll"\r
-  File "Microsoft.WindowsAPICodePack.dll"\r
-  File "HandBrakeInterop.dll"\r
-  File "SplitButton.dll"\r
-  File "Ookii.Dialogs.Wpf.dll"\r
-  File "defaultsettings.xml"\r
+  File "*.dll"\r
+  File "*.config"\r
+  File "*.xml"\r
 \r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
-  File "doc\AUTHORS"\r
-  File "doc\COPYING"\r
-  File "doc\CREDITS"\r
-  File "doc\NEWS"\r
-  File "doc\THANKS"\r
-  File "doc\TRANSLATIONS"\r
+  File "doc\*.*"\r
 SectionEnd\r
 \r
 Section -AdditionalIcons\r
@@ -178,30 +166,8 @@ FunctionEnd
 Section Uninstall\r
   Delete "$INSTDIR\uninst.exe"\r
   \r
-  Delete "$INSTDIR\Interop.QTOLibrary.dll"\r
-  Delete "$INSTDIR\Interop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\HandBrakeCLI.exe"\r
-  Delete "$INSTDIR\handbrakepineapple.ico"\r
-  Delete "$INSTDIR\Handbrake.exe"\r
-  Delete "$INSTDIR\Handbrake.exe.config"\r
-  Delete "$INSTDIR\Growl.Connector.dll"\r
-  Delete "$INSTDIR\Growl.CoreLibrary.dll"\r
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"\r
-  Delete "$INSTDIR\HandBrake.ApplicationServices.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"\r
-  Delete "$INSTDIR\HandBrakeInterop.dll"\r
-  Delete "$INSTDIR\SplitButton.dll"\r
-  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"\r
-  Delete "$INSTDIR\defaultsettings.dll"\r
-\r
-  Delete "$INSTDIR\doc\AUTHORS"\r
-  Delete "$INSTDIR\doc\COPYING"\r
-  Delete "$INSTDIR\doc\CREDITS"\r
-  Delete "$INSTDIR\doc\NEWS"\r
-  Delete "$INSTDIR\doc\THANKS"\r
-  Delete "$INSTDIR\doc\TRANSLATIONS"\r
+  Delete "$INSTDIR\*.*"\r
+  Delete "$INSTDIR\doc\*.*"\r
   RMDir  "$INSTDIR\doc"\r
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"\r
   Delete "$DESKTOP\Handbrake.lnk"\r

diff --git a/win/CS/Installer/MakeNightly64.nsi.tmpl b/win/CS/Installer/MakeNightly64.nsi.tmpl
index b55e42f09ce872d61aa7ad15cb26b91e95c1698e..c8fc377264ec947050a0f61b215defeab8c67672 100644 (file)
--- a/win/CS/Installer/MakeNightly64.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly64.nsi.tmpl
@@ -124,31 +124,18 @@ Section "Handbrake" SEC01
   ${EndIf}\r
   \r
   ; Install Files\r
-  File "Handbrake.exe"\r
-  File "HandBrakeCLI.exe"\r
+  File "*.exe"\r
   CreateDirectory "$SMPROGRAMS\Handbrake"\r
   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
-  File "Growl.Connector.dll"\r
-  File "Growl.CoreLibrary.dll"\r
-  File "Handbrake.exe.config"\r
-  File "HandBrake.ApplicationServices.dll"\r
-  File "Microsoft.WindowsAPICodePack.Shell.dll"\r
-  File "Microsoft.WindowsAPICodePack.dll"\r
-  File "HandBrakeInterop.dll"\r
-  File "SplitButton.dll"\r
-  File "Ookii.Dialogs.Wpf.dll"\r
-  File "defaultsettings.xml"\r
+  File "*.dll"\r
+  File "*.config"\r
+  File "*.xml"\r
 \r
   ; Copy the standard doc set into the doc folder\r
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
-  File "doc\AUTHORS"\r
-  File "doc\COPYING"\r
-  File "doc\CREDITS"\r
-  File "doc\NEWS"\r
-  File "doc\THANKS"\r
-  File "doc\TRANSLATIONS"\r
+  File "doc\*.*"\r
 SectionEnd\r
 \r
 Section -AdditionalIcons\r
@@ -178,30 +165,8 @@ FunctionEnd
 Section Uninstall\r
   Delete "$INSTDIR\uninst.exe"\r
   \r
-  Delete "$INSTDIR\Interop.QTOLibrary.dll"\r
-  Delete "$INSTDIR\Interop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"\r
-  Delete "$INSTDIR\HandBrakeCLI.exe"\r
-  Delete "$INSTDIR\handbrakepineapple.ico"\r
-  Delete "$INSTDIR\Handbrake.exe"\r
-  Delete "$INSTDIR\Handbrake.exe.config"\r
-  Delete "$INSTDIR\Growl.Connector.dll"\r
-  Delete "$INSTDIR\Growl.CoreLibrary.dll"\r
-  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"\r
-  Delete "$INSTDIR\HandBrake.ApplicationServices.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"\r
-  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"\r
-  Delete "$INSTDIR\HandBrakeInterop.dll"\r
-  Delete "$INSTDIR\SplitButton.dll"\r
-  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"\r
-  Delete "$INSTDIR\defaultsettings.dll"\r
-\r
-  Delete "$INSTDIR\doc\AUTHORS"\r
-  Delete "$INSTDIR\doc\COPYING"\r
-  Delete "$INSTDIR\doc\CREDITS"\r
-  Delete "$INSTDIR\doc\NEWS"\r
-  Delete "$INSTDIR\doc\THANKS"\r
-  Delete "$INSTDIR\doc\TRANSLATIONS"\r
+  Delete "$INSTDIR\*.*"\r
+  Delete "$INSTDIR\doc\*.*"\r
   RMDir  "$INSTDIR\doc"\r
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"\r
   Delete "$DESKTOP\Handbrake.lnk"\r