From 840f44848f61265da807ded528c221ad1f6947e7 Mon Sep 17 00:00:00 2001 From: Nate Weibley Date: Thu, 4 Feb 2016 19:04:48 -0500 Subject: [PATCH] Update NSIS installer to modern UI --- deploy/qgroundcontrol_installer.nsi | 29 +++++++++++++++++----------- installheader.bmp | Bin 0 -> 25818 bytes 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 installheader.bmp diff --git a/deploy/qgroundcontrol_installer.nsi b/deploy/qgroundcontrol_installer.nsi index 96db33ac2..1b7a97172 100644 --- a/deploy/qgroundcontrol_installer.nsi +++ b/deploy/qgroundcontrol_installer.nsi @@ -1,15 +1,22 @@ +!include "MUI2.nsh" + Name "QGroundcontrol" +Var StartMenuFolder InstallDir $PROGRAMFILES\qgroundcontrol -Page license -Page directory -Page components -Page instfiles -UninstPage uninstConfirm -UninstPage instfiles +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "installheader.bmp"; + +!insertmacro MUI_PAGE_LICENSE "license.txt" +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES -LicenseData license.txt +!insertmacro MUI_LANGUAGE "English" Section SetOutPath $INSTDIR @@ -50,10 +57,10 @@ done: SectionEnd Section "Uninstall" + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder SetShellVarContext all - Delete $INSTDIR\QGroundControl_uninstall.exe RMDir /r /REBOOTOK $INSTDIR - RMDir /r /REBOOTOK "$SMPROGRAMS\QGroundControl\" + RMDir /r /REBOOTOK "$SMPROGRAMS\$StartMenuFolder\" SetShellVarContext current RMDir /r /REBOOTOK "$APPDATA\QGROUNDCONTROL.ORG\" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\QGroundControl" @@ -61,8 +68,8 @@ SectionEnd Section "create Start Menu Shortcuts" SetShellVarContext all - CreateDirectory "$SMPROGRAMS\QGroundControl" - CreateShortCut "$SMPROGRAMS\QGroundControl\QGroundControl.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0 + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QGroundControl.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0 SectionEnd Function .onInit diff --git a/installheader.bmp b/installheader.bmp new file mode 100644 index 0000000000000000000000000000000000000000..6f8732501dfb1e11b9e3d69669690f3cd221d77b GIT binary patch literal 25818 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 literal 0 HcmV?d00001 -- 2.22.0