Changeset 38778 in vbox for trunk/src/VBox

Timestamp:

Sep 16, 2011 1:25:08 PM (14 years ago)

Author:

vboxsync

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

74071

Message:

Installer/win: 2nd shot at the 2869 error.

File:

• trunk/src/VBox/Installer/win/UserInterface.wxi (modified) (4 diffs)

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

@@ -543 +543 @@
         </Dialog>
 
-        <!-- This dialog is called after an error during installation -->
-        <Dialog Id="VBoxFatalErrorDlg" ErrorDialog="yes" Width="270" Height="150" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+        <!-- This dialog is called via the ErrorDialog property on an installation error. -->
+        <Dialog Id="VBoxErrorDlg" ErrorDialog="yes" Width="270" Height="150" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <!-- Do *not* change the control IDs in the dialog! -->
             <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no" NoPrefix="yes" Text="Error information text" />
@@ -568 +568 @@
             <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="!(loc.ButtonText_Retry)">
                 <Publish Event="EndDialog" Value="ErrorRetry">1</Publish>
+            </Control>
+        </Dialog>
+
+        <!-- Used to signal a fatal error in the 'OnExit="error"' fashion. -->
+        <Dialog Id="VBoxFatalErrorDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
+                <Publish Event="EndDialog" Value="Exit">1</Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Cancel)" />
+            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[ExclamationMark]" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="80" Transparent="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" />
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
             </Control>
         </Dialog>
@@ -896 +911 @@
 
         <!-- Dialog property table. -->
-        <Property Id="ErrorDialog" Value="VBoxFatalErrorDlg"/>
+        <Property Id="ErrorDialog" Value="VBoxErrorDlg"/>
 
         <!-- Define some textstyles used for formatting dialog items. -->
@@ -1087 +1102 @@
              skips the actions in this table if the user interface level is set to basic UI or no UI. -->
          <AdminUISequence>
-            <!-- bird: VBoxFatalErrorDlg is an error dialog, apparently that's not what we're supposed to use for OnExit="error". See ./src/ext/UIExtension/wixlib/FatalError.wxs -->
             <Show Dialog="VBoxFatalErrorDlg" OnExit="error" />
             <Show Dialog="VBoxUserExitDlg" OnExit="cancel" />