VirtualBox

Changeset 107380 in vbox


Ignore:
Timestamp:
Dec 19, 2024 1:43:48 PM (4 weeks ago)
Author:
vboxsync
Message:

Windows host installer: Removed support for (optionally) installing a shortcut to the Quick Launch menu (not supported anymore since Windows 10). This also should fix some more warnings wrt the MSI validation. bugref:10827

Location:
trunk/src/VBox/Installer/win
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/NLS/de_DE.wxl

    r107324 r107380  
    137137    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Startmenü-Einträge anlegen" />
    138138    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Verknüpfung auf dem Desktop anlegen" />
    139     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Verknüpfung in der Schnellstartleiste anlegen" />
    140139    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Dateizuordnungen registrieren" />
    141140

  • trunk/src/VBox/Installer/win/NLS/el_GR.wxl

    r107324 r107380  
    142142    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Δημιουργία καταχωρήσεων στο μενού έναρξης" />
    143143    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Δημιουργία συντόμευσης στην επιφάνεια εργασίας" />
    144     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Δημιουργία συντόμευσης στη γραμμή γρήγορης εκκίνησης" />
    145144    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Καταχώριση συσχετίσεων αρχείων" />
    146145

  • trunk/src/VBox/Installer/win/NLS/en_US.wxl

    r107324 r107380  
    141141    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Create start menu entries" />
    142142    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Create a shortcut on the desktop" />
    143     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Create a shortcut in the Quick Launch Bar" />
    144143    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Register file associations" />
    145144

  • trunk/src/VBox/Installer/win/NLS/fa_IR.wxl

    r107324 r107380  
    113113    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Create start menu entries" />
    114114    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="ایجاد یک میانبر روی دسکتاپ" />
    115     <String Id="Customize2Dlg_CreateQuickLaunch" Value="ایجاد یک میانبر در اِجرای سریع" />
    116115    <String Id="Customize2Dlg_RegisterFileExtensions" Value="ثبت نام انجمن فایل" />
    117116    <!---->

  • trunk/src/VBox/Installer/win/NLS/fr_FR.wxl

    r107324 r107380  
    137137    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Créer des éléments dans le menu démarrer" />
    138138    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Créer un raccourci sur le bureau" />
    139     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Créer un raccourci dans la barre de lancement rapide" />
    140139    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Inscription des associations de fichiers" />
    141140

  • trunk/src/VBox/Installer/win/NLS/it_IT.wxl

    r107324 r107380  
    113113    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Crea voci del menu di avvio" />
    114114    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Crea una scorciatoia sul desktop" />
    115     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Crea una scorciatoia nella barra di avvio veloce" />
    116115    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Registrati associazioni di file" />
    117116    <!---->

  • trunk/src/VBox/Installer/win/NLS/ru_RU.wxl

    r107324 r107380  
    142142    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Create start menu entries" />
    143143    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Create a shortcut on the desktop" />
    144     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Create a shortcut in the Quick Launch Bar" />
    145144    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Register file associations" />
    146145

  • trunk/src/VBox/Installer/win/NLS/tr_TR.wxl

    r107324 r107380  
    142142    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="Başlangıç menüsü girişlerini oluştur" />
    143143    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="Masaüstünde kısayol oluştur" />
    144     <String Id="Customize2Dlg_CreateQuickLaunch" Value="Hızlı Başlat Çubuğunda kısayol oluştur" />
    145144    <String Id="Customize2Dlg_RegisterFileExtensions" Value="Dosya ilişkilendirmelerini kaydettir" />
    146145

  • trunk/src/VBox/Installer/win/NLS/zh_CN.wxl

    r107324 r107380  
    142142<String Id="Customize2Dlg_CreateStartMenuEntries" Value="添加系统菜单条目" />
    143143<String Id="Customize2Dlg_CreateDesktopShortcut" Value="在桌面创建快捷方式" />
    144 <String Id="Customize2Dlg_CreateQuickLaunch" Value="在快速启动栏创建快捷方式" />
    145144<String Id="Customize2Dlg_RegisterFileExtensions" Value="注册文件关联" />
    146145

  • trunk/src/VBox/Installer/win/NLS/zh_TW.wxl

    r107324 r107380  
    142142    <String Id="Customize2Dlg_CreateStartMenuEntries" Value="建立 [開始] 功能表項目" />
    143143    <String Id="Customize2Dlg_CreateDesktopShortcut" Value="在桌面建立捷徑" />
    144     <String Id="Customize2Dlg_CreateQuickLaunch" Value="在快速啟動列建立捷徑" />
    145144    <String Id="Customize2Dlg_RegisterFileExtensions" Value="註冊檔案關聯" />
    146145

  • trunk/src/VBox/Installer/win/PublicProperties.wxi

    r106061 r107380  
    3737  <SetProperty Id="VBOX_INSTALLSTARTMENUENTRIES" After="AppSearch" Sequence="both" Value="{}" Condition="VBOX_INSTALLSTARTMENUENTRIES=&quot;0&quot;" />
    3838
    39   <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
    40   <Property Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes" />
    41   <SetProperty Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both" Value="{}" Condition="VBOX_INSTALLQUICKLAUNCHSHORTCUT=&quot;0&quot;" />
    42 
    4339  <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
    4440  <Property Id="VBOX_START" Value="1" Secure="yes" />

  • trunk/src/VBox/Installer/win/UserInterface.wxi

    r107376 r107380  
    313313                <Text Value="!(loc.Customize2Dlg_CreateDesktopShortcut)" />
    314314            </Control>
    315             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17" Property="VBOX_INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
    316                 <Text Value="!(loc.Customize2Dlg_CreateQuickLaunch)" />
    317             </Control>
    318             <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="155" Width="200" Height="17" Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
     315            <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17" Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
    319316                <Text Value="!(loc.Customize2Dlg_RegisterFileExtensions)" />
    320317            </Control>

  • trunk/src/VBox/Installer/win/VirtualBox.wxs

    r107366 r107380  
    6565    <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes" />
    6666
    67     <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
     67    <!-- Whether or not registering of file extensions handled by FE/Qt should be performed -->
    6868    <Property Id="VBOX_REGISTERFILEEXTENSIONS" Value="1" Secure="yes" />
    6969
    … …  
    249249        <ComponentRef Id="cp_StartMenuVBox" />
    250250        <ComponentRef Id="cp_DesktopShortcut" />
    251         <ComponentRef Id="cp_QuickLaunchVBox" />
    252251<?endif?>
    253252        <!-- Components for removing empty folders after cleaning traces -->
    … …  
    460459    </InstallExecuteSequence>
    461460
    462 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    463     <!-- Set up special directory IDs for referencing to the start menu
    464             or the Quick Launch bar.
    465             See: http://msdn.microsoft.com/en-us/library/aa368276.aspx
    466                 http://wix.mindcapers.com/wiki/Shortcuts_in_WiX -->
    467     <StandardDirectory Id="ProgramMenuFolder">
    468         <Directory Id="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)" />
    469     </StandardDirectory>
    470 
    471     <StandardDirectory Id="DesktopFolder" />
    472 
    473     <StandardDirectory Id="AppDataFolder">
    474         <Directory Id="dir_AppDataMicrosoft" Name="Microsoft">
    475             <Directory Id="dir_AppDataMSIE" Name="Internet Explorer">
    476                 <Directory Id="dir_QuicklaunchFolder" Name="Quick Launch" />
    477             </Directory>
    478         </Directory>
    479     </StandardDirectory>
    480 <?endif?>
    481 
    482461        <Directory Id="$(var.Property_ProgramFiles)" Name="PFiles">
    483462            <Directory Id="VENDOR" Name="$(env.VBOX_VENDOR_SHORT)">
    … …  
    563542                </Directory>
    564543
     544            </Directory> <!-- INSTALLDIR -->
     545        </Directory> <!-- $(env.VBOX_VENDOR_SHORT) -->
     546    </Directory> <!-- Program Files -->
     547
    565548<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
    566                 <!-- Start menu entries. -->
     549    <!-- Start menu entries -->
     550    <Directory Id="ProgramMenuFolder">
     551        <Directory Id="StartMenuFolder">
     552            <Directory Id="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)">
    567553                <Component Id="cp_StartMenuVBox" Guid="C2DC321A-CE63-40EE-8A98-724DF8BD12FB" Condition="VBOX_INSTALLSTARTMENUENTRIES" Bitness="$(var.Property_Bitness)">
    568 
    569554                    <Shortcut Id="sc_StartMenuVBox" Directory="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />
    570555                    <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string" Value="installed" KeyPath="yes" />
    571556                    <?include $(env.PATH_TARGET)\Shortcuts_StartMenu.wxi ?>
     557                    <RemoveFolder Id="rmf_ShortcutStartMenu" On="uninstall" />
    572558                </Component>
    573 
    574                 <!-- Desktop shortcut. -->
    575                 <Component Id="cp_DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Condition="VBOX_INSTALLDESKTOPSHORTCUT" Bitness="$(var.Property_Bitness)">
    576 
    577                     <Shortcut Id="sc_DesktopVBox" Directory="DesktopFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />
    578                     <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string" Value="installed" KeyPath="yes" />
    579                 </Component>
    580 
    581                 <!-- QuickLaunch shortcut. -->
    582                 <Component Id="cp_QuickLaunchVBox" Guid="CC19E026-938A-41CB-8E77-3F33296244B6" Condition="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Bitness="$(var.Property_Bitness)">
    583                     <CreateFolder />
    584 
    585                     <Shortcut Id="sc_QuickLaunchVBox" Directory="dir_QuicklaunchFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />
    586                     <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string" Value="installed" KeyPath="yes" />
    587                 </Component>
    588 <?endif?>
    589                 </Directory>
    590559            </Directory>
    591560        </Directory>
    592     </Package>
     561    </Directory>
     562
     563    <!-- Desktop shortcut -->
     564    <Directory Id="DesktopFolder" Name="Desktop">
     565        <Component Id="cp_DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Condition="VBOX_INSTALLDESKTOPSHORTCUT" Bitness="$(var.Property_Bitness)">
     566            <Shortcut Id="sc_DesktopVBox" Directory="DesktopFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)" Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR" />
     567            <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string" Value="installed" KeyPath="yes" />
     568            <RemoveFolder Id="rmf_ShortcutDesktop" On="uninstall" />
     569        </Component>
     570    </Directory>
     571<?endif?> <!-- $(env.VBOX_WITH_QTGUI) = "yes" -->
     572
     573</Package>
    593574</Wix>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette