AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jj: fix strange shortcuts :D add features for shortcuts

Browse Source
This commit is contained in:
Jonathan Jenne 2018-06-06 11:15:26 +02:00
parent ea497783d0
commit ea7c1eae9e
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/Setup/Product.wxs
View File

@ -31,7 +31,7 @@
<Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" /> <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
<Upgrade Id="$(var.UpgradeCode)"> <Upgrade Id="$(var.UpgradeCode)">
<UpgradeVersion <UpgradeVersion
Minimum="1.0.0.0" Maximum="99.0.0.0" Minimum="1.0.0.0" Maximum="1.9.4.0"
Property="PREVIOUSVERSIONSINSTALLED" Property="PREVIOUSVERSIONSINSTALLED"
IncludeMinimum="yes" IncludeMaximum="no" /> IncludeMinimum="yes" IncludeMaximum="no" />
</Upgrade> </Upgrade>
@ -59,30 +59,28 @@
<Component Id="ApplicationShortcut_StartMenu" Guid="62aad607-27fc-438f-b2e5-0e3f26e51aaa"> <Component Id="ApplicationShortcut_StartMenu" Guid="62aad607-27fc-438f-b2e5-0e3f26e51aaa">
<Shortcut Id="ApplicationStartMenuShortcut_StartMenu" <Shortcut Id="ApplicationStartMenuShortcut_StartMenu"
Name="$(var.ProductName)" Name="$(var.ProductName)"
Target="[#MainApplicationExe]" Target="[INSTALLDIR]$(var.ProgramName).exe"
WorkingDirectory="INSTALLDIR"/> WorkingDirectory="INSTALLDIR"/>
<RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/> <RemoveFolder Id="ApplicationProgramsFolder_StartMenu" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="ApplicationProgramsFolder"> <DirectoryRef Id="DesktopFolder">
<Component Id="ApplicationShortcut_Desktop" Guid="796a4f03-8156-4c62-8d92-29ce92805089"> <Component Id="ApplicationShortcut_Desktop" Guid="796a4f03-8156-4c62-8d92-29ce92805089">
<Shortcut Id="ApplicationStartMenuShortcut_Desktop" <Shortcut Id="ApplicationStartMenuShortcut_Desktop"
Name="$(var.ProductName)" Name="$(var.ProductName)"
Target="[#MainApplicationExe]" Target="[INSTALLDIR]$(var.ProgramName).exe"
WorkingDirectory="INSTALLDIR"/> WorkingDirectory="INSTALLDIR"/>
<RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/> <RemoveFolder Id="ApplicationProgramsFolder_Desktop" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="INSTALLDIR"> <DirectoryRef Id="INSTALLDIR">
<Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes"> <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B" KeyPath="yes">
<File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes"> <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="no" Checksum="yes" />
</File>
<!-- <!--
<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" /> <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
<Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" /> <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="no" Target="[#MainApplicationExe]" />
@ -152,17 +150,6 @@
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" /> <util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
</Component> </Component>
<!--<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="Process Manager">
<Component Id="ProgramMenuDir" Guid="84FC82EA-EF4F-4246-A463-B076E878DF0A">
<RemoveFolder Id="ProgramMenuDir" On="uninstall" />
<RegistryValue Root="HKMU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" KeyPath="yes" />
</Component>
</Directory>
</Directory>
<Directory Id="DesktopFolder" Name="Desktop"></Directory>-->
</DirectoryRef> </DirectoryRef>
<Feature Id="MainApplication" Title="Main Application" Level="1"> <Feature Id="MainApplication" Title="Main Application" Level="1">
@ -175,16 +162,22 @@
<ComponentRef Id="PDFsharp" /> <ComponentRef Id="PDFsharp" />
<ComponentRef Id="IndependentsoftLibs" /> <ComponentRef Id="IndependentsoftLibs" />
<ComponentRef Id="DevExpressLibs" /> <ComponentRef Id="DevExpressLibs" />
<ComponentRef Id="ApplicationShortcut_Desktop" /> </Feature>
<Feature Id="DesktopShortcut" Title="Desktop Shortcut" >
<ComponentRef Id="ApplicationShortcut_Desktop" />
</Feature>
<Feature Id="StartmenuShortcut" Title="Startmenu Shortcut">
<ComponentRef Id="ApplicationShortcut_StartMenu" /> <ComponentRef Id="ApplicationShortcut_StartMenu" />
<!--<ComponentRef Id="ProgramMenuDir" />-->
</Feature> </Feature>
<!-- Legt das Standard-Installationsverzeichnis fest--> <!-- Legt das Standard-Installationsverzeichnis fest-->
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" /> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
<UI> <UI>
<UIRef Id="WixUI_InstallDir" /> <!--<UIRef Id="WixUI_InstallDir" />-->
<UIRef Id="WixUI_FeatureTree"/>
<UIRef Id="WixUI_ErrorProgressText" /> <UIRef Id="WixUI_ErrorProgressText" />
<Publish Dialog="WelcomeDlg" <Publish Dialog="WelcomeDlg"
Control="Next" Control="Next"
@ -196,6 +189,21 @@
Event="NewDialog" Event="NewDialog"
Value="WelcomeDlg" Value="WelcomeDlg"
Order="2">1</Publish> Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="Next"
Event="NewDialog"
Value="FeaturesDlg"
Order="2">1</Publish>
<Publish Dialog="InstallDirDlg"
Control="ChangeFolder"
Event="NewDialog"
Value="BrowseDlg"
Order="2">1</Publish>
<Publish Dialog="FeaturesDlg"
Control="Back"
Event="NewDialog"
Value="InstallDirDlg"
Order="2">1</Publish>
</UI> </UI>
</Product> </Product>
</Wix> </Wix>