Changeset 7ac07220428c…
Parent 8ee2db8769a2…
by
Changes to 4 files · Browse files at 7ac07220428c Showing diff from parent 8ee2db8769a2 Diff from another changeset...
@@ -5,6 +5,7 @@ <?define CLSID_TortoiseHgAdded = {AF42ADAB-8C2E-4285-B746-99B31094708E} ?>
<?define CLSID_TortoiseHgModified = {CDA1C89D-E9B5-4981-A857-82DD932EA2FD} ?>
<?define CLSID_TortoiseHgUnversioned = {9E3D4EC9-0624-4393-8B48-204C217ED1FF} ?>
+ <?define CLSID_TortoiseHgKeyboard = {36BFF16B-4EA0-4D91-9D2C-39941CF0BFE4} ?>
<?define OverlayCLSIDList =
{869C8877-2C3C-438D-844B-31B86BFE5E8A};{AF42ADAB-8C2E-4285-B746-99B31094708E};{CDA1C89D-E9B5-4981-A857-82DD932EA2FD};{9E3D4EC9-0624-4393-8B48-204C217ED1FF}
?>
|
|
@@ -0,0 +1,17 @@ + <Include>
+ <!-- keyboard hook component -->
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)'
+ Type='string' Value='TortoiseHg'
+ />
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32'
+ Type='string' Name='ThreadingModel' Value='Apartment'
+ />
+
+ <!-- register browser helper object -->
+ <RegistryValue
+ Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Explorer\Browser Helper Objects\${var.CLSID_TortoiseHgKeyboard}'
+ Type='string' Value='TortoiseHg'
+ />
+</Include>
|
@@ -138,6 +138,9 @@ <RegistryValue
Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
+ <RegistryValue
+ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32'
+ Type='string' Value='[INSTALLDIR]ThgShellx64.dll'/>
<?foreach CLSID in $(var.OverlayCLSIDList) ?>
<RegistryValue
Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32'
@@ -152,6 +155,10 @@ Guid='$(var.OverlaysShellRegistrationX64.guid)'>
<?include shell-register-overlays.wxi ?>
</Component>
+ <Component Id='KeyboardShellRegistration' Win64='yes'
+ Guid='$(var.KeyboardShellRegistrationX64.guid)'>
+ <?include shell-register-keyboard.wxi ?>
+ </Component>
<?else?>
<Component Id='thgshellx86dll' Guid='$(var.thgshellx86dll.guid)' Win64='no'>
<File Id='thgshellx86dll' Name='ThgShellx86.dll' KeyPath='yes'
@@ -169,6 +176,10 @@ Root='HKCR' Key='CLSID\$(var.CLSID_TortoiseHgDropHandler)\InProcServer32'
Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
/>
+ <RegistryValue
+ Root='HKLM' Key='CLSID\$(var.CLSID_TortoiseHgKeyboard)\InProcServer32'
+ Type='string' Value='[INSTALLDIR]ThgShellx86.dll'
+ />
<?foreach CLSID in $(var.OverlayCLSIDList) ?>
<RegistryValue
Root='HKCR' Key='CLSID\$(var.CLSID)\InProcServer32'
@@ -184,6 +195,10 @@ Guid='$(var.OverlaysShellRegistrationX86.guid)' Win64='no'>
<?include shell-register-overlays.wxi ?>
</Component>
+ <Component Id='KeyboardShellRegistration' Win64='no'
+ Guid='$(var.KeyboardShellRegistrationX86.guid)'>
+ <?include shell-register-keyboard.wxi ?>
+ </Component>
<?endif?>
<Component Id='COPYING' Guid='$(var.COPYING.guid)' Win64='$(var.IsX64)'>
@@ -395,6 +410,7 @@ <ComponentRef Id='OverlayServerEXE' />
<MergeRef Id='TortoiseOverlaysMergeX64' />
<ComponentRef Id='OverlaysShellRegistrationX64' />
+ <ComponentRef Id='KeyboardShellRegistrationX64' />
</Feature>
</Feature>
<?endif?>
@@ -416,6 +432,7 @@ <ComponentRef Id='OverlayServerEXE' />
<MergeRef Id='TortoiseOverlaysMergeX86' />
<ComponentRef Id='OverlaysShellRegistrationX86' />
+ <ComponentRef Id='KeyboardShellRegistrationX86' />
</Feature>
</Feature>
<Feature Id='Locales' Level='1'
|
Loading...