From: sr55 Date: Sun, 8 Aug 2010 14:04:32 +0000 (+0000) Subject: WinGui: X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=569edda7fb96bfc40d78b1edc3c95efc177e8981;p=handbrake-jp%2Fhandbrake-jp-git.git 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 377d8cdc..baef6141 100644 --- a/win/C#/HandBrake.sln +++ b/win/C#/HandBrake.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServic EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Build|Any CPU = Build|Any CPU - Build|x86 = Build|x86 Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 Install|Any CPU = Install|Any CPU @@ -19,10 +17,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.ActiveCfg = Build|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.Build.0 = Build|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.ActiveCfg = Build|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.Build.0 = Build|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Debug|x86 @@ -39,9 +33,6 @@ Global {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.ActiveCfg = Release|Any CPU - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.Build.0 = Release|Any CPU - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|x86.ActiveCfg = Release|Any CPU {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.Build.0 = Debug|Any CPU {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/win/C#/HandBrake10.sln b/win/C#/HandBrake10.sln index cd4ea1ae..9b4e35b0 100644 --- a/win/C#/HandBrake10.sln +++ b/win/C#/HandBrake10.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.ApplicationServic EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Build|Any CPU = Build|Any CPU - Build|x86 = Build|x86 Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 Install|Any CPU = Install|Any CPU @@ -19,10 +17,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.ActiveCfg = Build|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|Any CPU.Build.0 = Build|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.ActiveCfg = Build|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Build|x86.Build.0 = Build|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Debug|x86 @@ -39,9 +33,6 @@ Global {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86 {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86 - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.ActiveCfg = Release|Any CPU - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|Any CPU.Build.0 = Release|Any CPU - {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Build|x86.ActiveCfg = Release|Any CPU {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|Any CPU.Build.0 = Debug|Any CPU {087A2BA8-BAC2-4577-A46F-07FF9D420016}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/win/C#/HandBrakeCS.sln b/win/C#/HandBrakeCS.sln deleted file mode 100644 index bde8c131..00000000 --- a/win/C#/HandBrakeCS.sln +++ /dev/null @@ -1,38 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeCS", "HandBrakeCS.csproj", "{A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 - Install|Any CPU = Install|Any CPU - Install|x86 = Install|x86 - NightlyBuild|Any CPU = NightlyBuild|Any CPU - NightlyBuild|x86 = NightlyBuild|x86 - Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.ActiveCfg = Release|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Debug|x86.Build.0 = Release|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.ActiveCfg = Install|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|Any CPU.Build.0 = Install|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.ActiveCfg = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Install|x86.Build.0 = Install|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Any CPU.ActiveCfg = NightlyBuild|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|Any CPU.Build.0 = NightlyBuild|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x86.ActiveCfg = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.NightlyBuild|x86.Build.0 = NightlyBuild|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|Any CPU.Build.0 = Release|Any CPU - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.ActiveCfg = Release|x86 - {A2923D42-C38B-4B12-8CBA-B8D93D6B13A3}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi index aa92ec01..c3013a88 100644 --- 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. ; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Handbrake" -!define PRODUCT_VERSION "SVN 3191 Snapshot" -!define PRODUCT_VERSION_NUMBER "svn3191" +!define PRODUCT_NAME "HandBrake" +!define PRODUCT_VERSION "0.9.5" +!define PRODUCT_VERSION_NUMBER "0.9.5" !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" @@ -30,7 +30,7 @@ SetCompressor lzma !define MUI_UNICON "handbrakepineapple.ico" ; Welcome page -!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_WELCOME ; License page !insertmacro MUI_PAGE_LICENSE "doc\COPYING" ; Directory page diff --git a/win/C#/Installer/MakeNightly.nsi.tmpl b/win/C#/Installer/MakeNightly.nsi.tmpl index 7adbe40d..de049fb4 100644 --- a/win/C#/Installer/MakeNightly.nsi.tmpl +++ b/win/C#/Installer/MakeNightly.nsi.tmpl @@ -120,8 +120,9 @@ Section "Handbrake" SEC01 SetDetailsView show ${EndIf} - + ; Install Files File "Handbrake.exe" + File "HandBrakeCLI.exe" CreateDirectory "$SMPROGRAMS\Handbrake" CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe" CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe" @@ -134,6 +135,16 @@ Section "Handbrake" SEC01 File "HandBrake.ApplicationServices.dll" File "Microsoft.WindowsAPICodePack.Shell.dll" File "Microsoft.WindowsAPICodePack.dll" + + ; Copy the standard doc set into the doc folder + SetOutPath "$INSTDIR\doc" + SetOverwrite ifnewer + File "doc\AUTHORS" + File "doc\COPYING" + File "doc\CREDITS" + File "doc\NEWS" + File "doc\THANKS" + File "doc\TRANSLATIONS" SectionEnd Section -AdditionalIcons @@ -166,13 +177,22 @@ Section Uninstall Delete "$INSTDIR\Interop.QTOLibrary.dll" Delete "$INSTDIR\Interop.QTOControlLib.dll" Delete "$INSTDIR\AxInterop.QTOControlLib.dll" + Delete "$INSTDIR\HandBrakeCLI.exe" + Delete "$INSTDIR\handbrakepineapple.ico" Delete "$INSTDIR\Handbrake.exe" Delete "$INSTDIR\Handbrake.exe.config" Delete "$INSTDIR\Growl.Connector.dll" Delete "$INSTDIR\Growl.CoreLibrary.dll" + Delete "$INSTDIR\libgcc_s_sjlj-1.dll" Delete "$INSTDIR\HandBrake.ApplicationServices.dll" Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll" Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll" + Delete "$INSTDIR\doc\AUTHORS" + Delete "$INSTDIR\doc\COPYING" + Delete "$INSTDIR\doc\CREDITS" + Delete "$INSTDIR\doc\NEWS" + Delete "$INSTDIR\doc\THANKS" + Delete "$INSTDIR\doc\TRANSLATIONS" RMDir "$INSTDIR" Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk" Delete "$DESKTOP\Handbrake.lnk" diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs index dac2e4d1..4145deec 100644 --- a/win/C#/frmAbout.Designer.cs +++ b/win/C#/frmAbout.Designer.cs @@ -60,7 +60,7 @@ namespace Handbrake // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(125, 47); + this.label1.Location = new System.Drawing.Point(125, 36); this.label1.Margin = new System.Windows.Forms.Padding(3); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(224, 13); diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 732a50c8..d95d085a 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -12,7 +12,6 @@ namespace Handbrake using System.Drawing; using System.Globalization; using System.IO; - using System.Reflection; using System.Threading; using System.Windows.Forms; using Functions;