From 4daadd308651424ed9baaa69764a3306af11c681 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Mon, 25 Jun 2018 19:38:49 +0200 Subject: [bug] point icon to assets folder --- win/RiseupVPN-installer.nsi | 190 ++++++++++++++++++++++---------------------- win/template.nsi | 4 +- 2 files changed, 97 insertions(+), 97 deletions(-) (limited to 'win') diff --git a/win/RiseupVPN-installer.nsi b/win/RiseupVPN-installer.nsi index fea8e60..d983f8c 100755 --- a/win/RiseupVPN-installer.nsi +++ b/win/RiseupVPN-installer.nsi @@ -1,69 +1,69 @@ -!include "MUI.nsh" - -Name "RiseupVPN" -RequestExecutionLevel admin - -Outfile RiseupVPN-installer.exe -;TODO make the installdir configurable - and set it in the registry. -InstallDir "C:\Program Files\RiseupVPN\" - - -!define BITMAP_FILE riseupvpn.bmp -!define MUI_PAGE_CUSTOMFUNCTION_PRE WelcomePageSetupLinkPre -!define MUI_PAGE_CUSTOMFUNCTION_SHOW WelcomePageSetupLinkShow - -; TODO fixme icons PATH -!define MUI_ICON "riseupvpn.ico" -!define MUI_UNICON "riseupvpn.ico" - -!define MUI_WELCOMEPAGE_TITLE "RiseupVPN" -!define MUI_WELCOMEPAGE_TEXT "This will install RiseupVPN in your computer. RiseupVPN is a simple VPN Client, powered by Bitmask." -#!define MUI_WELCOMEFINISHPAGE_BITMAP "riseup.png" - -!insertmacro MUI_PAGE_WELCOME -#!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - - -Function WelcomePageSetupLinkPre - File "..\assets\riseupvpn.png" - File "..\assets\riseupvpn.ico" - - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4" ; increase counter - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "122" ; limit size of the upper label - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Type" "Link" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "https://riseup.net" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "https://riseup.net" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "120" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "315" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "123" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "132" -FunctionEnd - -Function WelcomePageSetupLinkShow - ; Thanks to pengyou - ; Fix colors of added link control - ; See http://forums.winamp.com/showthread.php?s=&threadid=205674 - Push $0 - - GetDlgItem $0 $MUI_HWND 1203 - SetCtlColors $0 "0000FF" "FFFFFF" - ; underline font - CreateFont $1 "$(^Font)" "$(^FontSize)" "400" /UNDERLINE - SendMessage $0 ${WM_SETFONT} $1 1 - Pop $0 - -FunctionEnd - -Section "InstallFiles" - SetOutPath $INSTDIR - WriteUninstaller $INSTDIR\uninstaller.exe - - File "readme.txt" - File "..\staging\nssm.exe" - - +!include "MUI.nsh" + +Name "RiseupVPN" +RequestExecutionLevel admin + +Outfile RiseupVPN-installer.exe +;TODO make the installdir configurable - and set it in the registry. +InstallDir "C:\Program Files\RiseupVPN\" + + +!define BITMAP_FILE riseupvpn.bmp +!define MUI_PAGE_CUSTOMFUNCTION_PRE WelcomePageSetupLinkPre +!define MUI_PAGE_CUSTOMFUNCTION_SHOW WelcomePageSetupLinkShow + +; TODO fixme icons PATH +!define MUI_ICON "..\riseupvpn.ico" +!define MUI_UNICON "..\riseupvpn.ico" + +!define MUI_WELCOMEPAGE_TITLE "RiseupVPN" +!define MUI_WELCOMEPAGE_TEXT "This will install RiseupVPN in your computer. RiseupVPN is a simple VPN Client, powered by Bitmask." +#!define MUI_WELCOMEFINISHPAGE_BITMAP "riseup.png" + +!insertmacro MUI_PAGE_WELCOME +#!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + + +Function WelcomePageSetupLinkPre + File "..\assets\riseupvpn.png" + File "..\assets\riseupvpn.ico" + + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4" ; increase counter + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "122" ; limit size of the upper label + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Type" "Link" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "https://riseup.net" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "State" "https://riseup.net" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Left" "120" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Right" "315" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Top" "123" + !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Bottom" "132" +FunctionEnd + +Function WelcomePageSetupLinkShow + ; Thanks to pengyou + ; Fix colors of added link control + ; See http://forums.winamp.com/showthread.php?s=&threadid=205674 + Push $0 + + GetDlgItem $0 $MUI_HWND 1203 + SetCtlColors $0 "0000FF" "FFFFFF" + ; underline font + CreateFont $1 "$(^Font)" "$(^FontSize)" "400" /UNDERLINE + SendMessage $0 ${WM_SETFONT} $1 1 + Pop $0 + +FunctionEnd + +Section "InstallFiles" + SetOutPath $INSTDIR + WriteUninstaller $INSTDIR\uninstaller.exe + + File "readme.txt" + File "..\staging\nssm.exe" + + File ..\staging\bitmask_helper.exe File ..\staging\bitmask-systray.exe File ..\staging\openssl.exe @@ -72,28 +72,28 @@ Section "InstallFiles" File ..\staging\libeay32.dll File ..\staging\liblzo2-2.dll File ..\staging\libpkcs11-helper-1.dll - -SectionEnd - -Section "InstallService" - ; TODO: make sure that this is not running before attempting - ; to install it. - ExecWait '"$INSTDIR\nssm.exe" install riseupvpn-helper "$INSTDIR\bitmask_helper.exe"' - ExecWait '"$INSTDIR\nssm.exe" set riseupvpn-helper AppDirectory "$INSTDIR"' - ExecWait '"$INSTDIR"\nssm.exe start riseupvpn-helper' - ; Exec cmd.exe - -SectionEnd - -Section "Uninstall" - ExecWait '"$INSTDIR"\nssm.exe stop riseupvpn-helper' - ExecWait '"$INSTDIR"\nssm.exe remove riseupvpn-helper' - - Delete $INSTDIR\uninstaller.exe - Delete $INSTDIR\readme.txt - Delete $INSTDIR\nssm.exe - - + +SectionEnd + +Section "InstallService" + ; TODO: make sure that this is not running before attempting + ; to install it. + ExecWait '"$INSTDIR\nssm.exe" install riseupvpn-helper "$INSTDIR\bitmask_helper.exe"' + ExecWait '"$INSTDIR\nssm.exe" set riseupvpn-helper AppDirectory "$INSTDIR"' + ExecWait '"$INSTDIR"\nssm.exe start riseupvpn-helper' + ; Exec cmd.exe + +SectionEnd + +Section "Uninstall" + ExecWait '"$INSTDIR"\nssm.exe stop riseupvpn-helper' + ExecWait '"$INSTDIR"\nssm.exe remove riseupvpn-helper' + + Delete $INSTDIR\uninstaller.exe + Delete $INSTDIR\readme.txt + Delete $INSTDIR\nssm.exe + + Delete $INSTDIR\bitmask_helper.exe Delete $INSTDIR\bitmask-systray.exe Delete $INSTDIR\openssl.exe @@ -102,10 +102,10 @@ Section "Uninstall" Delete $INSTDIR\libeay32.dll Delete $INSTDIR\liblzo2-2.dll Delete $INSTDIR\libpkcs11-helper-1.dll - -SectionEnd - -;---------------------------------------- -;Languages - -!insertmacro MUI_LANGUAGE "English" + +SectionEnd + +;---------------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" diff --git a/win/template.nsi b/win/template.nsi index a0e4a3a..4f99863 100755 --- a/win/template.nsi +++ b/win/template.nsi @@ -13,8 +13,8 @@ InstallDir "C:\Program Files\$app_name\" !define MUI_PAGE_CUSTOMFUNCTION_SHOW WelcomePageSetupLinkShow ; TODO fixme icons PATH -!define MUI_ICON "$app_name_lower.ico" -!define MUI_UNICON "$app_name_lower.ico" +!define MUI_ICON "..\$app_name_lower.ico" +!define MUI_UNICON "..\$app_name_lower.ico" !define MUI_WELCOMEPAGE_TITLE "$app_name" !define MUI_WELCOMEPAGE_TEXT "This will install $app_name in your computer. $app_name is a simple VPN Client, powered by Bitmask." -- cgit v1.2.3