Enables shortcuts to be deselected when installing on Windows.
diff --git a/Tools/msi/tcltk/tcltk.wxs b/Tools/msi/tcltk/tcltk.wxs
index 4a0d80f..5def5ed 100644
--- a/Tools/msi/tcltk/tcltk.wxs
+++ b/Tools/msi/tcltk/tcltk.wxs
@@ -27,8 +27,19 @@
<ComponentGroupRef Id="tcltk_lib" />
<ComponentGroupRef Id="tkinter_lib" Primary="yes" />
- <Component Id="idle_shortcut" Directory="MenuDir">
+ <Component Id="idle_reg" Directory="InstallDirectory">
<RegistryValue KeyPath="yes" Root="HKMU" Key="[REGISTRYKEY]\Idle" Type="string" Value="[#Lib_idlelib_idle.pyw]" />
+ </Component>
+ </Feature>
+ <Feature Id="AssociateFiles" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
+ <ComponentGroupRef Id="tkinter_lib" />
+ <ComponentGroupRef Id="idle_reg" />
+ </Feature>
+ <Feature Id="Shortcuts" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
+ <ComponentGroupRef Id="tkinter_lib" />
+
+ <Component Id="idle_shortcut" Directory="MenuDir">
+ <RegistryValue Root="HKMU" Key="[REGISTRYKEY]\IdleShortcuts" Type="integer" Value="1" KeyPath="yes" />
<RemoveFolder Id="Remove_MenuDir" On="uninstall" />
<Shortcut Id="IDLE"
@@ -48,50 +59,5 @@
Icon="idle.exe" />
</Component>
</Feature>
- <Feature Id="AssociateFiles" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
- <ComponentGroupRef Id="tkinter_lib" />
-
- <!-- We fix the guid of the Subcommands key so that it is correctly reference counted -->
- <Component Id="assoc_subcommands" Directory="InstallDirectory" Guid="{57D47B4C-96E6-40A0-A958-57083D74423F}">
- <Condition>VersionNT > 600</Condition>
- <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" />
- <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" />
- </Component>
- <Component Id="assoc_subcommands_nocon" Directory="InstallDirectory" Guid="{07061D85-9151-4FC4-BB78-13628020D026}">
- <Condition>VersionNT > 600</Condition>
- <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="MUIVerb" Value="!(loc.EditMenu)" Type="string" KeyPath="yes" />
- <RegistryValue Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle" Name="Subcommands" Value="" Type="string" KeyPath="no" />
- </Component>
-
- <Component Id="assoc_editwithidle" Directory="InstallDirectory">
- <Condition>VersionNT > 600</Condition>
- <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)">
- <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" />
- <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" />
- </RegistryKey>
- </Component>
- <Component Id="assoc_editwithidle_nocon" Directory="InstallDirectory">
- <Condition>VersionNT > 600</Condition>
- <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle\shell\edit$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)">
- <RegistryValue Name="MUIVerb" Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" />
- <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" />
- </RegistryKey>
- </Component>
-
- <Component Id="assoc_editwithidle_vista" Directory="InstallDirectory">
- <Condition>VersionNT = 600</Condition>
- <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.File\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)">
- <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" />
- <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" />
- </RegistryKey>
- </Component>
- <Component Id="assoc_editwithidle_nocon_vista" Directory="InstallDirectory">
- <Condition>VersionNT = 600</Condition>
- <RegistryKey Root="HKCR" Key="$(var.TestPrefix)Python.NoConFile\Shell\editwithidle$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.Suffix32)">
- <RegistryValue Value="!(loc.EditSubMenu)" Type="string" KeyPath="yes" />
- <RegistryValue Key="command" Value='"[PYTHONW_EXE]" -m idlelib "%L" %*' Type="string" />
- </RegistryKey>
- </Component>
- </Feature>
</Product>
</Wix>