From 09b77d4a97d8acc0cd28621157b316990ecc6c6a Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Tue, 8 Jan 2008 15:00:33 +0000 Subject: [PATCH] BUG: [ 1865168 ] "Integrate w/ Tortoise*"checkboxes in installer aren't shown --- Docs/Users/ChangeLog.txt | 2 ++ Installer/InnoSetup/WinMerge.iss | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt index cab24086f..c6174ce53 100644 --- a/Docs/Users/ChangeLog.txt +++ b/Docs/Users/ChangeLog.txt @@ -6,6 +6,8 @@ WinMerge 2.7.7.2 Syntax highlighting for PowerShell files (#1859657) Change font size with Ctrl + MouseWheel (#1865795) Horizontal scrolling with Shift + MouseWheel (#1865795) + Installer: Add support for integration with latest version of TortoiseCVS and + TortoiseSVN x64 (#1865168) BugFix: Crash when using TrackPoint middle-button scrolling (#1864040) BugFix: WinMerge didn't show the contents of the symbolic link target (#1864978) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 18ae5310c..ec56126b2 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -464,11 +464,15 @@ Root: HKCU; SubKey: Software\Thingamahoochie\WinMerge; ValueType: dword; ValueNa ;If WinMerge.exe is installed then we'll automatically configure WinMerge as the differencing application Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Diff Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: DiffAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Diff2 Params; ValueType: string; ValueName: _; ValueData: """%1"" ""%2"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS ;Tells TortoiseCVS to use WinMerge as its differencing application (this happens whether or not Tortoise is current installed, that way ;if it is installed at a later date this will automatically support it) Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: string; ValueName: External Merge Application; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue; Tasks: TortoiseCVS Root: HKCU; SubKey: Software\TortoiseCVS; ValueType: dword; ValueName: MergeAsUnicode; ValueData: $00000001; Flags: uninsdeletevalue; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge Application; ValueType: string; ValueName: _; ValueData: {app}\{code:ExeName}; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS +Root: HKCU; SubKey: Software\TortoiseCVS\Prefs\External Merge2 Params; ValueType: string; ValueName: _; ValueData: """%mine"" ""%yours"""; Flags: uninsdeletevalue dontcreatekey; Tasks: TortoiseCVS ;Set WinMerge as TortoiseSVN diff tool Root: HKCU; SubKey: Software\TortoiseSVN; ValueType: string; ValueName: Diff; ValueData: {app}\{code:ExeName} -e -x -ub -dl %bname -dr %yname %base %mine; Flags: uninsdeletevalue; Tasks: TortoiseSVN @@ -814,13 +818,13 @@ end; Function TortoiseCVSInstalled(): boolean; Begin {This absolutely must remain as \CustomIcons, because our application used to create some TortoiseCVS keys even if the application wasn't installed!} - Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseCVS\CustomIcons'); + Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseCVS\CustomIcons') or RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseCVS\Icons'); End; {Determines whether or not TortoiseSVN is installed} Function TortoiseSVNInstalled(): boolean; Begin - Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseSVN'); + Result := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\TortoiseSVN') or RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Classes\Directory\Background\shellex\ContextMenuHandlers\TortoiseSVN'); End; Function RelativeGroupPath(Unused: string): String; -- 2.11.0