From 77b2923f87131a407f7d4193c54db22375130403 Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Mon, 14 Aug 2023 11:24:16 +0200 Subject: [PATCH 1/2] Add Signet launch shortcut for Windows cd src/qt/res/icons convert bitcoin.png -modulate 100,87,119.4 -define icon:auto-resize="256,48,32,16" bitcoin_signet.ico This commit also removes the 64-bit mention from testnet. --- share/setup.nsi.in | 6 ++++-- src/qt/res/bitcoin-qt-res.rc | 1 + src/qt/res/icons/bitcoin_signet.ico | Bin 0 -> 44428 bytes 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/qt/res/icons/bitcoin_signet.ico diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 2ce798bd2d1..6a6b18a55ce 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -95,7 +95,8 @@ Section -post SEC0001 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory $SMPROGRAMS\$StartMenuGroup CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ - CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, 64-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1 + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1 + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (test signet).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-signet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 2 CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_END WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" @@ -140,7 +141,8 @@ Section -un.post UNSEC0001 DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" - Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet, 64-bit).lnk" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet).lnk" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (test signet).lnk" Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk" Delete /REBOOTOK $INSTDIR\uninstall.exe Delete /REBOOTOK $INSTDIR\debug.log diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index e590b407b0d..18bf877fc2a 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -1,5 +1,6 @@ IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico" IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" +IDI_ICON3 ICON DISCARDABLE "icons/bitcoin_signet.ico" #include // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information diff --git a/src/qt/res/icons/bitcoin_signet.ico b/src/qt/res/icons/bitcoin_signet.ico new file mode 100644 index 0000000000000000000000000000000000000000..fb9be5153b05851d74af13a717ec082d2abb2359 GIT binary patch literal 44428 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 O*`VFVx77b_r2Pd>X0Chy literal 0 HcmV?d00001 From cfd03de965a081facbd72316c76603dd7aa511bd Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Tue, 3 Sep 2024 10:25:38 +0200 Subject: [PATCH 2/2] Add Testnet4 launch shortcut for Windows --- share/setup.nsi.in | 2 ++ src/qt/res/bitcoin-qt-res.rc | 1 + 2 files changed, 3 insertions(+) diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 6a6b18a55ce..f22e256967e 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -97,6 +97,7 @@ Section -post SEC0001 CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1 CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (test signet).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-signet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 2 + CreateShortcut "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet4).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet4" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 3 CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_END WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" @@ -142,6 +143,7 @@ Section -un.post UNSEC0001 Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet).lnk" + Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (testnet4).lnk" Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\@PACKAGE_NAME@ (test signet).lnk" Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk" Delete /REBOOTOK $INSTDIR\uninstall.exe diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 18bf877fc2a..d84744f91e7 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -1,6 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico" IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" IDI_ICON3 ICON DISCARDABLE "icons/bitcoin_signet.ico" +IDI_ICON4 ICON DISCARDABLE "icons/bitcoin_testnet.ico" // testnet4 #include // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information