diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-09-14 00:47:07 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-09-14 00:47:07 +0000 |
| commit | 569cef75edf5525c46e34e55dc53dcc8a814ee05 (patch) | |
| tree | 6b9c5945011959fd273177b1090d786a3fe50d63 /src/windows | |
| parent | 66edbde71866aa8b4718a04689b37d5c634d1079 (diff) | |
| download | krb5-569cef75edf5525c46e34e55dc53dcc8a814ee05.tar.gz krb5-569cef75edf5525c46e34e55dc53dcc8a814ee05.tar.xz krb5-569cef75edf5525c46e34e55dc53dcc8a814ee05.zip | |
wix installer - permit administrative installs
remove the registration requirement for administrative installs.
ticket: new
component: windows
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19936 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/installer/wix/lang/ui_1033.wxi | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/src/windows/installer/wix/lang/ui_1033.wxi b/src/windows/installer/wix/lang/ui_1033.wxi index ca0bdb700..bae778175 100644 --- a/src/windows/installer/wix/lang/ui_1033.wxi +++ b/src/windows/installer/wix/lang/ui_1033.wxi @@ -29,7 +29,7 @@ <Dialog Id="AdminWelcomeDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes"> <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]"> <Publish Property="InstallMode" Value="Server Image">1</Publish> - <Publish Event="NewDialog" Value="AdminRegistrationDlg">1</Publish> + <Publish Event="NewDialog" Value="AdminInstallPointDlg">1</Publish> </Control> <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]"> <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> @@ -180,7 +180,7 @@ <Publish Event="SpawnDialog" Value="AdminBrowseDlg">1</Publish> </Control> <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="[ButtonText_Back]"> - <Publish Event="NewDialog" Value="AdminRegistrationDlg">1</Publish> + <Publish Event="NewDialog" Value="AdminWelcomeDlg">1</Publish> </Control> <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]"> <Publish Event="SetTargetPath" Value="TARGETDIR">1</Publish> @@ -199,35 +199,6 @@ <Text>[DlgTitleFont]Network Location</Text> </Control> </Dialog> - <Dialog Id="AdminRegistrationDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes"> - <Control Id="OrganizationLabel" Type="Text" X="45" Y="71" Width="285" Height="30" TabSkip="no"> - <Text>&Please enter the name of your organization in the box below. This will be used as default company name for subsequent installations of [ProductName]:</Text> - </Control> - <Control Id="OrganizationEdit" Type="Edit" X="45" Y="105" Width="220" Height="18" Property="COMPANYNAME" Text="{80}" /> - <Control Id="CDKeyLabel" Type="Text" X="45" Y="130" Width="50" Height="10" TabSkip="no"> - <Text>CD &Key:</Text> - </Control> - <Control Id="CDKeyEdit" Type="MaskedEdit" X="45" Y="143" Width="250" Height="16" Property="PIDKEY" Text="[PIDTemplate]" /> - <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Image="yes" Text="[ButtonText_Back]"> - <Publish Event="NewDialog" Value="AdminWelcomeDlg">1</Publish> - </Control> - <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_Next]"> - <Publish Event="ValidateProductID" Value="0">0</Publish> - <Publish Event="NewDialog" Value="AdminInstallPointDlg">ProductID</Publish> - </Control> - <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="[ButtonText_Cancel]"> - <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish> - </Control> - <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="374" Height="44" TabSkip="no" Text="[BannerBitmap]" /> - <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" /> - <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="374" Height="0" /> - <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes"> - <Text>Please enter your company information</Text> - </Control> - <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes"> - <Text>[DlgTitleFont]Company Information</Text> - </Control> - </Dialog> <Dialog Id="BrowseDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes"> <Control Id="PathEdit" Type="PathEdit" X="84" Y="202" Width="261" Height="18" Property="_BrowseProperty" Indirect="yes" /> <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="[ButtonText_OK]"> @@ -1265,4 +1236,4 @@ <Binary Id="removico" src="Binary\removico.ico" /> <Binary Id="repairic" src="Binary\repairic.ico" /> <Binary Id="Up" src="Binary\up.bmp" /> -</Include>
\ No newline at end of file +</Include> |
