CP-15162: Add desktop shortcut to installdlg

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2024-11-24 22:06:59 +01:00 · 2016-02-01 17:20:56 +08:00 · 2016-02-01 17:20:56 +08:00 · 40e3ba3d66
commit 40e3ba3d66
parent 2689f0bd9e
3 changed files with 26 additions and 12 deletions
--- a/WixInstaller/XenCenter.l10n.diff
+++ b/WixInstaller/XenCenter.l10n.diff
@ -28,8 +28,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 # SUCH DAMAGE.

--- XenCenter.wxs	2016-01-28 17:15:18.419410400 +0800
-+++ XenCenter.l10n.wxs	2016-01-28 17:22:44.000717200 +0800
+--- XenCenter.wxs	2016-02-01 16:42:15.810832400 +0800
+++ XenCenter.l10n.wxs	2016-02-01 16:41:55.953846900 +0800
@@ -38,7 +38,7 @@
     <?define UpgradeCode="{@BRANDING_XENCENTER_UPGRADE_CODE_GUID@}"?>
     <?define ProductCode="{65AE1345-A520-456D-8A19-2F52D43D3A09}"?>
@ -169,7 +169,7 @@
                             </Component>
                         </Directory>
                         <Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
-@@ -260,9 +282,11 @@
+@@ -268,9 +290,11 @@
         <Feature Id="MainProgram" Title="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_BRAND_CONSOLE@" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow" >
             <ComponentRef Id="MainExecutable" />
             <ComponentRef Id="HelpFiles" />
@ -182,7 +182,7 @@
             <ComponentRef Id="TestResources" />
             <ComponentRef Id="SchemasFilesComponent" />
             <ComponentRef Id="ExternalToolsComponent" />
-@@ -281,7 +305,7 @@
+@@ -290,7 +314,7 @@
         <Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
         <MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
         <PropertyRef Id="NETFRAMEWORK45" />
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@ -240,6 +240,14 @@
            <Directory Id="ProgramMenuFolder">
                <Directory Id="ApplicationProgramsFolder" Name="@BRANDING_COMPANY_NAME_SHORT@" />
            </Directory>
+            <Directory Id="DesktopFolder" Name="Desktop">
+                <Component Id="ProgramFilesShortcut" Guid="63b44222-b5e8-4ab1-8f68-baed79abbf36">
+                    <Condition>INSTALLSHORTCUT</Condition>
+                    <Shortcut Id="ApplicationDesktopShortcut" Name="@BRANDING_BRAND_CONSOLE@" Description="@BRANDING_BRAND_CONSOLE@ Shortcut" Target="[INSTALLDIR]@BRANDING_BRAND_CONSOLE@.exe" WorkingDirectory="INSTALLDIR"/>
+                    <RemoveFolder Id="DesktopFolder" On="uninstall"/>
+                    <RegistryValue Root="HKCU" Key="Software\@BRANDING_COMPANY_NAME_SHORT@\@BRANDING_BRAND_CONSOLE@" Name="installed" Type="integer" Value="1" KeyPath="yes" />
+                </Component>
+            </Directory>
        </Directory>
        <DirectoryRef Id="TARGETDIR">
            <Component Id="RegistryEntries" Guid="@BRANDING_REGISTRY_ENTRIES_GUID@">
@ -268,6 +276,7 @@
            <ComponentRef Id="ExternalToolsComponent" />
            <ComponentRef Id="RegistryEntries" />
            <ComponentRef Id="ApplicationShortcut" />
+            <ComponentRef Id="ProgramFilesShortcut" />
        </Feature>
 		
        <Feature Id="HealthCheckService" Title="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_SERVER@ Health Check Service" Description="@BRANDING_COMPANY_NAME_SHORT@ @BRANDING_SERVER@ Health Check Service" Display="expand" Level="1" ConfigurableDirectory="HEALTHCHECKSERVICEDIR" AllowAdvertise="no" InstallDefault="local" Absent="allow" >
@ -286,6 +295,7 @@
            <RegistrySearch Id="InstallRegistry" Type="raw" Root="HKLM" Key="Software\@BRANDING_COMPANY_NAME_SHORT@\@BRANDING_BRAND_CONSOLE@" Name="InstallDir" />
        </Property>
 		<Property Id="REINSTALLMODE" Value="amus" />
+        <Property Id="INSTALLSHORTCUT" />
        <CustomAction Id="ClearAllUsers" Property="ALLUSERS" Value="" />
        <CustomAction Id="SetAllUsers" Property="ALLUSERS" Value="1" />
        <InstallExecuteSequence>
--- a/mk/patches/wix_src_patch
+++ b/mk/patches/wix_src_patch
@ -99,7 +99,7 @@ diff -ru wixlib/InstallDirDlg.wxs wixlib/InstallDirDlg.wxs
                 <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
                 <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
                 <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-@@ -29,6 +30,13 @@
+@@ -29,6 +30,14 @@
                 <Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
                 <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
                 <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
@ -109,7 +109,8 @@ diff -ru wixlib/InstallDirDlg.wxs wixlib/InstallDirDlg.wxs
 +                        <RadioButton Value="1" X="20" Y="0" Width="260" Height="20" Text="!(loc.InstallDirDlgUsersAllRadioButton)" />
 +                        <RadioButton Value="0" X="20" Y="20" Width="260" Height="20" Text="!(loc.InstallDirDlgUsersOneRadioButton)" />
 +                    </RadioButtonGroup>
