diff --git a/DisplayMagicianSetup/DisplayMagicianSetup.wixproj b/DisplayMagicianSetup/DisplayMagicianSetup.wixproj index 360a331..a53758f 100644 --- a/DisplayMagicianSetup/DisplayMagicianSetup.wixproj +++ b/DisplayMagicianSetup/DisplayMagicianSetup.wixproj @@ -95,6 +95,9 @@ + + + diff --git a/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs b/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs index 578637c..c13f755 100644 --- a/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs +++ b/DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs @@ -2,196 +2,196 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/DisplayMagicianSetup/Includes/DisplayMagicianVariables.wxi b/DisplayMagicianSetup/Includes/DisplayMagicianVariables.wxi index 60a2512..93f0669 100644 --- a/DisplayMagicianSetup/Includes/DisplayMagicianVariables.wxi +++ b/DisplayMagicianSetup/Includes/DisplayMagicianVariables.wxi @@ -24,6 +24,6 @@ The name of your application exe file. This will be used to kill the process when updating and creating the desktop shortcut --> - + \ No newline at end of file diff --git a/DisplayMagicianSetup/Lang/en-us/Loc_en-us.wxl b/DisplayMagicianSetup/Lang/en-us/Loc_en-us.wxl index a7e058a..8d7e041 100644 --- a/DisplayMagicianSetup/Lang/en-us/Loc_en-us.wxl +++ b/DisplayMagicianSetup/Lang/en-us/Loc_en-us.wxl @@ -12,5 +12,31 @@ You must close !(loc.ProductName) in order to upgrade it! You cannot downgrade !(loc.ProductName) to a lower version using this installer. Please uninstall the older version of !(loc.ProductName) first! A newer version of !(loc.ProductName) is already installed. - This setup wizard will install DisplayMagician onto your computer. DisplayMagician will automatically run your games with a different display profile or audio settings and then will revert everything back to the way it was when you've finished playing. If you want to install DisplayMagician then click Next to continue or Cancel to exit. + {\White_Title}Welcome to the [ProductName] [ProductVersion] Setup Wizard + {\White_Normal}DisplayMagician will automatically run your games with a different display profile or audio settings and then will revert everything back to the way it was when you've finished playing. If you want to install DisplayMagician then click Next to continue or Cancel to exit. + {\White_Title}End User License Agreement + {\White_Normal}Please read and accept this License Agreement + {\White_Title}Completed the [ProductName] Setup Wizard + {\White_Normal}Click the Finish button to exit the Setup Wizard. + {\White_Title}[ProductName] Setup Wizard ended prematurely + {\White_Normal}[ProductName] Setup Wizard ended prematurely because of an error. Your system has not been modified. To install this program at a later time, run Setup Wizard again. + {\White_Title}[ProductName] Setup Wizard was interrupted + {\White_Normal}[ProductName] setup was interrupted. Your system has not been modified. To install this program at a later time, please run the installation again. + {\White_Title}Disk Space Requirements + {\White_Normal}The disk space required for the installation of the selected features. + {\White_Title}Change destination folder + {\White_Normal}Browse to the destination folder + {\White_Title}Files in Use + {\White_Normal}Some files that need to be updated are currently in use. + {\White_Title}Destination Folder + {\White_Normal}Click Next to install to the default folder or click Change to choose another. + {\White_Title}Ready to install [ProductName] + {\White_Title}Ready to change [ProductName] + {\White_Title}Ready to repair [ProductName] + {\White_Title}Ready to remove [ProductName] + {\White_Title}Ready to update [ProductName] + {\White_Title}Welcome to the [ProductName] Setup Wizard + {\White_Normal}The Setup Wizard allows you to change the way [ProductName] features are installed on your computer or to remove it from your computer. Click Next to continue or Cancel to exit the Setup Wizard. + {\White_Title}Change, repair, or remove installation + {\White_Normal}Select the operation you wish to perform. diff --git a/DisplayMagicianSetup/Product.wxs b/DisplayMagicianSetup/Product.wxs index a580c63..aca0a89 100644 --- a/DisplayMagicianSetup/Product.wxs +++ b/DisplayMagicianSetup/Product.wxs @@ -2,15 +2,14 @@ + xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> - + @@ -19,8 +18,8 @@ --> - - + + - - - - - - - - + + + + + + + + 1 1 LicenseAcceptedOverwritten = "1" AND NOT OLDER_VERSION_FOUND - - WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed + 1 + - + + + + @@ -126,11 +119,11 @@ - - + - - + @@ -168,10 +161,6 @@ - - - - \ No newline at end of file diff --git a/DisplayMagicianSetup/Resources/WixUIBannerBmp.png b/DisplayMagicianSetup/Resources/WixUIBannerBmp.png new file mode 100644 index 0000000..b1eb896 Binary files /dev/null and b/DisplayMagicianSetup/Resources/WixUIBannerBmp.png differ diff --git a/DisplayMagicianSetup/Resources/WixUIBannerBmpDark.png b/DisplayMagicianSetup/Resources/WixUIBannerBmpDark.png new file mode 100644 index 0000000..1e71cfd Binary files /dev/null and b/DisplayMagicianSetup/Resources/WixUIBannerBmpDark.png differ diff --git a/DisplayMagicianSetup/Resources/WixUIDialogBmp.png b/DisplayMagicianSetup/Resources/WixUIDialogBmp.png new file mode 100644 index 0000000..3dd1f3c Binary files /dev/null and b/DisplayMagicianSetup/Resources/WixUIDialogBmp.png differ