Changeset 38761 in vbox for trunk/src/VBox/Installer

Timestamp:

Sep 15, 2011 11:57:36 AM (13 years ago)

Author:

vboxsync

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

74043

Message:

UserInterface.wxi: 1st try at fixing VBoxFatalErrorDlg so W7 likes accepts it as an error dialog: InfoIcon instead of ExclamationIcon; Standard button text instead of font+hardcoding.

File:

• trunk/src/VBox/Installer/win/UserInterface.wxi (modified) (1 diff)

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

@@ -546 +546 @@
         <Dialog Id="VBoxFatalErrorDlg" ErrorDialog="yes" Width="270" Height="150" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <!-- Do *not* change the control IDs in the dialog! -->
-            <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Icon" FixedSize="yes" IconSize="32" Text="[ExclamationIcon]" />
-            <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no">
-                <Text><![CDATA[{&DlgFont8}]]></Text>
-            </Control>
-            <Control Id="Y" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&Yes]]></Text>
+            <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no" NoPrefix="yes" Text="Error information text" />
+            <Control Id="Y" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_Yes]">
                 <Publish Event="EndDialog" Value="ErrorYes">1</Publish>
             </Control>
-            <Control Id="A" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&Cancel]]></Text>
+            <Control Id="A" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_Cancel]">
                 <Publish Event="EndDialog" Value="ErrorAbort">1</Publish>
             </Control>
-            <Control Id="C" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&Cancel]]></Text>
+            <Control Id="C" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_Cancel]">
                 <Publish Event="EndDialog" Value="ErrorCancel">1</Publish>
             </Control>
-            <Control Id="I" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&Ignore]]></Text>
+            <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="[InfoIcon]" />
+            <Control Id="I" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_Ignore]">
                 <Publish Event="EndDialog" Value="ErrorIgnore">1</Publish>
             </Control>
-            <Control Id="N" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&No]]></Text>
+            <Control Id="N" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_No]">
                 <Publish Event="EndDialog" Value="ErrorNo">1</Publish>
             </Control>
-            <Control Id="O" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&OK]]></Text>
+            <Control Id="O" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_OK]">
                 <Publish Event="EndDialog" Value="ErrorOk">1</Publish>
             </Control>
-            <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
-                <Text><![CDATA[{\DlgFont8}&Retry]]></Text>
+            <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes" Text="[ButtonText_Retry]">
                 <Publish Event="EndDialog" Value="ErrorRetry">1</Publish>
             </Control>