diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-06-13 12:24:16 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-06-13 12:24:16 +0200 |
| commit | 8c887bdba3150b723ba8fd26a7420869de694644 (patch) | |
| tree | 97d3eb1d37b0892d550dfd16a1290d3fc78ab293 | |
| parent | 7ff0bdb6e2c9e83628f179532eb2b30b16cf45dd (diff) | |
| parent | 6bf7907c195e7a36ca91098bb72b7352403967b0 (diff) | |
| download | qutebrowser-8c887bdba3150b723ba8fd26a7420869de694644.tar.gz qutebrowser-8c887bdba3150b723ba8fd26a7420869de694644.zip | |
Merge remote-tracking branch 'origin/pr/7124'
| -rwxr-xr-x | misc/nsis/install.nsh | 12 | ||||
| -rwxr-xr-x | misc/nsis/qutebrowser.nsi | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/misc/nsis/install.nsh b/misc/nsis/install.nsh index 9f0cdf446..8233ab5f0 100755 --- a/misc/nsis/install.nsh +++ b/misc/nsis/install.nsh @@ -542,8 +542,16 @@ Function PageInstallModeChangeMode FunctionEnd Function PageComponentsPre - GetDlgItem $0 $HWNDPARENT 1 - SendMessage $0 ${BCM_SETSHIELD} 0 0 ; hide SHIELD (Windows Vista and above) + SendMessage $mui.Button.Next ${BCM_SETSHIELD} 0 0 + StrCmpS $HasCurrentModeInstallation 0 +9 + IfFileExists "$DESKTOP\${PRODUCT_NAME}.lnk" +4 + SectionGetFlags ${SectionDesktopIcon} $1 + IntOp $1 $1 & 0xFFFFFFFE + SectionSetFlags ${SectionDesktopIcon} $1 + IfFileExists "$STARTMENU\${PRODUCT_NAME}.lnk" +4 + SectionGetFlags ${SectionStartMenuIcon} $1 + IntOp $1 $1 & 0xFFFFFFFE + SectionSetFlags ${SectionStartMenuIcon} $1 FunctionEnd Function PageDirectoryPre diff --git a/misc/nsis/qutebrowser.nsi b/misc/nsis/qutebrowser.nsi index 43214d9c8..7623d8cb2 100755 --- a/misc/nsis/qutebrowser.nsi +++ b/misc/nsis/qutebrowser.nsi @@ -43,6 +43,9 @@ ShowUninstDetails hide !addplugindir /x86-unicode ".\plugins\x86-unicode"
!addincludedir ".\include"
+!define MUI_BGCOLOR "SYSCLR:Window"
+!define MUI_TEXTCOLOR "SYSCLR:WindowText"
+
!include MUI2.nsh
!include NsisMultiUser.nsh
!include StdUtils.nsh
|