diff options
author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-09-05 03:24:27 +0400 |
---|---|---|
committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-09-05 03:24:27 +0400 |
commit | c8bfedb6389cfd6de325030eb0b361e815a3fad4 (patch) | |
tree | 00dfbec955aed38e3dbc93cabda7d5de73318086 /installer | |
parent | 803a6d53a61d4c96d1f5b85f1fc84d9e5e6ca8a6 (diff) |
Added launch checkbox and new bitmaps for the installer
Diffstat (limited to 'installer')
-rw-r--r-- | installer/MumbleInstall.wixproj | 1 | ||||
-rw-r--r-- | installer/Product.wxs | 11 | ||||
-rw-r--r-- | installer/Settings.wxi | 2 | ||||
-rw-r--r-- | installer/UI.wxs | 75 | ||||
-rw-r--r-- | installer/bannrbmp.bmp | bin | 0 -> 85894 bytes | |||
-rw-r--r-- | installer/dlgbmp.bmp | bin | 0 -> 461814 bytes |
6 files changed, 86 insertions, 3 deletions
diff --git a/installer/MumbleInstall.wixproj b/installer/MumbleInstall.wixproj index cf22663a9..5c37762f4 100644 --- a/installer/MumbleInstall.wixproj +++ b/installer/MumbleInstall.wixproj @@ -33,6 +33,7 @@ <Compile Include="Files.wxs" /> <Compile Include="Plugins.wxs" /> <Compile Include="Product.wxs" /> + <Compile Include="UI.wxs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Translations\Czech.wxl" /> diff --git a/installer/Product.wxs b/installer/Product.wxs index 1fc2207f9..b74a32fc0 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -15,6 +15,11 @@ <ProgressText Action="NSISUninstall">Uninstalling old version</ProgressText> </UI> + <CustomAction Id="LaunchApplication" FileKey="mumble.exe" ExeCommand="" Execute="immediate" Impersonate="yes" Return="asyncNoWait" /> + <UI> + <Publish Dialog="MumbleExitDialog" Control="Finish" Order="1" Event="DoAction" Value="LaunchApplication">LAUNCHAPPONEXIT</Publish> + </UI> + <Property Id='INSTALLDIR'> <ComponentSearch Id='SearchMumbleComponent' Guid='A08F7909-1116-4AC8-9422-051FA1A1BE19' /> </Property> @@ -27,7 +32,7 @@ <Media Id="1" Cabinet="$(var.ProductName).cab" EmbedCab="yes" CompressionLevel="high" /> - <UIRef Id="WixUI_FeatureTree" /> + <UIRef Id="MumbleUI_FeatureTree" /> <UIRef Id="WixUI_ErrorProgressText" /> <Property Id="ALLUSERS" Value="1" /> @@ -37,6 +42,8 @@ <Property Id='ARPPRODUCTICON'>mumble.ico</Property> <WixVariable Id="WixUILicenseRtf" Value="$(var.SourceDir)\installer\gpl.rtf" /> + <WixVariable Id="WixUIBannerBmp" Value="$(var.SourceDir)\installer\bannrbmp.bmp" /> + <WixVariable Id="WixUIDialogBmp" Value="$(var.SourceDir)\installer\dlgbmp.bmp" /> <Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="ProgramFilesFolder"> @@ -154,7 +161,7 @@ <?endif ?> </Feature> - <Feature Id="Murmur" Title="!(loc.MUMBLE_SEC_MURMUR)" Description="!(loc.DESC_SectionMurmur)" Level="1000"> + <Feature Id="Murmur" Title="!(loc.MUMBLE_SEC_MURMUR)" Description="!(loc.DESC_SectionMurmur)" Level="1000" ConfigurableDirectory="INSTALLDIR"> <?ifdef IceDir ?> <ComponentRef Id="bzip2.dll" /> <ComponentRef Id="ice34.dll" /> diff --git a/installer/Settings.wxi b/installer/Settings.wxi index ccfd53796..f8584bce1 100644 --- a/installer/Settings.wxi +++ b/installer/Settings.wxi @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Include> <?define ProductName = "Mumble" ?> - <?define ProductManufacturer = "Mumble" ?> + <?define ProductManufacturer = "Thorvald Natvig" ?> <?define ProductVersion = "1.2.3" ?> diff --git a/installer/UI.wxs b/installer/UI.wxs new file mode 100644 index 000000000..c65d6ed6b --- /dev/null +++ b/installer/UI.wxs @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + + <Fragment> + <WixVariable Id="WixUICostingPopupOptOut" Value="1" Overridable="yes" /> + + <UI Id="MumbleUI_FeatureTree"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="FeatureTree" /> + + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + + <Publish Dialog="MumbleExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish> + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish> + + <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> + <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg">LicenseAccepted = "1"</Publish> + + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">Installed</Publish> + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2">NOT Installed</Publish> + <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">NOT Installed OR WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3">Installed AND PATCH</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + </UI> + + <UIRef Id="WixUI_Common" /> + </Fragment> + + <Fragment> + <UI> + <Dialog Id="MumbleExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)"> + <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" /> + <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" /> + <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" /> + <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" /> + <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="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" /> + <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" /> + <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="!(loc.MUMBLE_START)"> + <Condition Action="show">NOT Installed AND &MumbleClient = 3</Condition> + </Control> + </Dialog> + + <InstallUISequence> + <Show Dialog="MumbleExitDialog" OnExit="success" Overridable="yes" /> + </InstallUISequence> + + <AdminUISequence> + <Show Dialog="MumbleExitDialog" OnExit="success" Overridable="yes" /> + </AdminUISequence> + </UI> + </Fragment> +</Wix>
\ No newline at end of file diff --git a/installer/bannrbmp.bmp b/installer/bannrbmp.bmp Binary files differnew file mode 100644 index 000000000..4db057472 --- /dev/null +++ b/installer/bannrbmp.bmp diff --git a/installer/dlgbmp.bmp b/installer/dlgbmp.bmp Binary files differnew file mode 100644 index 000000000..1b4abbc2c --- /dev/null +++ b/installer/dlgbmp.bmp |