From 5c99e10e7f681624eb0288221298f0aa671a9bee Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Mon, 8 Aug 2016 06:56:15 +0000 Subject: [PATCH] Generate bitcoin_testnet.ico using ImageMagick --- src/Makefile.am | 4 ++++ src/Makefile.qt.include | 3 +-- src/qt/res/bitcoin-qt-res.rc | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 711b373fd7..3391e2050c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1112,6 +1112,7 @@ RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg RES_RENDERED_ICONS = \ qt/res/rendered_icons/bitcoin.ico \ + qt/res/rendered_icons/bitcoin_testnet.ico \ qt/res/rendered_icons/bitcoin1024.png RES_ALL_RENDERED_ICONS = $(RES_RENDERED_ICONS) \ @@ -1137,6 +1138,9 @@ qt/res/rendered_icons/bitcoin.icns: $(patsubst %,qt/res/rendered_icons/bitcoin%. qt/res/rendered_icons/bitcoin.ico: qt/res/rendered_icons/bitcoin32d8.gif $(patsubst %,qt/res/rendered_icons/bitcoin%.png,256 64 48 32 20 16) $(IMAGEMAGICK_CONVERT) $^ $@ +qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico + $(IMAGEMAGICK_CONVERT) $^ -modulate 100,87,9 $@ + qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png $(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@ diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 495e874497..fd2140f3bd 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -175,7 +175,6 @@ QT_RES_FONTS = \ QT_RES_ICONS = $(RES_RENDERED_ICONS) \ qt/res/icons/add.png \ qt/res/icons/address-book.png \ - qt/res/icons/bitcoin_testnet.ico \ qt/res/icons/chevron.png \ qt/res/icons/clock1.png \ qt/res/icons/clock2.png \ @@ -291,7 +290,7 @@ QT_RES_ANIMATION = $(wildcard $(srcdir)/qt/res/animation/spinner-*.png) BITCOIN_QT_RC = qt/res/bitcoin-qt-res.rc -$(BITCOIN_RC): qt/res/rendered_icons/bitcoin.ico +$(BITCOIN_RC): qt/res/rendered_icons/bitcoin.ico qt/res/rendered_icons/bitcoin_testnet.ico BITCOIN_QT_INCLUDES = -DQT_NO_KEYWORDS -DQT_USE_QSTRINGBUILDER diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 0bd9fc443e..ca228ad9b6 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -1,5 +1,5 @@ IDI_ICON1 ICON DISCARDABLE "rendered_icons/bitcoin.ico" -IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico" +IDI_ICON2 ICON DISCARDABLE "rendered_icons/bitcoin_testnet.ico" #include // needed for VERSIONINFO #include "../../clientversion.h" // holds the needed client version information