-+                </Control>
+                </Control>
+                <Control Id="InstallShortcutCheckbox" Type="CheckBox" X="20" Y="210" Width="200" Height="20" Property="INSTALLSHORTCUT" CheckBoxValue="1" Text="!(loc.InstallDirDlgShortCut)" />
             </Dialog>
         </UI>
     </Fragment>
@ -467,7 +468,7 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
 
     <String Id="ProgressTextInstallValidate" Overridable="yes"><!-- _locID_text="ProgressTextInstallValidate" _locComment="ProgressTextInstallValidate" -->Validating install</String>
     <String Id="ProgressTextInstallFiles" Overridable="yes"><!-- _locID_text="ProgressTextInstallFiles" _locComment="ProgressTextInstallFiles" -->Copying new files</String>
-@@ -606,4 +606,9 @@
+@@ -606,4 +606,10 @@
     <String Id="UITextVolumeCostRequired" Overridable="yes"><!-- _locID_text="UITextVolumeCostRequired" _locComment="UITextVolumeCostRequired" -->Required</String>
     <String Id="UITextVolumeCostSize" Overridable="yes"><!-- _locID_text="UITextVolumeCostSize" _locComment="UITextVolumeCostSize" -->Disk Size</String>
     <String Id="UITextVolumeCostVolume" Overridable="yes"><!-- _locID_text="UITextVolumeCostVolume" _locComment="UITextVolumeCostVolume" -->Volume</String>
@ -475,7 +476,8 @@ diff -ru wixlib/WixUI_en-us.wxl wixlib/WixUI_en-us.wxl
 +    <String Id="ErrorNewerProduct">A newer version of this product is already installed.</String>
 +    <String Id="InstallDirDlgUsersLabel">Install for:</String>
 +    <String Id="InstallDirDlgUsersAllRadioButton">&amp;All Users</String>
-+    <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
+    <String Id="InstallDirDlgUsersOneRadioButton">&amp;Just Me</String>
+    <String Id="InstallDirDlgShortCut">&amp;Create shortcut on Desktop</String>
 </WixLocalization>
 \ No newline at end of file
 diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
@ -633,7 +635,7 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
 
     <String Id="ProgressTextInstallValidate" Overridable="yes">インストールを検証しています</String>
     <String Id="ProgressTextInstallFiles" Overridable="yes">新しいファイルをコピーしています</String>
-@@ -606,4 +606,9 @@
+@@ -606,4 +606,10 @@
     <String Id="UITextVolumeCostRequired" Overridable="yes">必須</String>
     <String Id="UITextVolumeCostSize" Overridable="yes">ディスク サイズ</String>
     <String Id="UITextVolumeCostVolume" Overridable="yes">ボリューム</String>
@ -641,7 +643,8 @@ diff -ru wixlib/WixUI_ja-jp.wxl wixlib/WixUI_ja-jp.wxl
 +    <String Id="ErrorNewerProduct" Overridable="yes">より新しいバージョンが既にインストールされています。</String>
 +    <String Id="InstallDirDlgUsersLabel" Overridable="yes">対象ユーザー:</String>
 +    <String Id="InstallDirDlgUsersAllRadioButton" Overridable="yes">すべてのユーザー(&amp;A)</String>
-+    <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">現在のユーザー(&amp;J)</String>
+    <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">現在のユーザー(&amp;J)</String>
+    <String Id="InstallDirDlgShortCut">Create shortcut on Desktop(&amp;C)</String>
 </WixLocalization>
 diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
 --- wixlib/WixUI_zh-CN.wxl	Thu Jan 20 06:13:28 2011 -0800
@ -798,7 +801,7 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
 
     <String Id="ProgressTextInstallValidate" Overridable="yes">正在验证安装</String>
     <String Id="ProgressTextInstallFiles" Overridable="yes">正在复制新文件</String>
-@@ -606,4 +606,9 @@
+@@ -606,4 +606,10 @@
     <String Id="UITextVolumeCostRequired" Overridable="yes">所需空间</String>
     <String Id="UITextVolumeCostSize" Overridable="yes">磁盘大小</String>
     <String Id="UITextVolumeCostVolume" Overridable="yes">卷</String>
@ -806,7 +809,8 @@ diff -ru wixlib/WixUI_zh-CN.wxl wixlib/WixUI_zh-CN.wxl
 +    <String Id="ErrorNewerProduct" Overridable="yes">已经安装了这种产品的较新版本。</String>
 +    <String Id="InstallDirDlgUsersLabel" Overridable="yes">安装：</String>
 +    <String Id="InstallDirDlgUsersAllRadioButton" Overridable="yes">所有用户(&amp;A)</String>
-+    <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">只有我(&amp;J)</String>
+    <String Id="InstallDirDlgUsersOneRadioButton" Overridable="yes">只有我(&amp;J)</String>
+    <String Id="InstallDirDlgShortCut">添加桌面快捷方式(&amp;C)</String>
 </WixLocalization>
 diff -ru wixlib/WixUI_FeatureTree.wxs wixlib/WixUI_FeatureTree.wxs
 --- wixlib/WixUI_FeatureTree.wxs	Tue Feb 21 12:03:46 2012