WinGui:

- Just some cleanup of project / install files.

git-svn-id: svn://localhost/HandBrake/trunk@3474 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrake.sln b/win/C#/HandBrake.sln
index 377d8cd..baef614 100644 (file)
--- a/win/C#/HandBrake.sln
+++ b/win/C#/HandBrake.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServic
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Build|Any CPU = Build|Any CPU\r
-               Build|x86 = Build|x86\r
                Debug|Any CPU = Debug|Any CPU\r
                Debug|x86 = Debug|x86\r
                Install|Any CPU = Install|Any CPU\r
@@ -19,10 +17,6 @@ Global
                Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.ActiveCfg = Build|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.Build.0 = Build|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.ActiveCfg = Build|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.Build.0 = Build|x86\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Debug|x86\r
@@ -39,9 +33,6 @@ Global
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.ActiveCfg = Release|Any CPU\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.Build.0 = Release|Any CPU\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|x86.ActiveCfg = Release|Any CPU\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|Any CPU\r

diff --git a/win/C#/HandBrake10.sln b/win/C#/HandBrake10.sln
index cd4ea1a..9b4e35b 100644 (file)
--- a/win/C#/HandBrake10.sln
+++ b/win/C#/HandBrake10.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServic
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Build|Any CPU = Build|Any CPU\r
-               Build|x86 = Build|x86\r
                Debug|Any CPU = Debug|Any CPU\r
                Debug|x86 = Debug|x86\r
                Install|Any CPU = Install|Any CPU\r
@@ -19,10 +17,6 @@ Global
                Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.ActiveCfg = Build|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.Build.0 = Build|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.ActiveCfg = Build|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.Build.0 = Build|x86\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Debug|x86\r
@@ -39,9 +33,6 @@ Global
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86\r
                {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.ActiveCfg = Release|Any CPU\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.Build.0 = Release|Any CPU\r
-               {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|x86.ActiveCfg = Release|Any CPU\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
                {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|Any CPU\r

diff --git a/win/C#/HandBrakeCS.sln b/win/C#/HandBrakeCS.sln
deleted file mode 100644 (file)
index bde8c13..0000000
--- a/win/C#/HandBrakeCS.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual Studio 2010\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}"\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Any CPU = Debug|Any CPU\r
-               Debug|x86 = Debug|x86\r
-               Install|Any CPU = Install|Any CPU\r
-               Install|x86 = Install|x86\r
-               NightlyBuild|Any CPU = NightlyBuild|Any CPU\r
-               NightlyBuild|x86 = NightlyBuild|x86\r
-               Release|Any CPU = Release|Any CPU\r
-               Release|x86 = Release|x86\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Release|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.Build.0 = Release|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.ActiveCfg = Install|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.Build.0 = Install|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.ActiveCfg = Install|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.Build.0 = Install|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Any CPU.ActiveCfg = NightlyBuild|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Any CPU.Build.0 = NightlyBuild|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x86.ActiveCfg = NightlyBuild|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x86.Build.0 = NightlyBuild|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86\r
-               {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r

diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index aa92ec0..c3013a8 100644 (file)
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -7,9 +7,9 @@
 ; Script generated by the HM NIS Edit Script Wizard.\r
 \r
 ; HM NIS Edit Wizard helper defines\r
-!define PRODUCT_NAME "Handbrake"\r
-!define PRODUCT_VERSION "SVN 3191 Snapshot"\r
-!define PRODUCT_VERSION_NUMBER "svn3191"\r
+!define PRODUCT_NAME "HandBrake"\r
+!define PRODUCT_VERSION "0.9.5"\r
+!define PRODUCT_VERSION_NUMBER "0.9.5"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
@@ -30,7 +30,7 @@ SetCompressor lzma
 !define MUI_UNICON "handbrakepineapple.ico"\r
 \r
 ; Welcome page\r
-!insertmacro MUI_PAGE_WELCOME\r
+!insertmacro MUI_PAGE_WELCOME \r
 ; License page\r
 !insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
 ; Directory page\r

diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl
index 7adbe40..de049fb 100644 (file)
--- a/win/C#/Installer/MakeNightly.nsi.tmpl
+++ b/win/C#/Installer/MakeNightly.nsi.tmpl
@@ -120,8 +120,9 @@ Section "Handbrake" SEC01
      SetDetailsView show\r
   ${EndIf}\r
   \r
-  \r
+  ; Install Files\r
   File "Handbrake.exe"\r
+  File "HandBrakeCLI.exe"\r
   CreateDirectory "$SMPROGRAMS\Handbrake"\r
   CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
   CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"\r
@@ -134,6 +135,16 @@ Section "Handbrake" SEC01
   File "HandBrake.ApplicationServices.dll"\r
   File "Microsoft.WindowsAPICodePack.Shell.dll"\r
   File "Microsoft.WindowsAPICodePack.dll"\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
 SectionEnd\r
 \r
 Section -AdditionalIcons\r
@@ -166,13 +177,22 @@ Section Uninstall
   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\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
   RMDir  "$INSTDIR"\r
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"\r
   Delete "$DESKTOP\Handbrake.lnk"\r

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index dac2e4d..4145dee 100644 (file)
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -60,7 +60,7 @@ namespace Handbrake
             // label1\r
             // \r
             this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(125, 47);\r
+            this.label1.Location = new System.Drawing.Point(125, 36);\r
             this.label1.Margin = new System.Windows.Forms.Padding(3);\r
             this.label1.Name = "label1";\r
             this.label1.Size = new System.Drawing.Size(224, 13);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 732a50c..d95d085 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,7 +12,6 @@ namespace Handbrake
     using System.Drawing;\r
     using System.Globalization;\r
     using System.IO;\r
-    using System.Reflection;\r
     using System.Threading;\r
     using System.Windows.Forms;\r
     using Functions;\r