Changeset 49534 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Nov 18, 2013 2:34:06 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90710

Message:

Windows host installer: Make registering .vbox, .vbox-extpack,.ovf and .ova file associations optional (contribution by Tal Aloni).

Location:

trunk/src/VBox/Installer/win

Files:

• NLS/de_DE.wxl (modified) (1 diff)
• NLS/en_US.wxl (modified) (1 diff)
• NLS/fa_IR.wxl (modified) (1 diff)
• NLS/fr_FR.wxl (modified) (1 diff)
• NLS/it_IT.wxl (modified) (1 diff)
• NLS/zh_TW.wxl (modified) (1 diff)
• UserInterface.wxi (modified) (1 diff)
• VirtualBox.wxs (modified) (3 diffs)

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

@@ -120 +120 @@
     <String Id="Customize2Dlg_CreateShortcut">Verknüpfung auf dem Desktop anlegen</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Verknüpfung in der Schnellstartleiste anlegen</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Dateizuordnungen registrieren</String>
 
     <!---->

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

@@ -124 +124 @@
     <String Id="Customize2Dlg_CreateShortcut">Create a shortcut on the desktop</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Create a shortcut in the Quick Launch Bar</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Register file associations</String>
 
     <!---->

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

@@ -91 +91 @@
     <String Id="Customize2Dlg_CreateShortcut">ایجاد یک میانبر روی دسکتاپ</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">ایجاد یک میانبر در اِجرای سریع</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">ثبت نام انجمن فایل</String>
     <!---->
     <String Id="WarnDisconNetIfacesDlg_Title">هشدار:</String>

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

@@ -118 +118 @@
     <String Id="Customize2Dlg_CreateShortcut">Créer un raccourci sur le bureau</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Créer un raccourci dans la barre de lancement rapide</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Inscription des associations de fichiers</String>
 
     <!---->

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

@@ -91 +91 @@
     <String Id="Customize2Dlg_CreateShortcut">Crea una scorciatoia sul desktop</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">Crea una scorciatoia nella barra di avvio veloce</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">Registrati associazioni di file</String>
     <!---->
     <String Id="WarnDisconNetIfacesDlg_Title">Avviso:</String>

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

@@ -124 +124 @@
     <String Id="Customize2Dlg_CreateShortcut">在桌面建立捷徑</String>
     <String Id="Customize2Dlg_CreateQuickLaunch">在快速啟動列建立捷徑</String>
+    <String Id="Customize2Dlg_RegisterFileExtensions">註冊文件關聯</String>
 
     <!---->

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

@@ -334 +334 @@
                      Property="INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1">
                 <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
+            </Control>
+            <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
+                     Property="REGISTERFILEEXTENSIONS" CheckBoxValue="1">
+                <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
             </Control>
 

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

@@ -117 +117 @@
         <Property Id="INSTALLDESKTOPSHORTCUT" Value="1"></Property>
         <Property Id="INSTALLQUICKLAUNCHSHORTCUT" Value="1"></Property>
+        <Property Id="REGISTERFILEEXTENSIONS" Value="1"></Property>
         <Property Id="STARTVBOX" Value="1"></Property>
 
@@ -379 +380 @@
                     <!---->
 
-                    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
-                         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
-                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
-
-                        <!-- Set required environment variables. -->
-                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
-                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
-
+                    
+                    <Component Id="cp_RegisterExtensions" Guid="FEB8943E-5D60-4E2D-846F-458207019D40" Win64="$(var.Property_Win64)">
+                        <Condition>REGISTERFILEEXTENSIONS</Condition>
                         <!-- Register file extensions. Note: Extension Id's *must not* be changed! These specify the actual
                              file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
@@ -422 +418 @@
                             <Extension Id="hdd" ContentType="application/x-virtualbox-hdd" />
                         </ProgId>
+                    </Component> <!-- RegisterExtensions -->
+
+                    <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
+                         binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
+                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
+
+                        <!-- Set required environment variables. -->
+                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
+                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
 
                         <!-- Files -->