diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-01 09:52:13 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-01 09:52:16 +0200 |
| commit | da50997a3ee7d3b73180c71cd454580af49c2244 (patch) | |
| tree | 4f780c1953a4dc24e15459da18805df2ed81b05f | |
| parent | 6a87eb0e4b476c37ed6e013f35a6aa5ef4ecf34e (diff) | |
| parent | 975a41dcc259c966e1ab952b3681dda2f7b99009 (diff) | |
| download | bitcoin-da50997a3ee7d3b73180c71cd454580af49c2244.tar.xz | |
Merge #8285: windows: Add testnet link to installer
975a41d windows: Add testnet icon for testnet link (Wladimir J. van der Laan)
0ce8e99 windows: Add testnet link to installer (Wladimir J. van der Laan)
| -rw-r--r-- | share/setup.nsi.in | 2 | ||||
| -rw-r--r-- | src/Makefile.qt.include | 1 | ||||
| -rw-r--r-- | src/qt/res/bitcoin-qt-res.rc | 1 | ||||
| -rw-r--r-- | src/qt/res/icons/bitcoin_testnet.ico | bin | 0 -> 57251 bytes |
4 files changed, 4 insertions, 0 deletions
diff --git a/share/setup.nsi.in b/share/setup.nsi.in index c062f96a30..dd42085a27 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -92,6 +92,7 @@ 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, @WINDOWS_BITS@-bit).lnk" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" "-testnet" "$INSTDIR\@BITCOIN_GUI_NAME@@EXEEXT@" 1 CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe !insertmacro MUI_STARTMENU_WRITE_END WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)" @@ -135,6 +136,7 @@ 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, @WINDOWS_BITS@-bit).lnk" Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk" Delete /REBOOTOK $INSTDIR\uninstall.exe Delete /REBOOTOK $INSTDIR\debug.log diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 36a21dd06f..ca2c7b2eb0 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -231,6 +231,7 @@ RES_ICONS = \ qt/res/icons/about.png \ qt/res/icons/about_qt.png \ qt/res/icons/bitcoin.ico \ + qt/res/icons/bitcoin_testnet.ico \ qt/res/icons/bitcoin.png \ qt/res/icons/chevron.png \ qt/res/icons/clock1.png \ diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 19c3d5d97d..94ae256477 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -1,4 +1,5 @@ IDI_ICON1 ICON DISCARDABLE "icons/bitcoin.ico" +IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" #include <windows.h> // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information diff --git a/src/qt/res/icons/bitcoin_testnet.ico b/src/qt/res/icons/bitcoin_testnet.ico Binary files differnew file mode 100644 index 0000000000..909194ecd2 --- /dev/null +++ b/src/qt/res/icons/bitcoin_testnet.ico |