VirtualBox

Changeset 64107 in vbox for trunk/src


Ignore:
Timestamp:
Sep 30, 2016 12:16:36 PM (8 years ago)
Author:
vboxsync
Message:

Windows host installer: Added option to disable creation of start menu entries in customization dialog. Untested.

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

Legend:

Unmodified
Added
Removed

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    120120    <String Id="Customize2Dlg_Header">Anpassen</String>
    121121    <String Id="Customize2Dlg_Desc">Bitte unten die gewünschten Optionen auswählen:</String>
    122     <String Id="Customize2Dlg_CreateShortcut">Verknüpfung auf dem Desktop anlegen</String>
     122    <String Id="Customize2Dlg_CreateStartMenuEntries">Startmenü-Einträge anlegen</String>
     123    <String Id="Customize2Dlg_CreateDesktopShortcut">Verknüpfung auf dem Desktop anlegen</String>
    123124    <String Id="Customize2Dlg_CreateQuickLaunch">Verknüpfung in der Schnellstartleiste anlegen</String>
    124125    <String Id="Customize2Dlg_RegisterFileExtensions">Dateizuordnungen registrieren</String>

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    124124    <String Id="Customize2Dlg_Header">Customize</String>
    125125    <String Id="Customize2Dlg_Desc">Please choose from the options below:</String>
    126     <String Id="Customize2Dlg_CreateShortcut">Create a shortcut on the desktop</String>
     126    <String Id="Customize2Dlg_CreateStartMenuEntries">Create start menu entries</String>
     127    <String Id="Customize2Dlg_CreateDesktopShortcut">Create a shortcut on the desktop</String>
    127128    <String Id="Customize2Dlg_CreateQuickLaunch">Create a shortcut in the Quick Launch Bar</String>
    128129    <String Id="Customize2Dlg_RegisterFileExtensions">Register file associations</String>

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    9797    <String Id="Customize2Dlg_Header">سفارشی</String>
    9898    <String Id="Customize2Dlg_Desc">لطفاً از گزینه های زیر انتخاب کنید:</String>
    99     <String Id="Customize2Dlg_CreateShortcut">ایجاد یک میانبر روی دسکتاپ</String>
     99    <String Id="Customize2Dlg_CreateStartMenuEntries">Create start menu entries</String>
     100    <String Id="Customize2Dlg_CreateDesktopShortcut">ایجاد یک میانبر روی دسکتاپ</String>
    100101    <String Id="Customize2Dlg_CreateQuickLaunch">ایجاد یک میانبر در اِجرای سریع</String>
    101102    <String Id="Customize2Dlg_RegisterFileExtensions">ثبت نام انجمن فایل</String>

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    116116
    117117    <!---->
    118  
     118
    119119    <String Id="Customize2Dlg_Header">Personaliser</String>
    120120    <String Id="Customize2Dlg_Desc">Veuillez choisir une des options suivantes:</String>
    121     <String Id="Customize2Dlg_CreateShortcut">Créer un raccourci sur le bureau</String>
     121    <String Id="Customize2Dlg_CreateStartMenuEntries">Create start menu entries</String>
     122    <String Id="Customize2Dlg_CreateDesktopShortcut">Créer un raccourci sur le bureau</String>
    122123    <String Id="Customize2Dlg_CreateQuickLaunch">Créer un raccourci dans la barre de lancement rapide</String>
    123124    <String Id="Customize2Dlg_RegisterFileExtensions">Inscription des associations de fichiers</String>

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    9797    <String Id="Customize2Dlg_Header">Personalizza</String>
    9898    <String Id="Customize2Dlg_Desc">Scegli dalle opzioni seguenti:</String>
    99     <String Id="Customize2Dlg_CreateShortcut">Crea una scorciatoia sul desktop</String>
     99    <String Id="Customize2Dlg_CreateStartMenuEntries">Create start menu entries</String>
     100    <String Id="Customize2Dlg_CreateDesktopShortcut">Crea una scorciatoia sul desktop</String>
    100101    <String Id="Customize2Dlg_CreateQuickLaunch">Crea una scorciatoia nella barra di avvio veloce</String>
    101102    <String Id="Customize2Dlg_RegisterFileExtensions">Registrati associazioni di file</String>

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    124124        <String Id="Customize2Dlg_Header">Özelleştir</String>
    125125    <String Id="Customize2Dlg_Desc">Lütfen aşağıdaki seçeneklerden seçin:</String>
    126     <String Id="Customize2Dlg_CreateShortcut">Masaüstüne kısayol oluştur</String>
     126    <String Id="Customize2Dlg_CreateStartMenuEntries">Create start menu entries</String>
     127    <String Id="Customize2Dlg_CreateDesktopShortcut">Masaüstüne kısayol oluştur</String>
    127128    <String Id="Customize2Dlg_CreateQuickLaunch">Hızlı Başlat Çubuğuna kısayol oluştur</String>
    128129

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

    r56299 r64107  
    55            Language Definition Include for VirtualBox WiX script.
    66
    7             Copyright (C) 2011-2015 Oracle Corporation
     7            Copyright (C) 2011-2016 Oracle Corporation
    88
    99            This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    124124    <String Id="Customize2Dlg_Header">自訂</String>
    125125    <String Id="Customize2Dlg_Desc">請選擇以下選項：</String>
    126     <String Id="Customize2Dlg_CreateShortcut">在桌面建立捷徑</String>
     126    <String Id="Customize2Dlg_CreateStartMenuEntries">Create start menu entries</String>
     127    <String Id="Customize2Dlg_CreateDesktopShortcut">在桌面建立捷徑</String>
    127128    <String Id="Customize2Dlg_CreateQuickLaunch">在快速啟動列建立捷徑</String>
    128129    <String Id="Customize2Dlg_RegisterFileExtensions">註冊文件關聯</String>

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

    r62539 r64107  
    2525               Value="{}"><![CDATA[VBOX_INSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
    2626
     27  <!-- Whether or not start menu entries should be created. -->
     28  <Property Id="VBOX_INSTALLSTARTMENUENTRIES" Value="1" Secure="yes"/>
     29  <SetProperty Id="VBOX_INSTALLSTARTMENUENTRIES" After="AppSearch" Sequence="both"
     30               Value="{}"><![CDATA[VBOX_INSTALLSTARTMENUENTRIES="0"]]></SetProperty>
     31
    2732  <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
    2833  <Property Id="VBOX_INSTALLQUICKLAUNCHSHORTCUT" Value="1" Secure="yes"/>

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

    r62539 r64107  
    393393                 change their Windows color scheme.
    394394                 Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
    395             <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
     395            <Control Id="StartMenuEntriesCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
     396                     Property="VBOX_INSTALLSTARTMENUENTRIES" CheckBoxValue="1" Default="no">
     397                <Text>!(loc.Customize2Dlg_CreateStartMenuEntries)</Text>
     398            </Control>
     399            <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
    396400                     Property="VBOX_INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
    397                 <Text>!(loc.Customize2Dlg_CreateShortcut)</Text>
    398             </Control>
    399             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
     401                <Text>!(loc.Customize2Dlg_CreateDesktopShortcut)</Text>
     402            </Control>
     403            <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
    400404                     Property="VBOX_INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
    401405                <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
    402406            </Control>
    403             <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
     407            <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="155" Width="200" Height="17"
    404408                     Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
    405409                <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>

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

    r63989 r64107  
    33    VirtualBox Windows Installation Script (WiX)
    44
    5     Copyright (C) 2014-2015 Oracle Corporation
     5    Copyright (C) 2014-2016 Oracle Corporation
    66
    77    This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    6161    <Property Id="ARPURLINFOABOUT">http://www.virtualbox.org</Property>
    6262    <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
    63    
     63
    6464    <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
    6565
    … …  
    256256<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    257257                <Merge Id="msm_VBoxApp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeApp)" DiskId="1">
    258                     <ConfigurationData Name="argRegesterExtensions" Value="[VBOX_REGISTERFILEEXTENSIONS]"/> 
     258                    <ConfigurationData Name="argRegesterExtensions" Value="[VBOX_REGISTERFILEEXTENSIONS]"/>
    259259                </Merge>
    260260    <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
    … …  
    284284    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    285285                            <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1">
    286                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
     286                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
    287287                            </Merge>
    288288    <?else ?>
    … …  
    296296<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    297297                            <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1">
    298                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
     298                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
    299299                            </Merge>
    300300<?else ?>
    … …  
    309309    <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    310310                            <Merge Id="msm_VBoxNetworkLwf" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkLwf)" DiskId="1">
    311                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
     311                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
    312312                            </Merge>
    313313    <?else ?>
    … …  
    321321<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
    322322                            <Merge Id="msm_VBoxNetworkAdp6" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp6)" DiskId="1">
    323                             <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
     323                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/>
    324324                            </Merge>
    325325<?else ?>
    … …  
    362362                </Directory>
    363363
    364                 <!-- Shortcut(s) in start menu -->
     364                <!-- Start menu entries. -->
    365365                <Component Id="cp_StartMenuVBox" Guid="C2DC321A-CE63-40EE-8A98-724DF8BD12FB" Win64="$(var.Property_Win64)">
     366                    <Condition>VBOX_INSTALLSTARTMENUENTRIES</Condition>
    366367                    <Shortcut Id="sc_StartMenuVBox" Directory="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)"
    367368                              Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR"/>
    … …  
    371372                </Component>
    372373
     374                <!-- Desktop shortcut. -->
    373375                <Component Id="cp_DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Win64="$(var.Property_Win64)">
    374376                    <Condition>VBOX_INSTALLDESKTOPSHORTCUT</Condition>
    … …  
    379381                </Component>
    380382
     383                <!-- QuickLaunch shortcut. -->
    381384                <Component Id="cp_QuickLaunchVBox" Guid="CC19E026-938A-41CB-8E77-3F33296244B6" Win64="$(var.Property_Win64)">
    382385                    <CreateFolder/>
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