From 7ed673ceebb0b8ae63da19e5fd850d3d03818513 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 5 Aug 2024 11:23:05 +0200
Subject: Adding upstream version 7.0.20-dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/VBox/Installer/win/UserInterface.wxi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/VBox/Installer/win/UserInterface.wxi')

diff --git a/src/VBox/Installer/win/UserInterface.wxi b/src/VBox/Installer/win/UserInterface.wxi
index cd4c2660..b8fff529 100644
--- a/src/VBox/Installer/win/UserInterface.wxi
+++ b/src/VBox/Installer/win/UserInterface.wxi
@@ -364,7 +364,6 @@
             <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="20">
                 <Text>!(loc.Customize2Dlg_Desc)</Text>
             </Control>
-<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
             <!-- Note the gray background behind the checkboxes. Unfortunately there's no easy way to
                  fix this, without fixing it in the WiX source code. Because the control's background
                  uses the default dialog background color, changing the background image for the dialog to
@@ -388,7 +387,7 @@
                      Property="VBOX_REGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
             </Control>
-<?endif?> <!-- VBOX_WITH_QTGUI -->
+
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)" />
             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)" />
 
@@ -1169,11 +1168,11 @@
         <!-- Property which defines whether the installer checks the serial number or not. -->
         <Property Id="VBOX_SHOW_SERIAL_CHECK_DLG">1</Property>
 <?endif?>
-<?if $(env.VBOX_WITH_QTGUI) = "no" ?>
+<?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <!-- Property which defines whether to show the second customization dialog. This second customization
              dialog only is needed for GUI-based options, so skip if we either don't ship FE/Qt or don't show
              the (first) customization dialog. -->
-        <Property Id="VBOX_SHOW_CUSTOMIZE2_DLG"><![CDATA[VBOX_SHOW_CUSTOMIZE_DLG]]></Property>
+        <Property Id="VBOX_SHOW_CUSTOMIZE2_DLG">1</Property>
 <?endif?>
 
 
-- 
cgit v1.2.3